diff --git a/industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java b/industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java index df543e9b..e22501c3 100644 --- a/industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java +++ b/industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java @@ -59,6 +59,7 @@ public class IndustryMaterialController extends BaseController + @Autowired private RedisCache redisCache; diff --git a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java index a464ef7d..ebc84eb6 100644 --- a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java +++ b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java @@ -17,11 +17,14 @@ import com.industry.common.utils.DateUtils; import com.industry.common.utils.MathUtils; import com.industry.work.domain.IndustryBatch; import com.industry.work.domain.IndustryMaterial; +import com.industry.work.domain.IndustryStep; import com.industry.work.domain.MomResource; import com.industry.work.domain.dto.IndustryMaterialDto; import com.industry.work.domain.vo.IndustryBatchVo; import com.industry.work.domain.vo.IndustryMaterialVo; +import com.industry.work.domain.vo.IndustryStepVo; import com.industry.work.mapper.IndustryMaterialMapper; +import com.industry.work.mapper.IndustryStepMapper; import com.industry.work.service.IIndustryBatchService; import com.industry.work.service.IIndustryMaterialService; import com.industry.work.service.IMomService; @@ -45,6 +48,9 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService { @Autowired private IIndustryBatchService industryBatchService; + @Autowired + private IndustryStepMapper industryStepMapper; + @Autowired private RedisCache redisCache; @@ -186,14 +192,32 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService { return industryMaterialMapper.deleteIndustryMaterialById(id); } + /** + * + * @param industryMaterial batchId + * @return + */ @Override public int submitMaterial(IndustryMaterial industryMaterial) { List industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList(industryMaterial); for (IndustryMaterialVo industryMaterialVo : industryMaterialVos) { if (Objects.nonNull(industryMaterialVo.getId())) { industryMaterialMapper.submitMaterial(industryMaterialVo); + + // 将异常的道次恢复成初始料 + IndustryStep industryStep = new IndustryStep(); + industryStep.setBatchId(industryMaterialVo.getBatchId()); + industryStep.setMaterialId(industryMaterialVo.getId()); + industryStep.setState(2L); + List industryStepVos = industryStepMapper.selectIndustryStepList(industryStep); + for (IndustryStepVo industryStepVo : industryStepVos) { + industryStepVo.setState(0L); + industryStepMapper.updateIndustryStep(industryStepVo); + } } + } + return 1; }