DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix():停机实绩

Browse Source
This commit is contained in:
Allenxy
2025-01-16 17:20:32 +08:00
parent 04ce1d87d5
commit 7697bb249e
7 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java
View File

@@ -28,10 +28,10 @@ public enum WebMatOperateEnum implements IEnum<String> {
ONLINE.syncPlanStatus(form.getId(), form.getEntryMatId()); ONLINE.syncPlanStatus(form.getId(), form.getEntryMatId());
} }
}, },
NEW("回退") { READY("回退") {
@Override @Override
public void operate(WebOperateMatForm form) { public void operate(WebOperateMatForm form) {
NEW.syncPlanStatus(form.getId(), form.getEntryMatId()); READY.syncPlanStatus(form.getId(), form.getEntryMatId());
} }
}, },

3
business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
View File

@@ -29,7 +29,8 @@ public class SteelGradeInfoController {
// 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
LambdaQueryWrapper<StdAlloy> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StdAlloy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName); // 只查询 gradeId 和 name 字段 queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName) // 只查询 gradeId 和 name 字段
.orderByAsc(StdAlloy::getName); // 按 name 排序
// 查询 StdAlloy 数据 // 查询 StdAlloy 数据
List<StdAlloy> stdAlloyList = steelGradeInfoService.list(queryWrapper); List<StdAlloy> stdAlloyList = steelGradeInfoService.list(queryWrapper);

2
business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
View File

@@ -41,7 +41,7 @@ public class CrmPdiPlan implements Serializable {
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @ApiModelProperty(value = "退火厚度")
private Integer annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @ApiModelProperty(value = "入口厚度")
private Double entryThick; private Double entryThick;

4
business/src/main/java/com/fizz/business/domain/ProStoppage.java
View File

@@ -17,7 +17,7 @@ public class ProStoppage implements Serializable {
private Long stopid; private Long stopid;
private String encoilid; private String coilid;
private String shift; private String shift;
@@ -35,7 +35,7 @@ public class ProStoppage implements Serializable {
private Float duration; private Float duration;
private String insDate; private String insdate;
private String stopType; private String stopType;

2
business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
View File

@@ -31,7 +31,7 @@ public class CalcPdiPlanForm {
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "退火厚度") @ApiModelProperty(value = "退火厚度")
private Integer annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @ApiModelProperty(value = "入口厚度")
private Double entryThick; private Double entryThick;

2
business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
View File

@@ -29,7 +29,7 @@ public class CrmPdiPlanForm {
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @ApiModelProperty(value = "退火厚度")
private Integer annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @ApiModelProperty(value = "入口厚度")
private Double entryThick; private Double entryThick;

13
business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
View File

@@ -132,7 +132,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
CrmPdiPlan crmPdiPlan = this.getById(form.getId()); CrmPdiPlan crmPdiPlan = this.getById(form.getId());
if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) { if (StringUtils.compare(form.getOperation(), "READY") == 0 && StringUtils.compare(crmPdiPlan.getStatus(), "ONLINE") == 0 ) {
crmPdiPlan.setStatus("READY"); crmPdiPlan.setStatus("READY");
log.info("退回钢卷,matId: {}", form.getCoilId()); log.info("退回钢卷,matId: {}", form.getCoilId());
this.updateById(crmPdiPlan); this.updateById(crmPdiPlan);
@@ -142,7 +142,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
} }
if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) { if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(crmPdiPlan.getStatus(), "PRODUCT") != 0) {
crmPdiPlan.setStatus(form.getOperation()); crmPdiPlan.setStatus(form.getOperation());
@@ -156,17 +156,10 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
ModCoilMap bean = BeanUtil.toBean(crmPdiPlan, ModCoilMap.class); ModCoilMap bean = BeanUtil.toBean(crmPdiPlan, ModCoilMap.class);
modCoilMapService.saveModCoilInfo(bean); modCoilMapService.saveModCoilInfo(bean);
}
if (StringUtils.compare(form.getOperation(), "PRODUCT") == 0) {
modCoilMapService.updateModCoil(form.getCoilId());
}
proMatmapService.updateMatid(form.getCoilId()); proMatmapService.updateMatid(form.getCoilId());
} }
}
@Override @Override
public String editCoilInfo(CrmPdiPlanForm coilid) { public String editCoilInfo(CrmPdiPlanForm coilid) {