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


@@ -60,6 +60,11 @@


            _materielInfoService = materielInfoService;


            _locationInfoService = locationInfoService;


        }


        public override WebResponseContent UpdateData(SaveModel saveModel)


        {


            return base.UpdateData(saveModel);


        }




        #region åˆ›å»ºå‡ºåº“单


        /// <summary>


        /// åˆ›å»ºå‡ºåº“单


@@ -350,7 +355,7 @@


                            #region æ•´ä»¶ä¼˜å…ˆåˆ†é…å¤§ä»¶åº“,计划库存,添加出库任务


                            foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))


                            {


                                if (xs <= 0) break;


                                if (xs <= 0 || item.AvailableQuantity <= 0) break;


                                decimal outqty = 0;


                                while (item.AvailableQuantity > 0 && xs > 0)


                                {


@@ -431,7 +436,9 @@


                            if (orderDetailLK != null)


                            {


                                #region æ·»åŠ å‡ºåº“任务、修改库存信息


                                Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();


                                Dt_InventoryInfo? inventoryInfo = dt_InventoryInfos.FirstOrDefault(x => x.WarehouseCode == WareCodeLK);


                                if (inventoryInfo == null)


                                    throw new Exception($"未找到物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】在立库中的库存信息；所需数量【{orderDetailLK.Order_qty}】请补货");


                                inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;


                                inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;


                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()


@@ -464,22 +471,29 @@


                            //_supplyTaskService.AddData(supplyTasks);


                        }


                    }


                    _unitOfWorkManage.BeginTran();


                    _supplyTaskService.AddData(supplyTasks);


                    _inventory_BatchServices.UpdateData(batchesUp);


                    _inventoryInfoService.UpdateData(inventoryInfosUp);


                    if (entityOrder.Details.Count > 0)


                        BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                    if (entityOrderLK.Details.Count > 0)


                        BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();


                    _unitOfWorkManage.CommitTran();


                    try


                    {


                        _unitOfWorkManage.BeginTran();


                        _supplyTaskService.AddData(supplyTasks);


                        _inventory_BatchServices.UpdateData(batchesUp);


                        _inventoryInfoService.UpdateData(inventoryInfosUp);


                        if (entityOrder.Details.Count > 0)


                            BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                        if (entityOrderLK.Details.Count > 0)


                            BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();


                        _unitOfWorkManage.CommitTran();


                    }


                    catch (Exception ex)


                    {


                        _unitOfWorkManage.RollbackTran();


                    }


                    #endregion


                }


                webResponseContent.OK();


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "入库退货" : "正常出库") + $"：单号【{outorder.order_no}】", ex.Message);


                webResponseContent.Error(ex.Message);


            }


            return webResponseContent;


@@ -508,7 +522,7 @@


                    {


                        //找库存批次信息


                        Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();


                        var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);


                        var Qty = Math.Abs(inventory_Batch.SupplyQuantity);


                        if (Qty != item.order_qty) throw new Exception($"盘亏出库单【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的盘亏数量有误");


                        //找所有库存


                        List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();


@@ -532,7 +546,7 @@


                                    Creater = App.User.UserName,


                                    LocationCode = inventoryInfo.LocationCode,


                                    OrderNo = order.order_no,


                                    StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                    StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                    SupplyQuantity = 0,


                                    Remark = "盘亏入库"


                                };


@@ -540,11 +554,13 @@


                                supplyTask_Hties.Add(supplyTask_Hty);


                            }


                            #endregion


                            inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                            inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                            inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                            inventoryInfo.SupplyQuantity = 0;


                            inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                        }


                        inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                        inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;


                        inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;


                        inventory_Batch.SupplyQuantity = 0;


                        infosUp.AddRange(inventoryInfos);


                        batchesUp.Add(inventory_Batch);


@@ -595,17 +611,20 @@


                    {


                        //找库存批次信息


                        Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();


                        var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);


                        var Qty = Math.Abs(inventory_Batch.SupplyQuantity);


                        if (Qty != item.order_qty) throw new Exception($"盘亏出库单【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的盘亏数量有误");


                        //找所有库存


                        List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();


                        //获取立库盘点差异数.。。。。。。。。。。。。


                        var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();


                        var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);


                        //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);


                        var LkQty = inventoryLK.SupplyQuantity;


                        //获取大件库盘点差异数


                        var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();


                        var DJQty = Math.Abs(inventoryDJ.Sum(x => x.StockQuantity) - inventoryDJ.Sum(x => x.SupplyQuantity));


                        if (LkQty + DJQty != Qty) throw new Exception($"【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的物料信息与物料批次信息盘盈数量不符");


                        //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));


                        var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);


                        var count = Math.Abs(LkQty + DJQty);


                        if (count != Qty) throw new Exception($"【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的物料信息与物料批次信息盘亏数量不符");


                        if (LkQty == 0)//立库无差异


                        {


                            #region åº“存、库存批次平账


@@ -629,7 +648,7 @@


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


                                        StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                        StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                        SupplyQuantity = 0,


                                        Remark = "盘亏入库"


                                    };


@@ -637,12 +656,14 @@


                                    supplyTask_Hties.Add(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                                inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                                inventoryInfo.SupplyQuantity = 0;


                                inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                            }


                            //_inventoryInfoService.UpdateData(inventoryInfos);


                            inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                            inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;


                            inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;


                            inventory_Batch.SupplyQuantity = 0;


                            //_inventory_BatchServices.UpdateData(inventory_Batch);


                            infosUp.AddRange(inventoryInfos);


@@ -700,7 +721,7 @@


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


                                        StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                        StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                        SupplyQuantity = 0,


                                        Remark = "盘亏出库"


                                    };


@@ -708,7 +729,8 @@


                                    supplyTask_Hties.Add(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                                inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                                inventoryInfo.SupplyQuantity = 0;


                                inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                            }


@@ -745,7 +767,7 @@


                                deliveryOrdersAdd.Add(cabinOrder);


                            }


                            #endregion




                            //这里


                            #region åˆ›å»ºç«‹åº“盘点单


                            var entityOrder = new Dt_DeliveryOrder


                            {


@@ -759,7 +781,7 @@


                                Details = order.details.Select(d => new Dt_DeliveryOrderDetail


                                {


                                    Goods_no = d.goods_no,


                                    Order_qty = LkQty,


                                    Order_qty = Math.Abs(LkQty), //给下游WCS的是要整数


                                    Batch_num = d.batch_num,


                                    Exp_date = d.exp_date,


                                    Reservoirarea = WareCodeLK,


@@ -979,12 +1001,6 @@


                    inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;


                }


                #endregion


                if (supplyTask.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000"))


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    if (materielInfo.Business_qty < materielInfo.MinQty)


                        CreateAllocatInOut(materielInfo);//创建调拨任务


                }


                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();




                _unitOfWorkManage.BeginTran();


@@ -1000,13 +1016,20 @@


                if (location != null) _locationInfoService.UpdateData(location);


                _deliveryOrderDetailServices.UpdateData(cabinOrderDetail);


                _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.人工完成);


                _unitOfWorkManage.CommitTran();




                #region åˆ¤æ–­è¯¦æƒ…是否全部完成


                if (!_deliveryOrderDetailServices.Repository.QueryData(x => x.DeliveryOrderId == deliveryOrder.Id && x.OotDetailStatus != "已完成").Any())


                    deliveryOrder.OutStatus = "已完成";


                BaseDal.UpdateData(deliveryOrder);


                if (supplyTask.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000"))


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    if (materielInfo.Business_qty < materielInfo.MinQty)


                        CreateAllocatInOut(materielInfo);//创建调拨任务


                }


                #endregion


                _unitOfWorkManage.CommitTran();




                content.OK();


            }


            catch (Exception ex)


@@ -1145,6 +1168,7 @@


                else


                {


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


                    if (deliveryOrder.Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";


                    var requestDate = new


                    {


                        order_no = deliveryOrder.Out_no


@@ -1152,7 +1176,7 @@


                    var result = HttpHelper.Post(url, requestDate.ToJsonString());


                    var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);


                    if (response == null) throw new Exception("上报ERP出库单完成失败！");


                    if (response.resultCode != "0") throw new Exception(response.resultMsg);


                    if (response.resultCode != "0" && response.resultMsg != "未找到合法单据") throw new Exception(response.resultMsg);


                    _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.人工完成);


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


                }