From a34059e688e947a2ea079a0646872f1a21089940 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 14:47:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
index f428eab..47c2219 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
@@ -1,6 +1,7 @@
锘縰sing log4net.Core;
using Masuit.Tools;
using System.Collections.Generic;
+using System.Linq;
using System.Net;
using WIDESEA_Common;
using WIDESEA_Core.Const;
@@ -230,6 +231,13 @@
return content.Error($"鏈煡鏉＄爜{input.PalletCode}浠诲姟");
}
+ List<Dt_Task> taskcl = BaseDal.QueryData(x => x.TaskState == (int)TaskOutStatusEnum.Lien_Check);
+ if (taskcl.Count > 0)
+ {
+ return content.Error($"宸叉湁鍦ㄦ祴閲忎腑鐨勮溅杞紝璇锋煡鐪嬫槸鍚︾敵璇锋纭�");
+ }
+
+
task.TaskState = (int)TaskOutStatusEnum.Lien_Check;
task.CurrentAddress = input.Position;
task.NextAddress = "2021";
@@ -266,12 +274,19 @@
if(cacheinfo.Towhereabouts =="" && cacheinfo.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖");
return content.OK(data: cacheinfo.Towhereabouts);*/
- var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
- if (task == null) throw new Exception($"鏈壘鍒皗input.PalletCode}鎵樼洏淇℃伅");
- if (task.Towhereabouts == "" && task.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖");
- return content.OK(data: task.Towhereabouts);
-
-
+ var task = await BaseDal.QueryFirstAsync(x => input.PalletCode.Contains(x.PalletCode));
+ if (task != null)
+ {
+ if (task.Towhereabouts == "" && task.Towhereabouts == null) return content.Error($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖");
+ return content.OK(data: task.Towhereabouts);
+ }
+ else
+ {
+ Dt_Task_Hty dt_Task_Hty = _task_HtyRepository.QueryFirst(x => input.PalletCode.Contains(x.PalletCode) && x.CreateDate >= DateTime.Now.AddHours(-2));
+ if (dt_Task_Hty == null) return content.Error($"鏈壘鍒皗input.PalletCode}鎵樼洏鍘嗗彶淇℃伅");
+ if (dt_Task_Hty.Towhereabouts == null && dt_Task_Hty.Towhereabouts == "") return content.Error($"{input.PalletCode}鎵樼洏鍘嗗彶淇℃伅娌℃湁璁板綍鐩爣鍦板潃");
+ return content.OK(data: dt_Task_Hty.Towhereabouts);
+ }
}
catch (Exception err)
{
@@ -288,7 +303,7 @@
try
{
string CZTM = saveModel.MainData["CZTM"].ToString();
- string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
+ string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
List<Dt_Task> taskt = BaseDal.QueryData(x => x.task_CZInfo == CZTM).ToList();
if (taskt.Count() == 0)
return webResponse.Error($"鏈壘鍒板搴旇溅杞达細{CZTM}鐨勮溅杞嚭搴撲俊鎭�");
--
Gitblit v1.9.3