1

huanghongfeng

2024-12-01 504404beedd006d029bb44fe2290aba649795229

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

@@ -276,6 +276,7 @@
                                Creater = "WMS",
                                Depth = newLocation.Depth,
                                CreateDate = DateTime.Now,
                                MaterialType= dt_StockInfo.MaterialType
                            };
                            _unitOfWorkManage.BeginTran();
                            if (newLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -386,20 +387,23 @@
        /// è§£æžåº“å­˜
        /// </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]);

                    Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                    if (dt_Inbound.OrderType == (int)InventoryMaterialType.原材料)   //0为原材料编码
                    {
                        Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                        if (dt_Inbound.OrderType == (int)InventoryMaterialType.原材料)   //0为原材料编码
                        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_Stock = new()
                            {
@@ -431,10 +435,10 @@
                                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)
                            {
                                return content = WebResponseContent.Instance.OK(data: 1);
@@ -443,9 +447,33 @@
                            {
                                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.成品)
                        
                        

                    }
                    else if (dt_Inbound.OrderType == (int)InventoryMaterialType.成品)
                    {
                        if(dt_StockInfo==null)
                        {
                            Dt_StockInfo dt_Stock = new()
                            {
@@ -481,18 +509,24 @@
                        }
                        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($"解析的托盘条码长度不足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 +536,7 @@
            }
        }

        public WebResponseContent Queryinventory(GenerateInv generate)
        public WebResponseContent Queryinventory2(GenerateInv generate)
        {
            try
            {
@@ -526,9 +560,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()
                        {