From d333a3cfd7882071fc3b9e357a8882e1e3f325d5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 12月 2024 13:20:24 +0800
Subject: [PATCH] 增补

---
 CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
index d33b27f..353b0de 100644
--- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
@@ -10,6 +10,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Remoting.Messaging;
 using System.ServiceModel.Configuration;
 using System.Text;
 using System.Threading;
@@ -34,7 +35,8 @@
                 SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = string.Empty;
                 try
                 {
-                    if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
+                    //if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
+                    if (SystemValue.isStartedModel)
                     {
                         var rgvLocation = StationLocationEnum.BZ30.ToString();
 
@@ -55,6 +57,7 @@
                             var configValues = configValue.Split('|');
                             var packageCode = configValues[0];
                             var qitaoValue = configValues[1];//榻愬  涓嶉綈濂�
+                            var _UnlinePerson = configValues[2];
                             bool iscomplete = false;
                             if (qitaoValue.Equals("榻愬"))
                             {
@@ -80,11 +83,11 @@
 
                             //鏇存柊鍊�
                             bz30Config.Value = "";
-                            var gahter = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
-                            if (gahter != null)
+                            var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
+                            if (package != null)
                             {
-                                gahter.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
-                                gahter.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+                                package.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+                                package.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
                             }
                             var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
                             foreach (var item in upiList)
@@ -99,14 +102,28 @@
                             {
                                 wmsDB.mes_package_linequeue.Remove(lineQueue);
                             }
+
+
+                            //澶勭悊琛�  mes_order_gather
+                            var errmsg = "";
+                            var result = MyExtendHelper.HandlerOrderGather(wmsDB, package, qitaoValue, _UnlinePerson, out errmsg);
+                            if (result == false)
+                            {
+                                SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = errmsg;
+                                continue;
+                            }
+
+
                             //鏂板涓嬬嚎璁板綍
                             mes_package_unline_record record = new mes_package_unline_record();
-                            record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(gahter);
+                            record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(package);
                             record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                             record.CreateTime = DateTime.Now;
                             record.UpdateTime = DateTime.Now;
                             record.OpRemark = "涓嬬嚎";
                             wmsDB.mes_package_unline_record.Add(record);
+
+                            WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ30", "榻愬楠岃瘉");
 
 
                             wmsDB.SaveChanges();
@@ -122,5 +139,6 @@
             }
         }
 
+
     }
 }

--
Gitblit v1.9.3