From 7a70c16d9fb28646a0f22e9f699746df6c651e8c Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期一, 15 十二月 2025 20:14:04 +0800
Subject: [PATCH] 最新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 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 316fe56..7554779 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"
@@ -380,7 +380,7 @@
{
WebResponseContent content = new WebResponseContent();
List<Dt_LocationInfo> loca = new List<Dt_LocationInfo>();
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == TaskNum);
+ Dt_Task task = BaseDal.QueryData().Where(x => x.TaskNum == TaskNum).FirstOrDefault();
if (task == null)
{
return content = WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅锛屼换鍔″彿锛歿TaskNum}");
@@ -404,7 +404,7 @@
}
targetCodes[4] = "01";
string LocationCode = string.Join("-", targetCodes); //缁勮娴呭簱浣嶅湴鍧�
- Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode && (x.LocationStatus == (int)LocationStatusEnum.Free || x.LocationStatus == (int)LocationStatusEnum.InStock || x.LocationStatus == (int)LocationStatusEnum.Pallet));
+ Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.LocationCode == LocationCode).Where(x=> x.LocationStatus == (int)LocationStatusEnum.Free || x.LocationStatus == (int)LocationStatusEnum.InStock || x.LocationStatus == (int)LocationStatusEnum.Pallet).FirstOrDefault();
if (locationInfos == null)
{
return content = WebResponseContent.Instance.Error($"鏈壘鍒拌璐т綅淇℃伅,璐т綅缂栧彿:{locationInfos}");
@@ -417,7 +417,7 @@
}
else
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode && x.StockStatus== (int)StockStatusEmun.宸插叆搴�);
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.LocationCode == LocationCode).Where(x=> x.StockStatus == (int)StockStatusEmun.宸插叆搴�).FirstOrDefault();
if (dt_StockInfo == null)
{
return content = WebResponseContent.Instance.Error($"鏈壘鍒拌璐т綅鐨勫簱瀛樹俊鎭�,璐т綅缂栧彿:{LocationCode}");
@@ -439,32 +439,45 @@
if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.鎴愬搧)
{
string[] targetCodesst = dt_StockInfo.PalletCode.Split("*");
- Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodesst[0]);
+ Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryData().Where(x => x.OrderName == targetCodesst[0]).FirstOrDefault();
if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
{
- newLocation = _basicService.LocationInfoService.GetLocation4(locationInfos.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+ newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+ if (newLocation == null)
+ {
+ return content.Error($"鏃犳硶鑾峰彇搴撲綅,娌℃壘鍒板贩閬擄細{locationInfos.RoadwayNo}锛屽垪锛歿dt_Inbound.Startingcolumn}==>{dt_Inbound.Terminationcolumn}锛岀殑鍙敤璐т綅,,锛屼换鍔＄紪鍙凤細{TaskNum}");
+ }
}
else
{
- newLocation = _basicService.LocationInfoService.GetLocation3(locationInfos.RoadwayNo, Locationtype);
+ newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype, 0, 0);
+ if (newLocation == null)
+ {
+ return content.Error($"鎴愬搧鏂欒繘琛岀Щ搴擄紝鏃犳硶鑾峰彇搴撲綅,娌℃壘鍒板贩閬擄細{locationInfos.RoadwayNo}锛屼换鍔＄紪鍙凤細{TaskNum}");
+ }
}
}
else
{
- newLocation = _basicService.LocationInfoService.GetLocation3(locationInfos.RoadwayNo, Locationtype);
+ newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype, 0, 0);
+ if (newLocation == null)
+ {
+ return content.Error($"鍘熸潗鏂欒繘琛岀Щ搴擄紝鏃犳硶鑾峰彇搴撲綅,娌℃壘鍒板贩閬擄細{locationInfos.RoadwayNo}锛屼换鍔＄紪鍙凤細{TaskNum}");
+ }
}
- //鐩爣璐т綅鏌ユ壘搴撲綅鏄惁鏈夎揣
- Dt_StockInfo dt_StockCurren = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode);
- if (dt_StockCurren != null) return content = WebResponseContent.Instance.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶄俊鎭搴斿凡鏈夊簱瀛�");
- Dt_Task taskcurren = BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode);
- if (taskcurren != null) return content = WebResponseContent.Instance.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶄俊鎭凡鏈夊叆搴撲换鍔�");
+ //鐩爣璐т綅鏌ユ壘搴撲綅鏄惁鏈夎揣
+ Dt_StockInfo dt_StockCurren = _stockService.StockInfoService.Repository.QueryData().Where(x => x.LocationCode == newLocation.LocationCode).FirstOrDefault();
+ if (dt_StockCurren != null) return content.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶄俊鎭搴斿凡鏈夊簱瀛�");
+
+ Dt_Task taskcurren = BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode || x.SourceAddress == newLocation.LocationCode);
+ if (taskcurren != null) return content.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶄俊鎭凡鏈夊叆搴撲换鍔�");
bool crutaskthy = _taskHtyService.CrueeTaskHty(newLocation.LocationCode);
- if (crutaskthy) return content = WebResponseContent.Instance.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶅湪浠诲姟鍘嗗彶淇℃伅涓紝鏈夊叆搴撴垨绉诲簱淇℃伅");
+ if (crutaskthy) return content.Error($"鍏ュ簱澶辫触锛屾墭鐩樻潯鐮侊細{dt_StockInfo.PalletCode}锛屾煡鎵惧嚭鐨勮揣浣嶅湪浠诲姟鍘嗗彶淇℃伅涓紝鏈夊叆搴撴垨绉诲簱淇℃伅");
//鎵剧殑娣卞簱鍖猴紝鍒欏垽鏂祬搴撲綅鏄惁鏈�
--
Gitblit v1.9.3