From c4c2f2214f3213c6200435595aa64110b6984092 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 14:18:16 +0800
Subject: [PATCH] 大屏
---
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 76a29ee..cbfcc0f 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"
@@ -55,6 +55,7 @@
var configValues = configValue.Split('|');
var packageCode = configValues[0];
var qitaoValue = configValues[1];//榻愬 涓嶉綈濂�
+ var _UnlinePerson = configValues[2];
bool iscomplete = false;
if (qitaoValue.Equals("榻愬"))
{
@@ -99,14 +100,7 @@
{
wmsDB.mes_package_linequeue.Remove(lineQueue);
}
- //鏂板涓嬬嚎璁板綍
- mes_package_unline_record record = new mes_package_unline_record();
- 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);
+
//澶勭悊琛� mes_order_gather
var isAddOrder = false;
@@ -141,12 +135,50 @@
order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
order.IsKitting = qitaoValue == "榻愬" ? true : false;
+ var order_unLine = false;
+ //鏌ヨ涓嬩竴涓寘鏄笉鏄睘浜庤璁㈠崟
+ var newLineQueue = wmsDB.mes_package_linequeue.OrderBy(x => x.Id).FirstOrDefault();
+ if (newLineQueue != null && newLineQueue.Info5 != order.Info5)
+ {
+ //琛ㄧず鏄� 鍒囨崲 鏂拌鍗曚簡锛岃璁㈠崟瑕佹洿鏂颁负 宸蹭笅绾裤��
+ order_unLine = true;
+ }
+ else
+ {
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order.PackageNum == order.UnLinePackageNum)
+ {
+ order_unLine = true;
+ }
+ }
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order_unLine)
+ {
+ order.IsUnline = true;
+ order.UnlineTime = DateTime.Now;
+ order.UnlinePerson = _UnlinePerson;
+ }
+ else
+ {
+ order.IsUnline = false;
+ }
+
if (isAddOrder)
{
wmsDB.mes_order_gather.Add(order);
}
+ //鏂板涓嬬嚎璁板綍
+ mes_package_unline_record record = new mes_package_unline_record();
+ 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);
+
+
wmsDB.SaveChanges();
}
}
--
Gitblit v1.9.3