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工位（补板后工位）/Outbound/3、DataProcess_RobotBuffer_FinishTaskForOutbound.cs | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.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/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
index a6fe956..73063b4 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/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.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/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
@@ -29,6 +29,11 @@
if (SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_OutboundFinish)
{
@@ -52,7 +57,7 @@
{
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_Outbound_TaskID.ToString()
- && x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ && (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
).OrderByDescending(x => x.Id).FirstOrDefault();
if (task == null)
{
@@ -63,28 +68,39 @@
{
if (task.TaskStatus == (int)TaskStatusEnum.宸插畬鎴�)
{
- //using (StationServiceClient client = new StationServiceClient())
- //{
- // var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
- //}
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, false);
+ }
continue;
}
}
- var upiCode = task.UPI;
+ var upiCode = task.Upi;
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
+ //鏇存柊鏉夸欢鐨勭姸鎬佸拰鍖哄煙
+ if (task.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟)
+ {
+ upiObj.UpiStatus = (int)UpiStatusEnum.宸查綈鍖�;
+ upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
+ }
+ else if (task.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
+ {
+ upiObj.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+ upiObj.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+ }
+
//搴撳瓨鍑忓皯
wms_stock_quan qun = wmsDB.wms_stock_quan.Where(x => x.PlaceCode == task.PlaceCode).FirstOrDefault();
wmsDB.wms_stock_quan.Remove(qun);
task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
- task.TaskStatusName = TaskStatusEnum.宸插畬鎴�.ToString();
task.FinishedTime = DateTime.Now;
var place = StationHandler.GetPlaceByPlaceCode(task.PlaceCode, wmsDB);
@@ -93,7 +109,7 @@
//缁橮LC鎺ㄩ�佷换鍔″畬鎴愮‘璁や俊鍙�
using (StationServiceClient client = new StationServiceClient())
{
- var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
+ var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, true);
if (!res.result)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-涓嬪彂鍑哄簱浠诲姟 澶辫触,OutboundFinishConfirmAsync 杩斿洖:{res.resMsg}";
@@ -105,12 +121,17 @@
}
}
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, $"鍑虹紦瀛樺簱锛歿task.PlaceCode}," + task.TaskMsg);
+
wmsDB.SaveChanges();
}
}
else
{
-
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation, false);
+ }
}
}
}
--
Gitblit v1.9.3