From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 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 e28d7e2..d521c7f 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"
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_BasicService;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -68,43 +69,31 @@
return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
}
-
var newTask = new Dt_Task()
{
- CurrentAddress = stationCode,
+ CurrentAddress = stations.GetValueOrDefault(stationCode) ?? "",
Grade = 0,
- NextAddress = stations.GetValueOrDefault(stationCode) ?? "",
+ NextAddress = locationInfo.LocationCode,
PalletCode = palletCode,
Roadway = locationInfo.RoadwayNo,
- SourceAddress = stationCode,
+ SourceAddress = stations.GetValueOrDefault(stationCode) ?? "",
TargetAddress = locationInfo.LocationCode,
TaskType = TaskTypeEnum.Inbound.ObjToInt(),
TaskStatus = TaskStatusEnum.New.ObjToInt(),
WarehouseId = stockInfo.WarehouseId,
PalletType = stockInfo.PalletType,
- OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo
-
+ OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo,
};
//绌虹
- if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
+ if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt()|| stockInfo.StockStatus == StockStatusEmun.鏅轰粨鍏ユ櫤浠撶粍鐩樻殏瀛�.ObjToInt())
{
_unitOfWorkManage.BeginTran();
newTask.TaskType = TaskTypeEnum.InEmpty.ObjToInt();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _locationInfoService.UpdateData(locationInfo);
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
-
- _stockRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- }
- //鏅轰粨鍏ユ櫤浠�
- if (stockInfo.StockStatus == StockStatusEmun.鏅轰粨鍏ユ櫤浠撶粍鐩樻殏瀛�.ObjToInt())
- {
- _unitOfWorkManage.BeginTran();
- newTask.TaskType = TaskTypeEnum.AllocateInWarehouse.ObjToInt();
+ if (stockInfo.StockStatus == StockStatusEmun.鏅轰粨鍏ユ櫤浠撶粍鐩樻殏瀛�.ObjToInt())
+ {
+ newTask.TaskType = TaskTypeEnum.AllocateInWarehouse.ObjToInt();
+ }
int taskId = BaseDal.AddData(newTask);
newTask.TaskId = taskId;
@@ -125,8 +114,6 @@
inboundOrder = _inboundOrderService.Repository.QueryFirst(x => x.InboundOrderNo == orderNo && x.OrderStatus < InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt());
}
-
-
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
--
Gitblit v1.9.3