资料，优化程序

huanghongfeng

2025-01-24 829eabf256e29392ca63f6da48829dba3b075dfe

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs

@@ -238,11 +238,13 @@
                                CreateDate = DateTime.Now,
                                MaterialType = (int)InventoryMaterialType.空托,
                                Materialweight = 0,
                                Wlstatus = (int)InventoryMaterialStatus.空托,
                                Mgeneratetime = DateTime.Now,
                            };
                            _stockService.StockInfoService.Repository.AddData(dt_Stock);
                        }
                    }
                    Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                    Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode && x.StockStatus== (int)StockStatusEmun.组盘暂存);
                    if (dt_StockInfo != null)
                    {
                        Dt_LocationInfo newLocation;
@@ -252,11 +254,32 @@
                        if(dt_StockInfo.MaterialType== (int)InventoryMaterialType.成品  || (generate.SourceAddress == "R01-003-041-001-01" && dt_StockInfo.MaterialType == (int)InventoryMaterialType.原材料))
                        {
                            Locationtype = 11;

                        }else if(dt_StockInfo.MaterialType == (int)InventoryMaterialType.原材料)
                        {
                            Locationtype = 10;
                        }
                        newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);

                        if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.成品)
                        {
                            string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
                            Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                            if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
                            {
                                newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
                            }
                            else
                            {
                                newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
                            }
                            
                        }
                        else
                        {
                            newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
                        }

                        
                        //string[] Pallet = PalletCode.Split("-");
                        if (newLocation != null && newSourceAddress != null)
                        {
@@ -276,6 +299,7 @@
                                Creater = "WMS",
                                Depth = newLocation.Depth,
                                CreateDate = DateTime.Now,
                                MaterialType= dt_StockInfo.MaterialType
                            };
                            _unitOfWorkManage.BeginTran();
                            if (newLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -386,98 +410,140 @@
        /// è§£æžåº“å­˜
        /// </summary>
        /// <returns></returns>
        public WebResponseContent Queryinventory2(GenerateInv generate)
        public WebResponseContent Queryinventory(GenerateInv generate)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                if(dt_StockInfo == null)

                string[] targetCodes = generate.PalletCode.Split("*");
                if (targetCodes.Length == 4)
                {
                    
                    string[] targetCodes = generate.PalletCode.Split("*");
                    if(targetCodes.Length == 4)
                    Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);

                    if(dt_Inbound != null)
                    {
                        Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                        Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                        if (dt_Inbound.OrderType == (int)InventoryMaterialType.原材料)   //0为原材料编码
                        {
                            Dt_StockInfo dt_Stock = new()
                            {
                                PalletCode = generate.PalletCode,
                                IsFull = true,
                                StockStatus = (int)StockStatusEmun.组盘暂存,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                                MaterialType = (int)InventoryMaterialType.原材料,
                                Materialweight = decimal.Parse(targetCodes[3]),
                            };
                            _unitOfWorkManage.BeginTran();
                            _stockService.StockInfoService.Repository.AddData(dt_Stock);
                            Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                            string part2 = targetCodes[1].Substring(0, 2);  //解析物料批次找详情
                            Dt_InboundOrder dt_Int = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == part2);
                            List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == (int)LocationStatusEnum.Free && x.Depth == 1 && x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationType == (int)LocationTypeEnum.MaterialsCube);

                            Dt_StockInfoDetail dt_StockInfoDetail = new()
                            if (dt_StockInfo == null)
                            {
                                StockId = dt_StockInfo2.Id,
                                MaterielCode = dt_Inbound.OrderName,    //物料号
                                MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                OrderNo = dt_Inbound.OrderNo,        //物料详情
                                BatchNo = targetCodes[1].ToString(),         //物料批次
                                SerialNumber = targetCodes[2].ToString(),    //包号
                                BatchNoName = dt_Int.OrderNo,
                                StockQuantity = decimal.Parse(targetCodes[3].ToString()),    //重量
                                OutboundQuantity = 1,    //序列号
                                Status = (int)StockStatusEmun.组盘暂存,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                            };
                            _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
                            _unitOfWorkManage.CommitTran();
                            List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus== (int)LocationStatusEnum.Free && x.Depth==1);
                            if (locationInfos.Count < 50)
                                Dt_StockInfo dt_Stock = new()
                                {
                                    PalletCode = generate.PalletCode,
                                    IsFull = true,
                                    StockStatus = (int)StockStatusEmun.组盘暂存,
                                    Creater = "WMS",
                                    CreateDate = DateTime.Now,
                                    MaterialType = (int)InventoryMaterialType.原材料,
                                    Materialweight = decimal.Parse(targetCodes[3]),
                                    Wlstatus = (int)InventoryMaterialStatus.待检,
                                    Mgeneratetime=DateTime.Now,
                                };
                                _unitOfWorkManage.BeginTran();
                                _stockService.StockInfoService.Repository.AddData(dt_Stock);
                                Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                                string part2 = targetCodes[1].Substring(0, 2);  //解析物料批次找详情
                                Dt_InboundOrder dt_Int = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == part2);

                                Dt_StockInfoDetail dt_StockInfoDetail = new()
                                {
                                    StockId = dt_StockInfo2.Id,
                                    MaterielCode = dt_Inbound.OrderName,    //物料号
                                    MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                    OrderNo = dt_Inbound.OrderNo,        //物料详情
                                    BatchNo = targetCodes[1].ToString(),         //物料批次
                                    SerialNumber = targetCodes[2].ToString(),    //包号
                                    BatchNoName = dt_Int.OrderNo,
                                    StockQuantity = decimal.Parse(targetCodes[3].ToString()),    //重量
                                    OutboundQuantity = 1,    //序列号
                                    Status = (int)StockStatusEmun.组盘暂存,
                                    Creater = "WMS",
                                    CreateDate = DateTime.Now,

                                };
                                _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
                                _unitOfWorkManage.CommitTran();
                                if (locationInfos.Count < 50)
                                {
                                    return content = WebResponseContent.Instance.OK(data: 1);
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.OK(data: 3);
                                }
                            }
                            else
                            {
                                if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                                {
                                    if (locationInfos.Count < 50)
                                    {
                                        return content = WebResponseContent.Instance.OK(data: 1);
                                    }
                                    else
                                    {
                                        return content = WebResponseContent.Instance.OK(data: 3);
                                    }
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.Error($"库存已有该条码，条码信息：{generate.PalletCode}");
                                }

                            }
                        }
                        else if (dt_Inbound.OrderType == (int)InventoryMaterialType.成品)
                        {
                            if (dt_StockInfo == null)
                            {
                                Dt_StockInfo dt_Stock = new()
                                {
                                    PalletCode = generate.PalletCode,
                                    IsFull = true,
                                    StockStatus = (int)StockStatusEmun.组盘暂存,
                                    Creater = "WMS",
                                    CreateDate = DateTime.Now,
                                    MaterialType = (int)InventoryMaterialType.成品,
                                    Materialweight = decimal.Parse(targetCodes[3]),
                                    Wlstatus = (int)InventoryMaterialStatus.待检,
                                    Mgeneratetime = DateTime.Now,
                                };
                                _unitOfWorkManage.BeginTran();
                                _stockService.StockInfoService.Repository.AddData(dt_Stock);
                                Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                                Dt_StockInfoDetail dt_StockInfoDetail = new()
                                {
                                    StockId = dt_StockInfo2.Id,
                                    MaterielCode = dt_Inbound.OrderName,    //物料号
                                    MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                    OrderNo = dt_Inbound.OrderNo,        //物料详情
                                    BatchNo = targetCodes[1].ToString(),         //物料批次
                                    BatchNoName = "",
                                    SerialNumber = targetCodes[2],    //包号
                                    StockQuantity = decimal.Parse(targetCodes[3]),    //重量
                                    OutboundQuantity = 1,    //序列号
                                    Status = (int)StockStatusEmun.组盘暂存,
                                    Creater = "WMS",
                                    CreateDate = DateTime.Now,
                                };
                                _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
                                _unitOfWorkManage.CommitTran();
                                return content = WebResponseContent.Instance.OK(data: 1);
                            }
                            else
                            {
                                return content = WebResponseContent.Instance.OK(data: 3);
                                if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                                {
                                    return content = WebResponseContent.Instance.OK(data: 1);
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.Error($"库存已有该条码，条码信息：{generate.PalletCode}");
                                }
                            }
                            
                        }
                        else if (dt_Inbound.OrderType == (int)InventoryMaterialType.成品)
                        {
                            Dt_StockInfo dt_Stock = new()
                            {
                                PalletCode = generate.PalletCode,
                                IsFull = true,
                                StockStatus = (int)StockStatusEmun.组盘暂存,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                                MaterialType = (int)InventoryMaterialType.成品,
                                Materialweight = decimal.Parse(targetCodes[3]),
                            };
                            _unitOfWorkManage.BeginTran();
                            _stockService.StockInfoService.Repository.AddData(dt_Stock);
                            Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                            Dt_StockInfoDetail dt_StockInfoDetail = new()
                            {
                                StockId = dt_StockInfo2.Id,
                                MaterielCode = dt_Inbound.OrderName,    //物料号
                                MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                OrderNo = dt_Inbound.OrderNo,        //物料详情
                                BatchNo = targetCodes[1].ToString(),         //物料批次
                                BatchNoName = "",
                                SerialNumber = targetCodes[2],    //包号
                                StockQuantity = decimal.Parse(targetCodes[3]),    //重量
                                OutboundQuantity = 1,    //序列号
                                Status = (int)StockStatusEmun.组盘暂存,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                            };
                            _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);
                            _unitOfWorkManage.CommitTran();
                            return content = WebResponseContent.Instance.OK(data: 1);
                        }
                        else
                        {
@@ -486,13 +552,13 @@
                    }
                    else
                    {
                        return content = WebResponseContent.Instance.Error($"解析的托盘条码长度不足4,条码信息：{generate.PalletCode}");
                        return content = WebResponseContent.Instance.Error($"未找到入库单，条码信息：{generate.PalletCode}");
                    }
                    
                }
                else
                {
                    return content = WebResponseContent.Instance.Error($"已有库存，入库失败：{generate.PalletCode}");
                    return content = WebResponseContent.Instance.Error($"解析的托盘条码长度不足4,条码信息：{generate.PalletCode}");
                }
            }
            catch (Exception ex)
@@ -502,7 +568,7 @@
            }
        }

        public WebResponseContent Queryinventory(GenerateInv generate)
        public WebResponseContent Queryinventory2(GenerateInv generate)
        {
            try
            {
@@ -526,9 +592,9 @@
                        _unitOfWorkManage.BeginTran();
                        _stockService.StockInfoService.Repository.AddData(dt_Stock);

                        string part2 = generate.PalletCode.Substring(2, 8);
                        //string part2 = generate.PalletCode.Substring(2, 8);

                        string part3 = generate.PalletCode.Split('#')[1];
                        //string part3 = generate.PalletCode.Split('#')[1];
                        Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                        Dt_StockInfoDetail dt_StockInfoDetail = new()
                        {
@@ -655,7 +721,7 @@
        {
            WebResponseContent content = new WebResponseContent();
            List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo=="2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() 
            && x.LocationType == (int)LocationTypeEnum.EmptyCube);
            && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
            if (locationinfoData.Count < 20)
            {
                return content = WebResponseContent.Instance.OK(data: 1);