From 4f2e9f2178864f37580e3b82e0a489e9d74130ca Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 24 十一月 2025 15:10:03 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index e918645..629e46f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -29,10 +29,17 @@
         {
             try
             {
-                Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
+                Dt_Task dbtask = Repository.Db.Queryable<Dt_Task>().Where(x => x.PalletCode == palletCode).OrderByDescending(x=>x.CreateDate).First();
                 if (dbtask != null)
                 {
-                    return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+                    if (dbtask.TaskType == TaskTypeEnum.Outbound.ObjToInt())
+                    {
+                        return WebResponseContent.Instance.Error($"鍑哄簱寰呭垎鎷d换鍔�");
+                    }
+                    else
+                    {
+                        return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+                    }
                 }
 
                 Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
@@ -58,7 +65,7 @@
 
 
                 var newTask = new Dt_Task()
-                {
+                {                    
                     CurrentAddress = stationCode,
                     Grade = 0,
                     NextAddress = stations.GetValueOrDefault(stationCode) ?? "",
@@ -70,7 +77,8 @@
                     TaskStatus = TaskStatusEnum.New.ObjToInt(),
                     WarehouseId = stockInfo.WarehouseId,
                     PalletType = stockInfo.PalletType,
-
+                    OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo
+                    
                 };
                 //绌虹
                 if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())

--
Gitblit v1.9.3