From be14322d1b20857082dd47aeb895bd976dca13e0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 17:40:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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..a88ad98 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;
@@ -55,6 +56,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 +82,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,9 +101,21 @@
{
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;
@@ -122,5 +136,6 @@
}
}
+
}
}
--
Gitblit v1.9.3