提交

pan

2025-12-02 550ae4989da1ce9ca874a00aec7423d252b67a27

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs

@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using Dm.filter;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using SqlSugar;
@@ -36,11 +37,11 @@
        private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
        private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
        private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;

        private readonly IMaterialUnitService _materialUnitService;
        private readonly IOutboundOrderService _outboundOrderService;
        private readonly IOutboundOrderDetailService _outboundOrderDetailService;
        private readonly IOutStockLockInfoService _outStockLockInfoService;
        public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService)
        public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService, IMaterialUnitService materialUnitService)
        {
            _httpClientFactory = httpClientFactory;
            _logger = logger;
@@ -51,6 +52,7 @@
            _outboundOrderService = outboundOrderService;
            _outboundOrderDetailService = outboundOrderDetailService;
            _outStockLockInfoService = outStockLockInfoService;
            _materialUnitService = materialUnitService;
        }

        /// <summary>
@@ -429,7 +431,6 @@
                        .Where(x => x.OrderNo == orderNo && detailids.Contains(x.OrderDetailId) &&
                                   x.Status == (int)OutLockStockStatusEnum.拣选完成)
                        .ToListAsync();

                    var detailModel = new FeedbackOutboundDetailsModel
                    {
                        materialCode = detail.MaterielCode,
@@ -438,16 +439,32 @@
                        qty = detail.BarcodeQty, // ä½¿ç”¨è®¢å•æ˜Žç»†çš„已出库数量
                        currentDeliveryQty = detail.BarcodeQty,
                        unit = detail.BarcodeUnit,
                        barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
                        {
                            barcode = lockInfo.CurrentBarcode,
                            supplyCode = lockInfo.SupplyCode,
                            batchNo = lockInfo.BatchNo,
                            unit = lockInfo.BarcodeUnit,
                            qty = lockInfo.BarcodeQty // æ¡ç çº§åˆ«çš„数量仍用锁定记录
                        }).ToList()
                        barcodes =  new List<WIDESEA_DTO.Outbound.BarcodesModel> ()
                    };

                    if (detailLocks.Any(x => x.BarcodeUnit != x.Unit))
                    {
                        foreach (var item in detailLocks)
                        {
                            var barmodel = new WIDESEA_DTO.Outbound.BarcodesModel
                            {
                                barcode = item.CurrentBarcode,
                                supplyCode = item.SupplyCode,
                                batchNo = item.BatchNo,
                                unit = item.BarcodeUnit,
                                qty = item.BarcodeQty // æ¡ç çº§åˆ«çš„数量仍用锁定记录
                            };
                            if (item.BarcodeUnit != item.Unit)
                            {
                                var issueoStockResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.BarcodeQty, item.Unit,item.BarcodeUnit);
                                barmodel.unit = issueoStockResult.Unit;
                                barmodel.qty = issueoStockResult.Quantity;
                            }
                            detailModel.qty = barmodel.qty;
                            detailModel.currentDeliveryQty = barmodel.qty;
                            detailModel.barcodes.Add(barmodel); 
                        }
                    }             
                    feedmodel.details.Add(detailModel);
                }