From c1c1b1f95b0880cd58afadb98d6933287fe6311c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 16:41:37 +0800
Subject: [PATCH] 22
---
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index 48372aa..4e74781 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -46,6 +46,7 @@
continue;
}
+
var rgvLocation = StationLocationEnum.BZ01.ToString();
/*
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
@@ -150,7 +151,7 @@
{
upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
}
-
+ /*
//鏌ヨ鏄惁榻愬寘
var allList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
var isQiTaoList = allList.Where(x => x.AreaCode == (int)AreaCodeEnum.寰呯紦瀛樺垎鎷ｅ尯
@@ -267,7 +268,7 @@
wmsDB.mes_upi_linequeue.Remove(lastUpiLineQueue);
}
}
-
+ //*/
//if (qitaoReault == false) {
// //涓存椂
// SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"妯℃嫙鍟婂晩锛屾殏鍋滃晩鍟�";
@@ -314,8 +315,25 @@
item.UpiStatus = (int)UpiStatusEnum.涓嶉綈鍖�;
}
}
+ //鏇存柊鍖呯姸鎬� [Editby shaocx,2024-12-15]
+ var packageObj = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
+ if (packageObj != null)
+ {
+ if (qitaoReault)
+ {
+ packageObj.UpiStatus = (int)UpiStatusEnum.宸查綈鍖�;
+ packageObj.IsQiBao = true;
+ }
+ else
+ {
+ packageObj.UpiStatus = (int)UpiStatusEnum.涓嶉綈鍖�;
+ packageObj.IsQiBao = false;
+ }
+ }
+
//鏇存柊 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢 鏁版嵁
var rbRunMode = wmsDB.wms_rbline_runmode.FirstOrDefault();
+ rbRunMode.UPI = upiObj.UPI;
rbRunMode.PlanNo = upiObj.PlanNo;
rbRunMode.OrderId = upiObj.OrderId;
rbRunMode.PackageCode = upiObj.PackageCode;
@@ -352,6 +370,10 @@
/// <returns></returns>
private static bool IsAllloRunOutTaskMode(WmsDBModel wmsDB, mes_batchOrderUPI_new curUpiObj)
{
+ //涓嶅啀鍒ゆ柇 銆怑ditby shaocx,2024-12-14銆�
+ return false;
+
+ /*
//棣栧厛鏌ヨ鏁版嵁搴撲腑鏄惁鏈� 瑕佸嚭搴撶殑鏁版嵁
var isExistOutTaskForNewCreated = wmsDB.wms_rbline_task.Where(x =>
(x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
@@ -419,6 +441,8 @@
FormCC.IsAllowRunOutMode = true;
return true;
+
+ //*/
}
/// <summary>
@@ -429,6 +453,10 @@
/// <returns></returns>
private static bool ValidateQiBao(WmsDBModel wmsDB, mes_batchOrderUPI_new upiObj)
{
+ if (upiObj.Shelf != 1)
+ {
+ return false;
+ }
//鏌ヨ鏄惁榻愬寘
var allList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
var isQiTaoList = allList.Where(x => x.AreaCode == (int)AreaCodeEnum.寰呯紦瀛樺垎鎷ｅ尯
--
Gitblit v1.9.3