添加移位功能，以及修改pad

yanjinhui

昨天 8cdcf8cb6fecf101bd7dd1db2e44f0cf5ddc0fd4

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs

@@ -200,8 +200,8 @@
                cabinOrderDetail.Order_Inqty += Inqty;
                if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
                    return WebResponseContent.Instance.Error($"入库数量不可超出单据数量");
                //大件库整箱校验
                if (warehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000")&& (materielInfo.MaterielSourceType==MaterielSourceTypeEnum.SelfMadePart))
                //大件库整箱校验(排除移库入库)
                if (warehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000")&& (materielInfo.MaterielSourceType==MaterielSourceTypeEnum.SelfMadePart) &&cabinOrder.Order_type != "40") // 40是移位入库类型)
                { 
                    var BoxRule = materielInfo.BoxQty;
                    if (BoxRule > 0 && Inqty % BoxRule != 0)
@@ -311,6 +311,23 @@
                //};
                //_supplyTaskService.AddData(supplyTask); 
                #endregion

                #region æ–°å¢žåŠ ä»»åŠ¡ç±»åž‹â€œ40”移库出库
                int taskType;

                switch (cabinOrder.Order_type)
                {
                    case "1":
                        taskType = TaskTypeEnum.In.ObjToInt();
                        break;
                    case "40":
                        taskType = TaskTypeEnum.TransferIn.ObjToInt();
                        break;
                    default:
                        taskType = TaskTypeEnum.OutReturn.ObjToInt();  // å…¶ä»–情况都是出库退货
                        break;
                }
                #endregion
                Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
                {
                    WarehouseCode = cabinOrderDetail.Reservoirarea,
@@ -322,7 +339,9 @@
                    MaterielName = inventoryInfo.MaterielName,
                    MaterielCode = inventoryInfo.MaterielCode,
                    MaterielSpec = inventoryInfo.MaterielSpec,
                    TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
                    //TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
                    //任务类型
                    TaskType = taskType,
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName,
                    LocationCode = location.LocationCode,
@@ -331,6 +350,7 @@
                    SupplyQuantity = 0,
                    Remark = "入库"
                };
          
                _supplyTaskHtyService.AddData(supplyTask_Hty);
                #endregion

@@ -380,7 +400,8 @@

        #region åˆ›å»ºå…¥åº“单
        /// <summary>
        /// åˆ›å»ºå…¥åº“单,返回一个入库单集合到data
        /// åˆ›å»ºå…¥åº“单,返回一个入库单集合到data  
        /// åœ¨åˆ›å»ºå…¥åº“单的时候就已经添加了业务数量，后续业务数量的增加在入库完成的时候进行（盘盈入库）
        /// </summary>
        public WebResponseContent CreateInboundOrder(UpstreamOrderInfo order)
        {
@@ -503,7 +524,7 @@
                                    OrderDetailStatus = "新建",
                                    Status = 0
                                };
                                materielInfo.Business_qty += ys;
                                materielInfo.Business_qty += ys;//这里添加了业务数量
                            }
                            #endregion