1

huangxiaoqiang

4 天以前 85d9ca4ec972ce4d020db046d930e8991709ae2d

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -118,12 +118,16 @@
            {
                orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
            });
            //盘点出库
            
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)

            var allocateOrderdetail = orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList();

            await ERPAllocateOut(stock);

            //调拨出库
            if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
            {
                if (orderDetails.Count > 0)
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.盘点出库单 || x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
            }
            //其他出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
@@ -131,7 +135,6 @@
                if (orderDetails.Count > 0)
                {
                    await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.其他出库单).ToList());
                    await ERPAllocate(orderDetails.Where(x =>  x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
                }
            }
            //生产领料出库
@@ -140,12 +143,32 @@
                if (orderDetails.Count > 0)
                {
                    content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.生产领料单).ToList());
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
                } 
            }
            List<DtBoxingInfo> boxingInfos = new List<DtBoxingInfo>();
            foreach (var item in allocateOrderdetail)
            {
                var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == item.PalletCode);
                if (boxingInfo == null)
                {
                    continue;
                }
                var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode);
                if (boxingdetail.Count() > 0)
                {
                    foreach (var detail in boxingdetail)
                    {
                        detail.Quantity = detail.Quantity - item.OutboundQuantity;
                        detail.Warehouse = "WMS出库缓存区";
                        detail.WareHouseId = "205";
                    }
                }
                boxingInfos.Add(boxingInfo);
            }
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await DeleteStockInfoAsync(stock.Id);
                _boxingInfoRepository.UpdateDataNav(boxingInfos);
                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                await AddStockInfoHtyAsync(stockInfo_Hty);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
@@ -690,25 +713,7 @@
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            stcok.StockInfoDetails.ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stcok.PalletCode,
                    OrderType = (int)OrderTypeEmun.盘点出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity,
                });
            });
            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });            

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
@@ -718,7 +723,6 @@
                _stockInfoRepository.UpdateData(stcok);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _orderOutDetailsRepository.AddData(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
@@ -771,23 +775,6 @@
                    WareHouseId = "107",
                    AllocateWarehouseId = "",
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
            details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity - x.OutboundQuantity,
                });
            });
            stock.StockInfoDetails = details;
@@ -864,23 +851,7 @@
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
            details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity - x.OutboundQuantity,
                });
            });
           
            stock.StockInfoDetails = details;

            var taskDto = CreateListTaskDTO(taskNew);
@@ -1417,6 +1388,7 @@
        }
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
    {
        WebResponseContent content = new WebResponseContent();
@@ -1462,12 +1434,12 @@
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                documentTypeCode = "LL20",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,
                issueList = orderOutDetails.Select(item => new issueList
                {
                    PickListID = item.MaterielID,
                    PickListID = item.ERPOrderId,
                    //存储地点
                    WhCode = item.WareHouseId,
                    //领料数量
@@ -1548,6 +1520,56 @@
        }
    }

    public async Task ERPAllocateOut(DtStockInfo stock)
    {
        try
        {
            if (stock == null)
            {
                throw new Exception("未找到库存信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                transferInList = stock.StockInfoDetails.Select(item => new transferInList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = "107",
                    //调入数量
                    TransInQty = item.Quantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = "205",
                }).ToList()
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception(respone.d.ResultMsg);
            }

        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }


    public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    {