From 13c22c3a105e051af9d0c76adfc2f95833a684a8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 01 十二月 2025 14:28:57 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 141197b..792869e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -282,7 +282,7 @@
                             {
                                 ReqCode = Guid.NewGuid().ToString(),
                                 ReqTime = DateTime.Now.ToString(),
-                                BusinessType = "2",
+                                BusinessType = "3",
                                 FactoryArea = inboundOrder.FactoryArea,
                                 OperationType = 1,
                                 Operator = inboundOrder.Operator,
@@ -325,6 +325,13 @@
                     }
                     else if (inboundOrder.OrderType == InOrderTypeEnum.ReCheck.ObjToInt()) //閲嶆鍏ュ簱
                     {
+                        //涓嶉渶瑕佸洖浼犮�傚崰涓�涓綅缃��
+                    }
+                    else if (inboundOrder.OrderType == InOrderTypeEnum.InternalAllocat.ObjToInt()) //鏅轰粨璋冩櫤浠�
+                    {
+                        _logger.LogInformation($"InboundTaskCompleted 鍥炲啓MES  : {inboundOrder.InboundOrderNo }  ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} "  );
+                        // BusinessTypeEnum.鏅轰粨璋冩櫤浠�
+
 
                     }
                     else
@@ -593,6 +600,7 @@
                 bool allCompleted = true;
                 foreach (var detail in orderDetails)
                 {
+                    _logger.LogInformation($"TaskService  HandleOutboundOrderToMESCompletion: {outboundOrder.OrderNo} , {detail.NeedOutQuantity}");
                     if (detail.OverOutQuantity < detail.NeedOutQuantity)
                     {
                         allCompleted = false;
@@ -662,7 +670,6 @@
 
                             allocatefeedmodel.Details.Add(detailModel);
                         }
-
                         var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
                         if (result != null && result.code == 200)
                         {
@@ -680,7 +687,7 @@
                     }
                     else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
                     {
-
+                        //涓嶇敤鍥炰紶
                     }
                     else
                     {
@@ -721,14 +728,13 @@
                                     barcode = lockInfo.CurrentBarcode,
                                     supplyCode = lockInfo.SupplyCode,
                                     batchNo = lockInfo.BatchNo,
-                                    unit = lockInfo.Unit,
-                                    qty = lockInfo.PickedQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
+                                    unit = lockInfo.BarcodeUnit,
+                                    qty = lockInfo.BarcodeQty // 鏉$爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
                                 }).ToList()
                             };
 
                             feedmodel.details.Add(detailModel);
                         }
-
                         var result = await _invokeMESService.FeedbackOutbound(feedmodel);
                         if (result != null && result.code == 200)
                         {

--
Gitblit v1.9.3