业务单选入第三方单据bug

src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java

@@ -50,7 +50,7 @@ public class ThrOrderEntity {
     /**
      * 单据类型名称
      */
-    @TableField(value = "billTypeName")
+    @TableField(exist = false)
     private String billTypeName;
 
     /**
@@ -69,7 +69,7 @@ public class ThrOrderEntity {
      * 出入库类型1:入库，2:出库
      */
     @TableField(value = "inoutType")
-    private Byte inoutType;
+    private Integer inoutType;
 
     /**
      * 当前部门编码
@@ -80,7 +80,7 @@ public class ThrOrderEntity {
     /**
      * 当前部门名称
      */
-    @TableField(value = "deptName")
+    @TableField(exist = false)
     private String deptName;
 
     /**
@@ -92,7 +92,7 @@ public class ThrOrderEntity {
     /**
      * 当前仓库名称
      */
-    @TableField(value = "invName")
+    @TableField(exist = false)
     private String invName;
 
     /**

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -335,19 +335,9 @@ public class HeartService {
         return ResultVOUtils.success();
     }
 
-    //    上传系统参数设置
-    public BaseResponse uploadAllConfig(String syncTime) {
-        return null;
-    }
-
-//
-//    //上传最近更新第三方基础数据
-//    public BaseResponse uploadThirdData(String syncTime) {
-//
-//    }
-
 
     //下载最近更新扫码单据--上级服务
+    @Transactional(propagation = Propagation.NESTED)
     public void dlAllOrder() {
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + "");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>();
@@ -428,6 +418,7 @@ public class HeartService {
     }
 
     //    下载最近更新国家库数据-上级服务
+    @Transactional(propagation = Propagation.NESTED)
     public void dlAllDiProducts() {
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + "");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();

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

@@ -106,6 +106,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
             }
             if (curTime - lastTime > timeInterval) {
                 heartService.dlAllOrder();
+                heartService.dlAllDiProducts();
                 Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                     heartService.pullData(i);
                 });

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

@@ -205,6 +205,16 @@ CALL Pro_Temp_ColumnWork('sys_hosp_config', 'thirdSys', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1);
+
+
+CALL Pro_Temp_ColumnWork('thr_order', 'inoutType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('thr_order', 'deptCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('thr_order', 'invCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('thr_order', 'reviewTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('thr_order_detail', 'supId', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('thr_order_detail', 'supName', 'varchar(255)', 1);
+
+
 CREATE TABLE IF NOT EXISTS `inv_prein_product`
 (
     `id`             int                                                           NOT NULL AUTO_INCREMENT,