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


@@ -21,6 +21,7 @@


using WIDESEA_Core.BaseServices;


using WIDESEA_Core.Enums;


using WIDESEA_Core.Helper;


using WIDESEA_DTO.Outbound;


using WIDESEA_DTO.SquareCabin;


using WIDESEA_IBasicService;


using WIDESEA_ISquareCabinServices;


@@ -62,7 +63,138 @@


        }


        public override WebResponseContent UpdateData(SaveModel saveModel)


        {


            return base.UpdateData(saveModel);


            try


            {


                int id = saveModel.MainData["id"].ObjToInt();


                var warehouse_no = saveModel.MainData["warehouse_no"].ToString();


                var out_no = saveModel.MainData["out_no"].ToString();


                //OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();


                //Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == id);


                List<DeliveryOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<DeliveryOrderDetailAddDTO>();


                orderDetailAddDTOs = orderDetailAddDTOs.Where(x => x.id == 0).ToList();


                if (orderDetailAddDTOs.Count < 1) return WebResponseContent.Instance.OK();


                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.locationCode)).Any()) return WebResponseContent.Instance.Error("货位号为必填字段!");


                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.exp_date)).Any()) return WebResponseContent.Instance.Error("效期为必填字段!");


                var LocationCodes = orderDetailAddDTOs.Select(x => x.locationCode);


                List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && LocationCodes.Contains(x.LocationCode));


                var diff = LocationCodes.Except(locationInfos.Select(x => x.LocationCode)).ToArray();


                if (diff.Length > 0) return WebResponseContent.Instance.Error($"货位编号【{string.Join(", ", diff)}】不属于当前库房");


                var array1 = orderDetailAddDTOs.Select(x => x.goods_no);


                var MaterielInfos = _materielInfoService.Repository.QueryData(x => array1.Contains(x.MaterielCode));


                var array2 = MaterielInfos.Select(x => x.MaterielCode);


                diff = array1.Except(array2).ToArray();


                if (diff.Length > 0) return WebResponseContent.Instance.Error($"请维护物料编号【{string.Join(", ", diff)}】的物料信息");


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


                {


                    var MaterielInfos1 = MaterielInfos.Where(x => x.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart).ToList();


                    if (MaterielInfos1.Count > 0)


                    {


                        return WebResponseContent.Instance.Error($"物料编号【{string.Join(", ", MaterielInfos1.Select(x => x.MaterielCode))}】的物料属性分类为大件，不可入立库");


                    }


                }


                var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && array2.ToList().Contains(x.MaterielCode));


                var Batchs = _inventory_BatchServices.Repository.QueryData(x => array2.Contains(x.MaterielCode));


                List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();


                List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();


                List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();


                List<Dt_Inventory_Batch> inventory_Batches = new List<Dt_Inventory_Batch>();


                foreach (var item in orderDetailAddDTOs)


                {


                    if (InventoryInfos.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).Any())


                        return WebResponseContent.Instance.Error($"物料编号【{item.goods_no}】物料批次【{item.batch_num}】已存在库存");


                    #region æ·»åŠ ç›˜ç‚¹å•è¯¦æƒ…


                    Dt_DeliveryOrderDetail dt_DeliveryOrde = new Dt_DeliveryOrderDetail()


                    {


                        DeliveryOrderId = id,


                        Reservoirarea = warehouse_no,


                        Status = 2,


                        Order_qty = 0,


                        Order_Outqty = item.order_Outqty,


                        Goods_no = item.goods_no,


                        OotDetailStatus = "新建",


                        Batch_num = item.batch_num,


                        Creater = App.User.UserName,


                        CreateDate = DateTime.Now,


                    };


                    deliveryOrderDetails.Add(dt_DeliveryOrde);


                    #endregion




                    #region æ·»åŠ åº“存、批次信息、盘点任务


                    var MaterielInfo = MaterielInfos.First(x => x.MaterielCode == item.goods_no);


                    Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo()


                    {


                        BatchNo = item.batch_num,


                        MaterielCode = MaterielInfo.MaterielCode,


                        AvailableQuantity = 0,


                        CreateDate = DateTime.Now,


                        Creater = App.User.UserName,


                        InDate = DateTime.Now,


                        LocationCode = item.locationCode,


                        MaterielName = MaterielInfo.MaterielName,


                        MaterielSpec = MaterielInfo.MaterielSpec,


                        OutboundQuantity = 0,


                        StockQuantity = 0,


                        StockStatus = StockStatusEmun.盘点锁定.ObjToInt(),


                        SupplyQuantity = 0,


                        WarehouseCode = warehouse_no,


                        ValidityPeriod = item.exp_date


                    };


                    inventoryInfos.Add(inventoryInfo);


                    Dt_Inventory_Batch? inventory_Batch = Batchs.FirstOrDefault(x => x.BatchNo == item.batch_num && x.MaterielCode == item.goods_no);


                    if (inventory_Batch == null)


                    {


                        inventory_Batch = new Dt_Inventory_Batch()


                        {


                            BatchNo = inventoryInfo.BatchNo,


                            CreateDate = inventoryInfo.CreateDate,


                            Creater = inventoryInfo.Creater,


                            MaterielCode = inventoryInfo.MaterielCode,


                            ERPStockQuantity = 0,


                            MaterielName = inventoryInfo.MaterielName,


                            MaterielSpec = inventoryInfo.MaterielSpec,


                            OutboundQuantity = inventoryInfo.OutboundQuantity,


                            ProductionDate = inventoryInfo.ProductionDate,


                            Status = false,


                            StockQuantity = inventoryInfo.StockQuantity,


                            AvailableQuantity = inventoryInfo.AvailableQuantity,


                            ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),


                            SupplyQuantity = inventoryInfo.SupplyQuantity,


                        };


                        inventory_Batches.Add(inventory_Batch);


                    }


                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()


                    {


                        WarehouseCode = warehouse_no,


                        TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),


                        BatchNo = inventoryInfo.BatchNo,


                        MaterielName = inventoryInfo.MaterielName,


                        MaterielCode = inventoryInfo.MaterielCode,


                        MaterielSpec = inventoryInfo.MaterielSpec,


                        TaskType = TaskTypeEnum.OutInventory.ObjToInt(),


                        CreateDate = DateTime.Now,


                        Creater = App.User.UserName,


                        LocationCode = inventoryInfo.LocationCode,


                        OrderNo = out_no,


                        StockQuantity = inventoryInfo.StockQuantity,


                        SupplyQuantity = 0,


                        Remark = "盘点"


                    };


                    supplyTasks.Add(supplyTask);


                    #endregion


                }


                _unitOfWorkManage.BeginTran();


                _deliveryOrderDetailServices.AddData(deliveryOrderDetails);


                _inventoryInfoService.AddData(inventoryInfos);


                if (inventory_Batches.Count > 0) _inventory_BatchServices.AddData(inventory_Batches);


                _supplyTaskService.AddData(supplyTasks);


                _unitOfWorkManage.CommitTran();


                return WebResponseContent.Instance.OK("盘点详情添加成功,请通过ERP平账！");


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                return WebResponseContent.Instance.Error(ex.Message);


            }


        }




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


@@ -108,8 +240,8 @@


                    List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();


                    List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();


                    List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();


                    var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode));


                    var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == outorder.warehouse_no);


                    var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode)).ToList();


                    var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == outorder.warehouse_no).ToList();


                    foreach (var item in entityOrder.Details)


                    {


                        Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).FirstOrDefault();


@@ -185,7 +317,7 @@


                    _supplyTaskService.AddData(supplyTasks);


                    _inventory_BatchServices.UpdateData(batchesUp);


                    _inventoryInfoService.UpdateData(inventoryInfosUp);


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


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


                    _unitOfWorkManage.CommitTran();


                    #endregion


                }


@@ -438,7 +570,7 @@


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


                                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}】请补货");


                                    throw new Exception($"出库单【{outorder.order_no}】详情存在散件,物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】所需数量【{Convert.ToInt32(orderDetailLK.Order_qty)}】请人工调拨补货入立库");


                                inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;


                                inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;


                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()


@@ -478,9 +610,9 @@


                        _inventory_BatchServices.UpdateData(batchesUp);


                        _inventoryInfoService.UpdateData(inventoryInfosUp);


                        if (entityOrder.Details.Count > 0)


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


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


                        if (entityOrderLK.Details.Count > 0)


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


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


                        _unitOfWorkManage.CommitTran();


                    }


                    catch (Exception ex)


@@ -617,11 +749,14 @@


                        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.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.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 åº“存、库存批次平账


@@ -764,7 +899,7 @@


                                deliveryOrdersAdd.Add(cabinOrder);


                            }


                            #endregion




                            //这里


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


                            var entityOrder = new Dt_DeliveryOrder


                            {


@@ -778,7 +913,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,


@@ -811,70 +946,6 @@


        }


        #endregion






        //盘点 æ‹¿æ•´ä¸ªæ‰¹æ¬¡ä¿¡æ¯è¡¨çš„商品批号和商品编号来进行盘点


        public WebResponseContent InventoryGood(string batchNo, string goodsNo)


        {


            var response = new WebResponseContent();


            try


            {


                // 1️⃣ æŸ¥æ‰¾æŒ‡å®šæ‰¹æ¬¡ä¸Žç‰©æ–™çš„库存信息


                var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()


                    .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)


                    .First();




                if (batchInfo == null)


                    return response.Error($"未找到该物料 [{goodsNo}] æ‰¹æ¬¡ [{batchNo}] çš„库存信息");




                // 2️⃣ ç»„装请求 DTO（完全符合接口文档结构）


                var ediDto = new TowcsDto.ToediOutInfo


                {


                    customerCode = "905",


                    materialCode = "YY",                              // ç‰©æ–™ç±»åž‹CODE


                    externalOrderNo = $"PDCK-{batchInfo.Id}",          // å¤–部出库单号


                    outOrderType = "20",                               // ç›˜ç‚¹å‡ºåº“单


                    priority = 1,


                    Is_cancel = 0,


                    details = new List<TowcsDto.ToeOutdiInDetail>


            {


                new TowcsDto.ToeOutdiInDetail


                {


                    batchNo = batchInfo.BatchNo,


                    productCode = batchInfo.MaterielCode,


                    productName = batchInfo.MaterielName,


                    productSpecifications = batchInfo.MaterielSpec,


                    quantity = (int)batchInfo.SupplyQuantity,


                    //stocktakingDetails = new List<TowcsDto.ToOutediInStock>


                    //{


                    //    // ç›˜ç‚¹æ˜Žç»†å¯æ ¹æ®å®žé™…托盘拆分；此处示例仅1条


                    //    new TowcsDto.ToOutediInStock


                    //    {


                    //        palletCode = "FC00001",


                    //        quantity = batchInfo.SupplyQuantity.ToString()


                    //    }


                    //}


                }


            }


                };




                // 3️⃣ è°ƒç”¨æŽ¥å£


                string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";


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


                var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);




                // 4️⃣ å“åº”处理


                if (resp == null)


                    return response.Error("WCS æ— å“åº”");


                if (resp.code != "0")


                    return response.Error($"WCS返回失败: {resp.msg}");




                return response.OK("盘点出库下发成功");


            }


            catch (Exception ex)


            {


                return response.Error("盘点失败：" + ex.Message);


            }


        }






        /// <summary>


@@ -957,6 +1028,8 @@


            }


            return content;


        }




       


        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)


        {


            WebResponseContent content = new WebResponseContent();


@@ -1005,7 +1078,7 @@


                    _inventory_BatchServices.DeleteData(inventory_Batch);


                else


                    _inventory_BatchServices.UpdateData(inventory_Batch);


                _materielInfoService.UpdateData(materielInfo);


                //_materielInfoService.UpdateData(materielInfo);


                if (inventoryInfo.StockQuantity <= 0)


                    _inventoryInfoService.DeleteData(inventoryInfo);


                else


@@ -1022,7 +1095,15 @@


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    if (materielInfo.Business_qty < materielInfo.MinQty)


                    {


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


                    }


                    else


                    {


                        _materielInfoService.UpdateData(materielInfo);


                    }


                       




                }


                #endregion


                _unitOfWorkManage.CommitTran();


@@ -1036,12 +1117,13 @@


            }


            return content;


        }




        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();


                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();


                if (cabinOrder == null) return WebResponseContent.Instance.OK($"出库单已完成");




                Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();


@@ -1065,7 +1147,7 @@


                    //_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);


                }


                _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);


                var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();


                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();


                if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "已完成").Any())


                    cabinOrder.OutStatus = "已完成";


                Repository.UpdateData(cabinOrder);