From ded7dffbb1fbed96acd8cc10c7710f4d848384e9 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期一, 23 三月 2026 15:45:17 +0800
Subject: [PATCH] fix: 修改库存已满无法入库问题，修复大屏库存图信息
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
index 5174a4a..16b14a5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using Org.BouncyCastle.Math.EC;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -96,9 +97,24 @@
if (task == null)
return webResponse.Error($"鏈壘鍒颁换鍔′俊鎭紝鎵樼洏鏉＄爜锛歿wCSTask.PalletCode}");
+ //Dt_Task Outtask = BaseDal.QueryData(x => x.TargetAddress == task.SourceAddress).FirstOrDefault();
+ // 澶勭悊鍦板潃杞崲
+ string targetAddress = wCSTask.FromPoint;
+ if (targetAddress == "1104")
+ {
+ targetAddress = "1103";
+ }
+ else if (targetAddress == "1102")
+ {
+ targetAddress = "1101";
+ }
+
+ Dt_Task Outtask = BaseDal.QueryData(x => x.TargetAddress == targetAddress).FirstOrDefault();
+ if (Outtask != null) return webResponse.Error($"褰撳墠宸叉湁鏉ヨ鐩爣浣嶇疆{wCSTask.FromPoint}鐨勪换鍔★紝涓嶅彲杩涜鍏ュ簱锛屾墭鐩樻潯鐮侊細{wCSTask.PalletCode}", 501);
+
if (task.PalletType != wCSTask.ContainerType.ToString())
{
- return webResponse.Error($"鎵樼洏绫诲瀷涓嶅尮閰嶏紝褰撳墠浠诲姟涓墭鐩樼被鍨嬩负:{task.PalletType}锛學CS涓婃姤绫诲瀷涓猴細{wCSTask.ContainerType}锛屾墭鐩樻潯鐮侊細{wCSTask.PalletCode}");
+ return webResponse.Error($"鎵樼洏绫诲瀷涓嶅尮閰嶏紝褰撳墠浠诲姟涓墭鐩樼被鍨嬩负:{task.PalletType}锛學CS涓婃姤绫诲瀷涓猴細{wCSTask.ContainerType}锛屾墭鐩樻潯鐮侊細{wCSTask.PalletCode}", 502);
}
// 浠诲姟閲嶅彂
if (task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
@@ -112,7 +128,7 @@
wcstaskinfo.FromPoint = wCSTask.FromPoint;
wcstaskinfo.ToPoint = task.NextAddress;
wcstaskinfo.ToStation = "";
- WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "杩斿洖杈撻�佺嚎浠诲姟淇℃伅", $"杩斿洖缁欒緭閫佺嚎鐨勪换鍔′俊鎭細{wcstaskinfo.ToJson()}");
+ WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", $"杩斿洖杈撻�佺嚎浠诲姟淇℃伅", $"杩斿洖缁欒緭閫佺嚎鐨勪换鍔′俊鎭細{wcstaskinfo.ToJson()}");
return webResponse.OK(data: wcstaskinfo);
}
if (task.TargetAddress!="" && task.TargetAddress!=null)
--
Gitblit v1.9.3