增加任务类型枚举，增加测试出库上报

wangxinhui

2024-12-23 942e47f8987bd8c266e58863bed3895d9cb4ded0

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

@@ -8,9 +8,11 @@
using WIDESEA_Common.OtherEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
@@ -30,14 +32,15 @@
            MesResponseContent responseContent = new MesResponseContent();
            try
            {
                //获取库存记录 warehouseID暂定先用固定值 TEST
                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == 1 && 
                  x.PalletCode == model.ToolCode && 
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==WarehouseEnum.HA64.ToString());
                //获取库存记录
                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => 
                  x.WarehouseId == warehouse.WarehouseId && 
                  x.StockStatus==(int)StockStatusEmun.入库完成)
                .Includes(x => x.Details).First();
                .Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.ToolCode)).First();
                if (stockInfo==null)
                {
                    return responseContent.Error($"测试架托盘:{model.ToolCode}无库存记录");
                    return responseContent.Error($"测试架:{model.ToolCode}无可用库存");
                }
                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
                  x.WarehouseId == stockInfo.WarehouseId &&
@@ -45,7 +48,7 @@
                  (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
                if (locationInfo==null)
                {
                    return responseContent.Error($"货位:{stockInfo.LocationCode}出库条件不满足");
                    return responseContent.Error($"测试架货位:{stockInfo.LocationCode}出库条件不满足");
                }
                //生成测试架出库任务 é”å®šåº“å­˜ æ›´æ”¹è´§ä½çŠ¶æ€
                Dt_Task taskOut = new()
@@ -57,8 +60,8 @@
                    Roadway = locationInfo.RoadwayNo,
                    SourceAddress = stockInfo.LocationCode,
                    TargetAddress = "",
                    TaskStatus = (int)TaskOutStatusEnum.OutNew,
                    TaskType = (int)TaskOutboundTypeEnum.OutTestStand,
                    TaskStatus = (int)TaskStatusEnum.New,
                    TaskType = (int)TaskTypeEnum.TestOutbound,
                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                    PalletType = stockInfo.PalletType,
                    WarehouseId = stockInfo.WarehouseId,
@@ -66,6 +69,7 @@
                stockInfo.StockStatus = (int)StockStatusEmun.出库锁定;
                LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
                locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
                //判断是否有出库单信息
                _unitOfWorkManage.BeginTran();
                //更新库存状态
                _stockRepository.StockInfoRepository.UpdateData(stockInfo);
@@ -76,6 +80,8 @@
                //加入货位变动记录
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
                _unitOfWorkManage.CommitTran();
                //将任务推送到WCS
                PushTasksToWCS();
                responseContent.OK();
            }
            catch (Exception ex)
@@ -85,5 +91,65 @@
            }
            return responseContent;
        }
        /// <summary>
        /// æµ‹è¯•æž¶é€€åº“
        /// </summary>
        /// <returns></returns>
        public MesResponseContent TestReturnStock(TestToolBackModel backModel)
        {
            MesResponseContent responseContent = new MesResponseContent();
            try
            {
                
            }
            catch (Exception ex)
            {
                responseContent.Error(ex.Message);
            }
            return responseContent;
        }
        /// <summary>
        /// æµ‹è¯•æž¶æŠ¥åºŸ
        /// </summary>
        /// <returns></returns>
        public MesResponseContent TestScrap(TestToolScrap toolScrap)
        {
            MesResponseContent responseContent = new MesResponseContent();
            try
            {
                //获取测试架批次号库存
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA64.ToString());
                //获取库存记录
                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
                  x.WarehouseId == warehouse.WarehouseId)
                .Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == toolScrap.ToolCode)).First();
            }
            catch (Exception ex)
            {
                responseContent.Error(ex.Message);
            }
            return responseContent;
        }
        /// <summary>
        /// åŒæ­¥æµ‹è¯•æž¶å¯¿å‘½
        /// </summary>
        /// <param name="toolSynInfo"></param>
        /// <returns></returns>
        public WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo)
        {
            WebResponseContent content= new WebResponseContent();
            try
            {
                Root<TestToolSynInfo> root = new Root<TestToolSynInfo>()
                {

                };
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }
}