From 6c3eb81fdbfb4418489e0c7c59f2f87619992be1 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 17 Aug 2022 16:21:59 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/res/basic/UdiTraceResponse.java    |  1 +
 .../admin/thread/DownloadThirdSysDataTask.java   |  3 +++
 .../src/main/resources/application.properties    |  2 +-
 .../resources/mybatis/mapper/inout/OrderDao.xml  | 16 +++++++++++-----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java
index 15b316c9..2fc966a2 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java
@@ -17,4 +17,5 @@ public class UdiTraceResponse {
     private String batchNo;
     private String produceDate;
     private String expireDate;
+    private String billTypeName;
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
index 0ce6c5fa..c855e298 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
@@ -78,6 +78,9 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("downThirdSysDataTask");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
                     String cron = scheduledEntity.getCron();
+                    if (cron.isEmpty()) {
+                        log.error("cron is null");
+                    }
                     return new CronTrigger(cron).nextExecutionTime(triggerContext);
                 });
     }
diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties
index 0f5d7b4c..e487e916 100644
--- a/api-admin/src/main/resources/application.properties
+++ b/api-admin/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=pro
+spring.profiles.active=dev
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index e736e513..58ea4432 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, originFromType,invStorageCode)
+                             fromSubInvCode, createTime, originFromType, invStorageCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,8 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},
+                #{invStorageCode})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -99,7 +100,8 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},
-        #{originFromType},#{invStorageCode}
+        #{originFromType},
+        #{invStorageCode}
         )
     </insert>
 
@@ -575,7 +577,9 @@
 
     <select id="filterListByCode" parameterType="java.util.List"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order WHERE id IN
+        SELECT io_order.*,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action =basic_bussiness_type.action
+        WHERE io_order.id IN
         <foreach collection="warehouseEntityList" item="item" open="(" separator="," close=")">
             #{item.orderId}
         </foreach>
@@ -583,7 +587,9 @@
 
     <select id="filterListByOrder" parameterType="java.util.List"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order WHERE id IN
+        SELECT io_order.*,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action =basic_bussiness_type.action
+        WHERE io_order.id IN
         <foreach collection="orderList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>