From c6d9d8e2c8c5a0dea829164e4a1a5c3ed9703521 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 08 12月 2024 11:19:47 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
index 8f9a8c2..4e75984 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
@@ -41,6 +41,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_ReqParseData)
{
@@ -70,6 +75,14 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
+ //鍒ゆ柇浠栨槸鍚﹀湪搴撻噷闈�
+ var stock = wmsDB.wms_stock_quan.Where(x => x.Upi == upiObj.UPI).FirstOrDefault();
+ if (stock != null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},UPI:{upiCode}宸茬粡鍦ㄧ紦瀛樺簱涓簡 ";
+ continue;
+ }
+
//浜嗚В浠栫殑闀裤�佸銆侀珮锛屽鎵剧┖搴撲綅
var place = StationHandlerV2.FindBestEmptyPlace(wmsDB, upiObj);
if (place == null)
@@ -86,7 +99,7 @@
{
Id = _id,
TaskNo = plcTaskNo,
- UPI = upiObj.UPI,
+ Upi = upiObj.UPI,
Length = upiObj.Length,
Width = upiObj.Width,
Thk = upiObj.Thk,
@@ -96,9 +109,7 @@
PackageCode = upiObj.PackageCode,
PlaceCode = place.PlaceCode,
RbTaskType = (int)RbTaskTypeEnum.鍏ュ簱浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.鍏ュ簱浠诲姟.ToString(),
TaskStatus = (int)TaskStatusEnum.鏂板缓,
- TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
TaskMsg = "鍏ュ簱",
@@ -134,7 +145,7 @@
place.PlaceStatus = (int)PlaceStatusEnum.閿佸畾;
- WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ39", "缂撳瓨鍏ュ簱锛�"+ place.PlaceCode);
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ39", "缂撳瓨鍏ュ簱锛�" + place.PlaceCode);
wmsDB.SaveChanges();
}
--
Gitblit v1.9.3