From 413f243b73ef073f4ac83889fda2f5bf6d1e727c Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期三, 08 一月 2025 10:17:32 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" index 010d9b4..c7cc800 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" @@ -44,7 +44,7 @@ private readonly IInvokeERPService _invokeERPService; private readonly IOutStockLockInfoService _outStockLockInfoService; - public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService, + public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService, IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal) { _mapper = mapper; @@ -115,7 +115,7 @@ }; Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder() { - OrderNo=model.OrderNo, + OrderNo = model.OrderNo, UpperOrderNo = model.OrderNo, OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(), OrderType = OutOrderTypeEnum.Issue.ObjToInt(), @@ -172,31 +172,31 @@ } } //涓婃姤鍑哄簱瀹屾垚 - public WebResponseContent TestOutUpload(int id,List<Dt_OutStockLockInfo>? outStockLockInfos) + public WebResponseContent TestOutUpload(int id, List<Dt_OutStockLockInfo>? outStockLockInfos) { try { - Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x=>x.Id==id).Includes(x=>x.Details).First(); + Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First(); Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId); ERPIssueModel issueModel = new ERPIssueModel(); List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>(); - List<Dt_OutStockLockInfo> _OutStockLockInfos=new List<Dt_OutStockLockInfo>(); + List<Dt_OutStockLockInfo> _OutStockLockInfos = new List<Dt_OutStockLockInfo>(); //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚 - if (outStockLockInfos.Count<=0 || outStockLockInfos==null) + if (outStockLockInfos.Count <= 0 || outStockLockInfos == null) { stockInfos = TestOutStocksUpdate(warehouse).Data as List<Dt_StockInfo> ?? new List<Dt_StockInfo>(); - List<ERPPickItemModel> eRPOutPick =new List<ERPPickItemModel>(); + List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>(); for (int i = 0; i < stockInfos.Count; i++) { ERPPickItemModel pickItemModel = new ERPPickItemModel() { - Lotno= stockInfos[i].Details[0].BatchNo, - Qty= stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(), - Location= warehouse.WarehouseCode + Lotno = stockInfos[i].Details[0].BatchNo, + Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(), + Location = warehouse.WarehouseCode }; eRPOutPick.Add(pickItemModel); } - + ERPPickModel pickModel = new ERPPickModel() { Rowindex = outboundOrder.Details[0].RowNo, @@ -225,8 +225,8 @@ } else { - List<ERPPickModel> eRPPickModels= new List<ERPPickModel>(); - + List<ERPPickModel> eRPPickModels = new List<ERPPickModel>(); + //鑾峰彇鍑哄簱璇︽儏鍗� foreach (var item in outStockLockInfos) { @@ -245,7 +245,7 @@ Qty = pickItemModel.Qty, Dataitem = new List<ERPPickItemModel> { pickItemModel } }; - item.Status= OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt(); + item.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt(); eRPPickModels.Add(pickModel); _OutStockLockInfos.Add(item); } @@ -267,7 +267,7 @@ Issitem = new List<ERPIssueItemModel>() { issueItemModel }, }; } - + if (stockInfos.Count > 0) { _stockInfoRepository.UpdateData(stockInfos); @@ -297,7 +297,7 @@ { //鑾峰彇鍑哄簱鍗曞簱瀛� List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList(); - if (stockInfos.Count<=0) + if (stockInfos.Count <= 0) { return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻"); } -- Gitblit v1.9.3