ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
647556386
3 天以前 696edbff3c8812e4b820f624d66a02ae6ddb1a06 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs


@@ -5,6 +5,7 @@


using System.Diagnostics.Eventing.Reader;


using System.Threading.Tasks;


using WIDESEA_Common.AllocateEnum;


using WIDESEA_Common.OrderEnum;


using WIDESEA_Core;


using WIDESEA_Core.Attributes;


using WIDESEA_Core.BaseController;


@@ -45,7 +46,7 @@


                BusinessType = model.BusinessType,


                FactoryArea = model.FactoryArea,


                IsBatch = model.IsBatch,


                CreateType = model.OperationType,


                CreateType =(int)OrderCreateTypeEnum.UpperSystemPush,


                FromWarehouse = model.fromWarehouse,


                ToWarehouse = model.toWarehouse,


                Details = new List<Dt_AllocateOrderDetail>()


@@ -78,7 +79,7 @@


                    {


                        Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail


                        {


                            WarehouseCode = detailDto.WarehouseCode,


                            WarehouseCode = model.toWarehouse,


                            MaterielCode = detailDto.MaterialCode,


                            MaterielName = materialName,


                            LineNo = detailDto.LineNo,


@@ -92,6 +93,10 @@


                            ValidDate = barcodeDto.validDate,


                            BoxSN = barcodeDto.BoxSN


                        };


                        if (businessType == BusinessTypeEnum.智仓调外部仓库 || businessType == BusinessTypeEnum.智仓调智仓)


                        {


                            orderDetail.WarehouseCode = model.fromWarehouse;


                        }


                        allocateOrder.Details.Add(orderDetail);


                    }


                }


@@ -99,7 +104,7 @@


                {


                    Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail


                    {


                        WarehouseCode = detailDto.WarehouseCode,


                        WarehouseCode = model.toWarehouse,


                        MaterielCode = detailDto.MaterialCode,


                        LineNo = detailDto.LineNo,


                        OrderQuantity = detailDto.Qty,


@@ -108,9 +113,12 @@


                        BarcodeQty=detailDto.Qty,


                        MaterielName = materialName


                    };


                    if (businessType == BusinessTypeEnum.智仓调外部仓库 || businessType == BusinessTypeEnum.智仓调智仓)


                    {


                        orderDetail.WarehouseCode = model.fromWarehouse;


                    }


                    allocateOrder.Details.Add(orderDetail);


                }


                allocateOrder.Details.AddRange(allocateOrder.Details);


            }


            var content = await Service.ReceiveAllocateOrder(allocateOrder, model.OperationType);