bug修改

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;
 }

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);
                 });
     }

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
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -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>