提交

heshaofeng

2025-12-02 c1f92d034bee8c989ee99519fac9cbe01a71d242

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -18,6 +18,7 @@
using AutoMapper;
using Dm.filter;
using MailKit.Search;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
@@ -1059,17 +1060,20 @@
                                    Barcode = item.CurrentBarcode,
                                    SupplyCode = item.SupplyCode,
                                    BatchNo = item.BatchNo,
                                    Unit = item.BarcodeUnit,
                                    Unit = detail.BarcodeUnit,
                                    Qty = 0
                                };
                                // 鍗曚綅涓嶄竴鑷存椂杞崲
                                if (item.BarcodeUnit != item.Unit)
                                if (detail.BarcodeUnit != detail.Unit)
                                {
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                    barModel.Unit = convertResult.Unit;
                                    barModel.Qty = convertResult.Quantity;
                                }

                                else
                                {
                                    barModel.Qty = item.PickedQty;
                                }
                                detailModel.Qty += barModel.Qty;
                                detailModel.Barcodes.Add(barModel);
                            }
@@ -1140,16 +1144,20 @@
                                    barcode = item.CurrentBarcode,
                                    supplyCode = item.SupplyCode,
                                    batchNo = item.BatchNo,
                                    unit = item.BarcodeUnit,
                                    unit = detail.BarcodeUnit,
                                    qty = item.PickedQty
                                };
                                // 鍗曚綅涓嶄竴鑷存椂杞崲
                                if (item.BarcodeUnit != item.Unit)
                                if (detail.BarcodeUnit != detail.Unit)
                                {
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                    barModel.unit = convertResult.Unit;
                                    barModel.qty = convertResult.Quantity;
                                }
                                else
                                {
                                    barModel.qty = item.PickedQty;
                                }

                                detailModel.qty += barModel.qty;
                                detailModel.currentDeliveryQty += barModel.qty;