提交

pan

2025-12-03 1a465495340bfea81b1e4d1db130399ccdf58fb4

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

@@ -1057,6 +1057,8 @@
                            {
                                if (item.PickedQty > 0)
                                {
                                    var barModel = new BarcodeInfo
                                    {
                                    Barcode = item.CurrentBarcode,
                                    SupplyCode = item.SupplyCode,
                                    BatchNo = item.BatchNo,
@@ -1095,6 +1097,7 @@
                                      ReturnToMESStatus = 1,
                                      Operator = App.User.UserName,
                                  }).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
                            }
                        }
                    }
                    else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
@@ -1141,7 +1144,6 @@
                            {
                                if (item.PickedQty > 0)
                                {
<<<<<<< .mine
                                    var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                    {
                                        barcode = item.CurrentBarcode,
@@ -1151,60 +1153,24 @@
                                        qty = item.PickedQty
                                    };
                                    // 鍗曚綅涓嶄竴鑷存椂杞崲
                                    if (item.BarcodeUnit != item.Unit)
                                    {
                                        var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
                                        barModel.unit = convertResult.Unit;
                                        barModel.qty = convertResult.Quantity;
                                    }

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







>>>>>>> .theirs
                                }
<<<<<<< .mine








=======
                                else
                                {
                                    barModel.qty = item.PickedQty;
                                }

                                    detailModel.qty += barModel.qty;
                                detailModel.currentDeliveryQty += barModel.qty;
                                detailModel.barcodes.Add(barModel);
>>>>>>> .theirs
                                }
                            }
                            feedmodel.details.Add(detailModel);
                        }

                        var result = await _invokeMESService.FeedbackOutbound(feedmodel);
                        if (result != null && result.code == 200)
                        {