From e2a5657e3a0b8615bcd78a3149e5ba9ce5579bb8 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 02 十二月 2024 16:25:35 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index 32d4bfa..851d20d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -427,9 +427,13 @@
Dt_LocationInfo newLocation;
//鏌ヨ蛋璐т綅锛岃繘琛岀敓鎴愮Щ搴撲换鍔�
int Locationtype = 9; //榛樿涓�9
- if (locationInfos.LocationType== (int)LocationStatusEnum.InStock)
+ if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.鎴愬搧)
{
Locationtype = 11;
+ }
+ else if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.鍘熸潗鏂�)
+ {
+ Locationtype = 10;
}
newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo,Locationtype); //鎷垮埌浜嗙Щ搴撳悗鐨勮揣浣�
if (newLocation != null)
@@ -448,6 +452,7 @@
Creater = "WMS",
CreateDate = DateTime.Now,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ MaterialType = dt_StockInfo.MaterialType
};
_unitOfWorkManage.BeginTran();
if (locationInfos.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
@@ -506,7 +511,12 @@
{
RoadwayNo = "2";
}
- Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.RoadwayNo == RoadwayNo && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
+ Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.RoadwayNo == RoadwayNo && x.EnableStatus != (int)EnableStatusEnum.Disable && x.Depth==1 && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
+ if(locationInfos == null)
+ {
+ locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.RoadwayNo == RoadwayNo && x.Depth == 2 && x.EnableStatus != (int)EnableStatusEnum.Disable && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
+ }
+
if (locationInfos != null)
{
Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == locationInfos.LocationCode);
@@ -534,6 +544,7 @@
Depth = locationInfos.Depth,
CreateDate = DateTime.Now,
PalletCodequantity = (int)dt_StockInfo.Materialweight,
+ MaterialType = dt_StockInfo.MaterialType
};
_unitOfWorkManage.BeginTran();
@@ -614,6 +625,7 @@
CreateDate = DateTime.Now,
PalletCodequantity = (int)dt_StockInfo[i].Materialweight,
PLCTo = generate.TargetAddress == "R01-002-041-011-01" ? 1 : 2,
+ MaterialType = dt_StockInfo[i].MaterialType
};
_unitOfWorkManage.BeginTran();
@@ -703,6 +715,7 @@
Creater = "WMS",
Depth = locationinfo.Depth,
CreateDate = DateTime.Now,
+ MaterialType= stockt.MaterialType
};
dtstockt.Add(stockt);
locations.Add(locationinfo);
@@ -803,7 +816,7 @@
Depth = locationinfo.Depth,
CreateDate = DateTime.Now,
PLCTo = int.Parse(saveModel.DelKeys[1].ToString()),
-
+ MaterialType=stockt.MaterialType
};
dtstockt.Add(stockt);
locations.Add(locationinfo);
@@ -1134,7 +1147,7 @@
else if(task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
{
//澶勭悊鍑哄簱鐨勯�昏緫
- Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
if (locationinfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt() || locationinfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
{
locationinfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
--
Gitblit v1.9.3