From 96a77e69b0577c50adfaacd5fd8b89009242d3bd Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期日, 07 十二月 2025 18:25:00 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index 848a862..2280285 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -245,6 +245,17 @@
_stockService.StockInfoService.Repository.AddData(dt_Stock);
}
}
+ /*else if(generate.SourceAddress == "R01-002-042-001-01")
+ {
+ WebResponseContent webResponse= Queryinventory(generate);
+ if (!webResponse.Status)
+ {
+ return content = WebResponseContent.Instance.Error($"缁勭洏澶辫触锛歿webResponse.Message}");
+ }
+ }*/
+
+
+
Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode && x.StockStatus== (int)StockStatusEmun.缁勭洏鏆傚瓨);
if (dt_StockInfo != null)
{
@@ -291,6 +302,7 @@
else
{
newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+
}
@@ -473,6 +485,7 @@
WebResponseContent content = new WebResponseContent();
try
{
+
string[] targetCodes = generate.PalletCode.Split("*");
if (targetCodes.Length == 5)
@@ -484,6 +497,16 @@
{
return content = WebResponseContent.Instance.Error($"绗簲浣嶇墿鏂欑姸鎬佺紪鐮佽В鏋愰敊璇細{generate.PalletCode}");
}
+
+ int xzrktype = 1;
+ if(dt_Inbound.OrderType == (int)InventoryMaterialType.鎴愬搧)
+ {
+ xzrktype = 2;
+ }
+
+ WebResponseContent webResponsePD = QueryinveCount(xzrktype);
+ if (!webResponsePD.Status) { return webResponsePD; }
+
if (dt_Inbound != null)
{
@@ -602,7 +625,16 @@
{
if (dt_StockInfo.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨)
{
- return content = WebResponseContent.Instance.OK(data: 1);
+ List<Dt_Task> dt_Tasks= BaseDal.QueryData(x => x.PalletCode.Contains(PalletCodetarget));
+ if (dt_Tasks.Count > 0)
+ {
+ return content = WebResponseContent.Instance.Error($"搴撳瓨宸叉湁璇ユ潯鐮侊紝鏉＄爜淇℃伅锛歿generate.PalletCode}");
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+
}
else
{
@@ -786,15 +818,72 @@
{
WebResponseContent content = new WebResponseContent();
List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo=="2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
- && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
- if (locationinfoData.Count < 20)
+ && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer > 10);
+ if (locationinfoData.Count <= 15)
{
- return content = WebResponseContent.Instance.OK(data: 1);
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer > 9);
+ if (locationinfoDataSC1.Count >= 15)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾绌烘墭鍏ュ簱澶辫触锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�15锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
}
else
{
return content = WebResponseContent.Instance.OK(data: 3);
}
}
+
+ public WebResponseContent QueryinveCount(int wltype)
+ {
+ WebResponseContent content = new WebResponseContent();
+ if (wltype == 1)
+ {
+
+ List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.LocationType == (int)LocationTypeEnum.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 10);
+ if (locationinfoData.Count <= 20)
+ {
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 9);
+ if (locationinfoDataSC1.Count >= 20)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�20锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.OK(data: 3);
+ }
+
+ }
+ else
+ {
+ List<Dt_LocationInfo> locationinfoDataSC1 = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "1" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus == (int)EnableStatusEnum.Normal && x.Layer <= 9);
+ if (locationinfoDataSC1.Count >= 20)
+ {
+ return content = WebResponseContent.Instance.OK(data: 1);
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("1宸烽亾锛氾細鍏ュ簱澶辫触锛屽綋鍓嶄笉鍙叆搴擄紝娴呰揣浣嶅皬浜�20锛屼笉鍙啀杩涜鍏ュ簱");
+ }
+
+
+ }
+
+
+ }
}
}
--
Gitblit v1.9.3