From 5b85c832b2e99ab7634a90334a2fdf573d353baa Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 2 Jun 2023 09:13:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/trace/TraceManuOrderMapper.xml       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
index dbfbc57..b670b13 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
@@ -3,14 +3,21 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
-        SELECT tmo.*, mid.*, uc.companyName
+--         SELECT tmo.*, mid.*, uc.companyName
+--         FROM trace_manu_order tmo
+--         LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
+--         LEFT JOIN (
+--         SELECT tr.recordCode, tr.createUser, tr.remark, trd.batchNo, trd.traceType
+--         FROM trace_record_log tr
+--         LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
+--         ) mid ON mid.recordCode = tmo.recordCode
+        SELECT tmo.*, trd.batchNo, trd.traceType, tr.createUser, tr.remark, uc.companyName
         FROM trace_manu_order tmo
         LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
-        LEFT JOIN (
-        SELECT tr.recordCode, tr.createUser, tr.remark, trd.batchNo, trd.traceType
-        FROM trace_record_log tr
+        LEFT JOIN trace_record_log tr ON tr.recordCode = tmo.recordCode
         LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-        ) mid ON mid.recordCode = tmo.recordCode
+        WHERE trd.batchNo IS NOT NULL
+
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and mid.recordCode = #{recordCode}

From 80d9a7b80be11c5efe676b9920c08c7fed84de9e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 2 Jun 2023 09:47:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0.0.66MQ=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/trace/TraceTaskNoticeEntity.java   | 2 +-
 src/main/resources/application-pro.yml                     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java
index 8a3791c..d35ffd0 100644
--- a/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java
+++ b/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java
@@ -110,7 +110,7 @@ public class TraceTaskNoticeEntity implements Serializable {
     @TableField(value = "updateTime")
     private Date updateTime;
 
-    @TableField(value = "diList",typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "diList", typeHandler = FastjsonTypeHandler.class)
     private List<String> diList;
 
 
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index acf74d0..4102f7c 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -30,6 +30,13 @@ spring:
       max-file-size: 500MB
       max-request-size: 500MB
 
+  rabbitmq:
+    host: 192.168.0.66
+    port: 5672
+    virtual-host: dev
+    username: glxp
+    password: glxp1234
+
 ok:
   http:
     connect-timeout: 3000