From 1c69e9bc3a9f6e5987123352bdc3a9ff4df01aee Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Sun, 13 Oct 2024 15:34:17 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BA=A7=E5=87=BA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E4=BA=A7=E5=87=BA=E5=AE=9E=E7=BB=A9=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fizz/business/form/WebOperateMatForm.java    | 2 +-
 .../com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java     | 2 +-
 .../java/com/fizz/business/service/impl/TrackServiceImpl.java  | 3 +++
 ruoyi-admin/src/main/resources/application.yml                 | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
index f7cc7b6..2d2b462 100644
--- a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
+++ b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
 public class WebOperateMatForm implements Serializable {
 
     @NotNull(message = "操作不存在")
-    @ApiModelProperty("ONLINE-钢卷上线，READY-回退，PRODUCT-生成完成")
+    @ApiModelProperty("ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成")
     private WebMatOperateEnum operation;
 
     @NotNull(message = "主键id不能为空")
diff --git a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
index 28a6af2..9d02389 100644
--- a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
+++ b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
@@ -7,7 +7,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Log4j2
-@Component
+//@Component
 public class RabbitQueueListener {
     @RabbitListener(queues = "plateform.hmi.queue")
     @RabbitHandler
diff --git a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java
index b2e8ecb..b05fe85 100644
--- a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java
@@ -45,6 +45,7 @@ public class TrackServiceImpl implements TrackService {
         if (StringUtils.compare(form.getOperation().getValue(),"PRODUCT") != 0) {
             return;
         }
+        this.operateMatWeb(form);
 
         CrmPdiPlan pdiPlan = crmPdiPlanMapper.selectById(form.getId());
         Plan2PdoVO bean = BeanUtil.toBean(pdiPlan, Plan2PdoVO.class);
@@ -52,6 +53,8 @@ public class TrackServiceImpl implements TrackService {
         CrmPdoExcoil excoil = BeanUtil.toBean(bean, CrmPdoExcoil.class);
 
         double calcCoilWeight = CalcUtil.calcCoilWeight(excoil.getExitLength(), excoil.getEntryThick(), excoil.getEntryWidth());
+        excoil.setEncoilid(bean.getCoilid());
+        excoil.setExitCoilid(bean.getCoilid());
         excoil.setCalcExitWeight(calcCoilWeight);
         excoil.setMeasExitWeight(calcCoilWeight);
         excoil.setHeadpos(0d);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3855b70..7403452 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331
-    password:
+    password: fe2b3cef78b74d3692909bdcbdf46331
     #password:
     # 连接超时时间
     timeout: 10s