From 71f890c1c7f40d2605f9eabfe787e5ac287162fc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 18:58:48 +0800
Subject: [PATCH] 333
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 78fb444..abb8a45 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"
@@ -30,7 +30,7 @@
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
+
try
{
if (SystemValue.isStartedModel)
@@ -80,7 +80,7 @@
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
+ var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result, true);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
@@ -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);
@@ -179,8 +186,19 @@
//璁板綍浠诲姟
var _id = Yitter.IdGenerator.YitIdHelper.NextId();
- var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
+ var plcTaskNo = BusinessHelper.CreatePlcTaskId();
+ plcTaskNo = MyExtendHelper.GetNewTaskNo(wmsDB, RbTaskTypeEnum.鍚堝寘浠诲姟, plcTaskNo);
+ //鍒ゆ柇璇ュ寘涓� 鏄惁鏈夋湭缁撴潫鐨� 鐮佹澘浠诲姟锛屽鏋滄湁锛屽氨鑷姩鏇存柊瀹屾垚
+ var mb_nofinishList = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
+ && x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
+ && x.PackageCode == upiObj.PackageCode
+ ).ToList();
+ foreach (var item in mb_nofinishList)
+ {
+ item.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
+ item.TaskMsg = "浠诲姟琚郴缁熷湪鍚堝寘宸ヤ綅鑷姩瀹屾垚(2)";
+ }
//鏂板浠诲姟琛�
var task = new wms_rbline_task()
@@ -199,14 +217,14 @@
TaskStatus = (int)TaskStatusEnum.鏂板缓,
TaskMsg = "澶规澘",
CreateTime = DateTime.Now,
- CreateUserName = "CC",
+ CreateUserName = SysGloble.WCSSystem,
UpdateTime = DateTime.Now,
- UpdateUserName = "CC",
+ UpdateUserName = SysGloble.WCSSystem,
PlaceCode = place
};
//鏂板鎵撳嵃琛�
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.鍖呰鏉＄爜鎵撳嵃;
@@ -216,16 +234,16 @@
print.IsAllowPrint = true;
print.CreateTime = print.UpdateTime = DateTime.Now;
wmsDB.wms_record_print.Add(print);
- var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
- printtwo.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
- printtwo.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
- printtwo.PrintSheetNum = 1;
- printtwo.PrintNum = 0;
- printtwo.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
- printtwo.IsAllowPrint = true;
- printtwo.CreateTime = print.UpdateTime = DateTime.Now;
- printtwo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wmsDB.wms_record_print.Add(printtwo);
+ //var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
+ //printtwo.PrintType = (int)PrintTypeEnum.鍖呰鏉＄爜;
+ //printtwo.PrintSource = (int)PrintSourceEnum.鍖呰鏉＄爜鎵撳嵃;
+ //printtwo.PrintSheetNum = 1;
+ //printtwo.PrintNum = 0;
+ //printtwo.PrintStatus = (int)PrintStatuEnum.鏈墦鍗�;
+ //printtwo.IsAllowPrint = true;
+ //printtwo.CreateTime = print.UpdateTime = DateTime.Now;
+ //printtwo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ //wmsDB.wms_record_print.Add(printtwo);
wmsDB.wms_rbline_task.Add(task);
@@ -233,7 +251,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 +261,7 @@
WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
- WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ21", "鍚堝寘");
wmsDB.SaveChanges();
}
--
Gitblit v1.9.3