From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/原料库/ConveyorLineJob_YL2ndFloor.cs | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL2ndFloor.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL2ndFloor.cs"
index fcaa52a..5f4466c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL2ndFloor.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL2ndFloor.cs"
@@ -109,7 +109,6 @@
if(task != null)
{
ConveyorLineTaskCommandWrite taskCommand = _mapper.Map<ConveyorLineTaskCommandWrite>(task);
-
bool sendFlag = SendCommand(taskCommand, conveyorLine, stationManger.StationCode);
if (sendFlag)
{
@@ -138,7 +137,7 @@
public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManger stationManger)
{
var task = _taskService.QueryExecutingTaskByBarcode(command.TaskNum, stationManger.StationCode);
- if (task != null && task.TaskState != (int)TaskStatusEnum.Line_Finish)
+ if (task != null && task.TaskState != (int)TaskStatusEnum.SC_Execute)
{
WebResponseContent content = _taskService.UpdateTaskStatusToNext(task, stationManger);
@@ -154,45 +153,55 @@
{
conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskCommand.TargetAddress, childDeviceCode);
- conveyorLine.SetValue(ConveyorLineDBName.Weight, taskCommand.Weight, childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName.Width, taskCommand.Width, childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName.Height, taskCommand.Height, childDeviceCode);
conveyorLine.SetValue(ConveyorLineDBName.Barcode, taskCommand.Barcode, childDeviceCode);
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 86, childDeviceCode);
- for (int i = 0; i < 6; i++)
- {
- ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
- if (command != null)
- {
- if (command.TaskNum == taskCommand.TaskNum && command.TargetAddress == taskCommand.TargetAddress && command.Weight == taskCommand.Weight && command.Barcode == taskCommand.Barcode)
- {
- WriteInfo(conveyorLine.DeviceName, $"鏃堕棿锛氥�恵DateTime.Now}銆戝啓鍏ヤ换鍔℃垚鍔熷啓鍏ユ鏁皗i}鍐欏叆浠诲姟銆恵JsonConvert.SerializeObject(taskCommand)}銆�");
- return true;
- }
- if (command.TaskNum != taskCommand.TaskNum)
- {
- conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
- Thread.Sleep(100);
- }
- if (command.Barcode != taskCommand.Barcode)
- {
- conveyorLine.SetValue(ConveyorLineDBName.Barcode, taskCommand.Barcode, childDeviceCode);
- Thread.Sleep(100);
- }
- if (command.TaskNum != taskCommand.TaskNum)
- {
- conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
- Thread.Sleep(100);
- }
- if (command.TargetAddress != taskCommand.TargetAddress)
- {
- conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskCommand.TargetAddress, childDeviceCode);
- Thread.Sleep(100);
- }
- }
- conveyorLine.SetValue(ConveyorLineDBName.ResponState, 86, childDeviceCode);
- }
- WriteInfo(conveyorLine.DeviceName, $"鏃堕棿锛氥�恵DateTime.Now}銆戝啓鍏ヤ换鍔℃垚鍔熶换鍔″彿銆恵taskCommand.TaskNum}銆戞墭鐩樺彿銆恵taskCommand.Barcode}銆戠洰鏍囧湴鍧�銆恵taskCommand.TargetAddress}銆戝綋鍓嶈妭鐐广�恵childDeviceCode}銆�");
- return false;
+ return true;
+
+ #region 闇�瑕佹牎楠岃嚜宸卞彇娑堟敞閲�
+ //for (int i = 0; i < 6; i++)
+ //{
+ // ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
+ // if (command != null)
+ // {
+ // if (command.TaskNum == taskCommand.TaskNum && command.TargetAddress == taskCommand.TargetAddress && command.Height == taskCommand.Height && command.Width == taskCommand.Width && command.Barcode == taskCommand.Barcode)
+ // {
+ // WriteInfo(conveyorLine.DeviceName, $"鏃堕棿锛氥�恵DateTime.Now}銆戝啓鍏ヤ换鍔℃垚鍔熷啓鍏ユ鏁皗i}鍐欏叆浠诲姟銆恵JsonConvert.SerializeObject(taskCommand)}銆�");
+ // return true;
+ // }
+ // if (command.TaskNum != taskCommand.TaskNum)
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
+ // Thread.Sleep(100);
+ // }
+ // if (command.Barcode != taskCommand.Barcode)
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.Barcode, taskCommand.Barcode, childDeviceCode);
+ // Thread.Sleep(100);
+ // }
+ // if (command.Height != taskCommand.Height)
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.Height, taskCommand.Height, childDeviceCode);
+ // Thread.Sleep(100);
+ // }
+ // if (command.Width != taskCommand.Width)
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.Width, taskCommand.Width, childDeviceCode);
+ // Thread.Sleep(100);
+ // }
+ // if (command.TargetAddress != taskCommand.TargetAddress)
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskCommand.TargetAddress, childDeviceCode);
+ // Thread.Sleep(100);
+ // }
+ // }
+ // conveyorLine.SetValue(ConveyorLineDBName.ResponState, 86, childDeviceCode);
+ //}
+ //WriteInfo(conveyorLine.DeviceName, $"鏃堕棿锛氥�恵DateTime.Now}銆戝啓鍏ヤ换鍔℃垚鍔熶换鍔″彿銆恵taskCommand.TaskNum}銆戞墭鐩樺彿銆恵taskCommand.Barcode}銆戠洰鏍囧湴鍧�銆恵taskCommand.TargetAddress}銆戝綋鍓嶈妭鐐广�恵childDeviceCode}銆�");
+ //return false;
+ #endregion
}
}
}
--
Gitblit v1.9.3