From 093a1f1e49f482a58cb95f6562ab6c890bb03c89 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 09:53:16 +0800
Subject: [PATCH] add
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
index 3b873f0..9f681ac 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
@@ -34,6 +34,25 @@
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
+ if (obj.R_PalletizingAck)
+ {
+ //缁橮LC鎺ㄩ�佷换鍔″畬鎺ユ敹瀹屾垚澶嶄綅淇″彿
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
+ if (!res.result)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ continue;
+ }
+ else
+ {
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,SetPalletizingTaskFinishAck锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ }
+ }
+
+
+ }
if (obj.R_ReqParseData)
{
var result = obj.R_ReadCodeResult;
@@ -73,7 +92,7 @@
//璁板綍浠诲姟
var _id = Yitter.IdGenerator.YitIdHelper.NextId();
var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
- var putpakegecode = new mes_PushPackageCode()
+ var putpakegecode = new mes_push_packagecode()
{
Id = _id,
PackageCode=upiObj.PackageCode,
@@ -109,7 +128,7 @@
};
wmsDB.wms_rbline_task.Add(task);
- wmsDB.mes_PushPackageCode.Add(putpakegecode);
+ wmsDB.mes_push_packagecode.Add(putpakegecode);
using (StationServiceClient client = new StationServiceClient())
{
@@ -145,7 +164,7 @@
Thread.Sleep(2000);
using (WmsDBModel edm = new WmsDBModel())
{
- var value = edm.mes_PushPackageCode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
+ var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
if (value != null)
{
PushPackageCodeInput input = new PushPackageCodeInput();
--
Gitblit v1.9.3