From afc3ef31921d5ca812f7db92dfb107e2c25eff4c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 01 4月 2025 16:41:45 +0800
Subject: [PATCH] 上一次码垛包装号和站点 LastPalletizingData 加上 第几块板和 upi
---
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
index c22b7f2..de3b436 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
@@ -69,27 +69,26 @@
}
var upiCode = result.Replace("/r", ""); ;
short lastnum = 0;//鏄惁鏈澘
- //short isrotate = 0;//鏄惁鏃嬭浆
- //short placeX = 0;
- //short placeY = 0;
- //short placeZ = 0;
+
string place = "";
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
+ var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result, false);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-upi锛歿result}鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
+ /*
isValidate = TaskHandler.ValidateNoFinishOutTaskFor鐮佹澘浠诲姟(wmsDB);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鏈� 鏈粨鏉� 鐨勪换鍔★紝涓嶈兘澶勭悊,姝ゆ寰幆缁撴潫";
continue;
}
+ //*/
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
@@ -106,12 +105,23 @@
//placeZ = (short)upiObj.MachineZCenter;
if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨� || upiObj.UpiStatus == (int)UpiStatusEnum.鐮佸灈涓�)
{
- //鍐欏叆鎶ヨ淇℃伅
- await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_3);
-
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}鐘舵�佸凡鏄�'宸茬爜鍨�'鎴�'鐮佸灈涓�' ";
+ MyExtendHelper.SetValueControlRequestDicts(PlcWarningAddressGloble.Num_BZ12_3, false, SystemWarningMsg._lbl_alert_DataProcess_BZ12);
+
+ var isAllow = MyExtendHelper.ValidateIsAllowRequest(PlcWarningAddressGloble.Num_BZ12_3, LogType.DataProcess_BZ12);
+ if (isAllow == false)
+ {
+ continue;
+ }
+ else
+ {
+ //鍐欏叆鎶ヨ淇℃伅
+ await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_3);
+ }
+
continue;
}
+ MyExtendHelper.SetValueControlRequestDicts(PlcWarningAddressGloble.Num_BZ12_3, true, "");
upiObj.UpiStatus = (int)UpiStatusEnum.鐮佸灈涓�;
upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
//鏌ュ杩欏寘鎵�鏈夌殑鏁伴噺
@@ -157,7 +167,6 @@
}
else
{//琛ㄧず杩欐槸 鍖呯殑绗竴鍧楁澘
- lastnum = 1;
palletizingUPI = upiObj.PackageCode;
if (obj.R_PalletizingStation1 == 1)
{
@@ -170,11 +179,15 @@
}
else
{
+ //鍘绘帀鎶ヨ锛屼笉鍐嶆牎楠岃繖涓簡
+ place = "1";
+ /*
//鍐欏叆鎶ヨ淇℃伅
await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
continue;
+ //*/
}
palletizingStation = int.Parse(place);
@@ -182,9 +195,17 @@
//濡傛灉娆″簭绛変簬褰撻挶鍖呮�绘暟閲忥紝鏄惁鏈澘缃负true
if (upiObj.Shelf == upiList.Count())
{
- lastnum = 2;
+ lastnum = 2;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
palletizingUPI = null;
palletizingStation = 0;
+ }
+ else if (upiObj.Shelf == 1)
+ {
+ lastnum = 1;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
+ }
+ else
+ {
+ lastnum = 0;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
}
@@ -201,7 +222,8 @@
//璁板綍浠诲姟
var _id = Yitter.IdGenerator.YitIdHelper.NextId();
- var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
+ var plcTaskNo = BusinessHelper.CreatePlcTaskId();
+ plcTaskNo = MyExtendHelper.GetNewTaskNo(wmsDB, RbTaskTypeEnum.鐮佹澘浠诲姟, plcTaskNo);
var task = new wms_rbline_task()
{
Id = _id,
@@ -218,9 +240,9 @@
TaskStatus = (int)TaskStatusEnum.鏂板缓,
TaskMsg = "鐮佹澘",
CreateTime = DateTime.Now,
- CreateUserName = "CC",
+ CreateUserName = SysGloble.WCSSystem,
UpdateTime = DateTime.Now,
- UpdateUserName = "CC",
+ UpdateUserName = SysGloble.WCSSystem,
PlaceCode = place,
LastNum = lastnum,
@@ -234,7 +256,7 @@
wmsDB.wms_rbline_task.Add(task);
//鏇存柊閰嶇疆
- sysConfig.Value = palletizingUPI + "|" + palletizingStation;
+ sysConfig.Value = palletizingUPI + "|" + palletizingStation + "|" + upiObj.UPI + "|绗�" + upiObj.Shelf + "鍧�";
WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12绔欑偣", "鐮佸寘");
--
Gitblit v1.9.3