From 9a886d711d8b21adc335fdf8c39350584c7ba6fd Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:14 +0800
Subject: [PATCH] 更新代码,取消MES出库单号同步标识,平库转立库功能,寄售周期判断取消,精品标识等

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
index f24d033..7b1f8e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
@@ -30,7 +30,7 @@
         /// MES鎴愬搧鍏ュ簱鍗曟帴鏀�
         /// </summary>
         /// <returns></returns>
-        public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel)
+        public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel, string formSign = "")
         {
             MesResponseContent content = new MesResponseContent();
             try
@@ -111,6 +111,7 @@
                             ERPOrder = child.ERPOrder,
                             SaleOrder = child.SaleOrder,
                             MoNumber = child.MoNumber,
+                            IsFineWorks=item.IsFineWorks,
                         };
                         mesProInOrderDetails.Add(mesProInOrderDetail);
                     }
@@ -177,18 +178,21 @@
                 newTask.TaskId = taskId;
                 Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
                 //涓婁紶ERP
-                WebResponseContent responseContent = _inboundOrderService.FeedbackProIn(mesProInOrder);
+                if (string.IsNullOrEmpty(formSign))
+                {
+                    WebResponseContent responseContent = _inboundOrderService.FeedbackProIn(mesProInOrder);
+                    if (!responseContent.Status)
+                    {
+                        //mesProInOrder.UpErpStatus = WhetherEnum.False.ObjToInt();
+                        //mesProInOrder.Remark = responseContent.Message;
+                        throw new Exception(responseContent.Message);
+                    }
+                    else
+                    {
+                        mesProInOrder.UpErpStatus = WhetherEnum.True.ObjToInt();
+                    }
+                }
                 _proInStatisticsService.SaveStatic(bagInfoModel);
-                if (!responseContent.Status)
-                {
-                    //mesProInOrder.UpErpStatus = WhetherEnum.False.ObjToInt();
-                    //mesProInOrder.Remark = responseContent.Message;
-                    throw new Exception(responseContent.Message);
-                }
-                else
-                {
-                    mesProInOrder.UpErpStatus = WhetherEnum.True.ObjToInt();
-                }
                 Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand();
                 _unitOfWorkManage.CommitTran();
                 //鎺ㄩ�佷换鍔�
@@ -440,7 +444,7 @@
             mesShipOrderDetails.Add(orderDetail);
             MesShipmentOrderSync shipmentOrderSync = new MesShipmentOrderSync()
             {
-                ShipmentOrder = proOutOrder.ProOutOrderNo+"-"+ outProStockInfo.TaskNum,
+                ShipmentOrder = proOutOrder.ProOutOrderNo,
                 PlantShipDate = proOutOrder.PlantShipDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 Customer = proOutOrderDetail.EndCustomer,
                 FactoryCode = proOutOrderDetail.FactoryCode,

--
Gitblit v1.9.3