代码更新

wangxinhui

昨天 011ca316e6ec2ed93e31c45a9ebd9d3c66664871

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs

@@ -365,6 +365,10 @@
                    throw new Exception($"未找到条码{stockInfoOld.PalletCode}一期ERP库存不存在");
                }
                BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"一期ERP未返回{stockInfoOld.PalletCode}的库存信息");
                if (stockInfoOld.StockLength <= 0 || bSTStockInfoDTO.StockMeter<=0)
                {
                    throw new Exception($"{stockInfoOld.RfidCode}绑定条码{stockInfoOld.PalletCode}库存为0");
                }
                stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
                decimal stockLength = bSTStockInfoDTO.StockMeter;
                decimal errWeight = Math.Abs(weight - bSTStockInfoDTO.Qty);
@@ -971,6 +975,10 @@
                {
                    item.Count -= count.Count;
                }
                if (item.Count >= 50 && count?.Count<=1)
                {
                    return item.RoadwayNo;
                }
            }
            return locationCounts.Where(x => x.Count > 0).OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? "";
        }
@@ -1065,7 +1073,7 @@
                            }
                            proInUpModel.PB_INV_PRODUCT_IN= pRODUCT_INItems;
                            string request = _invokeERPService.ERPProInUp(proInUpModel) ?? throw new Exception("成品入库接口请求失败");
                            if (!request.Contains("Success"))
                            if (!request.Contains("success"))
                            {
                                throw new Exception($"成品入库失败");
                            }
@@ -1952,7 +1960,7 @@
                    string request = _invokeERPService.ERPSemiProInUp(
                            new ERPProInUpModel()
                            {
                                PB_INV_PRODUCT_IN= pRODUCT_INItems
                                PB_INV_PRODUCT_IN = pRODUCT_INItems
                            }) ?? throw new Exception("半成品入库接口请求失败");
                    //生成半成品入库
                    List<Dt_MESProInOrderInfo> semiProInOrderInfos = mESProInOrderInfos.Where(x => x.MESProInStatus == InOrderStatusEnum.未开始.ObjToInt() && x.WarehouseId==WarehouseEnum.LLDYL.ObjToInt()).ToList();
@@ -2004,7 +2012,6 @@
                {
                    return content.Error("传入信息为空");
                }
                
                List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData();
                List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
                List<Dt_Task> tasks = new List<Dt_Task>();
@@ -2065,7 +2072,7 @@
                        NextAddress = "",
                        PalletCode = item.BarCode,
                        Roadway = "",
                        SourceAddress = CheckPointCode.AGVStationCode,
                        SourceAddress = item.PointCode.StartsWith("YS") ? CheckPointCode.AGVStationCode : CheckPointCode.MESPointCode,
                        TargetAddress = "",
                        TaskType = 0,
                        TaskStatus = TaskStatusEnum.New.ObjToInt(),
@@ -2081,10 +2088,11 @@
                        nameof(StationAreaEnum.一楼印刷) => TaskTypeEnum.PrintYLInbound,
                        nameof(StationAreaEnum.一楼分切) => TaskTypeEnum.PartOffInbound,
                        nameof(StationAreaEnum.一楼纸张淋膜) => TaskTypeEnum.PaperFilmInbound,
                        nameof(StationAreaEnum.一楼无纺淋膜) => TaskTypeEnum.WFBYLInbound,
                        nameof(StationAreaEnum.一楼无纺织布) => TaskTypeEnum.WFBYLInbound,
                        nameof(StationAreaEnum.一楼无纺淋膜) => TaskTypeEnum.WFBLMYLInbound,
                        _ => throw new Exception("未找到对应任务")
                    };
                    if (taskTypeEnum == TaskTypeEnum.WFBYLInbound)
                    if (taskTypeEnum == TaskTypeEnum.WFBYLInbound || taskTypeEnum == TaskTypeEnum.WFBLMYLInbound)
                    {
                        Dt_AGVStationInfo? stationInfo = AssignWFBStation(_AGVStationInfos?.Select(x => x.AGVStationCode).ToList()) ?? throw new Exception("未找到可用无纺布暂存架");
                        newTask.NextAddress = stationInfo.AGVStationCode;
@@ -2150,6 +2158,10 @@
                throw new Exception(ex.Message);
            }
        }
        /// <summary>
        /// æˆå“ç»„盘
        /// </summary>
        /// <returns></returns>
        public WebResponseContent BoxingInBound(string stationCode,List<string> barCodes)
        {
            WebResponseContent content = new WebResponseContent();