1

huanghongfeng

2024-12-02 e2a5657e3a0b8615bcd78a3149e5ba9ce5579bb8

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

@@ -238,6 +238,7 @@
                                CreateDate = DateTime.Now,
                                MaterialType = (int)InventoryMaterialType.空托,
                                Materialweight = 0,
                                Wlstatus = (int)InventoryMaterialStatus.空托,
                            };
                            _stockService.StockInfoService.Repository.AddData(dt_Stock);
                        }
@@ -398,60 +399,50 @@
                {
                    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为原材料编码
                    if(dt_Inbound != null)
                    {
                        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);
                        
                        if (dt_StockInfo == null)
                        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();
                            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.组盘暂存)
                            {
                                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.待检,
                                };
                                _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);
@@ -463,66 +454,83 @@
                            }
                            else
                            {
                                return content = WebResponseContent.Instance.Error($"库存已有该条码，条码信息：{generate.PalletCode}");
                            }
                            
                        }
                        
                        
                                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]),
                            };
                            _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
                        else if (dt_Inbound.OrderType == (int)InventoryMaterialType.成品)
                        {
                            if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                            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.待检,
                                };
                                _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.Error($"库存已有该条码，条码信息：{generate.PalletCode}");
                                if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                                {
                                    return content = WebResponseContent.Instance.OK(data: 1);
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.Error($"库存已有该条码，条码信息：{generate.PalletCode}");
                                }
                            }
                        }
                        else
                        {
                            return content = WebResponseContent.Instance.Error($"未找到条码解析，条码信息：{generate.PalletCode}");
                        }
                    }
                    else
                    {
                        return content = WebResponseContent.Instance.Error($"未找到条码解析，条码信息：{generate.PalletCode}");
                        return content = WebResponseContent.Instance.Error($"未找到入库单，条码信息：{generate.PalletCode}");
                    }
                    
                }
                else
                {
@@ -689,7 +697,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.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
            if (locationinfoData.Count < 20)
            {
                return content = WebResponseContent.Instance.OK(data: 1);