数据同步，代码备份

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

@@ -25,6 +25,13 @@ public class BasicProcessStatus {
     public static final int BASIC_THIRD_PRODUCTS = 4;          //往来单位
     public static final int BASIC_THIRD_CORP = 5;          //往来单位
     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 int NEW_ALL_DI = 10;
+
+    public static final int SCHEDULE_NORMAL = 1;        //常规任务
+    public static final int SCHEDULE_TRANSFER = 2;      //需要传递任务
 
 
 }

api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java

@@ -54,8 +54,6 @@ public class AuthCheckController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
-
         String key = null;
         try {
             key = RsaUtils.publicKeyDecrypt(authCheckEntity.getRegisterCode(), RsaUtils.publicKey);

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java

@@ -84,7 +84,7 @@ public class BasicThirdSysController {
     /**
      * 扫码精灵获取第三方系统列表
      */
-//    @AuthRuleAnnotation("")
+    @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/thirdsys/get")
     public BaseResponse get(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
                             BindingResult bindingResult) {

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java

@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.sql.Date;
 import java.util.List;
 
@@ -134,7 +135,7 @@ public class UdiInfoImportLogController {
                     return ResultVOUtils.error(500, "请上传udi文件");
                 }
                 //导入数据
-                String jsonData = IoUtil.read(file.getInputStream()).toString();
+                String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
                 UdiRelevanceExportJsonResponse importData = JSONUtil.toBean(jsonData, UdiRelevanceExportJsonResponse.class);
 
                 //导入日志

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java

@@ -17,7 +17,7 @@ public interface BasicExportDao {
 
     boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
 
-    boolean deleteById(@Param("id") Integer id);
+    boolean deleteById(@Param("id") String id);
 
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
 

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java

@@ -0,0 +1,20 @@
+package com.glxp.api.admin.dao.basic;
+
+import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
+import com.glxp.api.admin.req.basic.BasicExportTimeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BasicExportTimeDao {
+
+
+    List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+}

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java

@@ -26,6 +26,7 @@ public interface BussinessLocalTypeDao {
 
     List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
 
+    List<BussinessLocalTypeEntity> filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
 
     BussinessLocalTypeEntity findBTByAction(String action);
 

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java

@@ -14,6 +14,8 @@ public interface BussinessTypeDao {
 
     List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
 
+    List<BussinessTypeEntity> filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
+
     List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
 
     boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);

api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java

@@ -0,0 +1,52 @@
+package com.glxp.api.admin.dao.basic;
+
+import com.glxp.api.admin.entity.basic.ProductInfoEntity;
+import com.glxp.api.admin.req.ListPageRequest;
+import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ProductInfoDao {
+
+    List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询
+
+    boolean insertProductInfo(ProductInfoEntity productInfoEntity);
+
+    boolean insertProductInfos(@Param("datas") List<ProductInfoEntity> productInfoEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean deleteAll(@Param("ids") List<String> ids);
+
+    boolean updateProductInfo(ProductInfoEntity productInfoEntity);
+
+    boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
+
+    List<String> findAllUuids(ListPageRequest listPageRequest);
+
+    List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid);
+
+    List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<String> filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> selectAllByUuid(@Param("ids") List<String> ids);
+
+    List<String> findAllTyshxyh();
+
+}

api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java

@@ -0,0 +1,30 @@
+package com.glxp.api.admin.dao.basic;
+
+import com.glxp.api.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.api.admin.req.basic.UdiCompanyRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UdiCompanyDao {
+
+    List<UdiCompanyEntity> selectAllTyshxyh();
+
+
+    List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest);
+
+    boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+    boolean insertUdiCompanys(@Param("udiCompanyEntities") List<UdiCompanyEntity> udiCompanyEntities);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean deleteAll(@Param("ids") List<String> ids);
+
+    boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+    List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest);
+
+}

api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java

@@ -14,8 +14,12 @@ public interface OrderDao {
 
     List<OrderEntity> listOrder(OrderQueryRequest orderQueryRequest);
 
+    List<OrderEntity> findAllByTime(OrderFilterRequest orderFilterRequest);
+
     boolean insertOrder(OrderEntity orderEntity);
 
+    boolean importOrder(OrderEntity orderEntity);
+
     boolean updateOrder(OrderEntity orderEntity);
 
     List<OrderEntity> listOrderError(OrderQueryRequest orderQueryRequest);

api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java

@@ -14,6 +14,8 @@ public interface ThrOrderDao {
 
     boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
 
+    boolean importThrOrder(ThrOrderEntity thrCorpEntity);
+
     boolean insertThrOrders(@Param("thrOrderEntities") List<ThrOrderEntity> thrOrderEntities);
 
     boolean updateThrOrder(ThrOrderEntity thrOrderEntity);

api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java

@@ -14,13 +14,15 @@ public interface ThrOrderDetailDao {
 
     boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
 
+    boolean importThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
+
     boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List<ThrOrderDetailEntity> thrOrderDetailEntities);
 
     boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
 
     boolean deleteById(@Param("id") String id);
 
-    boolean deleteByOrderIdFk(@Param("orderIdFk")String orderIdFk);
+    boolean deleteByOrderIdFk(@Param("orderIdFk") String orderIdFk);
 
     boolean deleteAll();
 

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java

@@ -8,11 +8,13 @@ import java.util.List;
 @Data
 public class BasicExportStatusEntity {
 
-    private Integer id;
+    private String id;
     private String idDatas;
     private Integer status;
     private Integer type;
     private Date updateTime;
-
+    private Integer scheduleType;
-
+    private Date startTime;
+    private Date endTime;
+    private String remark;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java

@@ -0,0 +1,13 @@
+package com.glxp.api.admin.entity.basic;
+
+import lombok.Data;
+
+@Data
+public class BasicExportStatusTimeEntity {
+
+    private Integer id;
+    private String lastUpdateTime;
+    private String key;
+    private String remark;
+
+}

api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java

@@ -0,0 +1,61 @@
+package com.glxp.api.admin.entity.basic;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductInfoEntity {
+    private Integer id;
+    private String nameCode;
+    private String packRatio;
+    private String packLevel;
+    private Integer bhxjsl;
+    private Integer bhzxxsbzsl;
+    private Integer zxxsbzbhsydysl;
+    private String bhxjcpbm;
+    private String sjcpbm;  //
+    private String bzcj;
+    private String thirdProductNo;
+    private String thirdProductName;
+    private String addType;
+    private String deviceRecordKey;
+    private Integer isUseDy;
+    private String cpmctymc;
+    private String cplb;
+    private String flbm;
+    private String ggxh;
+    private String qxlb;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarywmc;
+    private String sydycpbs;
+    private String uuid;
+    private Integer versionNumber;
+    private Integer diType;
+
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
+
+    private String ybbm;
+    private String spmc;
+    private String cphhhbh;
+    private String cpms;
+    private String cpbsbmtxmc;
+
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+
+    private Boolean isNewest;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+    private String cplx;
+    private String hchzsb;
+
+}

api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java

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

api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.api.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class BasicExportTimeRequest {
+
+    private Integer id;
+    private String key;
+}

api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java

@@ -27,5 +27,5 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
     private Integer corpType;
     private String unitId;
 
-
+    private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java

@@ -14,4 +14,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private Boolean isFilterBind;
     private Boolean spUse;
     private String code;
+    private Integer userId;
+    private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java

@@ -10,4 +10,8 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest {
     private String thirdSys;
     private String thirdSysName;
     private Boolean enable;
+    private String thirdAction;
+    private String mainAction;
+    private String localAction;
+    private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java

@@ -11,4 +11,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
     private String productUuid;
     private String udiRlIdFk;
     private String unitFk;
+    private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java

@@ -0,0 +1,15 @@
+package com.glxp.api.admin.req.basic;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class UdiCompanyRequest extends ListPageRequest {
+
+    private String ylqxzcrbarmc;
+    private String tyshxydm;
+    private String provinceCode;
+    private String cityCode;
+    private String areaCode;
+    private String updateTime;
+}

api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java

@@ -35,5 +35,6 @@ public class OrderFilterRequest extends ListPageRequest {
     private String locStorageCode;
 
     private Integer unionCtrStatus;
+    private String lastUpdateTime;
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java

@@ -4,6 +4,7 @@ import com.glxp.api.admin.req.ListPageRequest;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class FilterInvWarehouseRequest extends ListPageRequest {
@@ -15,10 +16,11 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private Boolean advanceType;
     private Boolean isDefault;
     private Date updateTime;
-    private String key;
-    private String locInvCode;
-
     private Integer level;
     private String pcode;
     private Integer userId;
+    private String locInvCode;
+    private Integer status;
+    private String lastUpdateTime;
+    private List<Integer> ids;
 }

api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java

@@ -24,4 +24,7 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String filterAction;
     private Integer userId;
 
+    private String locInvCode;
+    private String lastUpdateTime;
+
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java

@@ -13,4 +13,6 @@ public class FilterThrCorpRequest extends ListPageRequest {
     private String unitId;
     private String name;
     List<ErpUnitsResponse> thrCorpEntities;
+    private String lastUpdateTime;
+
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java

@@ -18,4 +18,6 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest {
     private String key;
     private String pcode;
     private Integer level;
+
+    private String lastUpdateTime;
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java

@@ -17,7 +17,7 @@ public class FilterThrOrderRequest extends ListPageRequest {
     private String billFlag;       //单据状态,0.未签字，1.已签字
     private String billAction;
     private String corpName;
-
+    private String lastUpdateTime;
 
     private List<ErpOrderResponse> erpOrderResponses;
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java

@@ -20,6 +20,6 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private String sptm;
     private String ybbm;
     private String supName;
-
+    private String lastUpdateTime;
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java

@@ -0,0 +1,14 @@
+package com.glxp.api.admin.res.basic;
+
+import com.glxp.api.admin.entity.basic.ProductInfoEntity;
+import com.glxp.api.admin.entity.basic.UdiCompanyEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpSyncUdiResponse {
+
+    List<ProductInfoEntity> productInfoEntityList;
+    List<UdiCompanyEntity> udiCompanyEntities;
+}

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java

@@ -0,0 +1,16 @@
+package com.glxp.api.admin.res.basic;
+
+import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
+import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
+import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBusResponse {
+
+    private List<BussinessTypeEntity> bussinessTypeEntities;
+    private List<BussinessOriginTypeEntity> bussinessOriginTypeEntities;
+    private List<BussinessLocalTypeEntity> bussinessLocalTypeEntities;
+}

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java

@@ -0,0 +1,26 @@
+package com.glxp.api.admin.res.basic;
+
+import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
+import com.glxp.api.admin.entity.basic.UdiInfoEntity;
+import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.entity.thrsys.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncDataResponse {
+
+    List<InvWarehouseEntity> invWarehouseEntities;
+    List<UdiInfoEntity> udiInfoEntities;
+    List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
+    List<ThrInvWarehouseEntity> thrInvWarehouseEntities;
+    List<ThrCorpEntity> thrCorpEntities;
+    List<ThrProductsEntity> thrProductsEntities;
+    List<ThrOrderDetailEntity> thrOrderDetailEntities;
+    List<ThrOrderEntity> thrOrderEntities;
+    List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
+    List<UdiRelevanceEntity> udiRelevanceEntities;
+}

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java

@@ -0,0 +1,16 @@
+package com.glxp.api.admin.res.basic;
+
+import com.glxp.api.admin.entity.inout.ErpOrderEntity;
+import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncOrderResponse {
+
+    List<OrderEntity> orderEntities;
+    List<ErpOrderEntity> orderDetailEntityList;
+    List<WarehouseEntity> warehouseEntityList;
+}

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java

@@ -0,0 +1,12 @@
+package com.glxp.api.admin.res.basic;
+
+import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncScheduleResponse {
+    List<BasicExportStatusEntity> basicExportStatusEntities;
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java

@@ -9,12 +9,13 @@ import java.util.List;
 
 public interface BasicExportService {
 
+    BasicExportStatusEntity findByData(String idDatas, Integer status);
 
     List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
 
     boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
 
-    boolean deleteById(Integer id);
+    boolean deleteById(String id);
 
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java

@@ -0,0 +1,21 @@
+package com.glxp.api.admin.service.basic;
+
+
+import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
+import com.glxp.api.admin.req.basic.BasicExportTimeRequest;
+
+import java.util.List;
+
+public interface BasicExportTimeService {
+
+    BasicExportStatusTimeEntity findByKey(String key);
+
+    List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java

@@ -13,6 +13,8 @@ public interface BussinessLocalTypeService {
 
     List<BussinessLocalTypeEntity> filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
 
+    List<BussinessLocalTypeEntity> filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
+
     List<BussinessLocalTypeEntity> filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
 
     List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);

api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java

@@ -15,6 +15,8 @@ public interface BussinessTypeService {
 
     List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
 
+    List<BussinessTypeEntity> filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
+
     List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
 
     BussinessTypeEntity findBTByAction(String action);

api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java

@@ -0,0 +1,50 @@
+package com.glxp.api.admin.service.basic;
+
+
+
+import com.glxp.api.admin.entity.basic.ProductInfoEntity;
+import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
+
+import java.util.List;
+
+public interface ProductInfoService {
+
+
+    //赋码用
+    //获取产品名称通用名称
+    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> selectByUuid(String uuid);
+
+    List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest);
+
+    List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate);//按更新时间查询
+
+    boolean insertProductInfo(ProductInfoEntity productInfoEntity);
+
+    boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities);
+
+    boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
+
+    boolean deleteById(String id);
+
+    boolean deleteAll(List<String> ids);
+
+    boolean updateProductInfo(ProductInfoEntity productInfoEntity);
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java

@@ -0,0 +1,28 @@
+package com.glxp.api.admin.service.basic;
+
+
+import com.glxp.api.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.api.admin.req.basic.UdiCompanyRequest;
+
+import java.util.List;
+
+public interface UdiCompanyService {
+
+    List<UdiCompanyEntity> selectAllTyshxyh();
+
+    List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest);
+
+
+    List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest);
+
+    boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+    boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities);
+
+    boolean deleteById(String id);
+
+    boolean deleteAll(List<String> ids);
+
+    boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity);
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java

@@ -12,6 +12,7 @@ public interface UdiRelevanceService {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
 
+    List<UdiRelevanceEntity> filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest);
 
     UdiRelevanceResponse selectByNameCode(String nameCode);
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.service.basic.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.basic.BasicExportDao;
 import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
@@ -19,6 +20,18 @@ public class BasicExportServiceImpl implements BasicExportService {
     @Resource
     BasicExportDao basicExportDao;
 
+    @Override
+    public BasicExportStatusEntity findByData(String idDatas, Integer status) {
+        BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
+        basicExportStatusRequest.setStatus(status);
+        basicExportStatusRequest.setIdDatas(idDatas);
+        List<BasicExportStatusEntity> basicExportStatusEntities = basicExportDao.filterExportStatus(basicExportStatusRequest);
+        if (CollUtil.isNotEmpty(basicExportStatusEntities)) {
+            return basicExportStatusEntities.get(0);
+        }
+        return null;
+    }
+
     @Override
     public List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest) {
         if (basicExportStatusRequest == null) {
@@ -37,7 +50,7 @@ public class BasicExportServiceImpl implements BasicExportService {
     }
 
     @Override
-    public boolean deleteById(Integer id) {
+    public boolean deleteById(String id) {
         return basicExportDao.deleteById(id);
     }
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java

@@ -0,0 +1,56 @@
+package com.glxp.api.admin.service.basic.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.glxp.api.admin.dao.basic.BasicExportTimeDao;
+import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
+import com.glxp.api.admin.req.basic.BasicExportTimeRequest;
+import com.glxp.api.admin.service.basic.BasicExportTimeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BasicExportTimeServiceImpl implements BasicExportTimeService {
+
+    @Resource
+    BasicExportTimeDao basicExportTimeDao;
+
+
+    @Override
+    public BasicExportStatusTimeEntity findByKey(String key) {
+        BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest();
+        basicExportTimeRequest.setKey(key);
+        List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = filterExportStatus(basicExportTimeRequest);
+        if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) {
+            return basicExportStatusTimeEntities.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest) {
+        if (basicExportStatusRequest == null) {
+            return Collections.emptyList();
+        }
+        return basicExportTimeDao.filterExportStatus(basicExportStatusRequest);
+    }
+
+    @Override
+    public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
+        return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity);
+
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return basicExportTimeDao.deleteById(id);
+    }
+
+    @Override
+    public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
+        return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity);
+
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java

@@ -43,6 +43,12 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
         return data;
     }
 
+    @Override
+    public List<BussinessLocalTypeEntity> filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
+        List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterAllList(bussinessTypeFilterRequest);
+        return data;
+    }
+
     @Override
     public List<BussinessLocalTypeEntity> filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
         return bussinessLocalTypeDao.filterUnBind(bussinessTypeFilterRequest);

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java

@@ -51,6 +51,12 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
         return data;
     }
 
+    @Override
+    public List<BussinessTypeEntity> filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
+        List<BussinessTypeEntity> data = bussinessTypeDao.filterAllList(bussinessTypeFilterRequest);
+        return data;
+    }
+
     @Override
     public List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
         if (bussinessTypeFilterRequest == null) {
@@ -135,7 +141,7 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
 
     @Override
     public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) {
-        if (!StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())){
+        if (!StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())) {
             BussinessTypeEntity correspondType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
             if (correspondType != null && correspondType.getCorpType() == 1) {
                 bussinessTypeDao.updateSupplementOrderType(bussinessTypeEntity.getSupplementOrderType(), bussinessTypeEntity.getAction());

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java

@@ -0,0 +1,153 @@
+package com.glxp.api.admin.service.basic.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.basic.ProductInfoDao;
+import com.glxp.api.admin.entity.basic.ProductInfoEntity;
+import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
+import com.glxp.api.admin.service.basic.ProductInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class ProductInfoServiceImpl implements ProductInfoService {
+
+    @Resource
+    ProductInfoDao productInfoDao;
+
+    @Override
+    public List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        List<ProductInfoEntity> data = productInfoDao.filterCpmctymc(productInfoFilterRequest);
+        return data;
+    }
+
+    @Override
+    public List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+
+        List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
+        return data;
+    }
+
+    @Override
+    public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+        return productInfoDao.filterUdiByTyshxydm(productInfoFilterRequest);
+
+    }
+
+    @Override
+    public List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+        return productInfoDao.filterUdiByCreditNo(productInfoFilterRequest);
+    }
+
+    @Override
+    public List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+        return productInfoDao.filterUdiByNewest(productInfoFilterRequest);
+    }
+
+    @Override
+    public List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+        List<String> uuids = productInfoDao.filterUuidByCreditNo(productInfoFilterRequest);
+        if (uuids != null && uuids.size() > 0)
+            return productInfoDao.selectAllByUuid(uuids);
+        else
+            return null;
+    }
+
+    @Override
+    public List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (productInfoFilterRequest.getPage() != null) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        }
+
+        List<ProductInfoEntity> data = productInfoDao.filterUdi(productInfoFilterRequest);
+        return data;
+    }
+
+    @Override
+    public List<ProductInfoEntity> selectByUuid(String uuid) {
+        List<ProductInfoEntity> data = productInfoDao.selectByUuid(uuid);
+        return data;
+    }
+
+    @Override
+    public List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit() + 1;
+        productInfoFilterRequest.setPage(offset);
+        return productInfoDao.syncDlUdi(productInfoFilterRequest);
+    }
+
+    @Override
+    public List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest) {
+        List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
+        return data;
+    }
+
+    public List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate) {
+        return productInfoDao.selectByUpdateTime(startDate, endDate);
+    }
+
+    @Override
+    public boolean insertProductInfo(ProductInfoEntity productInfoEntity) {
+        return productInfoDao.insertProductInfo(productInfoEntity);
+    }
+
+    @Override
+    public boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities) {
+        return productInfoDao.insertProductInfos(productInfoEntities);
+    }
+
+    @Override
+    public boolean updateProductByUuid(ProductInfoEntity productInfoEntity) {
+        return productInfoDao.updateProductByUuid(productInfoEntity);
+    }
+
+    @Override
+    public boolean updateProductInfo(ProductInfoEntity productInfoEntity) {
+        return productInfoDao.updateProductInfo(productInfoEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return productInfoDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteAll(List<String> ids) {
+        return productInfoDao.deleteAll(ids);
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java

@@ -0,0 +1,65 @@
+package com.glxp.api.admin.service.basic.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.basic.UdiCompanyDao;
+import com.glxp.api.admin.entity.basic.UdiCompanyEntity;
+import com.glxp.api.admin.req.basic.UdiCompanyRequest;
+import com.glxp.api.admin.service.basic.UdiCompanyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class UdiCompanyServiceImpl implements UdiCompanyService {
+
+    @Resource
+    UdiCompanyDao udiCompanyDao;
+
+    @Override
+    public List<UdiCompanyEntity> selectAllTyshxyh() {
+        return udiCompanyDao.selectAllTyshxyh();
+    }
+
+    @Override
+    public List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest) {
+        int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit() + 1;
+        udiCompanyRequest.setPage(offset);
+        return udiCompanyDao.syncDlCompany(udiCompanyRequest);
+    }
+
+
+    @Override
+    public List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest) {
+        if (udiCompanyRequest.getPage() != null && udiCompanyRequest.getLimit() != null) {
+            int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit();
+            PageHelper.offsetPage(offset, udiCompanyRequest.getLimit());
+        }
+        return udiCompanyDao.filterUdiCompany(udiCompanyRequest);
+    }
+
+    @Override
+    public boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity) {
+        return udiCompanyDao.insertUdiCompany(udiCompanyEntity);
+    }
+
+    @Override
+    public boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities) {
+        return udiCompanyDao.insertUdiCompanys(udiCompanyEntities);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return udiCompanyDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteAll(List<String> ids) {
+        return udiCompanyDao.deleteAll(ids);
+    }
+
+    @Override
+    public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) {
+        return udiCompanyDao.updateUdiCompany(udiCompanyEntity);
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -36,6 +36,12 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
         return data;
     }
 
+    @Override
+    public List<UdiRelevanceEntity> filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest) {
+        List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiInfoRequest);
+        return data;
+    }
+
     @Override
     public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
         return udiRelevanceDao.batchSelectByUuid(uuids);

api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java

@@ -18,6 +18,7 @@ public interface OrderService {
 
     boolean updateOrder(OrderEntity orderEntity);
 
+    List<OrderEntity> findAllByTime(OrderFilterRequest orderFilterRequest);
 
     List<OrderEntity> listOrderRepeat(OrderQueryRequest orderQueryRequest);
 

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -62,6 +62,10 @@ public class OrderServiceImpl implements OrderService {
         return orderDao.listOrder(orderQueryRequest);
     }
 
+    @Override
+    public List<OrderEntity> findAllByTime(OrderFilterRequest orderFilterRequest) {
+        return orderDao.findAllByTime(orderFilterRequest);
+    }
 
     @Override
     public boolean insertOrder(OrderEntity orderEntity) {

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -1,20 +1,52 @@
 package com.glxp.api.admin.thread;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.admin.constant.BasicProcessStatus;
-import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
+import com.glxp.api.admin.constant.ConstantStatus;
+import com.glxp.api.admin.dao.basic.*;
+import com.glxp.api.admin.dao.inout.CodesDao;
+import com.glxp.api.admin.dao.inout.OrderDao;
+import com.glxp.api.admin.dao.inout.OrderDetailDao;
+import com.glxp.api.admin.dao.thrsys.ThrCorpDao;
+import com.glxp.api.admin.dao.thrsys.ThrOrderDao;
+import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao;
+import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
+import com.glxp.api.admin.entity.basic.*;
+import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
+import com.glxp.api.admin.entity.inout.ErpOrderEntity;
+import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
-import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse;
+import com.glxp.api.admin.entity.thrsys.ThrCorpEntity;
-import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
+import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
+import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
+import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
+import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
+import com.glxp.api.admin.res.basic.*;
 import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse;
 import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
+import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
+import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
+import com.glxp.api.admin.util.CustomUtil;
+import com.glxp.api.admin.util.FileUtils;
+import com.glxp.api.admin.util.RedisUtil;
 import com.glxp.api.admin.util.SpGetHttp;
 import com.glxp.api.common.res.BaseResponse;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.TransactionIsolationLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -29,6 +61,15 @@ public class DlBasicService {
     BasicCorpImportService basicCorpImportService;
     @Resource
     InvWarehouseService invWarehouseService;
+    @Resource
+    SqlSessionFactory sqlSessionFactory;
+    @Resource
+    OrderService orderService;
+    @Resource
+    HeartService heartService;
+    @Resource
+    RedisUtil redisUtil;
+    private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
 
     public void dlBasicUdiInfo() {
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.BASIC_UDI + "");
@@ -86,4 +127,324 @@ public class DlBasicService {
     }
 
 
+//------------------------------------------------------------
+
+    public void dlAllData() {
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DATA + "");
+        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
+        if (pageSimpleResponse != null) {
+            List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
+            if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DATA);
+                    BaseResponse<SpsSyncDataResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<SpsSyncDataResponse>>() {
+                    });
+                    if (response.getCode() == 20000 && response.getData() != null) {
+                        SpsSyncDataResponse syncDataResponse = response.getData();
+                        SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+                        //仓库字典导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) {
+                            invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities());
+                        }
+
+                        //关联表导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) {
+                            try {
+                                List<UdiRelevanceEntity> corpList = syncDataResponse.getUdiRelevanceEntities();
+                                UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class);
+                                for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) {
+                                    mapper.insertUdiRelevance(basicUnitMaintainEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        //耗材字典导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
+                            if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
+                                try {
+                                    List<UdiInfoEntity> corpList = syncDataResponse.getUdiInfoEntities();
+                                    UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
+                                    for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
+                                        mapper.insertUdiInfo(basicUnitMaintainEntity);
+                                    }
+                                    batchSession.commit();
+                                } catch (Exception e) {
+                                }
+                            }
+                        }
+
+                        //往来单位信息导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getBasicUnitMaintainEntities())) {
+                            try {
+                                List<BasicUnitMaintainEntity> corpList = syncDataResponse.getBasicUnitMaintainEntities();
+                                BasicUnitMaintainDao mapper = batchSession.getMapper(BasicUnitMaintainDao.class);
+                                for (BasicUnitMaintainEntity basicUnitMaintainEntity : corpList) {
+                                    mapper.importBasicUnitMaintain(basicUnitMaintainEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+
+                        //供应商关联表导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getCompanyProductRelevanceEntities())) {
+                            try {
+                                List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = syncDataResponse.getCompanyProductRelevanceEntities();
+                                CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class);
+                                for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
+                                    mapper.importCompanyProductRelevance(companyProductRelevanceEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+
+
+                        //第三方产品信息导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) {
+
+                            try {
+                                List<ThrProductsEntity> thrProductsEntities = syncDataResponse.getThrProductsEntities();
+                                ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class);
+                                for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
+                                    mapper.insertThrProducts(thrProductsEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+
+
+                        //第三方往来单位信息导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getThrCorpEntities())) {
+                            try {
+                                List<ThrCorpEntity> thrCorpEntities = syncDataResponse.getThrCorpEntities();
+                                ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class);
+                                thrCorpEntities.forEach(thrCorpEntity -> {
+                                    mapper.importThrCorp(thrCorpEntity);
+                                });
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+
+                        //第三方业务单据导入
+                        if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities())) {
+                            try {
+                                List<ThrOrderEntity> thrOrderEntities = syncDataResponse.getThrOrderEntities();
+                                ThrOrderDao mapper = batchSession.getMapper(ThrOrderDao.class);
+                                thrOrderEntities.forEach(thrCorpEntity -> {
+                                    mapper.importThrOrder(thrCorpEntity);
+                                });
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+
+                        //第三方业务单据详情
+                        if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderDetailEntities())) {
+                            try {
+                                List<ThrOrderDetailEntity> thrOrderDetailEntities = syncDataResponse.getThrOrderDetailEntities();
+                                ThrOrderDetailDao mapper = batchSession.getMapper(ThrOrderDetailDao.class);
+                                thrOrderDetailEntities.forEach(thrOrderDetailEntity -> {
+                                    mapper.importThrOrderDetail(thrOrderDetailEntity);
+                                });
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+                    }
+                }
+            }
+        }
+    }
+
+
+    public void dlAllBus() {
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_BUS + "");
+        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
+        if (pageSimpleResponse != null) {
+            List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
+            if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_BUS);
+                    BaseResponse<SpsSyncBusResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<SpsSyncBusResponse>>() {
+                    });
+                    if (response.getCode() == 20000 && response.getData() != null) {
+                        SpsSyncBusResponse syncDataResponse = response.getData();
+                        SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+
+                        //扫码单据
+                        if (CollUtil.isNotEmpty(syncDataResponse.getBussinessTypeEntities())) {
+                            try {
+                                List<BussinessTypeEntity> bussinessTypeEntities = syncDataResponse.getBussinessTypeEntities();
+                                BussinessTypeDao mapper = batchSession.getMapper(BussinessTypeDao.class);
+                                for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
+                                    mapper.insertBussinessType(bussinessTypeEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        //业务单据
+                        if (CollUtil.isNotEmpty(syncDataResponse.getBussinessLocalTypeEntities())) {
+                            try {
+                                List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = syncDataResponse.getBussinessLocalTypeEntities();
+                                BussinessLocalTypeDao mapper = batchSession.getMapper(BussinessLocalTypeDao.class);
+                                for (BussinessLocalTypeEntity bussinessTypeEntity : bussinessLocalTypeEntities) {
+                                    mapper.insertBussinessType(bussinessTypeEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        //原始单据
+                        if (CollUtil.isNotEmpty(syncDataResponse.getBussinessOriginTypeEntities())) {
+                            try {
+                                List<BussinessOriginTypeEntity> bussinessTypeEntities = syncDataResponse.getBussinessOriginTypeEntities();
+                                BussinessOriginTypeDao mapper = batchSession.getMapper(BussinessOriginTypeDao.class);
+                                for (BussinessOriginTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
+                                    mapper.insertBusOriginType(bussinessTypeEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    public void dlAllOrder() {
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + "");
+        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
+        if (pageSimpleResponse != null) {
+            List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
+            if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_ORDER);
+                    BaseResponse<SpsSyncOrderResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<SpsSyncOrderResponse>>() {
+                    });
+                    if (response.getCode() == 20000 && response.getData() != null) {
+                        SpsSyncOrderResponse syncDataResponse = response.getData();
+                        SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+                        if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
+                            try {
+                                List<OrderEntity> orderEntities = syncDataResponse.getOrderEntities();
+                                OrderDao mapper = batchSession.getMapper(OrderDao.class);
+                                for (OrderEntity orderEntity : orderEntities) {
+                                    orderEntity.setFromType(ConstantStatus.FROM_UDISP);
+                                    orderEntity.setReceiveStatus(0);
+                                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                                    orderService.deleteByOrderId(orderEntity.getId());
+                                    mapper.importOrder(orderEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) {
+                            try {
+                                List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList();
+                                OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class);
+                                for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
+                                    mapper.insertErpOrder(erpOrderEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
+                            try {
+                                List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
+                                CodesDao mapper = batchSession.getMapper(CodesDao.class);
+                                for (WarehouseEntity warehouseEntity : warehouseEntityList) {
+                                    mapper.insertWarehouse(warehouseEntity);
+                                }
+                                batchSession.commit();
+                            } catch (Exception e) {
+                            }
+                        }
+                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    public void dlScheduleStatus() {
+        BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
+        basicExportStatusRequest.setScheduleType(BasicProcessStatus.SCHEDULE_TRANSFER);
+        BaseResponse<List<BasicExportStatusEntity>> basicStatuss = spGetHttp.getBasicStatus(basicExportStatusRequest);
+        if (CollUtil.isNotEmpty(basicStatuss.getData())) {
+            for (BasicExportStatusEntity basicExportStatusEntity : basicStatuss.getData()) {
+                //todo处理上游穿过来的任务
+                logger.info("---------------处理上游传过来的任务-------------------");
+                if (basicExportStatusEntity.getScheduleType() == BasicProcessStatus.SCHEDULE_TRANSFER) {
+                    if (basicExportStatusEntity.getId().equals("AsyncUploadAllData")) {
+                        heartService.uploadAllBus();
+                        heartService.uploadAllData();
+                        heartService.uploadAllOrder();
+                        heartService.uploadScheduleList();
+                        redisUtil.set("SPS_SYNC_UPLOAD_DATA", System.currentTimeMillis());
+                    }
+                }
+
+                spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+            }
+        }
+
+    }
+
+
+    public void dlAllUDI() {
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + "");
+        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
+        if (pageSimpleResponse != null) {
+            List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
+            if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+
+                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DI);
+                    BaseResponse<SpSyncUdiResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<SpSyncUdiResponse>>() {
+                    });
+                    if (response.getCode() == 20000 && response.getData() != null) {
+                        SpSyncUdiResponse spSyncUdiResponse = response.getData();
+                        SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+                        if (CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) {
+                            List<UdiCompanyEntity> udiCompanyEntities = spSyncUdiResponse.getUdiCompanyEntities();
+                            UdiCompanyDao mapper = batchSession.getMapper(UdiCompanyDao.class);
+                            for (UdiCompanyEntity udiCompanyEntity : udiCompanyEntities) {
+                                mapper.insertUdiCompany(udiCompanyEntity);
+                            }
+                            batchSession.commit();
+                        }
+
+                        if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())) {
+                            List<ProductInfoEntity> productInfoEntities = spSyncUdiResponse.getProductInfoEntityList();
+                            ProductInfoDao mapper = batchSession.getMapper(ProductInfoDao.class);
+                            for (ProductInfoEntity productInfoEntity : productInfoEntities) {
+                                mapper.insertProductInfo(productInfoEntity);
+                            }
+                            batchSession.commit();
+                        }
+                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+                    }
+                }
+
+            }
+        }
+
+
+    }
+
+
 }

api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java

@@ -52,82 +52,14 @@ public class DlUploadService {
         } else if (curTime - lastTime > timeInterval) {
             logger.info("每分钟执行一次基础信息下载");
             redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
-            dlBasicService.dlBasicUdiInfo();
+            dlBasicService.dlAllData();
-            dlBasicService.dlBasicCorp();
+            dlBasicService.dlAllBus();
-            dlBasicService.dlBasicInv();
+            dlBasicService.dlAllOrder();
+            dlBasicService.dlScheduleStatus();
+            dlBasicService.dlAllUDI();
         }
     }
 
 
-    //定时扫描本地共享文件夹---上传到上游
-    public void scanFolderUpload() {
-        SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
-        if (upConnect.getParamValue().equals("1")) {
-            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
-            long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
-            long curTime = System.currentTimeMillis();
-            Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
-            if (lastTime == null) {
-                lastTime = System.currentTimeMillis();
-                redisUtil.set("DL_ORDER_STATUS", lastTime);
-            } else if (curTime - lastTime > timeInterval) {
-                logger.info("每分钟执行一次基础信息下载");
-                redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
-                dlBasicService.dlBasicUdiInfo();
-                dlBasicService.dlBasicCorp();
-                dlBasicService.dlBasicInv();
-            }
-        }
-    }
-
-    //定时扫描本地共享文件夹---上传到上游
-    public void scanFolderDown() {
-        SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
-        if (upConnect.getParamValue().equals("1")) {
-            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
-            long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
-            long curTime = System.currentTimeMillis();
-            Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
-            if (lastTime == null) {
-                redisUtil.set("DL_BASIC_UDIINFO_STATUS", System.currentTimeMillis());
-            } else if (curTime - lastTime > timeInterval) {
-                logger.info("每分钟执行一次基础信息下载");
-                redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
-                dlBasicService.dlBasicUdiInfo();
-                dlBasicService.dlBasicCorp();
-                dlBasicService.dlBasicInv();
-            }
-        }
-    }
-
-    public void dlBasicCorp() {
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_corp_status");
-        long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
-        long curTime = System.currentTimeMillis();
-        //任务一,定时下载供应商平台已完成单据
-        Long lastTime = (Long) redisUtil.get("DL_BASIC_CORP_STATUS");
-        if (lastTime == null) {
-            redisUtil.set("DL_BASIC_CORP_STATUS", System.currentTimeMillis());
-        } else if (curTime - lastTime > timeInterval) {
-            logger.info("每分钟执行一次单据下载");
-            redisUtil.set("DL_BASIC_CORP_STATUS", curTime);
-            dlBasicService.dlBasicCorp();
-        }
-    }
-
-    public void dlBasicInv() {
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_inv_status");
-        long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
-        long curTime = System.currentTimeMillis();
-        //任务一,定时下载供应商平台已完成单据
-        Long lastTime = (Long) redisUtil.get("DL_BASIC_INV_STATUS");
-        if (lastTime == null) {
-            redisUtil.set("DL_BASIC_INV_STATUS", System.currentTimeMillis());
-        } else if (curTime - lastTime > timeInterval) {
-            logger.info("每分钟执行一次单据下载");
-            redisUtil.set("DL_BASIC_INV_STATUS", curTime);
-            dlBasicService.dlBasicInv();
-        }
-    }
 
 }

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -0,0 +1,186 @@
+package com.glxp.api.admin.thread;
+
+import cn.hutool.core.collection.CollUtil;
+import com.glxp.api.admin.constant.BasicProcessStatus;
+import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
+import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
+import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
+import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
+import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
+import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
+import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse;
+import com.glxp.api.admin.service.basic.BasicExportService;
+import com.glxp.api.admin.service.basic.BasicExportTimeService;
+import com.glxp.api.admin.util.CustomUtil;
+import com.glxp.api.admin.util.DateUtil;
+import com.glxp.api.admin.util.SpGetHttp;
+import com.glxp.api.common.res.BaseResponse;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class HeartService {
+    @Resource
+    BasicExportService basicExportService;
+    @Resource
+    UpBasicService upBasicService;
+    @Resource
+    SpGetHttp spGetHttp;
+    @Resource
+    BasicExportTimeService basicExportTimeService;
+
+    public void uploadAllOrder() {
+        //自动创建要求被下载已完成单据任务
+        BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData("AutoUploadOrder", 0);
+        if (basicExportStatusEntity1 == null) {
+            BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity();
+            orderStatusEntity.setId(CustomUtil.getId());
+            orderStatusEntity.setIdDatas("AutoUploadOrder");
+            orderStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER);
+            orderStatusEntity.setUpdateTime(new Date());
+            orderStatusEntity.setStartTime(new Date());
+            orderStatusEntity.setStatus(0);
+            orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
+            basicExportService.insertExportStatus(orderStatusEntity);
+            basicExportStatusEntity1 = orderStatusEntity;
+        }
+        SpsSyncOrderResponse spsSyncOrderResponse = upBasicService.upAllOrder();
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+        basicExportStatusTimeEntity.setKey("AutoUploadOrder");
+        if (CollUtil.isEmpty(spsSyncOrderResponse.getWarehouseEntityList()) && CollUtil.isEmpty(spsSyncOrderResponse.getOrderEntities()) && CollUtil.isEmpty(spsSyncOrderResponse.getOrderDetailEntityList())) {
+            basicExportStatusEntity1.setRemark("当前没有数据需要更新");
+            basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+        } else {
+            BaseResponse<String> baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse);
+            if (baseResponse1.getCode() == 20000) {
+                basicExportStatusEntity1.setStatus(1);
+                basicExportStatusEntity1.setEndTime(new Date());
+                basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+            } else {
+                basicExportStatusEntity1.setRemark(baseResponse1.getMessage());
+            }
+        }
+        basicExportStatusEntity1.setUpdateTime(new Date());
+        basicExportService.updateExportStatus(basicExportStatusEntity1);
+    }
+
+    public void uploadAllBus() {
+        //自动创建要求被下载单据类型任务
+        BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData("AutoUploadBusType", 0);
+        if (basicExportStatusEntity2 == null) {
+            BasicExportStatusEntity busTypetatusEntity = new BasicExportStatusEntity();
+            busTypetatusEntity.setId(CustomUtil.getId());
+            busTypetatusEntity.setIdDatas("AutoUploadBusType");
+            busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS);
+            busTypetatusEntity.setUpdateTime(new Date());
+            busTypetatusEntity.setStartTime(new Date());
+            busTypetatusEntity.setStatus(0);
+            busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
+            basicExportService.insertExportStatus(busTypetatusEntity);
+            basicExportStatusEntity2 = busTypetatusEntity;
+        }
+        SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus();
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+        basicExportStatusTimeEntity.setKey("AutoUploadBusType");
+        if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities()) && CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities())
+                && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())) {
+            basicExportStatusEntity2.setRemark("当前没有数据需要更新!");
+            basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+        } else {
+            BaseResponse<String> baseResponse2 = spGetHttp.postAllBus(spsSyncBusResponse);
+            if (baseResponse2.getCode() == 20000) {
+                basicExportStatusEntity2.setStatus(1);
+                basicExportStatusEntity2.setEndTime(new Date());
+                basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+            } else {
+                basicExportStatusEntity2.setRemark(baseResponse2.getMessage());
+            }
+        }
+
+
+        basicExportStatusEntity2.setUpdateTime(new Date());
+        basicExportService.updateExportStatus(basicExportStatusEntity2);
+    }
+
+    public void uploadAllData() {
+        //自动创建要求被下载基础信息任务
+        BasicExportStatusEntity basicExportStatusEntity3 = basicExportService.findByData("AutoUploadAllData", 0);
+        if (basicExportStatusEntity3 == null) {
+            BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
+            basicExportStatusEntity.setId(CustomUtil.getId());
+            basicExportStatusEntity.setIdDatas("AutoUploadAllData");
+            basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA);
+            basicExportStatusEntity.setUpdateTime(new Date());
+            basicExportStatusEntity.setStartTime(new Date());
+            basicExportStatusEntity.setStatus(0);
+            basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
+            basicExportService.insertExportStatus(basicExportStatusEntity);
+            basicExportStatusEntity3 = basicExportStatusEntity;
+
+        }
+        SpsSyncDataResponse syncDataResponse = upBasicService.upAllData();
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+        basicExportStatusTimeEntity.setKey("AutoUploadAllData");
+        if (CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities()) && CollUtil.isEmpty(syncDataResponse.getThrOrderEntities())
+                && CollUtil.isEmpty(syncDataResponse.getInvWarehouseEntities())
+                && CollUtil.isEmpty(syncDataResponse.getBasicUnitMaintainEntities())
+                && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities())
+                && CollUtil.isEmpty(syncDataResponse.getThrCorpEntities())
+                && CollUtil.isEmpty(syncDataResponse.getUdiInfoEntities())
+                && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())
+                && CollUtil.isEmpty(syncDataResponse.getThrProductsEntities())
+                && CollUtil.isEmpty(syncDataResponse.getThrInvWarehouseEntities())
+        ) {
+            basicExportStatusEntity3.setRemark("当前没有数据需要更新");
+            basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+        } else {
+            BaseResponse<String> baseResponse = spGetHttp.postAllBaseData(syncDataResponse);
+            if (baseResponse.getCode() == 20000) {
+                basicExportStatusEntity3.setStatus(1);
+                basicExportStatusEntity3.setEndTime(new Date());
+                basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
+            } else {
+                basicExportStatusEntity3.setRemark(baseResponse.getMessage());
+            }
+        }
+        basicExportStatusEntity3.setUpdateTime(new Date());
+        basicExportService.updateExportStatus(basicExportStatusEntity3);
+    }
+
+    public void uploadScheduleList() {
+        //自动创建要求被下载基础信息任务
+
+        BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
+        basicExportStatusRequest.setScheduleType(2);
+        List<BasicExportStatusEntity> basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest);
+        if (CollUtil.isNotEmpty(basicExportStatusEntities)) {
+            SpsSyncScheduleResponse spsSyncScheduleResponse = new SpsSyncScheduleResponse();
+            spsSyncScheduleResponse.setBasicExportStatusEntities(basicExportStatusEntities);
+            BaseResponse<String> baseResponse = spGetHttp.postAllSchedule(spsSyncScheduleResponse);
+            if (baseResponse.getCode() == 20000) {
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+                    basicExportService.deleteById(basicExportStatusEntity.getId());
+                }
+            } else {
+
+                for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
+                    basicExportStatusEntity.setRemark(baseResponse.getMessage());
+                    basicExportStatusEntity.setUpdateTime(new Date());
+                    basicExportService.updateExportStatus(basicExportStatusEntity);
+                }
+
+            }
+
+
+        }
+
+
+    }
+
+}

api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java

@@ -1,12 +1,27 @@
 package com.glxp.api.admin.thread;
 
+import cn.hutool.core.collection.CollUtil;
+import com.glxp.api.admin.constant.BasicProcessStatus;
 import com.glxp.api.admin.constant.RedisContant;
 import com.glxp.api.admin.dao.schedule.ScheduledDao;
+import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
+import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
 import com.glxp.api.admin.entity.info.ScheduledEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
+import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
 import com.glxp.api.admin.req.info.ScheduledRequest;
+import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
+import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
+import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
+import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse;
+import com.glxp.api.admin.service.basic.BasicExportService;
+import com.glxp.api.admin.service.basic.BasicExportTimeService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
+import com.glxp.api.admin.util.CustomUtil;
+import com.glxp.api.admin.util.DateUtil;
 import com.glxp.api.admin.util.RedisUtil;
+import com.glxp.api.admin.util.SpGetHttp;
+import com.glxp.api.common.res.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -16,6 +31,8 @@ import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 
 @Component
@@ -29,11 +46,10 @@ public class HeartTask implements SchedulingConfigurer {
     RedisUtil redisUtil;
     @Resource
     SystemParamConfigService systemParamConfigService;
-    @Resource
-    DlSpOrderService dlSpOrderService;
-
     @Resource
     DlUploadService dlUploadService;
+    @Resource
+    HeartService heartService;
 
     @Override
     public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
@@ -57,24 +73,43 @@ public class HeartTask implements SchedulingConfigurer {
 
         SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
         if (upConnect.getParamValue().equals("1")) {
-            dlUploadService.dlOrder();
+
-            dlUploadService.dlBasicUdiInfo();
+            //定时上传最近更新数据至上游轮询时间
-        }
+            SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("sps_sync_upload_data");
+            long timeInterval1 = Long.parseLong(systemParamConfigEntity1.getParamValue()) * 60 * 1000;
+            long curTime1 = System.currentTimeMillis();
+            Long lastTime1 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_DATA");
+            if (lastTime1 == null) {
+                lastTime1 = System.currentTimeMillis();
+                redisUtil.set("SPS_SYNC_UPLOAD_DATA", lastTime1);
+            }
+            if (curTime1 - lastTime1 > timeInterval1) {
+                heartService.uploadAllBus();
+                heartService.uploadAllData();
+                heartService.uploadAllOrder();
+                heartService.uploadScheduleList();
+                redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1);
+            }
 
 
-//        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_order_status");
+            //定时下载上游最近更新数据轮询时间
-//        long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
+            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_donwload_data");
-//        long curTime = System.currentTimeMillis();
+            long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
-//        //任务一,定时下载供应商平台已完成单据
+            long curTime = System.currentTimeMillis();
-//        Long lastTime = (Long) redisUtil.get(RedisContant.DL_ORDER_STATUS);
+            Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA");
-//        if (lastTime == null) {
+            if (lastTime == null) {
-//            redisUtil.set(RedisContant.DL_ORDER_STATUS, System.currentTimeMillis());
+                lastTime = System.currentTimeMillis();
-//        }
+                redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", lastTime);
-//        if (curTime - lastTime > timeInterval) {
+            }
-//            logger.info("每分钟执行一次单据下载");
+            if (curTime - lastTime > timeInterval) {
-//            redisUtil.set(RedisContant.DL_ORDER_STATUS, curTime);
+                dlUploadService.dlBasicUdiInfo();
-//            dlSpOrderService.dlOrdedrs();
+                redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime);
-//        }
+            }
+
+        }
+
 
     }
+
+
 }

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -0,0 +1,219 @@
+package com.glxp.api.admin.thread;
+
+import cn.hutool.core.collection.CollUtil;
+import com.glxp.api.admin.constant.ConstantStatus;
+import com.glxp.api.admin.dao.basic.UdiInfoDao;
+import com.glxp.api.admin.entity.basic.*;
+import com.glxp.api.admin.entity.inout.ErpOrderEntity;
+import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseEntity;
+import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.entity.thrsys.*;
+import com.glxp.api.admin.req.basic.*;
+import com.glxp.api.admin.req.inout.OrderFilterRequest;
+import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.api.admin.req.thrsys.*;
+import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
+import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
+import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
+import com.glxp.api.admin.service.basic.*;
+import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
+import com.glxp.api.admin.service.inout.CodesService;
+import com.glxp.api.admin.service.inout.OrderDetailService;
+import com.glxp.api.admin.service.inout.OrderService;
+import com.glxp.api.admin.service.inventory.InvWarehouseService;
+import com.glxp.api.admin.service.thrsys.*;
+import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class UpBasicService {
+
+
+    //基础信息
+    @Resource
+    InvWarehouseService invWarehouseService;
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+    @Resource
+    UdiInfoDao udiInfoDao;
+    @Resource
+    BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    ThrInvWarehouseService thrInvWarehouseService;
+    @Resource
+    ThrCorpService thrCorpService;
+    @Resource
+    ThrProductsService thrProductsService;
+    @Resource
+    ThrOrderService thrOrderService;
+    @Resource
+    ThrOrderDetailService thrOrderDetailService;
+    @Resource
+    private CompanyProductRelevanceService companyProductRelevanceService;
+    @Resource
+    private BasicExportTimeService basicExportTimeService;
+
+
+    public SpsSyncDataResponse upAllData() {
+
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadAllData");
+        if (basicExportStatusTimeEntity == null) {
+            basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        }
+
+        //仓库字典
+        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        filterInvWarehouseRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
+
+        //耗材字典
+        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+        filterUdiInfoRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
+        List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.filterUdiEntity(filterUdiInfoRequest);
+        List<String> results = new ArrayList<>();
+        udiRelevanceEntities.forEach(
+                item -> {
+                    results.add(item.getUuid() + "");
+                }
+        );
+        List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
+        if (results.size() > 0)
+            udiInfoEntities = udiInfoDao.batchSelectByUuid(results);
+
+
+        //往来单位字典
+        BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest();
+        basicUnitMaintainFilterRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
+        List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+
+
+        //第三方仓库信息
+        FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
+        filterThrInvWarehouseRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
+
+
+        //第三方往来单位
+        FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrCorpRequest);
+        List<ThrCorpEntity> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
+
+        //第三方产品信息
+        FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrProductsRequest);
+        List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
+
+        //第三方业务单据
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrOrderRequest);
+        List<ThrOrderDetailEntity> allOrderDetailEntities = new ArrayList<>();
+        List<ThrOrderEntity> thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest);
+        for (ThrOrderEntity thrOrderEntity : thrOrderEntities) {
+            FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
+            filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
+            List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
+            if (!thrOrderDetailEntities.isEmpty()) {
+                allOrderDetailEntities.addAll(thrOrderDetailEntities);
+            }
+        }
+
+        //供应商产品信息关联表
+        FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, filterCompanyProductRelevanceRequest);
+        List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
+
+        SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
+        syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities);
+        syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
+        syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities);
+        syncDataResponse.setThrCorpEntities(thrCorpEntities);
+        syncDataResponse.setThrInvWarehouseEntities(thrInvWarehouseEntities);
+        syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities);
+        syncDataResponse.setThrOrderEntities(thrOrderEntities);
+        syncDataResponse.setUdiInfoEntities(udiInfoEntities);
+        syncDataResponse.setThrProductsEntities(thrProductsEntities);
+        syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities);
+
+        return syncDataResponse;
+
+    }
+
+    //单据类型
+    @Resource
+    BussinessTypeService bussinessTypeService;
+    @Resource
+    BussinessLocalTypeService bussinessLocalTypeService;
+    @Resource
+    BussinessOriginTypeService bussinessOriginTypeService;
+
+    public SpsSyncBusResponse upAllBus() {
+
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadBusType");
+        if (basicExportStatusTimeEntity == null) {
+            basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        }
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessTypeFilterRequest);
+        List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest);
+        BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessLocalTypeFilterRequest);
+        List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest);
+        BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessOriginTypeFilterRequest);
+        List<BussinessOriginTypeEntity> bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest);
+        SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
+        spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
+        spsSyncBusResponse.setBussinessLocalTypeEntities(bussinessLocalTypeEntities);
+        spsSyncBusResponse.setBussinessOriginTypeEntities(bussinessOriginTypeEntities);
+        return spsSyncBusResponse;
+    }
+
+
+    //已完成扫码单据
+    @Resource
+    OrderService orderService;
+    @Resource
+    CodesService codesService;
+    @Resource
+    OrderDetailService orderDetailService;
+
+    public SpsSyncOrderResponse upAllOrder() {
+
+        BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadOrder");
+        if (basicExportStatusTimeEntity == null) {
+            basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
+        }
+        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+        BeanUtils.copyProperties(basicExportStatusTimeEntity, orderFilterRequest);
+        orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+        List<OrderEntity> orderEntities = orderService.findAllByTime(orderFilterRequest);
+        List<ErpOrderEntity> allOrderDetailEntityList = new ArrayList<>();
+        List<WarehouseEntity> warehouseEntityList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(orderEntities)) {
+            for (OrderEntity orderEntity : orderEntities) {
+                List<ErpOrderEntity> orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId());
+                if (CollUtil.isNotEmpty(orderDetailEntityList)) {
+                    allOrderDetailEntityList.addAll(orderDetailEntityList);
+                }
+                List<WarehouseEntity> codes = codesService.findByReceiptId(orderEntity.getId());
+                if (CollUtil.isNotEmpty(codes)) {
+                    warehouseEntityList.addAll(codes);
+                }
+            }
+        }
+        SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
+        syncOrderResponse.setOrderEntities(orderEntities);
+        syncOrderResponse.setOrderDetailEntityList(allOrderDetailEntityList);
+        syncOrderResponse.setWarehouseEntityList(warehouseEntityList);
+        return syncOrderResponse;
+
+    }
+
+}

api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.util;
 
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
@@ -89,4 +90,18 @@ public class CustomUtil {
         return "HZ" + id.substring(4);
     }
 
+    public static boolean isEmpty(List data) {
+        if (data == null || data.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isNotEmpty(List data) {
+        if (data != null && !data.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
 }

api-admin/src/main/java/com/glxp/api/admin/util/SpGetHttp.java

@@ -9,6 +9,10 @@ import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
 import com.glxp.api.admin.req.inout.OrderStatusFilterRequest;
 import com.glxp.api.admin.req.sync.BasicDataFilterRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
+import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
+import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
+import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse;
 import com.glxp.api.admin.res.inout.DlOrderResponse;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -86,9 +90,32 @@ public class SpGetHttp {
         }
     }
 
+    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(BasicExportStatusRequest basicExportStatusRequest) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        if (basicExportStatusRequest.getType() != null)
+            paramMap.put("type", basicExportStatusRequest.getType() + "");
+        if (basicExportStatusRequest.getStatus() != null)
+            paramMap.put("status", basicExportStatusRequest.getStatus() + "");
+        if (basicExportStatusRequest.getId() != null)
+            paramMap.put("id", basicExportStatusRequest.getId());
+        if (basicExportStatusRequest.getScheduleType() != null)
+            paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType());
+        String response = UHttpClient.mipsGet(spsSyncUrl + "/spssync/basic/udiinfo/getStatus", paramMap);
+        try {
+            BaseResponse<List<BasicExportStatusEntity>> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
+                    });
+            return data;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "下载失败！");
+        }
+    }
+
 
     //获取耗材字典
-    public String getBasicData(Integer id, int type) {
+    public String getBasicData(String id, int type) {
         BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
         basicExportStatusRequest.setId(id);
         basicExportStatusRequest.setType(type);
@@ -100,7 +127,7 @@ public class SpGetHttp {
     }
 
 
-    public BaseResponse<String> postBasicStatus(Integer id) {
+    public BaseResponse<String> postBasicStatus(String id) {
         BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest();
         basicStatusFilterRequest.setId(id);
         String result = UHttpClient.postJson(spsSyncUrl + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest);
@@ -111,4 +138,39 @@ public class SpGetHttp {
     }
 
 
+    public BaseResponse<String> postAllBaseData(SpsSyncDataResponse syncDataResponse) {
+        String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/basic/upload", syncDataResponse);
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+
+    public BaseResponse<String> postAllBus(SpsSyncBusResponse spsSyncBusResponse) {
+        String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/busType/upload", spsSyncBusResponse);
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+
+    public BaseResponse<String> postAllOrder(SpsSyncOrderResponse spsSyncOrderResponse) {
+        String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/order/upload", spsSyncOrderResponse);
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+    public BaseResponse<String> postAllSchedule(SpsSyncScheduleResponse spsSyncScheduleResponse) {
+        String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/schedule/upload", spsSyncScheduleResponse);
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+
 }

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

@@ -32,7 +32,7 @@ SPSYNC_IP=http://127.0.0.1:9989
 #UDI_SERVER_URL=http://127.0.0.1:9995
 ##端口号
 # Redis数据库索引（默认为0）
-spring.redis.database=1 
+spring.redis.database=8 
 # Redis服务器地址
 spring.redis.host=127.0.0.1
 # Redis服务器连接端口

api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml

@@ -10,11 +10,17 @@
             <if test="id != '' and id!=null">
                 and id = #{id}
             </if>
-            <if test="status != '' and status!=null">
+            <if test="status!=null">
                 and status = #{status}
             </if>
-            <if test="type != '' and type!=null">
+            <if test="type!=null">
-                and type = #{type}
+                and `type` = #{type}
+            </if>
+            <if test="idDatas != '' and idDatas!=null">
+                and idDatas = #{idDatas}
+            </if>
+            <if test="scheduleType!=null">
+                and scheduleType = #{scheduleType}
             </if>
         </where>
     </select>
@@ -23,12 +29,16 @@
     <insert id="insertExportStatus" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BasicExportStatusEntity">
         replace
-        INTO basic_export_status(idDatas,status,type,updateTime)
+        INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark)
         values(
+        #{id},
         #{idDatas},
         #{status},
         #{type},
-        #{updateTime}
+        #{updateTime},
+        #{scheduleType},
+        #{startTime},
+        #{endTime},#{remark}
         )
     </insert>
 
@@ -39,8 +49,12 @@
             <if test="status != null">status=#{status},</if>
             <if test="type != null">type=#{type},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="scheduleType != null">scheduleType=#{scheduleType},</if>
+            <if test="startTime != null">startTime=#{startTime},</if>
+            <if test="endTime != null">endTime=#{endTime},</if>
+            <if test="remark != null">remark=#{remark},</if>
         </trim>
-        WHERE orderId = #{orderId}
+        WHERE id = #{id}
     </update>
     <delete id="deleteById" parameterType="Map">
         DELETE

api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.basic.BasicExportTimeDao">
+
+    <select id="filterExportStatus" parameterType="com.glxp.api.admin.req.basic.BasicExportTimeRequest"
+            resultType="com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity">
+        select * from basic_export_status_time
+        <where>
+            <if test="id != '' and id!=null">
+                and id = #{id}
+            </if>
+            <if test="key != '' and key!=null">
+                and `key` = #{key}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insertExportStatus" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity">
+        replace
+        INTO basic_export_status_time(`key`,lastUpdateTime,remark)
+        values(
+        #{key},
+        #{lastUpdateTime},
+        #{remark}
+        )
+    </insert>
+
+    <update id="updateExportStatus" parameterType="com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity">
+        UPDATE basic_export_status_time
+        <trim prefix="set" suffixOverrides=",">
+            <if test="lastUpdateTime != null">lastUpdateTime=#{lastUpdateTime},</if>
+            <if test="remark != null">remark=#{remark},</if>
+        </trim>
+        WHERE key = #{key}
+    </update>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM basic_export_status_time
+        WHERE id = #{id}
+    </delete>
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml

@@ -31,7 +31,9 @@
             <if test="corpType != null">
                 AND corpType = #{corpType}
             </if>
-
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
         order by updateTime desc
 
@@ -170,7 +172,7 @@
         INTO basic_corp
                 ( thirdId, erpId, name, spell,
                  addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,
-                 thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType)
+                 thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType,outType)
         values (
         #{thirdId},
         #{erpId},
@@ -192,7 +194,8 @@
         #{thirdName3},
         #{thirdName4},
         #{updateTime},
-        #{corpType}
+        #{corpType},
+        #{outType}
         )
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -39,6 +39,29 @@
 
     </select>
 
+    <select id="filterAllList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
+            resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
+        SELECT * from basic_bustype_local
+        <where>
+            <if test="name != ''and name != null">
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
+            </if>
+            <if test="action != ''and action != null">
+                AND action LIKE concat(#{action},'%')
+            </if>
+            <if test="originAction != ''and originAction != null">
+                AND originAction =#{originAction}
+            </if>
+            <if test="spUse != ''and spUse != null">
+                AND spUse =#{spUse}
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+
+    </select>
+
     <select id="filterJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
             resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
         SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
@@ -148,7 +171,7 @@
 
     <insert id="insertBussinessType" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
-        INSERT INTO basic_bustype_local
+        replace INTO basic_bustype_local
             (action, name, remark, originAction, advanceType, changeEnable)
         values (#{action},
                 #{name},

api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml

@@ -13,7 +13,9 @@
             <if test="action != ''and action != null">
                 AND action LIKE concat(#{action},'%')
             </if>
-
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
     </select>
 
@@ -57,7 +59,7 @@
 
     <insert id="insertBusOriginType" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity">
-        INSERT INTO basic_bustype_origin
+        replace INTO basic_bustype_origin
             (action, name, enable, remark, thirdSys, thirdSysName)
         values (#{action},
                 #{name},

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -41,6 +41,37 @@
 
 
     </select>
+
+
+    <select id="filterAllList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
+            resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
+        SELECT *
+        FROM basic_bussiness_type
+        <where>
+            <if test="name != ''and name != null">
+                AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
+            </if>
+            <if test="action != ''and action != null">
+                AND basic_bussiness_type.action LIKE concat('%',#{action},'%')
+            </if>
+            <if test="mainAction != ''and mainAction != null">
+                AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%')
+            </if>
+            <if test="enabled != ''and enabled != null">
+                AND basic_bussiness_type.enable =#{enabled}
+            </if>
+            <if test="advanceType != ''and advanceType != null">
+                AND basic_bustype_local.advanceType =#{advanceType}
+            </if>
+            <if test="spUse != ''and spUse != null">
+                AND basic_bustype_local.spUse =#{spUse}
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+    </select>
+
     <select id="filterJoinList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
             resultType="com.glxp.api.admin.res.basic.BussinessTypResponse">
         select basic_bussiness_type.*,

api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml

@@ -17,6 +17,9 @@
             <if test="unitFk != null and unitFk != ''">
                 and unitFk = #{unitFk}
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
         ORDER BY id DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.basic.ProductInfoDao">
+
+    <select id="filterProductInfo" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        SELECT * FROM productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat(#{ggxh},'%')
+            </if>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+
+
+        </where>
+
+    </select>
+
+
+    <select id="filterCpmctymc" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        select * from productinfo
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        GROUP BY cpmctymc
+    </select>
+
+
+    <select id="filterUdiByTyshxydm" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        SELECT * FROM productinfo
+        <where>
+            diType = 1
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        GROUP BY nameCode
+    </select>
+
+    <select id="selectAllByUuid" parameterType="java.util.List"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        select * from productinfo where
+        uuid in (
+        <foreach collection="ids" item="item" index="index"
+                 separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
+
+
+    <select id="selectByUuid" parameterType="Map"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        select *
+        from productinfo
+        where uuid = #{uuid}
+    </select>
+    <!--   CHAR_LENGTH(nameCode)  <![CDATA[ >= ]]>  14-->
+    <select id="filterUdiByCreditNo" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+
+        select p.* from productinfo p INNER JOIN
+        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+
+        <where>
+
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+        </where>
+        GROUP BY deviceRecordKey)
+        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+        <where>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="filterUdiByNewest" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+
+        SELECT * FROM productinfo
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="isNewest != null">
+                AND isNewest = #{isNewest}
+            </if>
+        </where>
+    </select>
+
+    <select id="filterUuidByCreditNo" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="java.lang.String">
+
+        select p.uuid from productinfo p INNER JOIN
+        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+        </where>
+        GROUP BY deviceRecordKey)
+        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+        group by uuid
+    </select>
+    <select id="filterUdi" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+
+        select * from productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc= #{ylqxzcrbarmc}
+            </if>
+
+            <if test="ylqxzcrbarmc == '' and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')
+            </if>
+
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+            <if test="isNewest != null and isNewest!=''">
+                AND isNewest = #{isNewest}
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+
+
+    </select>
+    <select id="selectByUpdateTime"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        select *
+        from productinfo
+        where
+ <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S')   ]]>
+        and
+  <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S')
+        ]]>
+    </select>
+    <!--<select id="filterUdi" parameterType="com.glxp.sync.admin.req.ProductInfoFilterRequest"-->
+    <!--resultType="com.glxp.sync.admin.entity.udi.ProductInfoEntity">-->
+    <!--&#45;&#45;         GROUP BY deviceRecordKey-->
+    <!--select p.* from productinfo p INNER JOIN-->
+    <!--(select deviceRecordKey ,max(versionNumber) versionNumber from productinfo-->
+    <!--<where>-->
+
+    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">-->
+    <!--AND ylqxzcrbarmc= #{ylqxzcrbarmc}-->
+    <!--</if>-->
+
+    <!--<if test="ylqxzcrbarmc == '' and ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">-->
+    <!--AND cpmctymc LIKE concat(#{cpmctymc},'%')-->
+    <!--</if>-->
+
+    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">-->
+    <!--AND cpmctymc LIKE concat('%',#{cpmctymc},'%')-->
+    <!--</if>-->
+    <!--<if test="nameCode != '' and nameCode != null">-->
+    <!--AND nameCode LIKE concat(#{nameCode},'%')-->
+    <!--</if>-->
+    <!--<if test="uuid != '' and uuid != null">-->
+    <!--AND uuid = #{uuid}-->
+    <!--</if>-->
+    <!--<if test="ggxh != '' and ggxh != null">-->
+    <!--AND ggxh LIKE concat('%',#{ggxh},'%')-->
+    <!--</if>-->
+    <!--<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">-->
+    <!--AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')-->
+    <!--</if>-->
+
+    <!--<if test="deviceRecordKey != '' and deviceRecordKey != null">-->
+    <!--AND deviceRecordKey = #{deviceRecordKey}-->
+    <!--</if>-->
+    <!--<if test="updateTime!=null and updateTime!=''">-->
+    <!--<![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>-->
+    <!--</if>-->
+    <!--</where>-->
+    <!--GROUP BY deviceRecordKey)-->
+    <!--a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber-->
+
+    <!--</select>-->
+
+    <select id="syncDlUdi" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+
+        SELECT * FROM productinfo
+        <where>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode},'%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh = #{zczbhhzbapzbh}
+            </if>
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        limit #{page},#{limit}
+    </select>
+
+
+    <insert id="insertProductInfo" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        REPLACE
+        INTO productinfo
+        (
+        id,nameCode,packRatio,packLevel,bhxjsl,
+        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        )
+        values
+            (
+        #{id},
+        #{nameCode},
+        #{packRatio},
+        #{packLevel},
+        #{bhxjsl},
+        #{bhzxxsbzsl},
+        #{zxxsbzbhsydysl},
+        #{bhxjcpbm},
+        #{bzcj},
+        #{thirdProductNo},
+        #{addType},
+        #{deviceRecordKey},
+        #{isUseDy},
+        #{thirdProductName},
+        #{cpmctymc},
+        #{cplb},
+        #{flbm},
+        #{ggxh},
+        #{qxlb},
+        #{tyshxydm},
+        #{ylqxzcrbarmc},
+        #{zczbhhzbapzbh},
+        #{ylqxzcrbarywmc},
+        #{uuid},
+        #{sjcpbm},
+        #{versionNumber},
+        #{diType},
+        #{scbssfbhph},
+        #{scbssfbhxlh},
+        #{scbssfbhscrq},
+        #{scbssfbhsxrq},
+        #{ybbm},
+        #{spmc},
+        #{cphhhbh},
+        #{cpms},
+        #{cpbsbmtxmc},
+        #{isNewest},
+        #{updateTime}
+        )
+    </insert>
+
+
+    <insert id="insertProductInfos" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        REPLACE INTO productinfo
+        (
+        id,nameCode,packRatio,packLevel,bhxjsl,
+        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        ) values
+
+        <foreach collection="datas" item="item" index="index"
+                 separator=",">
+
+
+            (
+            #{item.id},
+            #{item.nameCode},
+            #{item.packRatio},
+            #{item.packLevel},
+            #{item.bhxjsl},
+            #{item.bhzxxsbzsl},
+            #{item.zxxsbzbhsydysl},
+            #{item.bhxjcpbm},
+            #{item.bzcj},
+            #{item.thirdProductNo},
+            #{item.addType},
+            #{item.deviceRecordKey},
+            #{item.isUseDy},
+            #{item.thirdProductName},
+            #{item.cpmctymc},
+            #{item.cplb},
+            #{item.flbm},
+            #{item.ggxh},
+            #{item.qxlb},
+            #{item.tyshxydm},
+            #{item.ylqxzcrbarmc},
+            #{item.zczbhhzbapzbh},
+            #{item.ylqxzcrbarywmc},
+            #{item.uuid},
+            #{item.sjcpbm},
+            #{item.versionNumber},
+            #{item.diType},
+            #{item.scbssfbhph},
+            #{item.scbssfbhxlh},
+            #{item.scbssfbhscrq},
+            #{item.scbssfbhsxrq},
+            #{item.ybbm},
+            #{item.spmc},
+            #{item.cphhhbh},
+            #{item.cpms},
+            #{item.cpbsbmtxmc},
+            #{item.isNewest},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM productinfo
+        WHERE thirdProductNo = #{id}
+    </delete>
+
+    <delete id="deleteAll" parameterType="java.util.List">
+        DELETE FROM productinfo WHERE thirdProductNo in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="updateProductInfo" parameterType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        UPDATE productinfo
+        <set>
+            <if test="nameCode != null">nameCode=#{nameCode},</if>
+            <if test="packRatio != null">packRatio=#{packRatio},</if>
+            <if test="packLevel != null">packLevel=#{packLevel},</if>
+            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
+            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
+            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
+            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
+            <if test="bzcj != null">bzcj=#{bzcj},</if>
+            <if test="thirdProductNo != null">thirdProductNo=#{thirdProductNo},</if>
+            <if test="addType != null">addType=#{addType},</if>
+            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
+            <if test="isUseDy != null">isUseDy=#{isUseDy},</if>
+            <if test="thirdProductName != null">thirdProductName=#{thirdProductName},</if>
+            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
+            <if test="cplb != null">cplb=#{cplb},</if>
+            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="ggxh != null">ggxh=#{ggxh},</if>
+            <if test="qxlb != null">qxlb=#{qxlb},</if>
+            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            <if test="uuid != null">uuid=#{uuid},</if>
+            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
+            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
+            <if test="diType != null">diType=#{diType},</if>
+            <if test="isNewest != null">isNewest=#{isNewest},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateProductByUuid" parameterType="com.glxp.api.admin.entity.receipt.ProductInfoEntity">
+        UPDATE productinfo
+        <set>
+            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
+            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
+            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
+            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
+            <if test="ybbm != null">ybbm=#{ybbm},</if>
+            <if test="spmc != null">spmc=#{spmc},</if>
+            <if test="cphhhbh != null">cphhhbh=#{cphhhbh},</if>
+            <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="cpbsbmtxmc != null">cpbsbmtxmc=#{cpbsbmtxmc},</if>
+            <if test="isNewest != null">isNewest=#{isNewest},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+        </set>
+        WHERE uuid = #{uuid}
+    </update>
+
+
+    <!--测试专用-->
+    <select id="findAllUuids" parameterType="com.glxp.api.admin.req.ListPageRequest" resultType="java.lang.String">
+        SELECT uuid
+        from device
+        group by uuid limit #{page}, #{limit}
+    </select>
+    <select id="findAllTyshxyh" resultType="java.lang.String">
+        SELECT tyshxydm
+        from productinfo
+        group by tyshxydm
+    </select>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.basic.UdiCompanyDao">
+
+    <select id="selectAllTyshxyh"
+            resultType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+        SELECT deviceRecordKey, tyshxydm, ylqxzcrbarmc, ylqxzcrbarywmc
+        FROM device
+        GROUP BY tyshxydm
+
+    </select>
+
+
+    <select id="filterUdiCompany"
+            parameterType="com.glxp.api.admin.req.basic.UdiCompanyRequest"
+            resultType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+        SELECT * FROM udicompany
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm =#{tyshxydm}
+            </if>
+            <if test="provinceCode != '' and provinceCode != null">
+                AND SUBSTRING(tyshxydm,3,2) = #{provinceCode}
+            </if>
+            <if test="cityCode != '' and cityCode != null">
+                AND SUBSTRING(tyshxydm,3,4) = #{cityCode}
+            </if>
+            <if test="areaCode != '' and areaCode != null">
+                AND SUBSTRING(tyshxydm,3,6) = #{areaCode}
+            </if>
+        </where>
+
+    </select>
+
+
+    <insert id="insertUdiCompany" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+        REPLACE
+        INTO udicompany
+        (
+        id,tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh,
+        qylxrcz,qylxryx
+        )
+        values
+        (
+        #{id},
+        #{tyshxydm},
+        #{ylqxzcrbarmc},
+        #{ylqxzcrbarywmc},
+        #{qylxrdh},
+        #{qylxrcz},
+        #{qylxryx}
+        )
+    </insert>
+
+    <insert id="insertUdiCompanys" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+        replace INTO udicompany(id,
+        tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh,
+        qylxrcz,qylxryx)
+        values
+        <foreach collection="udiCompanyEntities" item="item" index="index"
+                 separator=",">
+
+            (
+            #{item.id},
+            #{item.tyshxydm},
+            #{item.ylqxzcrbarmc},
+            #{item.ylqxzcrbarywmc},
+            #{item.qylxrdh},
+            #{item.qylxrcz},
+            #{item.qylxryx})
+        </foreach>
+
+    </insert>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM udicompany
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteAll" parameterType="java.util.List">
+        DELETE FROM udicompany WHERE id in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="updateUdiCompany" parameterType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+        UPDATE udicompany
+        <set>
+            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            <if test="qylxrdh != null">qylxrdh=#{qylxrdh},</if>
+            <if test="qylxrcz != null">qylxrcz=#{qylxrcz},</if>
+            <if test="qylxryx != null">qylxryx=#{qylxryx},</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <select id="syncDlCompany" parameterType="com.glxp.api.admin.req.basic.UdiCompanyRequest"
+            resultType="com.glxp.api.admin.entity.basic.UdiCompanyEntity">
+
+        SELECT * FROM udicompany
+        <where>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+        limit #{page},#{limit}
+    </select>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -249,6 +249,9 @@
             <if test="mainId != '' and mainId != null">
                 AND mainId = #{mainId}
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
     </select>
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -19,7 +19,21 @@
         ORDER BY actDate DESC
 
     </select>
-
+    <select id="findAllByTime" parameterType="com.glxp.api.admin.req.inout.OrderQueryRequest"
+            resultType="com.glxp.api.admin.entity.inout.OrderEntity">
+        SELECT * FROM io_order
+        <where>
+            <if test="status != '' and status!=null">
+                and status = #{status}
+            </if>
+            <if test="receiveStatus != '' and receiveStatus!=null">
+                and receiveStatus = #{receiveStatus}
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+    </select>
     <select id="listOrderRepeat" parameterType="com.glxp.api.admin.req.inout.OrderQueryRequest"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
 
@@ -53,6 +67,43 @@
                 #{stockCheckFk}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}
                    , #{ullageSupNo}, #{createUser}, #{reviewUser})
     </insert>
+
+    <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
+        replace
+        INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
+                             fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
+                             receiveStatus, erpFk, stockCheckFk, supId,
+                             exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser)
+        values (
+        #{id},
+        #{action},
+        #{corpOrderId},
+        #{actDate},
+        #{fromCorpId},
+        #{actor},
+        #{mainAction},
+        #{fromCorp},
+        #{status},
+        #{remark},
+        #{exportStatus},
+        #{fromType},
+        #{contrastStatus},
+        #{signStatus},
+        #{receiveStatus},
+        #{erpFk},
+        #{stockCheckFk},
+        #{supId},
+        #{exportFilePath},
+        #{locStorageCode},
+        #{supplementNo}
+        ,
+        #{ullageSupNo},
+        #{createUser},
+        #{reviewUser}
+        )
+    </insert>
+
+
     <update id="updateOrder" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
         UPDATE io_order
         <trim prefix="set" suffixOverrides=",">

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

@@ -139,6 +139,12 @@
             <if test="isDefault != '' and isDefault != null">
                 AND isDefault = #{isDefault}
             </if>
+            <if test="updateTime!=null and updateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
 
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml

@@ -16,6 +16,9 @@
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml

@@ -28,6 +28,9 @@
             <if test="key != null">
                 and code like concat('%',#{key},'%') or `name` like concat('%',#{key},'%')
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
 
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml

@@ -37,20 +37,64 @@
 
 
     <insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
-        replace INTO thr_order
+        replace
+        INTO thr_order
                 (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType,
                  startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
                  remark3)
-        values (#{billNo},
+        values (
-                #{billdate},
+        #{billNo},
-                #{corpId},
+        #{billdate},
-                #{corpName},
+        #{corpId},
-                #{billType},
+        #{corpName},
-                #{billFlag},
+        #{billType},
-                #{thirdSysFk}, #{updateTime}, #{originType},
+        #{billFlag},
-                #{startDate}, #{endDate}, #{createUser}, #{reviewUser},
+        #{thirdSysFk},
-                #{address}, #{linkMan}, #{linkTel}, #{remark}, #{remark1},
+        #{updateTime},
-                #{remark2}, #{remark3})
+        #{originType},
+        #{startDate},
+        #{endDate},
+        #{createUser},
+        #{reviewUser},
+        #{address},
+        #{linkMan},
+        #{linkTel},
+        #{remark},
+        #{remark1},
+        #{remark2},
+        #{remark3}
+        )
+    </insert>
+
+    <insert id="importThrOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
+        replace
+        INTO thr_order
+                (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType,
+                 startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
+                 remark3)
+        values (
+        #{id},
+        #{billNo},
+        #{billdate},
+        #{corpId},
+        #{corpName},
+        #{billType},
+        #{billFlag},
+        #{thirdSysFk},
+        #{updateTime},
+        #{originType},
+        #{startDate},
+        #{endDate},
+        #{createUser},
+        #{reviewUser},
+        #{address},
+        #{linkMan},
+        #{linkTel},
+        #{remark},
+        #{remark1},
+        #{remark2},
+        #{remark3}
+        )
     </insert>
 
     <insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
@@ -79,11 +123,14 @@
     </insert>
 
     <delete id="deleteById" parameterType="Map">
-        DELETE FROM thr_order  WHERE id =  #{id}
+        DELETE
+        FROM thr_order
+        WHERE id = #{id}
     </delete>
 
     <delete id="deleteAll">
-        DELETE FROM thr_order
+        DELETE
+        FROM thr_order
     </delete>
 
     <update id="updateThrOrder" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml

@@ -19,34 +19,75 @@
 
     <insert id="insertThrOrderDetail" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
-        replace INTO thr_order_detail
+        replace
+        INTO thr_order_detail
                 (productId, productName, spec, batchNo, expireDate,
                  productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
-        values (#{productId}, #{productName}, #{spec}, #{batchNo}, #{expireDate},
+        values (
-                #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime},
+        #{productId},
-                #{price}, #{corpName})
+        #{productName},
+        #{spec},
+        #{batchNo},
+        #{expireDate},
+        #{productDate},
+        #{count},
+        #{reCount},
+        #{orderIdFk},
+        #{thirdSysFk},
+        #{updateTime},
+        #{price},
+        #{corpName}
+        )
+    </insert>
+
+    <insert id="importThrOrderDetail" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
+        replace
+        INTO thr_order_detail
+                (id,productId, productName, spec, batchNo, expireDate,
+                 productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
+        values (
+        #{id},
+        #{productId},
+        #{productName},
+        #{spec},
+        #{batchNo},
+        #{expireDate},
+        #{productDate},
+        #{count},
+        #{reCount},
+        #{orderIdFk},
+        #{thirdSysFk},
+        #{updateTime},
+        #{price},
+        #{corpName}
+        )
     </insert>
 
     <insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_order_detail
-                (productId, productName, spec, batchNo, expireDate,
+        (productId, productName, spec, batchNo, expireDate,
-                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
+        productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
-                values
+        values
 
         <foreach collection="thrOrderDetailEntities" item="item" index="index"
                  separator=",">
             (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate},
-             #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
+            #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
-             #{item.updateTime},
+            #{item.updateTime},
-             #{item.price}, #{item.corpName})
+            #{item.price}, #{item.corpName})
         </foreach>
     </insert>
 
     <delete id="deleteById" parameterType="Map">
-        DELETE FROM thr_order_detail  WHERE id =  #{id}
+        DELETE
+        FROM thr_order_detail
+        WHERE id = #{id}
     </delete>
     <delete id="deleteByOrderIdFk" parameterType="Map">
-        DELETE FROM thr_order_detail  WHERE orderIdFk =  #{orderIdFk}
+        DELETE
+        FROM thr_order_detail
+        WHERE orderIdFk = #{orderIdFk}
     </delete>
 
     <update id="updateThrOrderDetail" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
@@ -70,7 +111,8 @@
     </update>
 
     <delete id="deleteAll">
-        DELETE FROM thr_order_detail
+        DELETE
+        FROM thr_order_detail
     </delete>
 
 </mapper>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -38,6 +38,9 @@
             <if test="supName != '' and supName != null">
                 AND supName = #{supName}
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
 
         </where>
 
@@ -52,7 +55,7 @@
     <insert id="insertThrProducts" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
         replace
                 INTO thr_products
-                (code, name, measname, spec, registerNo, manufactory,
+                (code, `name`, measname, spec, registerNo, manufactory,
                  cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
                  thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3)
         values (#{code},