From 60fb2fdfaddceda64b934b2167ca255f8c3579b8 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 29 十二月 2025 09:49:34 +0800
Subject: [PATCH] 成品库入库
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 302 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 197 insertions(+), 105 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 06ad9c5..11d4d63 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -56,11 +56,12 @@
private readonly IStockRepository _stockRepository;
private IPalletTypeInfoRepository _palletTypeInfoRepository;
private readonly IReturnOrderRepository _returnOrderRepository;
+ private readonly ICPInboundOrderDetailRepository _cPInboundOrderDetailRepository;
public IInboundOrderRepository Repository => BaseDal;
- public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IWarehouseService warehouseService, IStockRepository stockRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository) : base(BaseDal)
+ public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IWarehouseService warehouseService, IStockRepository stockRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, ICPInboundOrderDetailRepository cPInboundOrderDetailRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -76,6 +77,7 @@
_stockRepository = stockRepository;
_palletTypeInfoRepository = palletTypeInfoRepository;
_returnOrderRepository = returnOrderRepository;
+ _cPInboundOrderDetailRepository = cPInboundOrderDetailRepository;
}
/// <summary>
@@ -334,14 +336,13 @@
var orderNo = saveModel.MainData["orderNo"].ToString();
var palletCode = saveModel.MainData["palletCode"].ToString();
var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- var Initiallife = saveModel.MainData["initiallife"].ObjToInt();
- // 棣栧厛楠岃瘉杈撳叆鏁版嵁
var serialNumbers = new List<string>();
var quantities = new List<decimal>();
+ var lotNos = new List<string>();
+ var materielCodes = new List<string>();
foreach (var item in saveModel.DelKeys)
{
- // 鐩存帴浣跨敤鍔ㄦ�佺被鍨嬭闂睘鎬э紝閬垮厤澶氫綑鐨勫簭鍒楀寲/鍙嶅簭鍒楀寲
var delKeyDict = item as IDictionary<string, object>;
if (delKeyDict == null)
{
@@ -361,31 +362,7 @@
return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
}
serialNumbers.Add(serialNumber);
-
- // 澶勭悊鏁伴噺
- if (!delKeyDict.TryGetValue("quantity", out object quantityObj) || quantityObj == null)
- {
- return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁鎴栧�间负绌�");
- }
-
- if (!decimal.TryParse(quantityObj.ToString(), out decimal quantity))
- {
- return WebResponseContent.Instance.Error($"鐗╂枡鏁伴噺'{quantityObj}'鏃犳硶杞崲涓烘暟瀛�");
- }
-
- if (quantity <= 0)
- {
- return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
- }
- quantities.Add(quantity);
}
-
- // 楠岃瘉鏁伴噺涓庡簭鍒楀彿鏁伴噺涓�鑷�
- if (serialNumbers.Count != quantities.Count)
- {
- return WebResponseContent.Instance.Error("搴忓垪鍙锋暟閲忎笌鐗╂枡鏁伴噺涓嶅尮閰�");
- }
-
// 鑾峰彇浠撳簱淇℃伅
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
@@ -404,28 +381,77 @@
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
}
- // 鎵归噺鏌ヨ鎵�鏈夌浉鍏崇鍙�/鎵樼洏鍙风殑CP鍏ュ簱鍗曟槑缁�
- // 鏍规嵁鎮ㄧ殑涓氬姟閫昏緫锛岃繖閲屽簲璇ユ槸鏌ヨ BoxCode 鎴栬�� PalletCode 鍦� serialNumbers 涓殑璁板綍
- // 鎴戝亣璁炬偍闇�瑕佹煡璇� BoxCode 鍦� serialNumbers 鍒楄〃涓殑鎵�鏈夎褰�
+ // 鎵归噺鏌ヨ鎵�鏈夌浉鍏崇鍙风殑CP鍏ュ簱鍗曟槑缁�
List<Dt_CPInboundOrderDetail> CPinboundOrderDetails = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>()
.LeftJoin<Dt_InboundOrderDetail>((cp, d) => cp.OrderDetailId == d.Id)
.LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
.Where((cp, d, o) =>
o.OrderNo == orderNo &&
o.WarehouseId == warehouse.WarehouseId &&
- serialNumbers.Contains(cp.BoxCode) // 淇敼杩欓噷锛氭壒閲忔煡璇�
+ serialNumbers.Contains(cp.BoxCode)
)
.Select((cp, d, o) => cp)
.ToList();
-
- // 鏂瑰紡2锛氬鏋滄偍闇�瑕佸垎鍒鐞嗙鍙峰拰鎵樼洏鍙凤紝鍙互鍒嗗紑鏌ヨ
- var boxDetails = CPinboundOrderDetails.Where(x => serialNumbers.Contains(x.BoxCode)).ToList();
+ float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
// 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
if (CPinboundOrderDetails.Count < serialNumbers.Count)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒版墍鏈夊搴旂殑绠卞彿/鎵樼洏鍙蜂俊鎭紝鎵惧埌{CPinboundOrderDetails.Count}鏉★紝鏈熸湜{serialNumbers.Count}鏉�");
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墍鏈夊搴旂殑绠卞彿淇℃伅锛屾壘鍒皗CPinboundOrderDetails.Count}鏉★紝鏈熸湜{serialNumbers.Count}鏉�");
+ }
+
+ // 鎸夌収绠卞彿鍒嗙粍锛岀敤浜庡悗缁鐞�
+ var cpDetailsByBoxCode = CPinboundOrderDetails
+ .GroupBy(x => x.BoxCode)
+ .ToDictionary(g => g.Key, g => g.ToList());
+
+
+
+ // 鑾峰彇鎵�鏈夌浉鍏崇殑鍏ュ簱鍗曟槑缁咺D
+ var orderDetailIds = CPinboundOrderDetails.Select(x => x.OrderDetailId).Distinct().ToList();
+
+ // 鏌ヨ瀵瑰簲鐨勫叆搴撳崟鏄庣粏
+ List<Dt_InboundOrderDetail> inboundOrderDetails = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
+ .Where(x => orderDetailIds.Contains(x.Id))
+ .ToList();
+
+ // 鎸夎鍗曟槑缁咺D鍒嗙粍锛屾鏌ユ瘡涓槑缁嗙殑鎵�鏈夌鍙锋槸鍚﹂兘鎵弿浜�
+ var detailsByOrderDetailId = CPinboundOrderDetails
+ .GroupBy(x => x.OrderDetailId)
+ .ToDictionary(g => g.Key, g => g.ToList());
+
+ // 鑾峰彇鐩稿叧鐨勮鍗曟槑缁�
+ List<Dt_InboundOrderDetail> orderDetails = new List<Dt_InboundOrderDetail>();
+ List<Dt_InboundOrderDetail> detailsToUpdate = new List<Dt_InboundOrderDetail>();
+
+ // 妫�鏌ユ瘡涓鍗曟槑缁嗘槸鍚﹀畬鎴愪簡鎵�鏈夌鍙风殑鎵弿
+ foreach (var kvp in detailsByOrderDetailId)
+ {
+ int orderDetailId = kvp.Key;
+ var cpDetails = kvp.Value;
+
+ // 鑾峰彇璁㈠崟鏄庣粏
+ var orderDetail = inboundOrder.Details.FirstOrDefault(x => x.Id == orderDetailId);
+ if (orderDetail == null)
+ {
+ orderDetail = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
+ .First(x => x.Id == orderDetailId);
+ }
+
+ if (orderDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鍗曟槑缁咺D锛歿orderDetailId}");
+ }
+
+ orderDetails.Add(orderDetail);
+
+ // 鏍囪璇ユ槑缁嗕负宸插畬鎴愮粍鐩�
+ orderDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+ var recqty = orderDetail.ReceiptQuantity;
+ orderDetail.ReceiptQuantity = ((decimal)totalQty) + recqty; // 鏀惰揣鏁伴噺绛変簬璁㈠崟鏁伴噺
+
+ detailsToUpdate.Add(orderDetail);
}
// 妫�鏌ユ墭鐩樻槸鍚﹀凡瀛樺湪
@@ -440,7 +466,7 @@
// 鍒涘缓鏂版墭鐩�
stockInfo = new Dt_StockInfo()
{
- //BatchNo = models.FirstOrDefault()?.LotNo ?? "",
+ BatchNo = "", // 浣跨敤鍏ュ簱鍗曟壒娆″彿
PalletCode = palletCode,
PalletType = GetPalletType(warehouse, palletCode),
IsFull = true,
@@ -464,13 +490,69 @@
}
}
- // 楠岃瘉鍜屾洿鏂版瘡涓墿鏂欑殑缁勭洏鏁伴噺
- List<Dt_InboundOrderDetail> detailsToUpdate = new List<Dt_InboundOrderDetail>();
+ // 鍒涘缓搴撳瓨鏄庣粏 - 鎸夎鍗曟槑缁嗗垱寤�
+ foreach (var orderDetail in orderDetails)
+ {
+ // 鑾峰彇璇ユ槑缁嗗搴旂殑鎵�鏈夌鍙�
+ var detailBoxCodes = detailsByOrderDetailId[orderDetail.Id]
+ .Select(x => x.BoxCode)
+ .ToList();
+
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>().Where(x => detailBoxCodes.Contains(x.BoxCode)).ToList();
+ List<Dt_StockInfoDetailCP> stockInfoDetailCP = new List<Dt_StockInfoDetailCP>();
+ foreach (var item in cPInboundOrderDetail)
+ {
+ Dt_StockInfoDetailCP stockInfoDetailCP1 = new Dt_StockInfoDetailCP()
+ {
+ BoxId = item.BoxId,
+ BoxCode = item.BoxCode,
+ DateCode = item.DateCode,
+ JobId = item.JobId,
+ PartNum = item.PartNum,
+ QtyOfpcs = item.QtyOfpcs,
+ QtyOfxout = item.QtyOfxout,
+ CPStockDetailStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "涓婃父WMS",
+ };
+ stockInfoDetailCP.Add(stockInfoDetailCP1);
+
+ item.CPOrderDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+ }
+
+ // 鍒涘缓搴撳瓨鏄庣粏
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ MaterielCode = orderDetail.MaterielCode,
+ MaterielName = orderDetail.MaterielName,
+ OrderNo = inboundOrder.OrderNo,
+ BatchNo = orderDetail.BatchNo,
+ SupplierBatch = orderDetail.SupplierBatch,
+ LinId = orderDetail.LinId,
+ StockQuantity = ((decimal)totalQty),
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Id = orderDetail.LinId.ObjToInt(),
+ //DeliveryNote = orderDetail.DeliveryNote,
+ MaterieSpec = orderDetail.MaterieSpec,
+ StockDetails = stockInfoDetailCP
+ };
+
+ if (stockInfo.Id > 0)
+ {
+ stockInfoDetail.StockId = stockInfo.Id;
+ }
+ stockInfo.Details.Add(stockInfoDetail);
+ }
+
+ // 妫�鏌ュ叆搴撳崟鏄惁鎵�鏈夋槑缁嗛兘宸插畬鎴愮粍鐩�
+ bool allDetailsCompleted = inboundOrder.Details.All(x =>
+ detailsToUpdate.Any(d => d.Id == x.Id) ||
+ x.OrderDetailStatus == OrderDetailStatusEnum.GroupAndInbound.ObjToInt());
-
- // 鏇存柊璁㈠崟鐘舵��
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+
// 浜嬪姟澶勭悊
_unitOfWorkManage.BeginTran();
@@ -479,7 +561,7 @@
if (stockInfo.Id == 0)
{
_stockRepository.StockInfoRepository.Db.InsertNav(stockInfo)
- .Include(x => x.Details)
+ .Include(x => x.Details).ThenInclude(x => x.StockDetails)
.ExecuteCommand();
}
else
@@ -488,24 +570,29 @@
.Include(x => x.Details, new UpdateNavOptions()
{
OneToManyInsertOrUpdate = true
- })
+ }).ThenInclude(x => x.StockDetails)
.ExecuteCommand();
}
// 鏇存柊璁㈠崟鏄庣粏
- _inboundRepository.InboundOrderDetailRepository.UpdateData(detailsToUpdate);
+ if (detailsToUpdate.Count > 0)
+ {
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(detailsToUpdate);
+ }
// 鏇存柊璁㈠崟
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
+ _cPInboundOrderDetailRepository.UpdateData(CPinboundOrderDetails);
+
_unitOfWorkManage.CommitTran();
-
+ content = WebResponseContent.Instance.OK("缁勭洏鎴愬姛");
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- throw;
+ throw new Exception($"缁勭洏浜嬪姟澶勭悊澶辫触锛歿ex.Message}", ex);
}
}
catch (Exception ex)
@@ -627,7 +714,7 @@
{
return content.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
- if (warehouse.WarehouseCode.Contains("CP"))
+ if (warehouse.WarehouseCode.Contains("TestJCLK"))
{
if (item.SupplierBatch == null)
{
@@ -661,7 +748,7 @@
OverInQuantity = 0,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
LinId = item.LinId,
- LPNNo = item.LPN_No,
+ LPNNo = item.LPNNo,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
@@ -672,69 +759,74 @@
}
else
{
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = new List<Dt_CPInboundOrderDetail>();
foreach (var list in item.BoxList)
{
- Dt_CPInboundOrderDetail cPInboundOrderDetail = new Dt_CPInboundOrderDetail()
+ Dt_CPInboundOrderDetail cPInboundOrderDetail1 = new Dt_CPInboundOrderDetail()
{
- BoxId = list.BoxId,
+ BoxId = (float)list.BoxId,
BoxCode = list.BoxCode,
DateCode = list.DateCode,
- JobId = list.JobId,
+ JobId = (float)list.JobId,
PartNum = list.PartNum,
- QtyOfpcs = list.QtyOfpcs,
- QtyOfxout = list.QtyOfxout,
+ QtyOfpcs = (float)list.QtyOfpcs,
+ QtyOfxout = (float)list.QtyOfxout,
+ CPOrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
Creater = "涓婃父WMS",
};
-
- Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
- {
- MaterielCode = item.MaterielCode,
- BatchNo = item.BatchNo,
- OrderQuantity = item.OrderQuantity,
- ReceiptQuantity = 0,
- OverInQuantity = 0,
- OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
- LinId = item.LinId,
- LPNNo = item.LPN_No,
- MaterielName = item.MaterielName,
- MaterieSpec = item.MaterieSpec,
- Creater = "涓婃父WMS",
- SupplierBatch = item.SupplierBatch,
- CPDetails = new List<Dt_CPInboundOrderDetail> { cPInboundOrderDetail }
- };
-
- Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
- {
- OrderNo = model.AsnNo,
- UpperOrderNo = model.AsnNo,
- WarehouseId = warehouse.WarehouseId,
- //SupplierId = "",
- OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt(),
- CreateType = CreateType.UpperSystemPush.ObjToInt(),
- Remark = "",
- TransactionCode = model.TransactionCode,
- InoutType = model.OrderType,
- OrderType = model.InoutType.ObjToInt(),
- Creater = "涓婃父WMS",
- System = model.System,
- Details = new List<Dt_InboundOrderDetail> { orderDetail }
- };
- //switch (model.OrderType)//鍗曟嵁绫诲瀷
- //{
- // case 1:
- // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
- // break;
- // case 3:
- // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
- // break;
- // case 6:
- // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
- // break;
- // default:
- // break;
- //};
- Db.InsertNav(inboundOrder).Include(x => x.Details).ThenInclude(x => x.CPDetails).ExecuteCommand();
+ cPInboundOrderDetail.Add(cPInboundOrderDetail1);
}
+
+ Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
+ {
+ MaterielCode = item.MaterielCode,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
+ ReceiptQuantity = 0,
+ OverInQuantity = 0,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ LinId = item.LinId,
+ LPNNo = item.LPNNo,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch,
+ CPDetails = cPInboundOrderDetail
+ };
+
+ Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
+ {
+ OrderNo = model.AsnNo,
+ UpperOrderNo = model.AsnNo,
+ WarehouseId = warehouse.WarehouseId,
+ //SupplierId = "",
+ OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt(),
+ CreateType = CreateType.UpperSystemPush.ObjToInt(),
+ Remark = "",
+ TransactionCode = model.TransactionCode,
+ InoutType = model.OrderType,
+ OrderType = model.InoutType.ObjToInt(),
+ Creater = "涓婃父WMS",
+ System = model.System,
+ Details = new List<Dt_InboundOrderDetail> { orderDetail }
+ };
+ //switch (model.OrderType)//鍗曟嵁绫诲瀷
+ //{
+ // case 1:
+ // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ // break;
+ // case 3:
+ // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
+ // break;
+ // case 6:
+ // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
+ // break;
+ // default:
+ // break;
+ //};
+
+
+ Db.InsertNav(inboundOrder).Include(x => x.Details).ThenInclude(x => x.CPDetails).ExecuteCommand();
}
}
else
@@ -771,7 +863,7 @@
OverInQuantity = 0,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
LinId = item.LinId,
- LPNNo = item.LPN_No,
+ LPNNo = item.LPNNo,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
@@ -791,7 +883,7 @@
OverInQuantity = 0,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
LinId = item.LinId,
- LPNNo = item.LPN_No,
+ LPNNo = item.LPNNo,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
@@ -1154,7 +1246,7 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
+ //鍙嶆嫞鍥炲簱鍗�
public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
{
try
--
Gitblit v1.9.3