From f7ad3416dfc1558be842f3190688adc9a5a8933d Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期日, 18 一月 2026 14:51:23 +0800
Subject: [PATCH] 添加盘点，合托流程
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 498 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 482 insertions(+), 16 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 11d4d63..a75be4d 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
{
@@ -171,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)
{
@@ -201,6 +213,7 @@
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
WarehouseId = warehouse.WarehouseId,
+ System = inboundOrder.System,
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -246,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)
{
@@ -266,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)
@@ -308,6 +333,240 @@
_stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo).Include(x => x.Details, new UpdateNavOptions() { OneToManyInsertOrUpdate = true }).ExecuteCommand();
}
_inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+
+ }
+ 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
+ {
+ //if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
+ //{
+ return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
+ //}
+ //beforeQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
+ }
+
+ if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ToString())
+ {
+ stockInfo.Remark = Initiallife.ToString();
+ string batchNo = models.FirstOrDefault()?.LotNo ?? "";
+ //Dt_StockInfoDetail existDetail = _stockRepository.StockInfoDetailRepository.QueryFirst(x => x.BatchNo == batchNo);
+ //if (existDetail != null)
+ //{
+ // return WebResponseContent.Instance.Error($"{batchNo}娴嬭瘯鏋跺凡瀛樺湪");
+ //}
+ if (models.Count >= 2)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
+ }
+ //if (palletCode.Substring(0, 1) == "6")
+ //{
+ // stockInfo.PalletType = PalletTypeEnum.MediumPallet.ObjToInt();
+ //}
+ //else
+ //{
+ // stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
+ //}
+ }
+ else if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ToString())
+ {
+ if (models.Count >= 2)
+ {
+ 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 = (quantitys.FirstOrDefault()),
+ 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((quantitys.FirstOrDefault()));
+ decimal decimalOrderQuantity = Convert.ToDecimal(notGroupDetail.OrderQuantity);
+ decimalReceiptQuantity += decimalModelQuantity;
+ // 妫�鏌ユ槸鍚﹁秴鍑鸿鍗曟暟閲�
+ 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();
@@ -393,7 +652,8 @@
.Select((cp, d, o) => cp)
.ToList();
- float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
+ //float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
+
// 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
if (CPinboundOrderDetails.Count < serialNumbers.Count)
@@ -407,6 +667,20 @@
.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();
@@ -415,6 +689,11 @@
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
@@ -449,16 +728,18 @@
// 鏍囪璇ユ槑缁嗕负宸插畬鎴愮粍鐩�
orderDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
var recqty = orderDetail.ReceiptQuantity;
- orderDetail.ReceiptQuantity = ((decimal)totalQty) + recqty; // 鏀惰揣鏁伴噺绛変簬璁㈠崟鏁伴噺
+ 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)
@@ -478,6 +759,7 @@
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
WarehouseId = warehouse.WarehouseId,
+ System = inboundOrder.System,
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -490,6 +772,7 @@
}
}
+ List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = new List<Dt_CPInboundOrderDetail>();
// 鍒涘缓搴撳瓨鏄庣粏 - 鎸夎鍗曟槑缁嗗垱寤�
foreach (var orderDetail in orderDetails)
{
@@ -498,7 +781,8 @@
.Select(x => x.BoxCode)
.ToList();
- List<Dt_CPInboundOrderDetail> cPInboundOrderDetail = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>().Where(x => detailBoxCodes.Contains(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)
{
@@ -528,14 +812,15 @@
BatchNo = orderDetail.BatchNo,
SupplierBatch = orderDetail.SupplierBatch,
LinId = orderDetail.LinId,
- StockQuantity = ((decimal)totalQty),
+ 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
+ StockDetails = stockInfoDetailCP,
+ OrinalLocation = orderDetail.OrinalLocation
};
if (stockInfo.Id > 0)
@@ -550,8 +835,6 @@
detailsToUpdate.Any(d => d.Id == x.Id) ||
x.OrderDetailStatus == OrderDetailStatusEnum.GroupAndInbound.ObjToInt());
-
- inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
// 浜嬪姟澶勭悊
@@ -583,7 +866,7 @@
// 鏇存柊璁㈠崟
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
- _cPInboundOrderDetailRepository.UpdateData(CPinboundOrderDetails);
+ _cPInboundOrderDetailRepository.UpdateData(cPInboundOrderDetail);
_unitOfWorkManage.CommitTran();
@@ -602,6 +885,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)
{
@@ -714,7 +1154,7 @@
{
return content.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
- if (warehouse.WarehouseCode.Contains("TestJCLK"))
+ if (warehouse.WarehouseCode.Contains("CP"))
{
if (item.SupplierBatch == null)
{
@@ -738,6 +1178,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,
@@ -752,9 +1210,12 @@
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
- SupplierBatch = item.SupplierBatch
+ SupplierBatch = item.SupplierBatch,
+ OrinalLocation = item.OrinalLocation,
+ CPDetails = cPInboundOrderDetail
};
- _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
+ //_inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
+ Db.InsertNav(orderDetail).Include(x => x.CPDetails).ExecuteCommand();
}
}
else
@@ -791,6 +1252,7 @@
MaterieSpec = item.MaterieSpec,
Creater = "涓婃父WMS",
SupplierBatch = item.SupplierBatch,
+ OrinalLocation = item.OrinalLocation,
CPDetails = cPInboundOrderDetail
};
@@ -1100,7 +1562,11 @@
}
return content;
}
-
+ /// <summary>
+ /// erp鍗曟嵁涓嬪彂
+ /// </summary>
+ /// <param name="addInboundOrder"></param>
+ /// <returns></returns>
public WebResponseContent Save(AddInboundOrderModel addInboundOrder)
{
try
--
Gitblit v1.9.3