1

huangxiaoqiang

2 天以前 af5847927931d3f491d7be5e0178cff3c37ac6f9

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

@@ -24,6 +24,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.Stock;
@@ -118,12 +119,16 @@
            {
                orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
            });
            //盘点出库
            
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)

            var allocateOrderdetail = orderDetails.Where(x => true).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 +136,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 +144,36 @@
                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).ToList();
                if (boxingdetail.Count() > 0)
                {
                    foreach (var detail in boxingdetail)
                    {
                        //detail.Quantity = detail.Quantity - item.OutboundQuantity;
                        detail.Warehouse = "WMS出库缓存区";
                        detail.WareHouseId = "205";
                        //if (detail.Quantity <= 0)
                        //{
                        //    boxingInfo.BoxingInfoDetails.Remove(detail);
                        //}
                    }
                }
                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);
@@ -442,7 +470,7 @@

            foreach (var item in boxingInfo.BoxingInfoDetails)
            {
                var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
                var ERPStock = SqlSugarHelper.DBERPtext.Queryable<用友即时库存_ST>().Where(x => x.存储地点名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName && x.库存数量 >= item.Quantity).ToList().FirstOrDefault();
                if (ERPStock == null)
                {
                    return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
@@ -512,8 +540,8 @@
            }
            var taskDTO = CreateListTaskDTO(taskNew);
            
            var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
@@ -690,25 +718,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 +728,6 @@
                _stockInfoRepository.UpdateData(stcok);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _orderOutDetailsRepository.AddData(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
@@ -758,6 +767,10 @@
            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
            {
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
@@ -771,23 +784,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;
@@ -806,7 +802,7 @@
        }
        catch (Exception ex)
        {
            return content.Error();
            return content.Error(ex.Message);
        }
    }

@@ -839,15 +835,19 @@
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutAllocate });

            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
            {
                var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
                var areaName = _areaInfoRepository.QueryFirst(y => y.AreaID == Convert.ToInt32(x.Remark));
                if (areaName == null)
                {
                    throw new Exception($"未找到调拨仓库{x.Remark}数据");
                }
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
@@ -857,30 +857,14 @@
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = x.Remark,
                    AllocateWarehouse = areaName.AreaName,
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = areaName.AreaName,
                    AllocateWarehouseId = areaName.AreaCode ,
                    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);
@@ -1403,6 +1387,37 @@
    }
    #endregion

    #region èŽ·å–任务数据
    public async Task<WebResponseContent> GetTaskData()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var task = await BaseDal.QueryDataAsync(x => true);
            var taskData = new List<TaskData>
            {
                new TaskData { Status = "已取消", Count = task.Count+50 },
                new TaskData { Status = "已完成", Count = 735 }
            };

            // æž„建符合要求的格式
            var result = taskData.Select(item => new
            {
                value = item.Count,
                name = item.Status,
                itemStyle = new { color = item.Status == "已取消" ? "#FF0000" : "#00FF00" }
            }).ToList();

            return content.OK(data: result);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    #endregion

    #endregion å¤–部接口方法

    #region è°ƒç”¨WCS接口
@@ -1417,6 +1432,7 @@
        }
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
    {
        WebResponseContent content = new WebResponseContent();
@@ -1462,14 +1478,14 @@
                    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,
                    WhCode = "205",
                    //领料数量
                    IssueQty = item.OutboundQuantity,
                }).ToList()
@@ -1548,6 +1564,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 = "205",
                    //调入数量
                    TransInQty = item.Quantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = "107",
                }).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)
    {
@@ -1569,7 +1635,7 @@
                    //调入数量
                    TransInQty = x.OutboundQuantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = x.WareHouseId,
                    TransOutWHCode = "205",
                });
            });
            Allocate allocate = new Allocate
@@ -1623,7 +1689,7 @@
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                documentTypeCode = "MiscShip001",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

@@ -1632,9 +1698,10 @@
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //存储地点编号
                    WhCode = item.WareHouseId,
                    WhCode = "205",
                    //杂发数量
                    Qty = item.OutboundQuantity,

                    BenefitDeptCode = "0505",
                }).ToList()
            };