板料优化，成品流程，测试架...

wangxinhui

2025-02-28 f947d43adfe6a204b6afe920ce88a30d78015f1d

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

@@ -333,7 +333,16 @@
        {
            try
            {
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA57.ToString());
                string line = string.Empty;
                if (!model.Line.Contains("SCUTL"))
                {
                    line = WarehouseEnum.HA58.ToString();
                }
                else
                {
                    line = WarehouseEnum.HA57.ToString();
                }
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
                if (warehouse == null)
                {
                    return MesResponseContent.Instance.Error($"仓库基础信息未配置");
@@ -385,6 +394,10 @@
                        throw new Exception("无库存");
                    }
                }
                tasks.ForEach(x =>
                {
                    x.TargetAddress = model.Line;
                });
                _unitOfWorkManage.BeginTran();

                int id = BaseDal.AddData(tasks);
@@ -431,11 +444,11 @@
                    return MesResponseContent.Instance.Error($"未识别该托盘类型，请确认托盘号");
                }

                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode == WarehouseEnum.HA57.ToString());
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == palletTypeInfo.WarehouseId);

                
                Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x=>x.PalletCode== model.CarrierCode).OrderByDescending(x=>x.SourceId).First();
                Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId==stockInfo_Hty.SourceId);

                Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x => x.PalletCode == model.CarrierCode).OrderByDescending(x => x.SourceId).First();
                Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId == stockInfo_Hty.SourceId);

                Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
                {
@@ -449,7 +462,7 @@
                    OutboundQuantity = 0,
                    SerialNumber = stockInfoDetail_Hty?.SerialNumber ?? "0",
                    StockQuantity = model.Quantity,
                    Status = StockStatusEmun.MES退库.ObjToInt(),
                    Status = model.Quantity <= 0.0 ? StockStatusEmun.MES空托退库.ObjToInt() : StockStatusEmun.MES退库.ObjToInt(),
                    Unit = model.Unit
                };
                Dt_StockInfo stockInfo = new Dt_StockInfo()
@@ -457,8 +470,9 @@
                    PalletCode = model.CarrierCode,
                    PalletType = palletTypeInfo.PalletType,
                    WarehouseId = warehouse.WarehouseId,
                    StockStatus = StockStatusEmun.MES退库.ObjToInt(),
                    Details=new List<Dt_StockInfoDetail> { stockInfoDetail }
                    StockStatus = stockInfoDetail.StockQuantity<=0.0? StockStatusEmun.MES空托退库.ObjToInt():StockStatusEmun.MES退库.ObjToInt(),
                    Details = new List<Dt_StockInfoDetail> { stockInfoDetail },
                    Remark= stockInfoDetail.StockQuantity <= 0.0 ? StockStatusEmun.MES空托退库.ToString() : StockStatusEmun.MES退库.ToString()
                };
                //Dt_Task task = new Dt_Task()
                //{