From 638a684258fb4bc6adf76a1964bdf0d7f99e404f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 31 三月 2025 02:18:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
index d682cdc..342a677 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService_Pick.cs"
@@ -9,15 +9,20 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_IOutboundRepository;
+using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
namespace WIDESEA_IOutboundService
{
- public partial class OutStockLockInfoService : ServiceBase<Dt_OutStockLockInfo, IOutStockLockInfoRepository>, IOutStockLockInfoService
+ public partial class OutStockLockInfoService
{
- IStockService _stockService;
+ /// <summary>
+ /// 鍒嗘嫞
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
public WebResponseContent MaterialPick(string palletCode)
{
try
@@ -27,20 +32,67 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨淇℃伅");
}
- List<Dt_OutStockLockInfo> outStockLockInfos = Repository.QueryData(x => x.PalletCode == palletCode);
+ if (stockInfo.StockStatus != StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樿繕鏈嚭搴撳畬鎴�");
+ }
+ List<Dt_OutStockLockInfo> outStockLockInfos = Repository.QueryData(x => x.PalletCode == palletCode && x.Status == OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt());
+ if (outStockLockInfos == null || outStockLockInfos.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("璇ユ墭鐩樺凡鍏ㄩ儴鍒嗘嫞瀹屾垚");
+ }
for (int i = 0; i < outStockLockInfos.Count; i++)
{
- float assignQuantity = outStockLockInfos[i].AssignQuantity;
- List<Dt_StockInfoDetail> stockInfoDetails = stockInfo.Details.Where(x => x.MaterielCode == outStockLockInfos[i].MaterielCode).ToList();
- for (int j = 0; j < stockInfoDetails.Count; j++)
+ outStockLockInfos[i].Status = OutLockStockStatusEnum.鎷ｉ�夊畬鎴�.ObjToInt();
+ }
+ List<Dt_StockInfoDetail> beforeDetaile = stockInfo.Details.GroupBy(x => x.MaterielCode).Select(x => new Dt_StockInfoDetail { MaterielCode = x.Key, StockQuantity = x.Sum(v => v.StockQuantity) }).ToList();
+ List<Dt_StockInfoDetail> updateDetailList = new List<Dt_StockInfoDetail>();
+ List<Dt_StockInfoDetail> deleteDetailList = new List<Dt_StockInfoDetail>();
+ List<Dt_StockInfoDetail> residueDetailList = new List<Dt_StockInfoDetail>();
+ for (int i = 0; i < stockInfo.Details.Count; i++)
+ {
+ if (stockInfo.Details[i].OutboundQuantity > 0)
{
- // if(assignQuantity > stockInfoDetails[j])
+ if (stockInfo.Details[i].StockQuantity > stockInfo.Details[i].OutboundQuantity)
+ {
+ stockInfo.Details[i].StockQuantity -= stockInfo.Details[i].OutboundQuantity;
+ updateDetailList.Add(stockInfo.Details[i]);
+ }
+ else
+ {
+ deleteDetailList.Add(stockInfo.Details[i]);
+ }
+ }
+ else
+ {
+ residueDetailList.Add(stockInfo.Details[i]);
}
}
+ stockInfo.StockStatus = StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt();
+ List<string> mCodes = stockInfo.Details.GroupBy(x => x.MaterielCode).Select(x => x.Key).ToList();
+ _unitOfWorkManage.BeginTran();
+ foreach (string code in mCodes)
+ {
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, residueDetailList, updateDetailList, deleteDetailList, StockChangeTypeEnum.Outbound);
+ }
+ updateDetailList.ForEach(x =>
+ {
+ x.OutboundQuantity = 0;
+ });
+ if (stockInfo.Details.Count > deleteDetailList.Count)
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ else
+ _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, OperateTypeEnum.鑷姩瀹屾垚);
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(deleteDetailList, OperateTypeEnum.鑷姩瀹屾垚);
+ _stockService.StockInfoDetailService.Repository.UpdateData(updateDetailList);
+ //_stockService.StockInfoDetailService.Repository.DeleteData(deleteDetailList);
+ BaseDal.UpdateData(outStockLockInfos);
+ _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
--
Gitblit v1.9.3