页面展示，同步相关修改

src/main/java/com/glxp/api/constant/BasicProcessStatus.java

@@ -27,7 +27,7 @@ public class BasicProcessStatus {
     public static final int BASIC_THIRD_ORDER = 6;          //往来单位
     public static final int NEW_ALL_DATA = 7;       //所有最新数据
     public static final int NEW_ALL_BUS = 8;
-    public static final int NEW_ALL_ORDER = 9;
+    public static final String NEW_ALL_ORDER = "9";
     public static final int NEW_ALL_DI = 10;
 
     public static final int SCHEDULE_NORMAL = 1;        //常规任务

src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java

@@ -18,7 +18,7 @@ public class BasicDownloadStatusEntity {
     private String taskId;
     private String idDatas;
     private Integer status;
-    private Integer type;
+    private String type;
     private Date updateTime;
     private Integer scheduleType;
     private Date startTime;

src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java

@@ -10,7 +10,7 @@ public class BasicExportStatusEntity {
     private String id;
     private String idDatas;
     private Integer status;
-    private Integer type;
+    private String type;
     private Date updateTime;
     private Integer scheduleType;
     private Date startTime;

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -158,7 +158,7 @@ public class SpGetHttpClient {
     }
 
 
-    public String getBasicData(String id, int type) {
+    public String getBasicData(String id, String type) {
         BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
         basicExportStatusRequest.setId(id);
         basicExportStatusRequest.setType(type);

src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java

@@ -8,7 +8,7 @@ public class BasicDownloadRequest extends ListPageRequest {
     private String id;
     private String taskId; //任务ID
     private Integer status;
-    private Integer type;
+    private String type;
     private String idDatas;
     private Integer scheduleType;
     public Integer createType;

src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java

@@ -7,7 +7,7 @@ import lombok.Data;
 public class BasicExportStatusRequest extends ListPageRequest {
     private String id;
     private Integer status;
-    private Integer type;
+    private String type;
     private String idDatas;
     private Integer scheduleType;
     public Integer createType;

src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java

@@ -32,7 +32,7 @@ public class SyncDataSetResponse {
 
     private List<SyncDataBustypeEntity> busTypes; //扫码单据类型
     private List<SyncDataChangeBustypesEntity> changeBusTypes; //业务单据类型
-    private List<SyncDataPurTypeEntity> purTypeEntities;
+//    private List<SyncDataPurTypeEntity> purTypeEntities;
 
     private String orderSyncStart;
     private String basicSyncStart;

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

@@ -5,6 +5,7 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.entity.purchase.PurOrderEntity;
+import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
 import com.glxp.api.entity.system.SyncDataBustypeEntity;
 import com.glxp.api.entity.system.SyncDataPurTypeEntity;
 import com.glxp.api.req.inout.FilterOrderRequest;
@@ -106,10 +107,10 @@ public class UpBasicService {
         List<PurOrderEntity> purOrderEntities = new ArrayList<>();
         FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
         BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
-        if (CollUtil.isNotEmpty(syncDataSetEntity.getPurTypeEntities())) {
-            for (SyncDataPurTypeEntity syncDataBustypeEntity : syncDataSetEntity.getPurTypeEntities()) {
-                if (syncDataBustypeEntity.getType() == ConstantStatus.BUS_TYPE_DD) {
-                    List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus());
+        if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) {
+            for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) {
+                if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) {
+                    List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus());
                     if (CollUtil.isNotEmpty(temps)) {
                         purOrderEntities.addAll(temps);
                     }

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

@@ -36,7 +36,7 @@ public class AsyncFetchUdiTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("syncFetch");
                     logger.info("syncFetch----------------");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/5 * * * ?";
+                    String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");

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

@@ -16,7 +16,6 @@ import com.glxp.api.idc.service.IdcService;
 import com.glxp.api.req.system.ScheduledRequest;
 
 
-
 @Component
 @EnableScheduling
 public class AsyncUdiTask implements SchedulingConfigurer {
@@ -37,7 +36,7 @@ public class AsyncUdiTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("syncIdcUdi");
                     logger.info("syncIdcUdi----------------");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/3 * * * ?";
+                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");
@@ -49,7 +48,6 @@ public class AsyncUdiTask implements SchedulingConfigurer {
 
     private void process() {
         logger.info("syncIdcUdi----process------------");
-
         idcService.asyncUdiTask();
     }
 

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

@@ -67,6 +67,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
             }
             if (curTime2 - lastTime2 > timeInterval2) {
                 heartService.uploadAllOrder(null);
+                heartService.uploadAllBusOrder(null);
                 redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2);
             }
 

src/main/resources/application-dev.yml

@@ -46,7 +46,7 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: D:/udi/udiwms/udiwmsfile/
+file_path: D:/udi/inUdiwms/udiwmsfile/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs