DeXun/industry
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug尝试修复

Browse Source
This commit is contained in:
86156
2025-07-15 18:54:48 +08:00
parent ff57bb06b8
commit 18ada329e1
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java
View File

@@ -59,6 +59,7 @@ public class IndustryMaterialController extends BaseController
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;

24
industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java
View File

@@ -17,11 +17,14 @@ import com.industry.common.utils.DateUtils;
import com.industry.common.utils.MathUtils; import com.industry.common.utils.MathUtils;
import com.industry.work.domain.IndustryBatch; import com.industry.work.domain.IndustryBatch;
import com.industry.work.domain.IndustryMaterial; import com.industry.work.domain.IndustryMaterial;
import com.industry.work.domain.IndustryStep;
import com.industry.work.domain.MomResource; import com.industry.work.domain.MomResource;
import com.industry.work.domain.dto.IndustryMaterialDto; import com.industry.work.domain.dto.IndustryMaterialDto;
import com.industry.work.domain.vo.IndustryBatchVo; import com.industry.work.domain.vo.IndustryBatchVo;
import com.industry.work.domain.vo.IndustryMaterialVo; 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.IndustryMaterialMapper;
import com.industry.work.mapper.IndustryStepMapper;
import com.industry.work.service.IIndustryBatchService; import com.industry.work.service.IIndustryBatchService;
import com.industry.work.service.IIndustryMaterialService; import com.industry.work.service.IIndustryMaterialService;
import com.industry.work.service.IMomService; import com.industry.work.service.IMomService;
@@ -45,6 +48,9 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
@Autowired @Autowired
private IIndustryBatchService industryBatchService; private IIndustryBatchService industryBatchService;
@Autowired
private IndustryStepMapper industryStepMapper;
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@@ -186,14 +192,32 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
return industryMaterialMapper.deleteIndustryMaterialById(id); return industryMaterialMapper.deleteIndustryMaterialById(id);
} }
/**
*
* @param industryMaterial batchId
* @return
*/
@Override @Override
public int submitMaterial(IndustryMaterial industryMaterial) { public int submitMaterial(IndustryMaterial industryMaterial) {
List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList(industryMaterial); List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList(industryMaterial);
for (IndustryMaterialVo industryMaterialVo : industryMaterialVos) { for (IndustryMaterialVo industryMaterialVo : industryMaterialVos) {
if (Objects.nonNull(industryMaterialVo.getId())) { if (Objects.nonNull(industryMaterialVo.getId())) {
industryMaterialMapper.submitMaterial(industryMaterialVo); industryMaterialMapper.submitMaterial(industryMaterialVo);
// 将异常的道次恢复成初始料
IndustryStep industryStep = new IndustryStep();
industryStep.setBatchId(industryMaterialVo.getBatchId());
industryStep.setMaterialId(industryMaterialVo.getId());
industryStep.setState(2L);
List<IndustryStepVo> industryStepVos = industryStepMapper.selectIndustryStepList(industryStep);
for (IndustryStepVo industryStepVo : industryStepVos) {
industryStepVo.setState(0L);
industryStepMapper.updateIndustryStep(industryStepVo);
}
} }
} }
return 1; return 1;
} }