From a474060ae47fc4c807120b2a6178e8d8f84c0863 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:07:25 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 168 insertions(+), 3 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 28bdeab..d64f1ee 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -50,7 +50,7 @@
List<Dt_NewOutboundOrderDetail> detailsForThisLPN = _outboundService.NewOutboundOrderDetailService.Repository.QueryData(x => x.LPNNo == lpn && x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt());
if (detailsForThisLPN.Count == 0) continue;
newOutboundOrderDetails.AddRange(detailsForThisLPN);
- Dt_StockInfo? stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == lpn);
+ Dt_StockInfo? stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == lpn && x.LocationCode != null);
if (stockInfo == null)
{
throw new Exception($"鏈壘鍒板簱瀛樹俊鎭紝鎵樼洏鍙穥lpn}");
@@ -226,8 +226,8 @@
throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
}
}
-
- var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutInventory);
+ string orderNo = takeStockOrderCPs.FirstOrDefault().OrderNo;
+ var Newtasks = GetTask(stockInfos, TaskTypeEnum.OutInventory, orderNo);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
foreach (var item in stockInfos)
{
@@ -277,12 +277,38 @@
List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
foreach (var item in houseAdjustment.DetailList)
{
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.LPNNo);
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒版鎵樼洏搴撳瓨");
+ }
var dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
.Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
if (dt_StockInfo != null)
{
dt_StockInfo.StockQuantity = item.OrderQuantity;
stockdetail.Add(dt_StockInfo);
+ }
+ else
+ {
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ StockId = stockInfo.Id,
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ OrderNo = dt_StockInfo.OrderNo,
+ BatchNo = item.BatchNo,
+ SupplierBatch = dt_StockInfo.SupplierBatch,
+ LinId = item.LinId,
+ StockQuantity = item.OrderQuantity,
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Id = item.LinId.ObjToInt(),
+ MaterieSpec = dt_StockInfo.MaterieSpec,
+ OrinalLocation = dt_StockInfo.OrinalLocation
+ };
+ stockdetail.Add(stockInfoDetail);
}
}
@@ -297,5 +323,144 @@
}
return WebResponseContent.Instance.OK();
}
+
+ /// <summary>
+ /// SMOM鍙戣揣鍚庢垚鍝佺搴撳瓨璋冩暣
+ /// </summary>
+ /// <param name="houseStockDetail"></param>
+ /// <returns></returns>
+ public WebResponseContent SMOMStock(HouseStockDetail houseStockDetail)
+ {
+ WebResponseContent responseContent = new WebResponseContent();
+ try
+ {
+ if (houseStockDetail.DetailList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("鏃犳槑缁嗕俊鎭�");
+ }
+ List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
+ var allBoxCodes = new List<string>();
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in houseStockDetail.DetailList)
+ {
+ // 妫�鏌ユ槑缁嗗垪琛ㄦ槸鍚﹀瓨鍦ㄤ笖鏈夋晥
+ if (item.LabelList == null || item.LabelList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏{item.LPNNo}鏃犵鐮佹槑缁嗕俊鎭�");
+ }
+ allBoxCodes.AddRange(item.LabelList);
+
+ //Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.LPNNo);
+ //if (stockInfo == null)
+ //{
+ // return WebResponseContent.Instance.Error("鏈壘鍒版鎵樼洏搴撳瓨");
+ //}
+
+ var stockdetailbox = BaseDal.Db.Queryable<Dt_StockInfo>().LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId).LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId).Where((s, d, cp) => allBoxCodes.Contains(cp.BoxCode)).Select((s, d, cp) => cp.BoxCode)
+ .Distinct()
+ .ToList();
+
+ var stockInfoDetailCPList = _stockInfoDetailCPRepository.QueryData(x => stockdetailbox.Contains(x.BoxCode)).ToList();
+ if (stockInfoDetailCPList != null)
+ {
+ _stockInfoDetailCPRepository.DeleteAndMoveIntoHty(stockInfoDetailCPList, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ }
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"Error: {ex.Message}");
+ }
+ return WebResponseContent.Instance.OK();
+ }
+
+ public List<Dt_Task> GetTask(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType, string orderNo)
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ for (int i = 0; i < stockInfos.Count; i++)
+ {
+ Dt_StockInfo stockInfo = stockInfos[i];
+
+ if (stockInfo != null)
+ {
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ if (locationInfo == null)
+ {
+ throw new Exception("鏈壘鍒板嚭搴撳簱浣�");
+ }
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.SourceAddress == locationInfo.LocationCode || x.TargetAddress == locationInfo.LocationCode);
+ if (dt_Task != null)
+ {
+ throw new Exception("璇ヨ揣浣嶅凡瀛樺湪璧风偣浠诲姟鎴栫粓鐐逛换鍔�");
+ }
+ Dt_Task dt_Task1 = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (dt_Task1 != null)
+ {
+ throw new Exception("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ Dt_RoadwayInfo roadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo);
+ Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
+ if (roadwayInfo != null)
+ {
+ if (roadwayInfo.RoadwayNo.Contains("CP"))
+ {
+ Dt_Task task = new()
+ {
+ PalletType = stockInfo.PalletType,
+ OrderNo = orderNo,
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = 0,
+ Creater = "WMS",
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = roadwayInfo.OutSCStationCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = locationInfo.LocationCode,
+ TargetAddress = "",
+ TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
+ TaskType = taskType.ObjToInt(),
+ Depth = locationInfo.Depth,
+ WarehouseId = stockInfo.WarehouseId,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ MaterielCode = stockInfoDetail.MaterielCode,
+ Quantity = (float)stockInfoDetail.StockQuantity
+ };
+ tasks.Add(task);
+ }
+ else
+ {
+ Dt_Task task = new()
+ {
+ PalletType = stockInfo.PalletType,
+ OrderNo = stockInfoDetail.OrderNo,
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = 0,
+ Creater = "WMS",
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = roadwayInfo.OutSCStationCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = locationInfo.LocationCode,
+ TargetAddress = "",
+ TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
+ TaskType = taskType.ObjToInt(),
+ Depth = locationInfo.Depth,
+ WarehouseId = stockInfo.WarehouseId,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
+ };
+ if (taskType != TaskTypeEnum.OutEmpty)
+ {
+ task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ }
+ tasks.Add(task);
+ }
+
+ }
+ }
+
+ }
+ return tasks;
+ }
}
}
--
Gitblit v1.9.3