From b513ce3a4527e998da66c6f179a279472c7262a8 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 18 十一月 2025 10:59:46 +0800
Subject: [PATCH] 代码更新优化
---
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index 46b9905..47834ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -1,21 +1,27 @@
锘縰sing AutoMapper;
using MailKit.Search;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
+using OfficeOpenXml.FormulaParsing.Excel.Operators;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Stock;
+using WIDESEA_External.ERPService;
+using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
using WIDESEA_IRecordRepository;
using WIDESEA_IRecordService;
@@ -31,13 +37,15 @@
private readonly IMapper _mapper;
private readonly IBasicRepository _basicRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IInvokeERPService _invokeERPService;
public IStockInfoRepository Repository => BaseDal;
- public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IUnitOfWorkManage unitOfWorkManage,IInvokeERPService invokeERPService) : base(BaseDal)
{
_mapper = mapper;
_basicRepository = basicRepository;
_unitOfWorkManage = unitOfWorkManage;
+ _invokeERPService = invokeERPService;
}
@@ -123,6 +131,64 @@
}
return content;
}
+ /// <summary>
+ /// 鏇存柊鑰佸巶绔嬪簱娈嬪嵎搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent UpBSTStock(int operate)
+ {
+ WebResponseContent content=new WebResponseContent();
+ try
+ {
+ DateTime dateTime = Convert.ToDateTime("2025-11-01 00:00:00");
+ //鑾峰彇鎵�鏈夌殑娈嬪嵎绔嬪簱搴撳瓨
+ List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.IsFull == WhetherEnum.True.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.ModifyDate> dateTime);
+ if (operate>0)
+ {
+ //鑾峰彇鎵�鏈夌殑鑰佸巶缂撳瓨鍖哄簱瀛�
+ stockInfos = BaseDal.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.WarehouseId==WarehouseEnum.LLDOldCache.ObjToInt());
+ }
+ List<Dt_StockInfo> stockInfosUp = new List<Dt_StockInfo>();
+ List<Dt_StockInfo> stockInfosDel = new List<Dt_StockInfo>();
+ foreach (var item in stockInfos)
+ {
+ BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(item.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
+ if (bSTResponse.Code == 500)
+ {
+ throw new Exception($"鏈壘鍒版潯鐮亄item.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�");
+ }
+ BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧item.PalletCode}鐨勫簱瀛樹俊鎭�");
+ if (item.StockLength != bSTStockInfoDTO.StockMeter && bSTStockInfoDTO.StockMeter>0)
+ {
+ item.MaterielThickness = bSTStockInfoDTO.Thick;
+ item.MaterielWeight = bSTStockInfoDTO.Qty;
+ item.MaterielWide = bSTStockInfoDTO.W;
+ item.Remark = $"{item.StockLength}-{bSTStockInfoDTO.StockMeter}";
+ item.StockLength = bSTStockInfoDTO.StockMeter;
+ stockInfosUp.Add(item);
+ }
+ else if(item.StockLength != bSTStockInfoDTO.StockMeter && bSTStockInfoDTO.StockMeter == 0)
+ {
+ stockInfosDel.Add(item);
+ }
+ }
+ //鏁版嵁搴撴搷浣�
+ _unitOfWorkManage.BeginTran();
+ BaseDal.UpdateData(stockInfosUp);
+ if (stockInfosDel.Count>0)
+ {
+ BaseDal.DeleteAndMoveIntoHty(stockInfosDel, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
+ }
+ _unitOfWorkManage.CommitTran();
+ content.OK("鏇存柊鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
public List<Dt_StockInfo> GetUseableStocks(int materielId,decimal width, int warehoseId)
{
@@ -181,5 +247,34 @@
}
return outStocks;
}
+ /// <summary>
+ /// 鍒嗛厤鑰佸巶搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public List<Dt_StockInfo> GetOutOldStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity)
+ {
+ List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
+ //鑾峰彇搴撳瓨鍙敤鏁伴噺
+ decimal stockTotalQuantity = stockInfos.Sum(x => x.StockLength - x.StockOutLength);
+ int index = 0;
+ while (needQuantity > 0 && (index + 1 <= stockInfos.Count))
+ {
+ Dt_StockInfo stockInfo = stockInfos[index];
+ decimal useableStockQuantity = stockInfo.StockLength - stockInfo.StockOutLength;
+ if (useableStockQuantity < needQuantity && useableStockQuantity > 0)
+ {
+ stockInfo.StockOutLength = stockInfo.StockLength;
+ needQuantity -= useableStockQuantity;
+ }
+ else
+ {
+ stockInfo.StockOutLength += needQuantity;
+ needQuantity = 0;
+ }
+ outStocks.Add(stockInfo);
+ index++;
+ }
+ return outStocks;
+ }
}
}
--
Gitblit v1.9.3