From 283a985dede9fd09cb820a79bb603d7ea34050fc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 14:26:17 +0800
Subject: [PATCH] 22
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index 17ad69b..075a77a 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -105,6 +105,13 @@
continue;
}
+ var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
+ if (package == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁鍖呭彿:{upiObj.PackageCode}娌℃湁鎵惧埌瀵硅薄 ";
+ continue;
+ }
+
//楠岃瘉鏄惁鍏佽鍒囩焊
var validteReslt = ValidateIsAllowCut();
if (validteReslt == false)
@@ -117,7 +124,7 @@
//string upi = "LS070700101B0001GS";
//璋冪敤鍑虹焊鏈烘帴鍙�
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
+ var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_package_gather>(package);
papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
papercut.ApiMessage = "";
papercut.PushNum = 0;
@@ -160,7 +167,7 @@
wmsDB.mes_push_packagecode.Add(putpakegecode);
//鏂板琛�
- var mesinequeue = ClassHelper.RotationMapping<mes_package_linequeue, mes_batchOrderUPI_new>(upiObj);
+ var mesinequeue = ClassHelper.RotationMapping<mes_package_linequeue, mes_package_gather>(package);
mesinequeue.Id = Yitter.IdGenerator.YitIdHelper.NextId();
mesinequeue.CreateTime = mesinequeue.UpdateTime = DateTime.Now;
wmsDB.mes_package_linequeue.Add(mesinequeue);
@@ -206,7 +213,7 @@
};
//鏂板鎵撳嵃琛�
var printid = Yitter.IdGenerator.YitIdHelper.NextId();
- var print = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
+ var print = ClassHelper.RotationMapping<wms_record_print, mes_package_gather>(package);
print.Id = printid;
print.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
print.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
@@ -233,7 +240,7 @@
//澶勭悊琛� mes_order_gather
var errmsg = "";
- var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
+
var resultAlert = MyExtendHelper.HandlerOrderGather(wmsDB, package, "", "", out errmsg);
if (resultAlert == false)
{
@@ -243,7 +250,7 @@
WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
- WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ21", "鍚堝寘");
wmsDB.SaveChanges();
}
--
Gitblit v1.9.3