From b2b779905bc8a71b52d0e14f91652309d9279878 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 03 二月 2026 14:37:38 +0800
Subject: [PATCH] 一堆逻辑修改
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 155 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 124 insertions(+), 31 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index ff193fb..a441c4b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -197,7 +197,7 @@
UpdateStock(stockInfoOld, weight, thickness, wide);
return content.OK($"涓存椂鍏ュ簱{stockInfoOld.RfidCode}");
}
- else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stockInfoOld.IsPick==WhetherEnum.False.ObjToInt() && stationCode.IsNotEmptyOrNull())
+ else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stationCode.IsNotEmptyOrNull())
{
decimal oldQty = stockInfoOld.StockLength;
//璋冪敤鏇存柊閫�鏂欏簱瀛樺強涓婃姤閲嶉噺
@@ -348,17 +348,17 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (thickness < 400)
+ {
+ throw new Exception($"RFID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}鐩村緞灏忎簬400mm");
+ }
BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(stockInfoOld.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
if (bSTResponse.Code == 500)
{
throw new Exception($"鏈壘鍒版潯鐮亄stockInfoOld.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�");
}
-
BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧stockInfoOld.PalletCode}鐨勫簱瀛樹俊鎭�");
- if (stockInfoOld.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt())
- {
- stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
- }
+ stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
decimal stockLength = bSTStockInfoDTO.StockMeter;
if (weight != bSTStockInfoDTO.Qty && weight < stockInfoOld.InitialWeight)
{
@@ -390,10 +390,6 @@
stockInfoOld.StockLength = stockLength;
stockInfoOld.StockOutLength = 0;
stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
- if (thickness < 400)
- {
- throw new Exception($"RFID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}鐩村緞灏忎簬400mm");
- }
content.OK("鎴愬姛",data:stockInfoOld);
}
catch (Exception ex)
@@ -826,6 +822,12 @@
{
try
{
+ List<string> roadways = ExistRoadwaysError();
+ bool ErrorRoadway = false;
+ if (roadways!=null && roadways.Count>0)
+ {
+ ErrorRoadway = true;
+ }
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
if (stockInfo==null)
{
@@ -861,8 +863,7 @@
{
locationCounts = locationCounts.Where(x => x.RoadwayNo != "SC03_YLDual").ToList();
}
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
+ roadwayNo = HandleRoadway(locationCounts, warehouse, ErrorRoadway ? roadways : null);
}
}
else
@@ -872,6 +873,7 @@
{
bool LayerLimit = stockInfo.CheckThickness > 1300;
bool RoadwayLimit = stockInfo.MaterielWide > 2200;
+ bool RoadwayType = stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt();
var query = Db.Queryable<Dt_LocationInfo>()
.Where(x => x.WarehouseId == warehouse.WarehouseId
&& x.LocationStatus == (int)LocationStatusEnum.Free
@@ -897,15 +899,30 @@
})
.OrderBy(x => x.RoadwayNo)
.ToList();
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
+ if (RoadwayType)
+ {
+ foreach (var item in locationCounts)
+ {
+ if (item.RoadwayNo.Contains("YLDual"))
+ {
+ int count = Db.Queryable<Dt_LocationInfo>()
+ .Where(x => x.WarehouseId == warehouse.WarehouseId
+ && x.LocationStatus == (int)LocationStatusEnum.Free
+ && x.EnableStatus == (int)EnableStatusEnum.Normal
+ && x.LocationType==LocationTypeEnum.MediumPallet.ObjToInt()
+ && x.RoadwayNo == item.RoadwayNo).Count();
+ item.Count = count;
+ }
+ }
+ }
+ roadwayNo = HandleRoadway(locationCounts, warehouse, ErrorRoadway ? roadways : null);
}
else if (stockInfo.CheckThickness >= 400 && stockInfo.CheckThickness < 800 && stockInfo.MaterielWide >= 700 && stockInfo.MaterielWide <= 2500)
{
+ bool RoadwayType = stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt();
//鑾峰彇鍒嗛厤
List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YLDual") && (stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt() ? x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt() : x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
+ roadwayNo = HandleRoadway(locationCounts, warehouse, ErrorRoadway ? roadways : null);
}
}
@@ -923,12 +940,17 @@
}
}
//澶勭悊鍒嗛厤宸烽亾 浠诲姟鏁伴噺
- public string HandleRoadway(List<LocationCount> locationCounts, Dt_Warehouse warehouse)
+ public string HandleRoadway(List<LocationCount> locationCounts, Dt_Warehouse warehouse,List<string> roadways=null)
{
+ if (roadways != null)
+ {
+ locationCounts = locationCounts.Where(x => !roadways.Contains(x.RoadwayNo)).ToList();
+ }
//宸烽亾浠诲姟鍒嗛厤鏁伴噺
List<LocationCount> useLocationCounts = Db.Queryable<Dt_Task>().Where(x => x.WarehouseId == warehouse.WarehouseId
&& locationCounts.Select(j => j.RoadwayNo).Distinct().Contains(x.Roadway)
&& TaskInboundTypes.Contains(x.TaskType)).GroupBy(x => x.Roadway).Select(x => new LocationCount { RoadwayNo = x.Roadway, Count = SqlFunc.AggregateCount(x) }).ToList();
+
foreach (var item in locationCounts)
{
LocationCount? count = useLocationCounts.FirstOrDefault(x => x.RoadwayNo == item.RoadwayNo);
@@ -1800,7 +1822,7 @@
return content.Error("浼犲叆淇℃伅涓虹┖");
}
//鑾峰彇鎵�鏈夋垚鍝侊紝鍗婃垚鍝佷俊鎭�
- List<Dt_MESProInOrderInfo> proInOrderInfos = _inboundRepository.MESProInOrderInfoRepository.QueryData();
+ List<Dt_MESProInOrderInfo> proInOrderInfosOld = _inboundRepository.MESProInOrderInfoRepository.QueryData();
//鑾峰彇鎵�鏈夌墿鏂欎俊鎭�
List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
@@ -1813,12 +1835,12 @@
List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x => !string.IsNullOrEmpty(x.MESPointCode));
//鍒ゆ柇鏄惁瀛樺湪閲嶅
- MESProInDTO? proInDTO = proInDTOs.FirstOrDefault(x => x.IsMantissa == false && proInOrderInfos.Select(x => x.BarCode).Contains(x.BarCode));
+ MESProInDTO? proInDTO = proInDTOs.FirstOrDefault(x => x.IsMantissa == false && proInOrderInfosOld.Select(x => x.BarCode).Contains(x.BarCode));
if (proInDTO != null)
{
return content.Error($"{proInDTO.ProductOrderNo}鐢熶骇宸ュ崟{proInDTO.BarCode}鏉＄爜宸插瓨鍦�");
}
- Dt_MESProInOrderInfo? proInOrderInfo = proInOrderInfos.FirstOrDefault(x => x.MESProInStatus == InOrderStatusEnum.鍏抽棴.ObjToInt() && proInDTOs.Select(x => x.ProductOrderNo).Distinct().Contains(x.ProductOrderNo));
+ Dt_MESProInOrderInfo? proInOrderInfo = proInOrderInfosOld.FirstOrDefault(x => x.MESProInStatus == InOrderStatusEnum.鍏抽棴.ObjToInt() && proInDTOs.Select(x => x.ProductOrderNo).Distinct().Contains(x.ProductOrderNo));
if (proInOrderInfo != null)
{
return content.Error($"{proInOrderInfo.ProductOrderNo}鐢熶骇宸ュ崟宸插叧闂�");
@@ -1827,6 +1849,11 @@
foreach (var item in proInDTOs)
{
Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
+ //鍒ゆ柇
+ if ((item.Thickness <= 0 || item.Wide <= 0) && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
+ {
+ return content.Error($"鐗╂枡{item.MaterialCode}鏉＄爜{item.BarCode}鐩村緞鎴栧箙瀹戒笉鑳藉皬浜�0");
+ }
if (materielInfo.MaterielSourceType != MaterielTypeEnum.鎴愬搧.ObjToInt())
{
Dt_AGVStationInfo? CheckPointCode = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item?.PointCode);
@@ -1842,29 +1869,57 @@
Dt_MESProInOrderInfo AddproInOrderInfo = _mapper.Map<Dt_MESProInOrderInfo>(item);
AddproInOrderInfo.WarehouseId = materielInfo.WarehouseId;
AddproInOrderInfo.MESProOrderType = materielInfo.MaterielSourceType;
+ //灏忎簬550骞呭鍒欎笉鑳芥惉杩�
+ if (item.Wide < 550 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
+ {
+ AddproInOrderInfo.MESProInStatus=InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
AddMESProInOrders.Add(AddproInOrderInfo);
}
List<Dt_Task> tasks = new List<Dt_Task>();
_unitOfWorkManage.BeginTran();
_inboundRepository.MESProInOrderInfoRepository.AddData(AddMESProInOrders);
- if (AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).Count() > 0)
+ List<Dt_MESProInOrderInfo> mESProInOrderInfos = AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList();
+ if (mESProInOrderInfos.Count > 0)
{
- //鐢熸垚鍗婃垚鍝佸叆搴�
- WebResponseContent webResponse = SemiProInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList());
- if (!webResponse.Status)
+ List<PB_INV_PRODUCT_INItem> pRODUCT_INItems = new List<PB_INV_PRODUCT_INItem>();
+ foreach (var item in mESProInOrderInfos)
{
- throw new Exception(webResponse.Message);
+ PB_INV_PRODUCT_INItem pB_INV_PRODUCT_INItem = new PB_INV_PRODUCT_INItem()
+ {
+ WP_ID = item.ProcessNum,
+ INV_BARCODE=item.BarCode,
+ REMARK = "鍗婃垚鍝佸叆搴�",
+ QTY=(int)item.ProQuantity
+ };
+ pRODUCT_INItems.Add(pB_INV_PRODUCT_INItem);
}
- tasks = webResponse.Data as List<Dt_Task>;
- WebResponseContent taskResponse = PushTasksToWCS(tasks);
- if (!taskResponse.Status)
+ string request = _invokeERPService.ERPSemiProInUp(
+ new ERPProInUpModel()
+ {
+ PB_INV_PRODUCT_IN= pRODUCT_INItems
+ }) ?? throw new Exception("鍗婃垚鍝佸叆搴撴帴鍙ｈ姹傚け璐�");
+ //鐢熸垚鍗婃垚鍝佸叆搴�
+ List<Dt_MESProInOrderInfo> semiProInOrderInfos = mESProInOrderInfos.Where(x => x.MESProInStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt()).ToList();
+ if (semiProInOrderInfos.Count>0)
{
- throw new Exception(taskResponse.Message);
+ WebResponseContent webResponse = SemiProInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList());
+ if (!webResponse.Status)
+ {
+ throw new Exception(webResponse.Message);
+ }
+ tasks = webResponse.Data as List<Dt_Task>;
+ WebResponseContent taskResponse = PushTasksToWCS(tasks);
+ if (!taskResponse.Status)
+ {
+ throw new Exception(taskResponse.Message);
+ }
}
}
- if (AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).Count() > 0)
+ List<Dt_MESProInOrderInfo> proInOrderInfos = AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).ToList();
+ if (proInOrderInfos.Count > 0)
{
- WebResponseContent webResponse = PushPackaxisTaskToWCS(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).ToList());
+ WebResponseContent webResponse = PushPackaxisTaskToWCS(proInOrderInfos);
if (!webResponse.Status)
{
throw new Exception(webResponse.Message);
@@ -2087,5 +2142,43 @@
}
return content;
}
+ /// <summary>
+ /// 鎴愬搧鍏ュ簱鎵爜璇锋眰鏇存柊鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent InBoundPalletCode(int taskNum, string barCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇褰撳墠浠诲姟
+ Dt_Task? taskExist = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (taskExist==null)
+ {
+ return content.Error($"鏈壘鍒颁换鍔taskNum}");
+ }
+ //鍒ゆ柇搴撳瓨涓槸鍚﹀瓨鍦ㄩ噸澶嶆墭鐩樻潯鐮�
+ Dt_ProStockInfo? proStockInfo = _stockRepository.ProStockInfoRepository.QueryFirst(x=>x.PalletCode==barCode);
+ if (proStockInfo!=null)
+ {
+ return content.Error($"搴撳瓨鏉＄爜{proStockInfo.PalletCode}宸插瓨鍦�");
+ }
+ Dt_ProStockInfo proStockInfoExist = _stockRepository.ProStockInfoRepository.QueryFirst(x=>x.PalletCode== taskExist.PalletCode);
+ //鏇存柊
+ proStockInfoExist.PalletCode = barCode;
+ taskExist.PalletCode = barCode;
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.ProStockInfoRepository.UpdateData(proStockInfoExist);
+ BaseDal.UpdateData(taskExist);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3