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

修复bug

Browse Source
This commit is contained in:
hdka
2025-08-12 22:17:51 +08:00
parent 39a4962bdb
commit b64237d408
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
// 直接删掉扫入并且未轧制的，写入二辊数据到四辊机器里面 // 直接删掉扫入并且未轧制的，写入二辊数据到四辊机器里面
clearSystem(); clearSystem();
// TODO 这里需要查一下数据库查看是否有正在轧或者说是未轧的情况 state=0,1,3,4 // TODO 这里需要查一下数据库查看是否有正在轧或者说是未轧的情况 state=1,3,4
List<IndustryMaterialVo> industryMaterialVos1 = industryMaterialMapper.selectIndustryMaterialListAndNotFinish(); List<IndustryMaterialVo> industryMaterialVos1 = industryMaterialMapper.selectIndustryMaterialListAndNotFinish();
System.out.println("触发四辊数据写入"); System.out.println("触发四辊数据写入");

1
industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java
View File

@@ -588,7 +588,6 @@ public class IndustryStepServiceImpl implements IIndustryStepService {
industryMaterialVo.setState(2L); industryMaterialVo.setState(2L);
List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList1(industryMaterialVo); List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList1(industryMaterialVo);
String result = industryMaterialService.insertIndustryMaterialToSlaveDataSource(industryMaterialVos); String result = industryMaterialService.insertIndustryMaterialToSlaveDataSource(industryMaterialVos);
System.out.println(result);
} }
} }

2
industry-system/src/main/resources/mapper/work/IndustryMaterialMapper.xml
View File

@@ -271,7 +271,7 @@
</select> </select>
<select id="selectIndustryMaterialListAndNotFinish" <select id="selectIndustryMaterialListAndNotFinish"
resultMap="IndustryMaterialResult"> resultMap="IndustryMaterialResult">
select * from industry_material where state!=0 and state!=1 and state!=3 and state!=4 and state!=5 select * from industry_material where state!=1 and state!=3 and state!=4 and state!=5
</select> </select>