From 39d468b76e60c05ffcdf749f7ed1d3c443d542f8 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 30 四月 2026 17:13:05 +0800
Subject: [PATCH] 一堆需要求新增及更改
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob1_CP.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob1_CP.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob1_CP.cs"
index 5a0ec05..0f00460 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob1_CP.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob1_CP.cs"
@@ -130,6 +130,21 @@
var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
if (axis != null)
{
+ //寮哄埗缁撴墭
+ if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
+ {
+ WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
+ if (responseContent.Status)
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
+ WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
+ }
+ else
+ {
+ WriteError(item.StationName, $"{responseContent.Message}");
+ }
+ continue;
+ }
//杩涜缁撴墭
if (Convert.ToInt32(PackNum) == axis.PackNum)
{
@@ -171,8 +186,6 @@
device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, 1);
//鍐欏叆涓嬪彂鏍囪瘑
device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 3);
- packaxisTask.TaskState = TaskStatusEnum.Finish.ObjToInt();
- _packaxisTaskRepository.UpdateData(packaxisTask);
//浠诲姟瀹屾垚
WebResponseContent webResponse = _packaxisTaskService.TaskCompleted(packaxisTask: packaxisTask);
if (!webResponse.Status)
--
Gitblit v1.9.3