Merge remote-tracking branch 'origin/zhairh' into zhairh

api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataBustypeEntity.java

@@ -5,7 +5,6 @@ import lombok.Data;
 @Data
 public class SyncDataBustypeEntity {
 
-
     private Integer id;
     private String action;
     private String name;

api-admin/src/main/resources/application-dev.properties

@@ -1,8 +1,8 @@
 server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10
@@ -14,9 +14,9 @@ UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 spring.redis.database=8 
-spring.redis.host=192.168.235.137
+spring.redis.host=127.0.0.1
 spring.redis.port=6379 
-spring.redis.auth=123456
+#spring.redis.auth=123456
 spring.redis.jedis.pool.max-active=8 
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8 

api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml

@@ -15,8 +15,8 @@
         replace
         INTO sync_data_set(id,typeBus, typeScan,
         typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
-        , basicThirdBusOrder, orderScanFinish,  dbDiProducts,downstreamEnable,syncTime,
-        orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
+        , basicThirdBusOrder, orderScanFinish,  dbDiProducts,downstreamEnable,syncTime,syncDownloadTime,
+        orderUnReceive,orderUnCheck,busTypes,sysUser,syncIp,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
         ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert)
         values (
         #{id},
@@ -34,10 +34,12 @@
         #{dbDiProducts},
         #{downstreamEnable},
         #{syncTime},
+        #{syncDownloadTime},
         #{orderUnReceive},
         #{orderUnCheck},
         #{busTypes},
         #{sysUser},
+        #{syncIp},
         #{orderSyncTime},
         #{orderSyncStart},
         #{basicSyncStart},

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml

@@ -401,6 +401,7 @@
         where invStorageCode = #{invStorageCode}
           and invWarehouseCode = #{invWarehouseCode}
           and code = #{code}
+            limit 1
     </select>
 
     <select id="selectCodeByInvCodeAndProductId" resultType="java.lang.String">