From fd5a43c2e677740482b8d25195120ffa75c5ac77 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 19 一月 2026 15:47:29 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 768 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 646 insertions(+), 122 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 06ad9c5..92a3b43 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -37,6 +37,9 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Inbound;
using static WIDESEA_Common.HouseInventoryIn;
+using static WIDESEA_Common.HouseSyncretism;
+using static WIDESEA_Common.InventoryAllocate;
+using Parameter = WIDESEA_Common.Parameter;
namespace WIDESEA_InboundService
{
@@ -56,11 +59,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 +80,7 @@
_stockRepository = stockRepository;
_palletTypeInfoRepository = palletTypeInfoRepository;
_returnOrderRepository = returnOrderRepository;
+ _cPInboundOrderDetailRepository = cPInboundOrderDetailRepository;
}
/// <summary>
@@ -169,8 +174,17 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
+ List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
///鎵炬暟閲忓尮閰嶇殑
- List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ if (warehouse.WarehouseCode.Contains("BC"))
+ {
+ inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ }
+ else
+ {
+ inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).ToList();
+ }
+
if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
{
@@ -199,6 +213,7 @@
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
WarehouseId = warehouse.WarehouseId,
+ System = inboundOrder.System,
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -244,7 +259,18 @@
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
foreach (var model in models)
{
- Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+
+ Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();
+ ///鎵炬暟閲忓尮閰嶇殑
+ if (warehouse.WarehouseCode.Contains("BC"))
+ {
+ notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ }
+ else
+ {
+ notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ }
+
if (notGroupDetail == null)
{
@@ -264,7 +290,8 @@
Id = inboundOrderDet.LinId.ObjToInt(),
DeliveryNote = model.DeliveryNote,
SupplierBatch = inboundOrderDet.SupplierBatch,
- MaterieSpec = inboundOrderDet.MaterieSpec
+ MaterieSpec = inboundOrderDet.MaterieSpec,
+ OrinalLocation = inboundOrderDet.OrinalLocation
};
if (stockInfo.Id > 0)
@@ -321,6 +348,205 @@
return content;
}
+ //鑽按锛屼綆娓╀粨缁勭洏
+ public WebResponseContent NewMaterielGroup(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ var orderNo = saveModel.MainData["orderNo"].ToString();
+ var palletCode = saveModel.MainData["palletCode"].ToString();
+ var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ var Initiallife = saveModel.MainData["initiallife"].ObjToInt();
+ List<string> serialNumbers = new List<string>();
+ List<decimal> quantitys = new List<decimal>();
+ foreach (var item in saveModel.DelKeys)
+ {
+ string json = JsonConvert.SerializeObject(item);
+ Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+
+
+ if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
+ {
+ string serialNumber = serialNumberObj?.ToString();
+ if (!string.IsNullOrEmpty(serialNumber))
+ {
+ serialNumbers.Add(serialNumber);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
+ }
+ }
+ if (delKeyDict.TryGetValue("quantity", out object quantityObj))
+ {
+ if (quantityObj == null)
+ {
+ return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺鐨勫�间负绌�");
+ }
+ decimal quantity;
+ try
+ {
+ quantity = Convert.ToDecimal(quantityObj);
+ }
+ catch
+ {
+ return WebResponseContent.Instance.Error($"鐗╂枡鏁伴噺{quantityObj}鏃犳硶杞崲涓烘暟瀛�");
+ }
+ if (quantity <= 0)
+ {
+ return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
+ }
+
+ quantitys.Add(quantity);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁");
+ }
+ }
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == orderNo && x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).First();
+ if (inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ }
+ if (inboundOrder.Details == null || inboundOrder.Details.Count <= 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ }
+ List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);
+ //楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
+ WebResponseContent IsValidContent = IsValidMCDates(models);
+ if (!IsValidContent.Status)
+ {
+ return content.Error(IsValidContent.Message);
+ }
+
+ string materielCode = models.FirstOrDefault()?.MaterielCode ?? "";
+ Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
+ }
+
+ decimal beforeQuantity = 0;
+
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
+ if (stockInfo == null)
+ {
+ stockInfo = new Dt_StockInfo()
+ {
+ BatchNo ="",
+ PalletCode = palletCode,
+ PalletType = GetPalletType(warehouse, palletCode),//GetPalletType(warehouse, palletCode)
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
+ Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
+ Mgeneratetime = DateTime.Now,
+ WarehouseId = warehouse.WarehouseId,
+ System = inboundOrder.System,
+ Details = new List<Dt_StockInfoDetail>()
+ };
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
+ }
+ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ foreach (var model in models)
+ {
+
+ Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();
+
+ notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo).FirstOrDefault();
+
+ if (notGroupDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"璇ョ墿鏂欏湪璇ュ叆搴撳崟涓凡鍏ㄩ儴缁勭洏瀹屾垚");
+ }
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ MaterielCode = notGroupDetail.MaterielCode,
+ MaterielName = notGroupDetail.MaterielName,
+ OrderNo = inboundOrder.OrderNo,
+ BatchNo = notGroupDetail.BatchNo,
+ LinId = notGroupDetail.LinId,
+ StockQuantity = model.Quantity,
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Id = notGroupDetail.LinId.ObjToInt(),
+ DeliveryNote = model.DeliveryNote,
+ SupplierBatch = notGroupDetail.SupplierBatch,
+ MaterieSpec = notGroupDetail.MaterieSpec,
+ OrinalLocation = notGroupDetail.OrinalLocation
+ };
+
+ if (stockInfo.Id > 0)
+ {
+ stockInfoDetail.StockId = stockInfo.Id;
+ }
+ stockInfo.Details.Add(stockInfoDetail);
+
+ stockInfoDetails.Add(stockInfoDetail);
+
+ decimal decimalReceiptQuantity = Convert.ToDecimal(notGroupDetail.ReceiptQuantity);
+ decimal decimalModelQuantity = Convert.ToDecimal(notGroupDetail.OrderQuantity);
+ decimal decimalOrderQuantity = Convert.ToDecimal(notGroupDetail.OrderQuantity);
+ decimalReceiptQuantity += model.Quantity;
+ // 妫�鏌ユ槸鍚﹁秴鍑鸿鍗曟暟閲�
+ if (decimalReceiptQuantity > decimalOrderQuantity)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏁伴噺婧㈠嚭{decimalReceiptQuantity - decimalOrderQuantity}");
+ }
+ // 杞洖float绫诲瀷瀛樺偍锛屼絾姣旇緝鍜岃绠楅兘浣跨敤decimal瀹屾垚
+ notGroupDetail.ReceiptQuantity = Convert.ToDecimal(decimalReceiptQuantity);
+ if (notGroupDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+ }
+ }
+
+ decimal totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
+
+ inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+
+ _unitOfWorkManage.BeginTran();
+ if (stockInfo.Id == 0)
+ {
+ _stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
+ }
+ else
+ {
+ _stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo).Include(x => x.Details, new UpdateNavOptions() { OneToManyInsertOrUpdate = true }).ExecuteCommand();
+ }
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrder.Details);
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+
+ }
+ return content;
+ }
+
/// <summary>
/// 鎴愬搧缁勭洏
/// </summary>
@@ -334,14 +560,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 +586,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,35 +605,106 @@
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();
+ //float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
- // 鏂瑰紡2锛氬鏋滄偍闇�瑕佸垎鍒鐞嗙鍙峰拰鎵樼洏鍙凤紝鍙互鍒嗗紑鏌ヨ
- var boxDetails = CPinboundOrderDetails.Where(x => serialNumbers.Contains(x.BoxCode)).ToList();
// 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
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());
+
+
+ var existingStockBoxCodes = _stockRepository.StockInfoRepository.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) =>
+ serialNumbers.Contains(cp.BoxCode))
+ .Select((s, d, cp) => cp.BoxCode)
+ .Distinct()
+ .ToList();
+
+ if (existingStockBoxCodes.Any())
+ {
+ return WebResponseContent.Instance.Error($"浠ヤ笅绠卞彿宸插湪搴撳瓨涓細{string.Join(",", existingStockBoxCodes)}");
+ }
+
+ // 鑾峰彇鎵�鏈夌浉鍏崇殑鍏ュ簱鍗曟槑缁咺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();
+
+ if (inboundOrderDetails.Sum(x => x.OrderQuantity) <= inboundOrderDetails.Sum(x => x.ReceiptQuantity))
+ {
+ return WebResponseContent.Instance.Error($"姝ゅ崟鎹凡鍏ㄩ儴缁勭洏瀹屾垚");
+ }
+
+ // 鎸夎鍗曟槑缁咺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;
+ float totalQty = cpDetails.Sum(item => item.QtyOfpcs);
+ orderDetail.ReceiptQuantity = (decimal)totalQty + recqty; // 鏀惰揣鏁伴噺绛変簬璁㈠崟鏁伴噺
+
+ detailsToUpdate.Add(orderDetail);
+ }
+
+
// 妫�鏌ユ墭鐩樻槸鍚﹀凡瀛樺湪
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db
.Queryable<Dt_StockInfo>()
.Where(x => x.PalletCode == palletCode)
- .Includes(x => x.Details)
.First();
if (stockInfo == null)
@@ -440,7 +712,7 @@
// 鍒涘缓鏂版墭鐩�
stockInfo = new Dt_StockInfo()
{
- //BatchNo = models.FirstOrDefault()?.LotNo ?? "",
+ BatchNo = "", // 浣跨敤鍏ュ簱鍗曟壒娆″彿
PalletCode = palletCode,
PalletType = GetPalletType(warehouse, palletCode),
IsFull = true,
@@ -452,6 +724,7 @@
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
WarehouseId = warehouse.WarehouseId,
+ System = inboundOrder.System,
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -464,13 +737,70 @@
}
}
- // 楠岃瘉鍜屾洿鏂版瘡涓墿鏂欑殑缁勭洏鏁伴噺
- List<Dt_InboundOrderDetail> detailsToUpdate = new List<Dt_InboundOrderDetail>();
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = new List<Dt_CPInboundOrderDetail>();
+ // 鍒涘缓搴撳瓨鏄庣粏 - 鎸夎鍗曟槑缁嗗垱寤�
+ foreach (var orderDetail in orderDetails)
+ {
+ // 鑾峰彇璇ユ槑缁嗗搴旂殑鎵�鏈夌鍙�
+ var detailBoxCodes = detailsByOrderDetailId[orderDetail.Id]
+ .Select(x => x.BoxCode)
+ .ToList();
+
+ 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)cPInboundOrderDetail.Sum(item => item.QtyOfpcs),
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Id = orderDetail.LinId.ObjToInt(),
+ //DeliveryNote = orderDetail.DeliveryNote,
+ MaterieSpec = orderDetail.MaterieSpec,
+ StockDetails = stockInfoDetailCP,
+ OrinalLocation = orderDetail.OrinalLocation
+ };
+
+ 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 +809,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 +818,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(cPInboundOrderDetail);
+
_unitOfWorkManage.CommitTran();
-
+ content = WebResponseContent.Instance.OK("缁勭洏鎴愬姛");
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- throw;
+ throw new Exception($"缁勭洏浜嬪姟澶勭悊澶辫触锛歿ex.Message}", ex);
}
}
catch (Exception ex)
@@ -515,6 +850,163 @@
return content;
}
+ public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
+ /// <summary>
+ /// 缁勭洏鍚堟墭
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent SYMaterielGroup(SaveModel saveModel)
+ {
+
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ var soussAddress = saveModel.MainData["soussAddress"];
+ var targetAddress = saveModel.MainData["targetAddress"];
+
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == soussAddress).First();
+ Dt_StockInfo targetstockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == targetAddress).First();
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == targetstockInfo.WarehouseId);
+ if (stockInfo == null || targetstockInfo == null)
+ {
+ throw new Exception("搴撳瓨鏈壘鍒版墭鐩樺彿");
+ }
+
+ var sameItems = from sourceItem in stockInfo.Details
+ join targetItem in targetstockInfo.Details
+ on new
+ {
+ sourceItem.BatchNo,
+ sourceItem.MaterielName,
+ sourceItem.MaterielCode
+ }
+ equals new
+ {
+ targetItem.BatchNo,
+ targetItem.MaterielName,
+ targetItem.MaterielCode
+ }
+ select new
+ {
+ SourceItem = sourceItem,
+ TargetItem = targetItem,
+ BatchNo = sourceItem.BatchNo,
+ MaterialCode = sourceItem.MaterielCode,
+ MaterialType = sourceItem.MaterielName
+ };
+
+ var matchedSourceItemIds = sameItems.Select(x => x.SourceItem.Id).ToList();
+
+ foreach (var item in stockInfo.Details)
+ {
+ if (!matchedSourceItemIds.Contains(item.Id))
+ {
+ item.StockId = targetstockInfo.Id;
+ }
+ }
+ var differentItems = stockInfo.Details
+ .Where(x => !matchedSourceItemIds.Contains(x.Id))
+ .ToList();
+ targetstockInfo.Details = targetstockInfo.Details
+ .Where(x => !matchedSourceItemIds.Contains(x.Id))
+ .Concat(differentItems)
+ .ToList();
+ if (warehouse.WarehouseCode == "SC02_CP")
+ {
+ warehouse.WarehouseCode = "SC01_CP";
+ }
+ if (warehouse.WarehouseCode == "SC02_BC")
+ {
+ warehouse.WarehouseCode = "SC01_BC";
+ }
+ var houseSyncretism = new HouseSyncretism
+ {
+ ApiType = "InventoryMoveController",
+ Method = "AsrsSubmitMoveDatas",
+
+ Parameters = new List<HouseSyncretism.Parame>
+ {
+ new HouseSyncretism.Parame {
+ Value = stockInfo.Details.Select(g => new Parame.Syncretism
+ {
+ Lpn = stockInfo.PalletCode,
+ MoveType = 0,
+ WareHouseCode = warehouse.WarehouseCode,
+ ItemCode = g.MaterielCode,
+ MoveNumber = g.StockQuantity,
+ LotNo = g.BatchNo,
+ WipBatch = g.BatchNo,
+ LocationName = stockInfo.LocationCode,
+ TargetLocName = targetstockInfo.LocationCode,
+ TargetLpn = targetstockInfo.PalletCode,
+
+ }).ToList()
+ }
+ }
+ };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ houseSyncretism.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+
+ };
+
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseSyncretism, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // 鍒ゆ柇Success鐨勫��
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+
+ }
+ _unitOfWorkManage.BeginTran();
+ foreach (var sameItem in sameItems)
+ {
+ sameItem.TargetItem.StockQuantity += sameItem.SourceItem.StockQuantity;
+ _stockRepository.StockInfoDetailRepository.UpdateData(sameItem.TargetItem);
+ _stockRepository.StockInfoDetailRepository.DeleteData(sameItem.SourceItem);
+ }
+ _stockRepository.StockInfoRepository.UpdateData(targetstockInfo);
+ _stockRepository.StockInfoRepository.DeleteData(stockInfo);
+
+ _unitOfWorkManage.CommitTran();
+ webResponseContent = WebResponseContent.Instance.OK("鍚堟墭鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ webResponseContent = WebResponseContent.Instance.Error($"缁勭洏澶辫触锛歿ex.Message}");
+ }
+ return webResponseContent;
+ }
+
+ private (bool IsSuccess, string Ticket, string InvOrgId) AuthenticateWithWMS()
+ {
+ var authentication = new Authentication
+ {
+ ApiType = "AuthenticationController",
+ Parameters = new List<Parameter>
+ {
+ new Parameter { Value = "LK-Admin" },
+ new Parameter { Value = "LK-Admin" }
+ },
+ Method = "Login",
+ };
+
+ var response = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, authentication, "鐧诲綍WMS璐﹀彿");
+
+ if (response.Context != null)
+ {
+ return (true, response.Context["Ticket"].ToString(), response.Context["InvOrgId"].ToString());
+ }
+
+ return (false, null, null);
+ }
+
public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
{
@@ -651,6 +1143,24 @@
}
else
{
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = new List<Dt_CPInboundOrderDetail>();
+ foreach (var list in item.BoxList)
+ {
+ Dt_CPInboundOrderDetail cPInboundOrderDetail1 = new Dt_CPInboundOrderDetail()
+ {
+ BoxId = (float)list.BoxId,
+ BoxCode = list.BoxCode,
+ DateCode = list.DateCode,
+ JobId = (float)list.JobId,
+ PartNum = list.PartNum,
+ QtyOfpcs = (float)list.QtyOfpcs,
+ QtyOfxout = (float)list.QtyOfxout,
+ CPOrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ Creater = "涓婃父WMS",
+ };
+ cPInboundOrderDetail.Add(cPInboundOrderDetail1);
+ }
+
Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
{
OrderId = orderDetail1.OrderId,
@@ -661,80 +1171,89 @@
OverInQuantity = 0,
OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
LinId = item.LinId,
- LPNNo = item.LPN_No,
- MaterielName = item.MaterielName,
- MaterieSpec = item.MaterieSpec,
- Creater = "涓婃父WMS",
- SupplierBatch = item.SupplierBatch
- };
- _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
- }
- }
- else
- {
- foreach (var list in item.BoxList)
- {
- Dt_CPInboundOrderDetail cPInboundOrderDetail = new Dt_CPInboundOrderDetail()
- {
- BoxId = list.BoxId,
- BoxCode = list.BoxCode,
- DateCode = list.DateCode,
- JobId = list.JobId,
- PartNum = list.PartNum,
- QtyOfpcs = list.QtyOfpcs,
- QtyOfxout = list.QtyOfxout,
- 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,
+ LPNNo = item.LPNNo,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
SupplierBatch = item.SupplierBatch,
- CPDetails = new List<Dt_CPInboundOrderDetail> { cPInboundOrderDetail }
+ OrinalLocation = item.OrinalLocation,
+ 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();
+ //_inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
+ Db.InsertNav(orderDetail).Include(x => x.CPDetails).ExecuteCommand();
}
+ }
+ else
+ {
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = new List<Dt_CPInboundOrderDetail>();
+ foreach (var list in item.BoxList)
+ {
+ Dt_CPInboundOrderDetail cPInboundOrderDetail1 = new Dt_CPInboundOrderDetail()
+ {
+ BoxId = (float)list.BoxId,
+ BoxCode = list.BoxCode,
+ DateCode = list.DateCode,
+ JobId = (float)list.JobId,
+ PartNum = list.PartNum,
+ QtyOfpcs = (float)list.QtyOfpcs,
+ QtyOfxout = (float)list.QtyOfxout,
+ CPOrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ Creater = "涓婃父WMS",
+ };
+ 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,
+ OrinalLocation = item.OrinalLocation,
+ 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
@@ -757,6 +1276,7 @@
if (inboundOrderDetailOld != null)
{
inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
+ inboundOrderDetailOld.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
_inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
}
else
@@ -771,7 +1291,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 +1311,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",
@@ -1008,7 +1528,11 @@
}
return content;
}
-
+ /// <summary>
+ /// erp鍗曟嵁涓嬪彂
+ /// </summary>
+ /// <param name="addInboundOrder"></param>
+ /// <returns></returns>
public WebResponseContent Save(AddInboundOrderModel addInboundOrder)
{
try
@@ -1154,7 +1678,7 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
+ //鍙嶆嫞鍥炲簱鍗�
public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
{
try
--
Gitblit v1.9.3