1

huanghongfeng

2025-02-28 3163fec4985ebc87ea859087cdedacad749096d9

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

@@ -239,11 +239,12 @@
                                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;
@@ -253,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)
                        {
@@ -401,7 +423,8 @@

                    if(dt_Inbound != null)
                    {
                        Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                        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为原材料编码
                        {
                            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);
@@ -418,6 +441,7 @@
                                    MaterialType = (int)InventoryMaterialType.原材料,
                                    Materialweight = decimal.Parse(targetCodes[3]),
                                    Wlstatus = (int)InventoryMaterialStatus.待检,
                                    Mgeneratetime=DateTime.Now,
                                };
                                _unitOfWorkManage.BeginTran();
                                _stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -486,6 +510,7 @@
                                    MaterialType = (int)InventoryMaterialType.成品,
                                    Materialweight = decimal.Parse(targetCodes[3]),
                                    Wlstatus = (int)InventoryMaterialStatus.待检,
                                    Mgeneratetime = DateTime.Now,
                                };
                                _unitOfWorkManage.BeginTran();
                                _stockService.StockInfoService.Repository.AddData(dt_Stock);
@@ -539,7 +564,7 @@
            }
            catch (Exception ex)
            {
                return content=WebResponseContent.Instance.Error($"系统巷道入库接口解析错误：错误：{ex.Message}");
                return content=WebResponseContent.Instance.Error($"托盘条码错误，导致系统错误：{ex.Message}");
                throw;
            }
        }
@@ -697,7 +722,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.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
            && x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
            if (locationinfoData.Count < 20)
            {
                return content = WebResponseContent.Instance.OK(data: 1);