From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
index ce69248..4cbe66d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
@@ -64,13 +64,13 @@
int heightType = 0;
if(needRelocationItem.Layer == 5)
{
- heightType = 3;
- }
- else if(needRelocationItem.Layer == 4)
- {
heightType = 2;
}
- else if(needRelocationItem.Layer <= 3 && needRelocationItem.Layer >= 1)
+ //else if(needRelocationItem.Layer == 4)
+ //{
+ // heightType = 2;
+ //}
+ else if(needRelocationItem.Layer <= 4 && needRelocationItem.Layer >= 1)
{
heightType = 1;
}
@@ -94,15 +94,7 @@
TaskStatus = 0,
TaskType = TaskTypeEnum.Relocation.ObjToInt()
};
- string MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
- float Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
- string BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
- if (MaterielCode != null && Quantity != null && BatchNo != null)
- {
- newTask.MaterielCode = MaterielCode;
- newTask.Quantity = Quantity;
- newTask.BatchNo = BatchNo;
- }
+
if (stockInfo.StockLength>0)
{
newTask.TaskLength = stockInfo.StockLength;
--
Gitblit v1.9.3