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

src/main/java/com/glxp/api/config/ReplaceBatch.java

@@ -40,11 +40,11 @@ public class ReplaceBatch extends AbstractMethod {
         CustomerSqlMethod sqlMethod = CustomerSqlMethod.REPLACE_ONE;
         List<TableFieldInfo> fieldList = tableInfo.getFieldList();
 
-        String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(null),
+//        String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(ENTITY_DOT),
-                LEFT_BRACKET, RIGHT_BRACKET, null, COMMA);
+//                LEFT_BRACKET, RIGHT_BRACKET, null, COMMA);
-//        String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) +
+        String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) +
-//                this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
+                this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
-//        String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
+        String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
         String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(true, ENTITY_DOT, true) +
                 this.filterTableFieldInfo(fieldList, predicate, i -> i.getInsertSqlProperty(ENTITY_DOT), EMPTY);
         insertSqlProperty = LEFT_BRACKET + insertSqlProperty.substring(0, insertSqlProperty.length() - 1) + RIGHT_BRACKET;

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -155,6 +155,12 @@ public class UdiRelevanceResponse {
         return allowNoProduct;
     }
 
+    public Boolean getAllowNoSerial() {
+
+        if (allowNoSerial == null)
+            return true;
+        return allowNoSerial;
+    }
 
     public Boolean getUseDy() {
         if (isUseDy == null)

src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java

@@ -16,7 +16,7 @@ public class ThrBusTypeOriginResponse {
     /**
      * id
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 单据类型名称

src/main/java/com/glxp/api/task/SyncThirdSysTask.java

@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 
 @Component
-//@EnableScheduling
+@EnableScheduling
 @Slf4j
 public class SyncThirdSysTask implements SchedulingConfigurer {
 

src/main/resources/schemas/schema_v2.1.sql

@@ -502,6 +502,8 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(2
 call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE');
 
 
+
+
 CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'cgzmraqxgxx', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'sfbjwycxsy', 'varchar(255)', 1);