1

huanghongfeng

2024-11-26 87d873ad509b4c927ac19aebaa3622fe9374626b

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

@@ -224,7 +224,7 @@
                else
                {
                    
                    if ((generate.SourceAddress == "R01-003-041-011-01" || generate.SourceAddress == "R01-002-043-001-01" || generate.SourceAddress == "R02-003-043-011-01"))
                    if ((generate.SourceAddress == "R01-003-041-011-01" || generate.SourceAddress == "R01-002-043-001-01" || generate.SourceAddress == "R02-003-027-011-01"))
                    {
                        Dt_StockInfo dt_StockInfo2 = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                       if(dt_StockInfo2 == null)
@@ -249,7 +249,7 @@
                        Dt_LocationInfo newSourceAddress;
                        newSourceAddress = _basicService.LocationInfoService.GetLocationplatform(generate.SourceAddress);
                        int Locationtype = 9;   //默认为9
                        if(dt_StockInfo.MaterialType== (int)InventoryMaterialType.成品)
                        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.原材料)
@@ -398,8 +398,8 @@
                    string[] targetCodes = generate.PalletCode.Split("*");
                    if(targetCodes.Length == 4)
                    {
                        Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == targetCodes[0]);
                        if (dt_Inbound.OrderType == (int)OrderTypeEmun.原材料)   //0为原材料编码
                        Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                        if (dt_Inbound.OrderType == (int)InventoryMaterialType.原材料)   //0为原材料编码
                        {
                            Dt_StockInfo dt_Stock = new()
                            {
@@ -414,19 +414,19 @@
                            _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(2, 8);  //解析物料批次找详情
                            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.UpperOrderNo,    //物料号
                                MaterielName = dt_Inbound.OrderName,    //物料名称
                                MaterielCode = dt_Inbound.OrderName,    //物料号
                                MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                OrderNo = dt_Inbound.OrderNo,        //物料详情
                                BatchNo = targetCodes[1],         //物料批次
                                BatchNo = targetCodes[1].ToString(),         //物料批次
                                SerialNumber = targetCodes[2].ToString(),    //包号
                                BatchNoName = dt_Int.OrderNo,
                                SerialNumber = targetCodes[2],    //包号
                                StockQuantity = decimal.Parse(targetCodes[3]),    //重量
                                StockQuantity = decimal.Parse(targetCodes[3].ToString()),    //重量
                                OutboundQuantity = 1,    //序列号
                                Status = (int)StockStatusEmun.组盘暂存,
                                Creater = "WMS",
@@ -445,7 +445,7 @@
                            }
                            
                        }
                        else if (dt_Inbound.OrderType == (int)OrderTypeEmun.成品料)
                        else if (dt_Inbound.OrderType == (int)InventoryMaterialType.成品)
                        {
                            Dt_StockInfo dt_Stock = new()
                            {
@@ -463,10 +463,10 @@
                            Dt_StockInfoDetail dt_StockInfoDetail = new()
                            {
                                StockId = dt_StockInfo2.Id,
                                MaterielCode = dt_Inbound.UpperOrderNo,    //物料号
                                MaterielName = dt_Inbound.OrderName,    //物料名称
                                MaterielCode = dt_Inbound.OrderName,    //物料号
                                MaterielName = dt_Inbound.UpperOrderNo,    //物料名称
                                OrderNo = dt_Inbound.OrderNo,        //物料详情
                                BatchNo = targetCodes[1],         //物料批次
                                BatchNo = targetCodes[1].ToString(),         //物料批次
                                BatchNoName = "",
                                SerialNumber = targetCodes[2],    //包号
                                StockQuantity = decimal.Parse(targetCodes[3]),    //重量
@@ -565,6 +565,8 @@
                {
                    Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.UpperOrderNo == result);
                    Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
                    List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
                            && x.LocationType == (int)LocationTypeEnum.MaterialsCube);
                    if (dt_Inbound != null)
                    {
                        if (dt_StockInfo == null)
@@ -603,13 +605,30 @@
                            _stockService.StockInfoDetailService.AddData(dt_StockInfoDetail);

                            _unitOfWorkManage.CommitTran();
                            return content = WebResponseContent.Instance.OK(data: 3);

                            
                            if (locationinfoData.Count > 40)
                            {
                                return content = WebResponseContent.Instance.OK(data: 3);
                            }
                            else
                            {
                                return content = WebResponseContent.Instance.OK(data: 1);
                            }
                            
                        }
                        else
                        {
                            if (dt_StockInfo.StockStatus == (int)StockStatusEmun.组盘暂存)
                            {
                                return content = WebResponseContent.Instance.OK(data: 3);
                                if (locationinfoData.Count > 40)
                                {
                                    return content = WebResponseContent.Instance.OK(data: 3);
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.OK(data: 1);
                                }
                            }
                            else
                            {
@@ -631,5 +650,20 @@
                throw;
            }
        }
    
        public WebResponseContent PalletQueryinventory()
        {
            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);
            if (locationinfoData.Count < 20)
            {
                return content = WebResponseContent.Instance.OK(data: 1);
            }
            else
            {
                return content = WebResponseContent.Instance.OK(data: 3);
            }
        }
    }
}