Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

2025-12-22 3bbc6b99b1492d12efde3cc92571fe0e91a81e94

Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/config/buttons.js

@@ -267,6 +267,15 @@
    onClick: function () {
    }
}
,{
    name: "整单出库",
    // icon: 'el-icon-upload2',
    class: '',
    value: 'OrderOut',
    type: 'primary',
    onClick: function () {
    }
}
]

export default buttons

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js

@@ -179,55 +179,7 @@
                    render(vnode, mountNode);
                }
            },
      {
  name: '分批入库',
  type: 'primary',
  value: '分批入库',
  onClick: async function () { 
    console.log('分批入库按钮被点击，开始校验');
    const selectedRows = this.$refs.table.getSelected();

    // æ ¡éªŒ1：是否选中行（至少选择一条）
    if (selectedRows.length === 0) {
      console.log('校验不通过：未选中任何单据');
      ElMessage.warning('请选择至少一条单据');
      return;
    }

    // æ”¶é›†æ‰€æœ‰é€‰ä¸­å•æ®çš„编号（过滤无单据号的异常行）
    const inboundOrderNos = selectedRows
      .filter(row => row.inboundOrderNo)
      .map(row => row.inboundOrderNo);

    // æ ¡éªŒ2：是否有有效单据号
    if (inboundOrderNos.length === 0) {
      console.log('校验不通过：选中单据无有效编号');
      ElMessage.warning('选中的单据中无有效编号，请重新选择');
      return;
    }

    try {
      console.log('发起分批入库请求，参数：', { inboundOrderNos});
      const response = await http.post('/api/InboundOrder/BatchOrderFeedbackToMes', {
        orderNos: inboundOrderNos, 
        inout:1
      });

      const { status, message, data } = response;
      if (status) {
        console.log('分批入库成功，后端返回：', data);
        ElMessage.success(`分批入库成功！共处理${inboundOrderNos.length}条单据`);
        this.refresh(); // å…¥åº“成功后刷新列表（复用原有逻辑）
      } else {
        console.log('分批入库失败，后端提示：', message);
        ElMessage.error(message || data?.message || '分批入库失败');
      }
    } catch (error) {
      console.error('分批入库请求异常：', error);
      ElMessage.error('网络异常或接口错误，请稍后重试');
    }
  }
},
     {
  name: '空托盘入库',
  type: 'primary',

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js

@@ -376,6 +376,177 @@
        }
      }

      let OrderOutBtn = this.buttons.find(x => x.value == 'OrderOut');
if (OrderOutBtn) {
  // 1. æ”¹ä¸ºç®­å¤´å‡½æ•°ï¼Œç¡®ä¿this指向Vue组件实例（原普通函数this指向按钮本身）
  OrderOutBtn.onClick = async () => {
    // çŽ°åœ¨this是Vue组件实例，能正确获取$refs
    let rows = this.$refs.table.getSelected();
    if (rows.length == 0) return this.$error("请选择数据!");
    if (rows.length > 1) return this.$error("请选择一条数据!");
    
    // ç¡®ä¿é€‰ä¸­è¡Œæœ‰id（根据实际表格数据字段调整，比如rows[0].detailId等）
    const selectedId = rows[0].id || rows[0].detailId;
    if (!selectedId) return this.$error("选中数据缺少必要ID字段!");

    const platformOptions = [
      { label: "站台2", value: "2-1" },
      { label: "站台3", value: "3-1" },
    ];
    const mountNode = document.createElement("div");
    document.body.appendChild(mountNode);

    const formData = reactive({
      selectedPlatform: platformOptions[0].value,
    });

    const vnode = createVNode(
      ElDialog,
      {
        title: "出库操作 - é€‰æ‹©å‡ºåº“站台",
        width: "500px",
        modelValue: true,
        appendToBody: true,
        "onUpdate:modelValue": (isVisible) => {
          if (!isVisible) {
            render(null, mountNode);
            document.body.removeChild(mountNode);
          }
        },
        style: {
          padding: "20px 0",
          borderRadius: "8px",
        },
      },
      {
        default: () =>
          h(
            ElForm,
            {
              model: formData,
              rules: {
                selectedPlatform: [
                  { required: true, message: "请选择出库站台", trigger: "change" },
                ],
              },
              ref: "outboundForm", // è¡¨å•ref
              labelWidth: "100px",
              style: {
                padding: "0 30px",
              },
            },
            [
              h(ElFormItem, {
                label: "出库站台",
                prop: "selectedPlatform",
                style: {
                  marginBottom: "24px",
                },
              }, [
                h(ElSelect, {
                  placeholder: "请选择出库站台（3-12）",
                  modelValue: formData.selectedPlatform,
                  "onUpdate:modelValue": (val) => {
                    formData.selectedPlatform = val;
                  },
                  style: {
                    width: "100%",
                    height: "40px",
                    borderRadius: "4px",
                    borderColor: "#dcdfe6",
                  },
                }, platformOptions.map((platform) =>
                  h(ElOption, { label: platform.label, value: platform.value })
                )),
              ]),
              h("div", {
                style: {
                  textAlign: "right",
                  marginTop: "8px",
                  paddingRight: "4px",
                },
              }, [
                h(ElButton, {
                  type: "text",
                  onClick: () => {
                    render(null, mountNode);
                    document.body.removeChild(mountNode);
                    ElMessage.info("取消出库操作");
                  },
                  style: {
                    marginRight: "8px",
                    color: "#606266",
                  },
                }, "取消"),
                h(ElButton, {
                  type: "primary",
                  onClick: async () => {
                    // 2. ç¡®ä¿è¡¨å•ref已挂载（用nextTick避免获取不到）
                    await this.$nextTick();
                    const formRef = vnode.component.refs.outboundForm;
                    
                    if (!formRef) {
                      ElMessage.error("表单初始化失败，请重试");
                      return;
                    }

                    try {
                      await formRef.validate();
                    } catch (err) {
                      return;
                    }
                    var param = rows[0].orderNo;
                    const requestParams = {
                      detailIds: [],
                      outboundTargetLocation: formData.selectedPlatform,
                      outboundQuantity: 1,
                      operator: this.currentOperator || "admin", 
                      orderNo: param,
                    };

                    try {

                      const x = await this.http.post(
                        "api/Outbound/ProcessPickingOutbound",
                        requestParams,
                        "数据处理中"
                      );

                      if (!x.status) {
                        ElMessage.error(x.message || "操作失败");
                        return;
                      }

                      ElMessage.success("操作成功");
                      this.showDetialBox = false;
                      this.$emit("parentCall", ($vue) => {
                        $vue.getData();
                      });
                    } catch (error) {
                      // 5. æ‰“开错误捕获，方便调试
                      console.error("出库接口请求失败：", error);
                      ElMessage.error("请求失败，请稍后重试");
                    } finally {
                      // æ— è®ºæˆåŠŸå¤±è´¥ï¼Œéƒ½å…³é—­å¼¹çª—
                      render(null, mountNode);
                      document.body.removeChild(mountNode);
                    }
                  },
                  style: {
                    borderRadius: "4px",
                    padding: "8px 20px",
                  },
                }, "确定出库"),
              ]),
            ]),
      }
    );

    vnode.appContext = this.$.appContext;
    render(vnode, mountNode);
  };
}

    },
    onInited() {
      //框架初始化配置后

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs

@@ -423,7 +423,13 @@
                    if (response != null && response.IsSuccess)
                    {
                        _inboundOrderRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
                        .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
                        .Where(it => it.OrderId == inboundOrder.Id && inbounddetailID.Contains(it.Id)).ExecuteCommand();
                    }
                    else
                    {
                        _inboundOrderRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
                         .Where(it => inbounddetailID.Contains(it.Id)).ExecuteCommand();
                        return content.Error("回传MES失败");
                    }
                }
                else

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs

@@ -1107,7 +1107,11 @@
                    {
                        UpdateOutboundOrderStatus(request.OrderNo, OutOrderStatusEnum.出库完成.ObjToInt());

                        if(outboundOrder.OrderType != OutOrderTypeEnum.InternalAllocat.ObjToInt())
                        {
                        _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
                        }
                        
                    }
                }
                catch (Exception ex)
@@ -1495,9 +1499,12 @@
                    {
                        UpdateOutboundOrderStatus(request.OrderNo, OutOrderStatusEnum.出库完成.ObjToInt());

                        if (outboundOrder.OrderType != OutOrderTypeEnum.InternalAllocat.ObjToInt())
                        {
                        _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);
                    }
                }
                }
                catch (Exception ex)
                {
                    _unitOfWorkManage.RollbackTran();

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -744,13 +744,15 @@
                }
                Dt_OutboundOrder outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x=>x.Details).First();

                if(outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                {
                ///回调MES
                    HttpResponseResult<MesResponseDTO> httpResponseResult = new HttpResponseResult<MesResponseDTO>();
                    string reqCode = Guid.NewGuid().ToString();
                    string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                    string requestData = string.Empty;
                    List<string> lineNos = new List<string>();
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    
                    Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.OrderNo == outboundOrder.OrderNo);
                    if (allocateOrder == null)
                    {
@@ -773,6 +775,72 @@
                    httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);
                    httpResponseResult.ApiUrl = apiUrl;
                }
                bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
                string message = "成功";
                if (!isSuccess)
                {
                    if (!httpResponseResult.IsSuccess)
                    {
                        message = $"MES接口返回错误，HTTP代码：{httpResponseResult.StatusCode}，信息：{httpResponseResult.ErrorMessage}";
                    }
                    else if (httpResponseResult?.Data?.Code != "200")
                    {
                        message = $"调用MES接口失败，代码：{httpResponseResult?.Data?.Code}，信息：{httpResponseResult?.Data?.Message}";
                    }
                }

                Dt_MesReturnRecord mesReturnRecord = new Dt_MesReturnRecord()
                {
                    ApiUrl = httpResponseResult.ApiUrl,
                    InterfaceType = outboundOrder.OrderType == 0 ? 1 : 3,
                    OrderId = outboundOrder.Id,
                    OrderNo = outboundOrder.OrderNo,
                    RequestCode = reqCode,
                    RequestData = requestData,
                    FailureReason = message,
                    LastReturnTime = DateTime.Now,
                    HttpStatusCode = httpResponseResult.StatusCode.ObjToInt(),
                    ResponseData = httpResponseResult.Content,
                    ReturnType = 0,
                    ReturnCount = 1,
                    ReturnStatus = isSuccess ? 1 : 2,
                    SuccessTime = isSuccess ? DateTime.Now : null
                };

                _unitOfWorkManage.BeginTran();
                _unitOfWorkManage.Db.Insertable(mesReturnRecord).ExecuteCommand();

                List<Dt_OutboundOrderDetail> outboundOrderDetails = outboundOrder.Details.Where(x => lineNos.Contains(x.lineNo)).ToList();
                outboundOrderDetails.ForEach(x =>
                {
                    if (x.OverOutQuantity == x.OrderQuantity - x.MoveQty)
                    {
                        x.ReturnToMESStatus = isSuccess ? 1 : 2;
                    }
                    else
                    {
                        x.ReturnToMESStatus = isSuccess ? 3 : 4;
                    }
                    x.CurrentDeliveryQty = 0;
                    x.ReturnJsonData = "";
                });

                mesReturnRecord.ReturnType = outboundOrder.Details.Count == outboundOrderDetails.Count ? 1 : 2;

                if (outboundOrder.Details.Count == outboundOrderDetails.Count && outboundOrderDetails.All(x => x.ReturnToMESStatus == 1 || x.ReturnToMESStatus == 2))
                {
                    outboundOrder.ReturnToMESStatus = isSuccess ? 1 : 2;
                }
                else
                {
                    outboundOrder.ReturnToMESStatus = isSuccess ? 3 : 4;
                }

                _outboundOrderService.Db.Updateable(outboundOrderDetails).ExecuteCommand();
                _outboundOrderService.UpdateData(outboundOrder);

                _unitOfWorkManage.CommitTran();

                try
                {
                    _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);