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

647556386

2026-01-08 c317c0a0c5475c3889a2bc75d30d2ed83cd6e43b

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

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue

@@ -272,6 +272,13 @@
        align: "left",
      },
      {
        field: "returnToMESStatus",
        title: "回传状态",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "factoryArea",
        title: "厂区",
        type: "string",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue

@@ -181,6 +181,11 @@
        type: "string",
        width: 120,
        align: "left"
      },{
        field: "returnToMESStatus",
        title: "回传MES状态",
        width: 120,
        bind: { key: "createType", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" }] },
      },
      {
        field: "creater",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue

@@ -192,6 +192,12 @@
        align: "left"
      },
      {
        field: "returnToMESStatus",
        title: "回传MES状态",
        width: 120,
        bind: { key: "createType", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" }] },
      },
      {
        field: "departmentCode",
        title: "修改时间",
        type: "string",

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

@@ -526,11 +526,13 @@
                    item.OrderStatus = _InboundOrder.OrderStatus;
                    item.OrderType = _InboundOrder.OrderType;
                    item.Modifier = _InboundOrder.Operator;
                    item.ReturnToMESStatus = _InboundOrder.ReturnToMESStatus;
                }else if (OutboundOrder!=null)
                {
                    item.OrderStatus = OutboundOrder.OrderStatus;
                    item.OrderType = OutboundOrder.OrderType;
                    item.Modifier = OutboundOrder.Operator;
                    item.ReturnToMESStatus = OutboundOrder.ReturnToMESStatus;
                }
            }
            return new PageGridData<Dt_AllocateOrder>(totalCount, data);

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

@@ -90,7 +90,7 @@

                if (details.Count() <= 0)
                {
                    return content.Error("未找到该条码单据信息请确认是否已经组盘完成");
                    return content.Error("请确认是否已经组盘");
                }
                inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Includes(x=>x.Details).Where(x => x.Id == details.First().OrderId).First();