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

feat():产出完成更新计划状态和产出实绩到数据库

Browse Source
This commit is contained in:
Allenxy
2024-10-13 15:34:17 +08:00
parent a8cac86c9b
commit 1c69e9bc3a
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ import java.io.Serializable;
public class WebOperateMatForm implements Serializable { public class WebOperateMatForm implements Serializable {
@NotNull(message = "操作不存在") @NotNull(message = "操作不存在")
@ApiModelProperty("ONLINE-钢卷上线，READY-回退，PRODUCT-生成完成") @ApiModelProperty("ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成")
private WebMatOperateEnum operation; private WebMatOperateEnum operation;
@NotNull(message = "主键id不能为空") @NotNull(message = "主键id不能为空")

2
business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
View File

@@ -7,7 +7,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Log4j2 @Log4j2
@Component //@Component
public class RabbitQueueListener { public class RabbitQueueListener {
@RabbitListener(queues = "plateform.hmi.queue") @RabbitListener(queues = "plateform.hmi.queue")
@RabbitHandler @RabbitHandler

3
business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java
View File

@@ -45,6 +45,7 @@ public class TrackServiceImpl implements TrackService {
if (StringUtils.compare(form.getOperation().getValue(),"PRODUCT") != 0) { if (StringUtils.compare(form.getOperation().getValue(),"PRODUCT") != 0) {
return; return;
} }
this.operateMatWeb(form);
CrmPdiPlan pdiPlan = crmPdiPlanMapper.selectById(form.getId()); CrmPdiPlan pdiPlan = crmPdiPlanMapper.selectById(form.getId());
Plan2PdoVO bean = BeanUtil.toBean(pdiPlan, Plan2PdoVO.class); Plan2PdoVO bean = BeanUtil.toBean(pdiPlan, Plan2PdoVO.class);
@@ -52,6 +53,8 @@ public class TrackServiceImpl implements TrackService {
CrmPdoExcoil excoil = BeanUtil.toBean(bean, CrmPdoExcoil.class); CrmPdoExcoil excoil = BeanUtil.toBean(bean, CrmPdoExcoil.class);
double calcCoilWeight = CalcUtil.calcCoilWeight(excoil.getExitLength(), excoil.getEntryThick(), excoil.getEntryWidth()); double calcCoilWeight = CalcUtil.calcCoilWeight(excoil.getExitLength(), excoil.getEntryThick(), excoil.getEntryWidth());
excoil.setEncoilid(bean.getCoilid());
excoil.setExitCoilid(bean.getCoilid());
excoil.setCalcExitWeight(calcCoilWeight); excoil.setCalcExitWeight(calcCoilWeight);
excoil.setMeasExitWeight(calcCoilWeight); excoil.setMeasExitWeight(calcCoilWeight);
excoil.setHeadpos(0d); excoil.setHeadpos(0d);

2
ruoyi-admin/src/main/resources/application.yml
View File

@@ -74,7 +74,7 @@ spring:
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 # 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331
password: password: fe2b3cef78b74d3692909bdcbdf46331
#password: #password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s