From 6861434f1445d1685b67a24897890c34f8c54f85 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 08 四月 2026 17:22:26 +0800
Subject: [PATCH] WCS&WMS代码更新
---
代码管理/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 266 ----------------------------------------------------
1 files changed, 3 insertions(+), 263 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index 247c7aa..ce6b319 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -1,281 +1,21 @@
-锘縰sing AutoMapper;
-using MailKit.Search;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using OfficeOpenXml.FormulaParsing.Excel.Operators;
-using SqlSugar;
-using System;
+锘縰sing 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;
-using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
-using WIDESEA_StockRepository;
namespace WIDESEA_StockService
{
- public partial class StockInfoService : ServiceBase<Dt_StockInfo, IStockInfoRepository>, IStockInfoService
+ public partial class StockInfoService : ServiceBase<Dt_StockInfo, IRepository<Dt_StockInfo>>, IStockInfoService
{
- 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,IInvokeERPService invokeERPService) : base(BaseDal)
+ public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
- _mapper = mapper;
- _basicRepository = basicRepository;
_unitOfWorkManage = unitOfWorkManage;
- _invokeERPService = invokeERPService;
- }
-
-
-
-
- public WebResponseContent StockQueryData(SaveModel saveModel)
- {
- try
- {
- var barcode = saveModel.MainData["barcode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).First();
- if (stockInfo == null) throw new Exception("鏈壘鍒版墭鐩樹俊鎭�");
- return WebResponseContent.Instance.OK(data: stockInfo);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- public WebResponseContent ManualMaterielGroup(SaveModel saveModel)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- var barcode = saveModel.MainData["palletCode"].ToString();
- var fridcode = saveModel.MainData["fridCode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- var materSn = saveModel.MainData["materSn"];
- //鐩村緞
- var thickness = saveModel.MainData["thickness"].ObjToInt();
- var weight = saveModel.MainData["weight"].ObjToInt();
- //骞呭
- var wide = saveModel.MainData["wide"].ObjToInt();
- var lengthStock = saveModel.MainData["lengthStock"].ObjToInt();
- Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materSn);
- if (materielInfo==null)
- {
- return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
- }
- if (materielInfo.MaterielInvOrgId==MaterielInvOrgEnum.鏂板巶.ObjToInt() && wide<700)
- {
- return content.Error("鐗╂枡骞呭闄愬埗涓�700-2700mm");
- }
- Dt_StockInfo stockInfoOld = BaseDal.QueryFirst(x=>x.PalletCode== barcode || x.RfidCode== fridcode);
-
- if (stockInfoOld != null)
- {
- return content.Error("鏉＄爜淇℃伅鎴朢FID淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId=materielInfo.MaterielInvOrgId,
- PalletCode= barcode,
- RfidCode= fridcode,
- LocationCode ="",
- PalletType = 1,
- WarehouseId=warehouseId,
- StockAttribute= materielInfo.MaterielSourceType,
- StockStatus= StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
- MaterielSpec=materielInfo.MaterielSpec,
- Unit=materielInfo.MaterielUnit,
- MaterielThickness=thickness,
- MaterielWide=wide,
- StockLength=lengthStock,
- MaterielWeight=weight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName=materielInfo.MaterielName,
- };
- if (wide>1200)
- {
- stockInfo.PalletType = 2;
- }
- BaseDal.AddData(stockInfo);
- content.OK("缁勭洏鎴愬姛");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- 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)
- {
- content.Message += $"鏉＄爜{item.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�,";
- continue;
- }
- 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)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielId,width, locationCodes);
- }
- /// <summary>
- /// 鑾峰彇鐢熺鍙娇鐢ㄥ簱瀛�
- /// </summary>
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, decimal width, int warehoseId)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielCode, width, locationCodes);
- }
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielCode, locationCodes);
- }
- /// <summary>
- /// 鍒嗛厤瀹為檯搴撳瓨
- /// </summary>
- /// <returns></returns>
- public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity)
- {
- List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- //鑾峰彇搴撳瓨鍙敤鏁伴噺
- decimal stockTotalQuantity = stockInfos.Sum(x => x.StockLength-x.StockOutLength);
- if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
- {
- int index = 0;
- while (needQuantity > 0)
- {
- 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++;
- }
- }
- else
- {
- throw new Exception("搴撳瓨涓嶈冻");
- }
- 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