方舱智能密集库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yanjinhui
9 天以前 e5c661c9d5dd92eecd810e6ce11ff67ec38b08f0 
 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs


@@ -62,7 +62,7 @@






        /// <summary>


        /// pda查询出库单信息


        /// pda查询入库单信息


        /// </summary>


        /// <param name="saveModel"></param>


        /// <returns></returns>


@@ -270,7 +270,7 @@


                        Status = false,


                        StockQuantity = inventoryInfo.StockQuantity,


                        AvailableQuantity = inventoryInfo.StockQuantity,


                        ValidityPeriod = inventoryInfo.ValidityPeriod,


                        ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),


                        SupplyQuantity = inventoryInfo.SupplyQuantity,


                    };


                    _inventory_BatchServices.AddData(inventory_Batch);


@@ -740,6 +740,12 @@


        }


        #endregion






        /// <summary>


        /// äººå·¥å…¥åº“完成


        /// </summary>


        /// <param name="key"></param>


        /// <returns></returns>


        public WebResponseContent FinishInOrder(int key)


        {


            WebResponseContent content = new WebResponseContent();


@@ -748,13 +754,26 @@


                Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);


                List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//找出所有出库单号相同的出库单


                _unitOfWorkManage.BeginTran();




                foreach (var item in cabinOrders)


                {


                    if (item.Details != null)


                        _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);


                    item.Modifier = App.User.UserName;


                    item.ModifyDate = DateTime.Now;


                    item.Details = null;


                    if (item.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())


                    {


                        if (item.Details != null)


                        {


                            _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);


                            item.Details = null;


                        }


                    }


                    else


                    {


                        if (item.Details != null)


                            _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);


                        item.Modifier = App.User.UserName;


                        item.ModifyDate = DateTime.Now;


                        item.Details = null;


                    }


                  


                }


                BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.人工完成);


                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";