From 76fc40d4f1e0dbd15383c0f3e29fd8bcb6dcff2a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 22 11月 2024 19:01:50 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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/2\343\200\201DataProcess_RobotBuffer_FinishTask.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/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
index eb83ebc..9424fc2 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/2\343\200\201DataProcess_RobotBuffer_FinishTask.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/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
@@ -39,15 +39,17 @@
var rgvLocation = StationLocationEnum.BZ39.ToString();
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_InboundFinish)
+ //if (true)//妯℃嫙
{
- var result = obj.R_InboundNumber;
- if (string.IsNullOrEmpty(result))
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- 鍏ュ簱搴撲綅鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
- continue;
- }
- var result2 = obj.R_Inbound_TaskID;
- if (result2==0)
+ //var result = obj.R_InboundNumber;
+ //if (string.IsNullOrEmpty(result))
+ //{
+ // SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- 鍏ュ簱搴撲綅鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
+ // continue;
+ //}
+ //obj.R_Inbound_TaskID = 17797;//妯℃嫙
+ var result2 = obj.R_Inbound_TaskID;
+ if (result2 == 0)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- 鍏ュ簱浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
continue;
@@ -57,8 +59,8 @@
var qitaoReault = false;
using (WmsDBModel wmsDB = new WmsDBModel())
{
- var task = wmsDB.wms_rbline_task.Where(x => x.PlaceCode == obj.R_InboundNumber
- && x.TaskNo == obj.R_Inbound_TaskID.ToString()
+ var task = wmsDB.wms_rbline_task.Where(x =>
+ x.TaskNo == obj.R_Inbound_TaskID.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
&& x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�).FirstOrDefault();
if (task == null)
@@ -80,6 +82,8 @@
Id = Yitter.IdGenerator.YitIdHelper.NextId(),
Upi = upiCode,
PlanNo = task.PlanNo,
+ DetailName = upiObj.DetailName,
+ OrderId = task.OrderId,
CreateTime = DateTime.Now,
CreateUserName = "CC",
InTime = DateTime.Now,
@@ -105,7 +109,7 @@
//缁橮LC鎺ㄩ�佷换鍔″畬鎴愮‘璁や俊鍙�
using (StationServiceClient client = new StationServiceClient())
{
- var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, rgvLocation);
+ var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
if (!res.result)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,InboundFinishConfirmAsync 杩斿洖:{res.resMsg}";
--
Gitblit v1.9.3