From f5b8c1ae89286dada20ea433ffac84f4c9e72a29 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 06 六月 2025 14:31:25 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 229f8f7..bad0925 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"
@@ -12,6 +12,7 @@
using MailKit.Search;
using System.Reflection.Metadata;
using static WIDESEA_ITaskInfoService.ITaskService;
+using WIDESEA_Common.Log;
namespace WIDESEA_TaskInfoService
{
@@ -264,19 +265,23 @@
{
string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
- if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Startingcolumn != 0)
+ if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
{
- newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Startingcolumn);
+ newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+
+ WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛屽尯闂翠负锛歿dt_Inbound.Startingcolumn}涓巤dt_Inbound.Terminationcolumn}=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation2");
}
else
{
newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+ WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛�=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation,鎴愬搧鎺ュ彛閲岄潰");
}
}
else
{
newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
+ WriteLog.GetLog("搴撲綅鑾峰彇鏃ュ織锛孏etLocation").Write($"鍘熸潗鏂欏叆搴撹幏鍙栧簱浣嶏紝浼犲叆鍊�,RoadwayNo:{newSourceAddress.RoadwayNo},绫诲瀷锛歿Locationtype}锛�=============鑾峰彇鍒扮殑搴撲綅涓猴細{newLocation.LocationCode}", $"搴撲綅鑾峰彇鏃ュ織锛孏etLocation");
}
@@ -406,6 +411,8 @@
}
}
+
+ public static List<int> InventoryCode = new List<int>() { 0,1,2,4,5,6}; //0:寰呮 1锛氬悎鏍� 2锛氫笉鍚堟牸 4锛氶��璐� 5锛氳繑宸� 6锛氱壒閲�
/// <summary>
/// 瑙ｆ瀽搴撳瓨
/// </summary>
@@ -417,13 +424,20 @@
{
string[] targetCodes = generate.PalletCode.Split("*");
- if (targetCodes.Length == 4)
+ if (targetCodes.Length == 5)
{
Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
- if(dt_Inbound != null)
+ bool isContained = InventoryCode.Contains(int.Parse(targetCodes[4]));
+ if(!isContained)
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
+ return content = WebResponseContent.Instance.Error($"绗簲浣嶇墿鏂欑姸鎬佺紪鐮佽В鏋愰敊璇細{generate.PalletCode}");
+ }
+
+ if (dt_Inbound != null)
+ {
+ string PalletCodetarget = string.Join("*", targetCodes.Take(3));
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode.Contains(PalletCodetarget));
if (dt_Inbound.OrderType == (int)InventoryMaterialType.鍘熸潗鏂�) //0涓哄師鏉愭枡缂栫爜
{
List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == (int)LocationStatusEnum.Free && x.Depth == 1 && x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationType == (int)LocationTypeEnum.MaterialsCube);
@@ -439,7 +453,7 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
Materialweight = decimal.Parse(targetCodes[3]),
- Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Wlstatus = int.Parse(targetCodes[4]),
Mgeneratetime=DateTime.Now,
};
_unitOfWorkManage.BeginTran();
@@ -508,7 +522,7 @@
CreateDate = DateTime.Now,
MaterialType = (int)InventoryMaterialType.鎴愬搧,
Materialweight = decimal.Parse(targetCodes[3]),
- Wlstatus = (int)InventoryMaterialStatus.寰呮,
+ Wlstatus = int.Parse(targetCodes[4]),
Mgeneratetime = DateTime.Now,
};
_unitOfWorkManage.BeginTran();
@@ -563,7 +577,7 @@
}
catch (Exception ex)
{
- return content=WebResponseContent.Instance.Error($"绯荤粺宸烽亾鍏ュ簱鎺ュ彛瑙ｆ瀽閿欒锛氶敊璇細{ex.Message}");
+ return content=WebResponseContent.Instance.Error($"鎵樼洏鏉＄爜閿欒锛屽鑷寸郴缁熼敊璇細{ex.Message}");
throw;
}
}
--
Gitblit v1.9.3