Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

2026-01-13 64840e4e6d97d177b8a765ba8c53888abcf86d16

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

@@ -78,11 +78,11 @@
                    {
                        Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
                        {
                            WarehouseCode = detailDto.WarehouseCode,
                            WarehouseCode = model.toWarehouse,
                            MaterielCode = detailDto.MaterialCode,
                            MaterielName = materialName,
                            LineNo = detailDto.LineNo,
                            OrderQuantity = detailDto.Qty,
                            OrderQuantity = barcodeDto.Qty,
                            SupplyCode = barcodeDto.SupplyCode,
                            Unit = detailDto.Unit,
                            Barcode = barcodeDto.Barcode,
@@ -92,6 +92,10 @@
                            ValidDate = barcodeDto.validDate,
                            BoxSN = barcodeDto.BoxSN
                        };
                        if (businessType == BusinessTypeEnum.智仓调外部仓库 || businessType == BusinessTypeEnum.智仓调智仓)
                        {
                            orderDetail.WarehouseCode = model.fromWarehouse;
                        }
                        allocateOrder.Details.Add(orderDetail);
                    }
                }
@@ -99,7 +103,7 @@
                {
                    Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
                    {
                        WarehouseCode = detailDto.WarehouseCode,
                        WarehouseCode = model.toWarehouse,
                        MaterielCode = detailDto.MaterialCode,
                        LineNo = detailDto.LineNo,
                        OrderQuantity = detailDto.Qty,
@@ -108,6 +112,10 @@
                        BarcodeQty=detailDto.Qty,
                        MaterielName = materialName
                    };
                    if (businessType == BusinessTypeEnum.智仓调外部仓库 || businessType == BusinessTypeEnum.智仓调智仓)
                    {
                        orderDetail.WarehouseCode = model.fromWarehouse;
                    }
                    allocateOrder.Details.Add(orderDetail);
                }
                allocateOrder.Details.AddRange(allocateOrder.Details);