From f84bf82bf8cbe00a2dad2b27be42e4eeec539552 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 一月 2025 14:46:46 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index b7ab61d..ecc901e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -423,7 +423,92 @@
}
return content;
}
+ /// <summary>
+ /// WMS鍏ュ钩搴撲笉鎺ㄥ崟鎹�
+ /// </summary>
+ /// <param name="warehouseId"></param>
+ /// <param name="serNums"></param>
+ /// <returns></returns>
+ public WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+ List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);
+ if (models.Select(x => x.MaterielCode).Distinct().Count() > 1)
+ {
+ return WebResponseContent.Instance.Error($"鐗╂枡涓嶅彲娣锋斁");
+ }
+ string materielCode = models.FirstOrDefault()?.MaterielCode ?? "";
+ Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
+ }
+ float beforeQuantity = 0;
+ Dt_StockInfo stockInfo = new Dt_StockInfo()
+ {
+ PalletCode = DateTime.Now.ToString("yyyyMMddHHmmss"),
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
+ PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
+ LocationCode = "骞冲簱浣�",
+ Details = new List<Dt_StockInfoDetail>()
+ };
+ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ foreach (var model in models)
+ {
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ BatchNo = model.LotNo,
+ MaterielCode = materielInfo.MaterielCode,
+ MaterielName = materielInfo.MaterielName,
+ SerialNumber = model.SerialNumber,
+ StockQuantity = model.Quantity,
+ OutboundQuantity = 0,
+ OrderNo = "",
+ Unit = materielInfo.MaterielUnit,
+ Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ ProductionDate = model.ProductionDate,
+ EffectiveDate = model.EffectiveDate,
+ };
+
+ if (stockInfo.Id > 0)
+ {
+ stockInfoDetail.StockId = stockInfo.Id;
+ }
+ stockInfo.Details.Add(stockInfoDetail);
+
+ stockInfoDetails.Add(stockInfoDetail);
+
+ }
+ float totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
+ _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();
+ }
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.Inbound);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
/// <summary>
/// 缁勭洏
/// </summary>
@@ -752,28 +837,34 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樻槑缁嗕俊鎭�");
}
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => stockInfoDetails.Select(x => x.StockId).ToList().Contains(x.Id));
+ //鑾峰彇璇ュ叆搴撳崟鎵�鏈夊簱瀛�
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => stockInfoDetails.GroupBy(x => x.StockId).Select(x => x.Key).Contains(x.Id)).Includes(x => x.Details).ToList();
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == inboundOrder.WarehouseId);
if (warehouse == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
List<ERPInboundDetailModel>? detailModels = new List<ERPInboundDetailModel>();
- foreach (var item in stockInfoDetails)
+ foreach (var stockInfo in stockInfos)
{
- ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
+ foreach (var item in stockInfo.Details.GroupBy(x => x.InboundOrderRowNo).Select(x => x.Key))
{
- ExpiryDate = item.EffectiveDate ?? "",
- LocationCode = warehouse.WarehouseCode,
- MaterialsCode = item.MaterielCode,
- MfgDate = item.ProductionDate ?? "",
- QtyCustoms = "0",
- Quantity = item.StockQuantity.ToString(),
- Rack = stockInfos.FirstOrDefault(x => x.Id == item.StockId).LocationCode,
- ReceiptCode = inboundOrder.UpperOrderNo,
- ReceiptSerNo = item.InboundOrderRowNo.ToString()
- };
- detailModels.Add(detailModel);
+ //鍖哄垎涓嶅悓鎵规
+ Dt_StockInfoDetail? dt_StockInfoDetail = stockInfo.Details.Where(x => x.InboundOrderRowNo == item).FirstOrDefault();
+ ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
+ {
+ ExpiryDate = dt_StockInfoDetail?.EffectiveDate ?? "",
+ LocationCode = warehouse.WarehouseCode,
+ MaterialsCode = dt_StockInfoDetail.MaterielCode,
+ MfgDate = dt_StockInfoDetail.ProductionDate ?? "",
+ QtyCustoms = "0",
+ Quantity = stockInfo.Details.Where(x => x.InboundOrderRowNo == item).Sum(x => x.StockQuantity).ToString(),
+ Rack = stockInfo.LocationCode,
+ ReceiptCode = inboundOrder.UpperOrderNo,
+ ReceiptSerNo = item.ToString()
+ };
+ detailModels.Add(detailModel);
+ }
}
ERPInboundModel model = new ERPInboundModel()
{
@@ -814,7 +905,7 @@
throw new ArgumentNullException(nameof(ruleCode));
SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
{
- IsAutoCloseConnection = false,
+ IsAutoCloseConnection = true,
DbType = DbType.SqlServer,
ConnectionString = DBContext.ConnectionString
});
--
Gitblit v1.9.3