挑选代码

api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

@@ -15,7 +15,7 @@ public enum BasicExportTypeEnum {
     /**
      * 国家库DI数据
      */
-    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
+//    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
 
     /**
      * 单据类型
@@ -47,6 +47,11 @@ public enum BasicExportTypeEnum {
      */
     IO_ORDER("io_order", "单据信息"),
 
+    /**
+     * 发票信息
+     */
+    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
+
     ;
     private String key;
 

api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java

@@ -210,6 +210,7 @@ public class DlAllDataService {
                             myEntity.setRemark(remark);
                             myEntity.setIdDatas(SYNC_SCAN_ORDER);
                             myEntity.setType(BasicProcessStatus.NEW_ALL_ORDER);
+                            myEntity.setScheduleType(1);
                             basicExportService.insertExportStatus(myEntity);
                             myEntity.setStatus(Constant.SYNC_STATUS_WAIT);
                             if (downstream.getParamValue().equals("1")) {
@@ -233,15 +234,18 @@ public class DlAllDataService {
                             }
                         }
                     }
-                    if (basicExportStatusEntity.getFromType() == 0) {
-                        BasicExportStatusEntity basicExportStatusEntity1 = basicExportStatusEntities.get(0);
-                        basicExportStatusEntity1.setStatus(4);
-                        spGetHttp.postUpdateBasicStatus(basicExportStatusEntity1);
-                        spGetHttp.finishTask(basicExportStatusEntity1.getId());
-                        spGetHttp.updateLastTime(SYNC_SCAN_ORDER, DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
-                    } else {
-                        spGetHttp.postDeleteBasicStatus(basicExportStatusEntity.getId());
-                    }
+//                    if (basicExportStatusEntity.getFromType() == 0) {
+//
+//                    } else {
+//                        spGetHttp.postDeleteBasicStatus(basicExportStatusEntity.getId());
+//                    }
+
+
+                    BasicExportStatusEntity basicExportStatusEntity1 = basicExportStatusEntities.get(0);
+                    basicExportStatusEntity1.setStatus(4);
+                    spGetHttp.postUpdateBasicStatus(basicExportStatusEntity1);
+                    spGetHttp.finishTask(basicExportStatusEntity1.getId());
+                    spGetHttp.updateLastTime(SYNC_SCAN_ORDER, DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
                 }
             }
 
@@ -280,7 +284,6 @@ public class DlAllDataService {
             if (StrUtil.isNotBlank(bean.getTaskId())) {
                 // 将数据写入文件
 //                try {
-
                 FileUtils.makeDirectory(filePath + "sync/");
                 String fileName = filePath + "sync/" + exportType.getRemark() + "-" + bean.getTaskId() + ".udi";
                 FileUtils.SaveFileAs(bean.getFileContent(), fileName);
@@ -288,14 +291,13 @@ public class DlAllDataService {
 //                    log.error("从UDI自助平台拉取基础数据 文件[{}]写入异常----{}",bean.getFilePath(), e.getMessage());
 //                    throw new RuntimeException(e);
 //                }
-
                 BasicExportStatusEntity exportStatusEntity = BasicExportStatusEntity.builder()
                         .id(bean.getTaskId())
                         .taskId(bean.getTaskId())
                         .status(BasicExportStatusEnum.WAIT_SYNC.getCode())
                         .type(exportType.getRemark())
                         .transportType(1)
-                        .scheduleType(0)
+                        .scheduleType(1)
                         .fromType(1).remark(remark)
                         .startTime(DateUtil.getDateTime())
                         .updateTime(new Date())
@@ -390,6 +392,7 @@ public class DlAllDataService {
                                 myEntity.setUpdateTime(new Date());
                                 myEntity.setType(NEW_ALL_UDIS);
                                 myEntity.setStartTime(DateUtil.getDateTime());
+                                myEntity.setScheduleType(1);
                                 myEntity.setRemark("国家库DI信息：" + spSyncUdiResponse.getProductInfoEntityList().size() + " 条");
                                 basicExportService.insertExportStatus(myEntity);
                                 if (downstream.getParamValue().equals("1")) {
@@ -449,6 +452,7 @@ public class DlAllDataService {
                                 myEntity.setStartTime(DateUtil.getDateTime());
                                 myEntity.setUpdateTime(new Date());
                                 myEntity.setIdDatas(ConstantStatus.SYNC_DI_PRODUCTS);
+                                myEntity.setScheduleType(1);
                                 myEntity.setRemark("医疗器械注册人信息：{} " + spSyncUdiResponse.getUdiCompanyEntities().size() + " 条");
                                 basicExportService.insertExportStatus(myEntity);
                                 if (downstream.getParamValue().equals("1")) {
@@ -522,8 +526,9 @@ public class DlAllDataService {
                         myEntity.setCacheFilePath(fileName);
                         basicExportService.updateExportStatus(myEntity);
                     }
-
-                    spGetHttp.postDeleteBasicStatus(basicExportStatusEntity.getId());
+//                    BasicExportStatusEntity basicExportStatusEntity1 = basicExportStatusEntities.get(0);
+                    basicExportStatusEntity.setStatus(4);
+                    spGetHttp.postUpdateBasicStatus(basicExportStatusEntity);
                 }
             }