From 9ac99af38d377e24fa0e1298a118212974592321 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 11:04:24 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/DataProcess_BZ12.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
index 0d53e87..33c1b32 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
@@ -26,7 +26,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
+ if ( SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ12.ToString();
/*
@@ -42,16 +42,18 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
- var upiCode = result;
+ var upiCode = result.Replace("/r", ""); ;
bool islast = false;//鏄惁鏈澘
+ bool isfirst = false;//鏄惁鏈澘
short isrotate = 0;//鏄惁鏃嬭浆
short placeX = 0;
short placeY = 0;
+ short placeZ = 0;
string place = "";
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForBZ12(wmsDB);
+ var isValidate = TaskHandler.ValidateIssueTaskForBZ12(wmsDB,result);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
@@ -66,6 +68,8 @@
isrotate = 1;
placeX = (short)upiObj.MachineXCenter;
placeY = (short)upiObj.MachineYCenter;
+ placeZ = (short)upiObj.MachineZCenter;
+
//鏌ュ杩欏寘鎵�鏈夌殑鏁伴噺
var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
//鏌ヨ鏄惁鏈澘骞朵笖鍒ゆ柇鏈夋病鏈夋贩鎵�
@@ -75,7 +79,7 @@
//鏌ヨ鏄惁娣锋壒
if (!string.IsNullOrEmpty(wms_rbline_runmode.PalletizingUPI))
{
- if (upiCode != wms_rbline_runmode.PalletizingUPI)
+ if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鐮佸寘閮ㄤ欢娣锋壒 ";
continue;
@@ -88,6 +92,8 @@
}
else
{
+ isfirst = true;
+ wms_rbline_runmode.PalletizingUPI = upiObj.PackageCode;
if (obj.R_PalletizingStation1 == 1)
{
place = "1";
@@ -98,7 +104,7 @@
}
else
- {
+ {
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
continue;
}
@@ -152,8 +158,8 @@
using (StationServiceClient client = new StationServiceClient())
{
- var res = client.WritePalletizingTaskInfo((int)EDevice.Station, rgvLocation, Convert.ToInt32(task.TaskNo), islast,
- (short)upiObj.Length, (short)upiObj.Width, (short)upiObj.Thk, isrotate, short.Parse(task.PlaceCode), placeX, placeY);
+ var res = client.WritePalletizingTaskInfo((int)EDevice.Station, rgvLocation, Convert.ToInt32(task.TaskNo), islast,isfirst,
+ (short)upiObj.Length, (short)upiObj.Width, (short)upiObj.Thk, isrotate, short.Parse(task.PlaceCode), placeX, placeY,placeZ);
if (!res.result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
--
Gitblit v1.9.3