最新

huanghongfeng

4 天以前 1d8897348d578648421b024d0dc5ff3d626e05f9

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

@@ -12,6 +12,7 @@
using MailKit.Search;
using System.Reflection.Metadata;
using static WIDESEA_ITaskInfoService.ITaskService;
using WIDESEA_Common.Log;

namespace WIDESEA_TaskInfoService
{
@@ -238,11 +239,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 +255,81 @@
                        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);

                        


                        int maxRetries = 20;
                        int retryCount = 0;
                        bool needRetry;

                        do
                        {
                            needRetry = false;  // é»˜è®¤ä¸éœ€è¦é‡è¯•
                            retryCount++;


                            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);
                            }


                            if (newLocation == null)
                            {
                                return WebResponseContent.Instance.Error("无法获取库位");
                            }

                            // 2. æ£€æŸ¥åº“å­˜
                            if (_stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode) !=null)
                            {
                                needRetry = true;
                                continue;  // ç›´æŽ¥è¿›å…¥ä¸‹ä¸€æ¬¡å¾ªçŽ¯ï¼ˆé‡è¯•ï¼‰
                            }

                            // 3. æ£€æŸ¥ä»»åŠ¡
                            if (BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode) != null)
                            {
                                needRetry = true;
                                continue;
                            }

                            // 4. æ£€æŸ¥åŽ†å²ä»»åŠ¡
                            if (_taskHtyService.CrueeTaskHty(newLocation.LocationCode))
                            {
                                needRetry = true;
                                continue;
                            }

                        } while (needRetry && retryCount < maxRetries);

                        // æ£€æŸ¥æ˜¯å¦è¶…过最大重试次数
                        if (retryCount >= maxRetries)
                        {
                            return WebResponseContent.Instance.Error($"无法找到可用库位（已尝试 {retryCount} æ¬¡ï¼‰");
                        }



                        //string[] Pallet = PalletCode.Split("-");
                        if (newLocation != null && newSourceAddress != null)
                        {
@@ -283,8 +356,13 @@
                            {
                                newLocation.LocationStatus = newSourceAddress.LocationType == (int)LocationTypeEnum.EmptyOut ? LocationStatusEnum.PalletLock.ObjToInt() : LocationStatusEnum.Lock.ObjToInt();
                            }
                            BaseDal.AddData(dt_Task);
                            else
                            {
                                return content = WebResponseContent.Instance.Error($"该库位{newSourceAddress.LocationCode}的货位状态异常，不可选");
                            }
                            _basicService.LocationInfoService.UpdateData(newLocation);
                            BaseDal.AddData(dt_Task);
                           

                            _unitOfWorkManage.CommitTran();

@@ -307,6 +385,7 @@
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return content = WebResponseContent.Instance.Error($"生成入库任务出错，出错信息:{ex.Message}");
                throw;
            }
@@ -383,6 +462,8 @@
            }
        }


        public static List<int> InventoryCode = new List<int>() { 0,1,2,4,5,6};  //0:待检   1：合格    2：不合格  4：退货   5：返工    6：特采
        /// <summary>
        /// è§£æžåº“å­˜
        /// </summary>
@@ -394,64 +475,62 @@
            {

                string[] targetCodes = generate.PalletCode.Split("*");
                if (targetCodes.Length == 4)
                if (targetCodes.Length == 5)
                {
                    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为原材料编码
                    bool isContained = InventoryCode.Contains(int.Parse(targetCodes[4]));
                    if(!isContained)
                    {
                        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()
                            {
                                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);
                        return content = WebResponseContent.Instance.Error($"第五位物料状态编码解析错误：{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(),         //物料批次
                                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_Inbound != null)
                    {
                        string PalletCodetarget = string.Join("*", targetCodes.Take(3));
                        Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode.Contains(PalletCodetarget));
                        if (dt_Inbound.OrderType == (int)InventoryMaterialType.原材料)   //0为原材料编码
                        {
                            if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                            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);

                            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.Parse(targetCodes[4]),
                                    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);
@@ -463,66 +542,84 @@
                            }
                            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.Parse(targetCodes[4]),
                                    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.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
                {
@@ -531,7 +628,7 @@
            }
            catch (Exception ex)
            {
                return content=WebResponseContent.Instance.Error($"系统巷道入库接口解析错误：错误：{ex.Message}");
                return content=WebResponseContent.Instance.Error($"托盘条码错误，导致系统错误：{ex.Message}");
                throw;
            }
        }
@@ -689,7 +786,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);