From 7db419acdd2c02950b67c081dd2d7f61fdb2cb89 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 30 三月 2026 16:09:07 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index f67b6cc..78ca85c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -44,7 +44,6 @@
throw new Exception();
}
-
//todo 浼樺寲 濡傛湭鏌ヨ鍒颁换鍔″垯澶勭悊
//if (content.Data != null)
//{
@@ -130,9 +129,9 @@
// 妫�鏌ュ綋鍓嶆墭鐩樻槸鍚﹀瓨鍦ㄤ换鍔�
- private async Task<bool> HasTask(string PVI)
+ private async Task<bool> HasTask(string palletCode)
{
- var hasTask = await BaseDal.QueryFirstAsync(x => x.PVI == PVI);
+ var hasTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
return hasTask != null;
}
@@ -192,10 +191,10 @@
StaticVariable.isLineRun = false;
// 妫�鏌ュ綋鍓嶆墭鐩樻槸鍚﹀瓨鍦ㄤ换鍔�
- if (await HasTask(palletCode))
- {
- return content.Error("褰撳墠鎵樼洏瀛樺湪浠诲姟");
- }
+ //if (await HasTask(palletCode))
+ //{
+ // return content.Error("褰撳墠鎵樼洏瀛樺湪浠诲姟");
+ //}
//PVI = "J26000456TF12"; // 妯℃嫙PVI璇锋眰浠诲姟
@@ -225,7 +224,19 @@
private async Task<WebResponseContent> RequestInRoadWayTask(string palletCode, string PVI, Dt_StationManager stationManager)
{
- var wmsIpAddrss = GetWmsIpAddress(SysConfigKeyConst.RequestInboundRoadWayNo);
+ var wmsIpAddrss = string.Empty;
+ if (stationManager.stationType == 5)
+ {
+ wmsIpAddrss = GetWmsIpAddress(SysConfigKeyConst.RequestInboundRoadWayNo);
+ }
+ else if (stationManager.stationType == 9)
+ {
+ wmsIpAddrss = GetWmsIpAddress(SysConfigKeyConst.RequestEmptyInboundRoadWayNo);
+ }
+
+ if (string.IsNullOrEmpty(wmsIpAddrss)) throw new Exception("鏈厤缃甒MS璇锋眰鍦板潃");
+
+ //var wmsIpAddrss = GetWmsIpAddress(SysConfigKeyConst.RequestInboundRoadWayNo);
var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletCode, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode, PVI = PVI }.ToJsonString());
return JsonConvert.DeserializeObject<WebResponseContent>(result);
}
--
Gitblit v1.9.3