From cbf06cbb2e7988fdee53507dede034756ebfbf59 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 14 一月 2025 15:47:40 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
index 701cb7b..b291525 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
@@ -131,6 +131,7 @@
Details = new List<Dt_StockInfoDetail>()
};
var ContainerDetailsInfos = TesugarClient.Queryable("ContainerDetailsInfo", "x").Where("CId", "=", id).ToList();
+ if (ContainerDetailsInfos.Count < 1) stockInfo.PalletType = PalletTypeEnum.Empty.ObjToInt();
foreach (var ContainerDetailsInfo in ContainerDetailsInfos)
{
dynamic ruleConfig1 = ContainerDetailsInfo;
@@ -156,7 +157,7 @@
Unit = Unit,
Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
ProductionDate = ProduceData,
- EffectiveDate = ValidData ?? "1",
+ EffectiveDate = ValidData ?? DateTime.Parse(ProduceData).AddYears(2).ToString("yyyy-MM-dd"),
Remark = Standard,
InboundOrderRowNo = MId,
};
@@ -164,7 +165,7 @@
}
stockInfos.Add(stockInfo);
}
- var LocationCodes = stockInfos/*.Where(x => x.LocationCode != "骞冲簱浣�")*/.Select(stockInfo => stockInfo.LocationCode).ToList();
+ var LocationCodes = stockInfos.Where(x => x.LocationCode != "骞冲簱浣�").Select(stockInfo => stockInfo.LocationCode).ToList();
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => LocationCodes.Contains(x.LocationCode));
locationInfos.ForEach(x =>
{
@@ -202,6 +203,8 @@
_ => throw new Exception($"鏈畾涔夌殑鎺�,鍦板潃:銆恵locationCode}銆�"),
};
var Column = locationCode.Substring(4, 2);
+ if (locationCode.Length == 7)
+ Column = locationCode.Substring(5, 2);
var Layer = locationCode.Substring(2, 2);
locationCode = "AGV_FL-" + Row + "-0" + Column + "-0" + Layer + "-01";
return locationCode;
--
Gitblit v1.9.3