From 1c7b32986b4824651e9ae29ef4d743d5d6c4b125 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sun, 24 Apr 2022 14:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/constant/BasicProcessStatus.java | 7 + .../controller/auth/AuthCheckController.java | 2 - .../basic/BasicThirdSysController.java | 2 +- .../basic/UdiInfoImportLogController.java | 3 +- .../api/admin/dao/basic/BasicExportDao.java | 2 +- .../admin/dao/basic/BasicExportTimeDao.java | 20 + .../dao/basic/BussinessLocalTypeDao.java | 1 + .../api/admin/dao/basic/BussinessTypeDao.java | 2 + .../api/admin/dao/basic/ProductInfoDao.java | 52 ++ .../api/admin/dao/basic/UdiCompanyDao.java | 30 ++ .../glxp/api/admin/dao/inout/OrderDao.java | 4 + .../api/admin/dao/thrsys/ThrOrderDao.java | 2 + .../admin/dao/thrsys/ThrOrderDetailDao.java | 4 +- .../entity/basic/BasicExportStatusEntity.java | 8 +- .../basic/BasicExportStatusTimeEntity.java | 13 + .../admin/entity/basic/ProductInfoEntity.java | 61 +++ .../req/basic/BasicExportStatusRequest.java | 4 +- .../req/basic/BasicExportTimeRequest.java | 10 + .../basic/BasicUnitMaintainFilterRequest.java | 2 +- .../BussinessLocalTypeFilterRequest.java | 2 + .../BussinessOriginTypeFilterRequest.java | 4 + .../FilterCompanyProductRelevanceRequest.java | 1 + .../admin/req/basic/UdiCompanyRequest.java | 15 + .../admin/req/inout/OrderFilterRequest.java | 1 + .../inventory/FilterInvWarehouseRequest.java | 8 +- .../receipt/BussinessTypeFilterRequest.java | 3 + .../req/thrsys/FilterThrCorpRequest.java | 2 + .../thrsys/FilterThrInvWarehouseRequest.java | 2 + .../req/thrsys/FilterThrOrderRequest.java | 2 +- .../req/thrsys/FilterThrProductsRequest.java | 2 +- .../admin/res/basic/SpSyncUdiResponse.java | 14 + .../admin/res/basic/SpsSyncBusResponse.java | 16 + .../admin/res/basic/SpsSyncDataResponse.java | 26 + .../admin/res/basic/SpsSyncOrderResponse.java | 16 + .../res/basic/SpsSyncScheduleResponse.java | 12 + .../service/basic/BasicExportService.java | 3 +- .../service/basic/BasicExportTimeService.java | 21 + .../basic/BussinessLocalTypeService.java | 2 + .../service/basic/BussinessTypeService.java | 2 + .../service/basic/ProductInfoService.java | 50 ++ .../service/basic/UdiCompanyService.java | 28 + .../service/basic/UdiRelevanceService.java | 1 + .../basic/impl/BasicExportServiceImpl.java | 15 +- .../impl/BasicExportTimeServiceImpl.java | 56 ++ .../impl/BussinessLocalTypeServiceImpl.java | 6 + .../basic/impl/BussinessTypeServiceImpl.java | 8 +- .../basic/impl/ProductInfoServiceImpl.java | 153 ++++++ .../basic/impl/UdiCompanyServiceImpl.java | 65 +++ .../basic/impl/UdiRelevanceServiceImpl.java | 6 + .../api/admin/service/inout/OrderService.java | 1 + .../service/inout/impl/OrderServiceImpl.java | 4 + .../glxp/api/admin/thread/DlBasicService.java | 367 ++++++++++++- .../api/admin/thread/DlUploadService.java | 78 +-- .../glxp/api/admin/thread/HeartService.java | 186 +++++++ .../com/glxp/api/admin/thread/HeartTask.java | 73 ++- .../glxp/api/admin/thread/UpBasicService.java | 219 ++++++++ .../com/glxp/api/admin/util/CustomUtil.java | 15 + .../com/glxp/api/admin/util/SpGetHttp.java | 66 ++- .../main/resources/application-pro.properties | 2 +- .../mybatis/mapper/basic/BasicExportDao.xml | 26 +- .../mapper/basic/BasicExportTimeDao.xml | 45 ++ .../mapper/basic/BasicUnitMaintainDao.xml | 9 +- .../mapper/basic/BussinessLocalTypeDao.xml | 25 +- .../mapper/basic/BussinessOriginTypeDao.xml | 6 +- .../mybatis/mapper/basic/BussinessTypeDao.xml | 31 ++ .../basic/CompanyProductRelevanceDao.xml | 3 + .../mybatis/mapper/basic/ProductInfoDao.xml | 510 ++++++++++++++++++ .../mybatis/mapper/basic/UdiCompanyDao.xml | 115 ++++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 + .../mybatis/mapper/inout/OrderDao.xml | 53 +- .../mapper/inventory/InvWarehouseDao.xml | 6 + .../mybatis/mapper/thrsys/ThrCorpDao.xml | 3 + .../mapper/thrsys/ThrInvWarehouseDao.xml | 3 + .../mybatis/mapper/thrsys/ThrOrderDao.xml | 73 ++- .../mapper/thrsys/ThrOrderDetailDao.xml | 68 ++- .../mybatis/mapper/thrsys/ThrProductsDao.xml | 5 +- 76 files changed, 2609 insertions(+), 157 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java index 137c07ed..843d570d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java +++ b/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; //需要传递任务 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java index e83e676c..4544dc54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java +++ b/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); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index f5e69eae..5162aac3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/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) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java index 83d173be..6118bb57 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java +++ b/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); //导入日志 diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java index befbd06d..60d6db0e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java +++ b/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); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java new file mode 100644 index 00000000..5cde6557 --- /dev/null +++ b/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 filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index 004dd913..6c5989c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -26,6 +26,7 @@ public interface BussinessLocalTypeDao { List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java index f9436891..0fd0f6e3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java @@ -14,6 +14,8 @@ public interface BussinessTypeDao { List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java new file mode 100644 index 00000000..111af0e7 --- /dev/null +++ b/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 filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); + + List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); + + List selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询 + + boolean insertProductInfo(ProductInfoEntity productInfoEntity); + + boolean insertProductInfos(@Param("datas") List productInfoEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteAll(@Param("ids") List ids); + + boolean updateProductInfo(ProductInfoEntity productInfoEntity); + + boolean updateProductByUuid(ProductInfoEntity productInfoEntity); + + List findAllUuids(ListPageRequest listPageRequest); + + List selectByUuid(@Param("uuid") String uuid); + + List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); + + List syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); + + List selectAllByUuid(@Param("ids") List ids); + + List findAllTyshxyh(); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java new file mode 100644 index 00000000..273e7c5a --- /dev/null +++ b/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 selectAllTyshxyh(); + + + List filterUdiCompany(UdiCompanyRequest udiCompanyRequest); + + boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity); + + boolean insertUdiCompanys(@Param("udiCompanyEntities") List udiCompanyEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteAll(@Param("ids") List ids); + + boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); + + List syncDlCompany(UdiCompanyRequest udiCompanyRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java index 747de7d6..227cf7c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java @@ -14,8 +14,12 @@ public interface OrderDao { List listOrder(OrderQueryRequest orderQueryRequest); + List findAllByTime(OrderFilterRequest orderFilterRequest); + boolean insertOrder(OrderEntity orderEntity); + boolean importOrder(OrderEntity orderEntity); + boolean updateOrder(OrderEntity orderEntity); List listOrderError(OrderQueryRequest orderQueryRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java index 56924127..52750198 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java +++ b/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 thrOrderEntities); boolean updateThrOrder(ThrOrderEntity thrOrderEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java index d7726f1a..c15b610f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java +++ b/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 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(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java index 176c319e..13a15210 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java new file mode 100644 index 00000000..8a13327e --- /dev/null +++ b/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; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java new file mode 100644 index 00000000..f4188dbc --- /dev/null +++ b/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; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java index 3da9447e..80285ba4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java new file mode 100644 index 00000000..0012a7c7 --- /dev/null +++ b/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; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java index 5d4929d5..ff45886b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java index 183d6667..9e71143d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java index 7ad41acf..7437beb5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java index 8fe79025..8298efae 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java new file mode 100644 index 00000000..b29bb6e7 --- /dev/null +++ b/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; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index 10ea61e7..ce288960 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java index b907bb8c..3004fba3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/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 ids; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java index a587cd08..68099676 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java index dfbd1538..b3b44984 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java +++ b/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 thrCorpEntities; + private String lastUpdateTime; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java index e5b7ba81..5494816d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java index 7786d055..56dfcd61 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java +++ b/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 erpOrderResponses; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java index 0002b719..21c592a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java new file mode 100644 index 00000000..8ce3f534 --- /dev/null +++ b/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 productInfoEntityList; + List udiCompanyEntities; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java new file mode 100644 index 00000000..828fa5a2 --- /dev/null +++ b/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 bussinessTypeEntities; + private List bussinessOriginTypeEntities; + private List bussinessLocalTypeEntities; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java new file mode 100644 index 00000000..ad8af38c --- /dev/null +++ b/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 invWarehouseEntities; + List udiInfoEntities; + List basicUnitMaintainEntities; + List thrInvWarehouseEntities; + List thrCorpEntities; + List thrProductsEntities; + List thrOrderDetailEntities; + List thrOrderEntities; + List companyProductRelevanceEntities; + List udiRelevanceEntities; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java new file mode 100644 index 00000000..20e9399d --- /dev/null +++ b/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 orderEntities; + List orderDetailEntityList; + List warehouseEntityList; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java new file mode 100644 index 00000000..c710e1f9 --- /dev/null +++ b/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 basicExportStatusEntities; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java index 43a36771..5bfacd72 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java +++ b/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 filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity); - boolean deleteById(Integer id); + boolean deleteById(String id); boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java new file mode 100644 index 00000000..aa653a27 --- /dev/null +++ b/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 filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java index f2b0df87..c6a2e6eb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java @@ -13,6 +13,8 @@ public interface BussinessLocalTypeService { List filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java index cbae5f04..14267dd4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java @@ -15,6 +15,8 @@ public interface BussinessTypeService { List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); BussinessTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java new file mode 100644 index 00000000..ab99f0b1 --- /dev/null +++ b/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 filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); + + List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); + + List findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest); + + List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); + + List selectByUuid(String uuid); + + List syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); + + List findAll(ProductInfoFilterRequest productInfoFilterRequest); + + List selectByUpdateTime(String startDate, String endDate);//按更新时间查询 + + boolean insertProductInfo(ProductInfoEntity productInfoEntity); + + boolean insertProductInfos(List productInfoEntities); + + boolean updateProductByUuid(ProductInfoEntity productInfoEntity); + + boolean deleteById(String id); + + boolean deleteAll(List ids); + + boolean updateProductInfo(ProductInfoEntity productInfoEntity); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java new file mode 100644 index 00000000..a856e83b --- /dev/null +++ b/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 selectAllTyshxyh(); + + List syncDlCompany(UdiCompanyRequest udiCompanyRequest); + + + List filterUdiCompany(UdiCompanyRequest udiCompanyRequest); + + boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity); + + boolean insertUdiCompanys(List udiCompanyEntities); + + boolean deleteById(String id); + + boolean deleteAll(List ids); + + boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java index 46d46350..32f29b15 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -12,6 +12,7 @@ public interface UdiRelevanceService { List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + List filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest); UdiRelevanceResponse selectByNameCode(String nameCode); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java index 8329aa2b..012841da 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java +++ b/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 basicExportStatusEntities = basicExportDao.filterExportStatus(basicExportStatusRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + return basicExportStatusEntities.get(0); + } + return null; + } + @Override public List 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); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java new file mode 100644 index 00000000..343cd22c --- /dev/null +++ b/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 basicExportStatusTimeEntities = filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) { + return basicExportStatusTimeEntities.get(0); + } + return null; + } + + @Override + public List 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); + + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 8bb40dbc..2c67e016 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/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 filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { + List data = bussinessLocalTypeDao.filterAllList(bussinessTypeFilterRequest); + return data; + } + @Override public List filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { return bussinessLocalTypeDao.filterUnBind(bussinessTypeFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java index e19dc41e..607a41d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/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 filterAllList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + List data = bussinessTypeDao.filterAllList(bussinessTypeFilterRequest); + return data; + } + @Override public List 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()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java new file mode 100644 index 00000000..4638e1e9 --- /dev/null +++ b/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 filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) { + if (productInfoFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + List data = productInfoDao.filterCpmctymc(productInfoFilterRequest); + return data; + } + + @Override + public List 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 data = productInfoDao.filterProductInfo(productInfoFilterRequest); + return data; + } + + @Override + public List 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 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 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 findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest) { + if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + } + List uuids = productInfoDao.filterUuidByCreditNo(productInfoFilterRequest); + if (uuids != null && uuids.size() > 0) + return productInfoDao.selectAllByUuid(uuids); + else + return null; + } + + @Override + public List 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 data = productInfoDao.filterUdi(productInfoFilterRequest); + return data; + } + + @Override + public List selectByUuid(String uuid) { + List data = productInfoDao.selectByUuid(uuid); + return data; + } + + @Override + public List syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest) { + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit() + 1; + productInfoFilterRequest.setPage(offset); + return productInfoDao.syncDlUdi(productInfoFilterRequest); + } + + @Override + public List findAll(ProductInfoFilterRequest productInfoFilterRequest) { + List data = productInfoDao.filterProductInfo(productInfoFilterRequest); + return data; + } + + public List 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 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 ids) { + return productInfoDao.deleteAll(ids); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java new file mode 100644 index 00000000..1ab32318 --- /dev/null +++ b/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 selectAllTyshxyh() { + return udiCompanyDao.selectAllTyshxyh(); + } + + @Override + public List syncDlCompany(UdiCompanyRequest udiCompanyRequest) { + int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit() + 1; + udiCompanyRequest.setPage(offset); + return udiCompanyDao.syncDlCompany(udiCompanyRequest); + } + + + @Override + public List 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 udiCompanyEntities) { + return udiCompanyDao.insertUdiCompanys(udiCompanyEntities); + } + + @Override + public boolean deleteById(String id) { + return udiCompanyDao.deleteById(id); + } + + @Override + public boolean deleteAll(List ids) { + return udiCompanyDao.deleteAll(ids); + } + + @Override + public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) { + return udiCompanyDao.updateUdiCompany(udiCompanyEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index fe280248..2c9adf4c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/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 filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest) { + List data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); + return data; + } + @Override public List batchSelectByUuid(List uuids) { return udiRelevanceDao.batchSelectByUuid(uuids); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java index d2dda5c1..e259687d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java +++ b/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 findAllByTime(OrderFilterRequest orderFilterRequest); List listOrderRepeat(OrderQueryRequest orderQueryRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 1c2dc7cd..83c8034e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/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 findAllByTime(OrderFilterRequest orderFilterRequest) { + return orderDao.findAllByTime(orderFilterRequest); + } @Override public boolean insertOrder(OrderEntity orderEntity) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 9c400f3b..f6f5845e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/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.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +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> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.BASIC_UDI + ""); @@ -86,4 +127,324 @@ public class DlBasicService { } +//------------------------------------------------------------ + + public void dlAllData() { + BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DATA + ""); + List pageSimpleResponse = baseResponse.getData(); + if (pageSimpleResponse != null) { + List basicExportStatusEntities = pageSimpleResponse; + if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { + for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DATA); + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + }); + 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 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 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 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 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 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 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 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 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> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_BUS + ""); + List pageSimpleResponse = baseResponse.getData(); + if (pageSimpleResponse != null) { + List basicExportStatusEntities = pageSimpleResponse; + if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { + for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_BUS); + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + }); + 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 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 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 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> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + ""); + List pageSimpleResponse = baseResponse.getData(); + if (pageSimpleResponse != null) { + List basicExportStatusEntities = pageSimpleResponse; + if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { + for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_ORDER); + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + }); + 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 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 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 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> 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> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + ""); + List pageSimpleResponse = baseResponse.getData(); + if (pageSimpleResponse != null) { + List basicExportStatusEntities = pageSimpleResponse; + if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { + for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { + + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DI); + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + }); + 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 udiCompanyEntities = spSyncUdiResponse.getUdiCompanyEntities(); + UdiCompanyDao mapper = batchSession.getMapper(UdiCompanyDao.class); + for (UdiCompanyEntity udiCompanyEntity : udiCompanyEntities) { + mapper.insertUdiCompany(udiCompanyEntity); + } + batchSession.commit(); + } + + if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())) { + List productInfoEntities = spSyncUdiResponse.getProductInfoEntityList(); + ProductInfoDao mapper = batchSession.getMapper(ProductInfoDao.class); + for (ProductInfoEntity productInfoEntity : productInfoEntities) { + mapper.insertProductInfo(productInfoEntity); + } + batchSession.commit(); + } + spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); + } + } + + } + } + + + } + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java index c5ab504c..21bae6dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java +++ b/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.dlBasicCorp(); - dlBasicService.dlBasicInv(); + dlBasicService.dlAllData(); + dlBasicService.dlAllBus(); + 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(); - } - } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java new file mode 100644 index 00000000..9fa4f5b4 --- /dev/null +++ b/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 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 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 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 basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + SpsSyncScheduleResponse spsSyncScheduleResponse = new SpsSyncScheduleResponse(); + spsSyncScheduleResponse.setBasicExportStatusEntities(basicExportStatusEntities); + BaseResponse 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); + } + + } + + + } + + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java index c28b906a..8af3c256 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java +++ b/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; -// long curTime = System.currentTimeMillis(); -// //任务一,定时下载供应商平台已完成单据 -// Long lastTime = (Long) redisUtil.get(RedisContant.DL_ORDER_STATUS); -// if (lastTime == null) { -// redisUtil.set(RedisContant.DL_ORDER_STATUS, System.currentTimeMillis()); -// } -// if (curTime - lastTime > timeInterval) { -// logger.info("每分钟执行一次单据下载"); -// redisUtil.set(RedisContant.DL_ORDER_STATUS, curTime); -// dlSpOrderService.dlOrdedrs(); -// } + //定时下载上游最近更新数据轮询时间 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_donwload_data"); + long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000; + long curTime = System.currentTimeMillis(); + Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA"); + if (lastTime == null) { + lastTime = System.currentTimeMillis(); + redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", lastTime); + } + if (curTime - lastTime > timeInterval) { + dlUploadService.dlBasicUdiInfo(); + redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime); + } + + } + } + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java new file mode 100644 index 00000000..dfc0b2b9 --- /dev/null +++ b/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 invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); + + //耗材字典 + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + List udiRelevanceEntities = udiRelevanceService.filterUdiEntity(filterUdiInfoRequest); + List results = new ArrayList<>(); + udiRelevanceEntities.forEach( + item -> { + results.add(item.getUuid() + ""); + } + ); + List udiInfoEntities = new ArrayList<>(); + if (results.size() > 0) + udiInfoEntities = udiInfoDao.batchSelectByUuid(results); + + + //往来单位字典 + BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); + basicUnitMaintainFilterRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + + + //第三方仓库信息 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + List thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest); + + + //第三方往来单位 + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrCorpRequest); + List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); + + //第三方产品信息 + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrProductsRequest); + List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + + //第三方业务单据 + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrOrderRequest); + List allOrderDetailEntities = new ArrayList<>(); + List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); + for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (!thrOrderDetailEntities.isEmpty()) { + allOrderDetailEntities.addAll(thrOrderDetailEntities); + } + } + + //供应商产品信息关联表 + FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, filterCompanyProductRelevanceRequest); + List 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 bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest); + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessLocalTypeFilterRequest); + List bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest); + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessOriginTypeFilterRequest); + List 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 orderEntities = orderService.findAllByTime(orderFilterRequest); + List allOrderDetailEntityList = new ArrayList<>(); + List warehouseEntityList = new ArrayList<>(); + if (CollUtil.isNotEmpty(orderEntities)) { + for (OrderEntity orderEntity : orderEntities) { + List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId()); + if (CollUtil.isNotEmpty(orderDetailEntityList)) { + allOrderDetailEntityList.addAll(orderDetailEntityList); + } + List 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; + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java index c7d1fc4b..4faa1c66 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java +++ b/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; + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/SpGetHttp.java b/api-admin/src/main/java/com/glxp/api/admin/util/SpGetHttp.java index d4f38dce..47d42c51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/SpGetHttp.java +++ b/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> getBasicStatus(BasicExportStatusRequest basicExportStatusRequest) { + Map 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> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + 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 postBasicStatus(Integer id) { + public BaseResponse 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 postAllBaseData(SpsSyncDataResponse syncDataResponse) { + String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/basic/upload", syncDataResponse); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse postAllBus(SpsSyncBusResponse spsSyncBusResponse) { + String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/busType/upload", spsSyncBusResponse); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse postAllOrder(SpsSyncOrderResponse spsSyncOrderResponse) { + String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/order/upload", spsSyncOrderResponse); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + public BaseResponse postAllSchedule(SpsSyncScheduleResponse spsSyncScheduleResponse) { + String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/schedule/upload", spsSyncScheduleResponse); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + } diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 16e41319..e6041f87 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/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服务器连接端口 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index d913b8ea..64485506 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -10,11 +10,17 @@ and id = #{id} - + and status = #{status} - - and type = #{type} + + and `type` = #{type} + + + and idDatas = #{idDatas} + + + and scheduleType = #{scheduleType} @@ -23,12 +29,16 @@ 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} ) @@ -39,8 +49,12 @@ status=#{status}, type=#{type}, updateTime=#{updateTime}, + scheduleType=#{scheduleType}, + startTime=#{startTime}, + endTime=#{endTime}, + remark=#{remark}, - WHERE orderId = #{orderId} + WHERE id = #{id} DELETE diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml new file mode 100644 index 00000000..ead10aff --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml @@ -0,0 +1,45 @@ + + + + + + + + + + replace + INTO basic_export_status_time(`key`,lastUpdateTime,remark) + values( + #{key}, + #{lastUpdateTime}, + #{remark} + ) + + + + UPDATE basic_export_status_time + + lastUpdateTime=#{lastUpdateTime}, + remark=#{remark}, + + WHERE key = #{key} + + + DELETE + FROM basic_export_status_time + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 1409e506..59b977f0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -31,7 +31,9 @@ AND corpType = #{corpType} - + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + 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} ) diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 7f07e791..4da8d618 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -39,6 +39,29 @@ + + @@ -57,7 +59,7 @@ - INSERT INTO basic_bustype_origin + replace INTO basic_bustype_origin (action, name, enable, remark, thirdSys, thirdSysName) values (#{action}, #{name}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 8f9387b7..e4e3bb61 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -41,6 +41,37 @@ + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml new file mode 100644 index 00000000..ccbbbc84 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -0,0 +1,510 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + ) + + + + + 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 + + + + + ( + #{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} + ) + + + + + DELETE + FROM productinfo + WHERE thirdProductNo = #{id} + + + + DELETE FROM productinfo WHERE thirdProductNo in + + #{item} + + + + + UPDATE productinfo + + nameCode=#{nameCode}, + packRatio=#{packRatio}, + packLevel=#{packLevel}, + bhxjsl=#{bhxjsl}, + bhzxxsbzsl=#{bhzxxsbzsl}, + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + bhxjcpbm=#{bhxjcpbm}, + bzcj=#{bzcj}, + thirdProductNo=#{thirdProductNo}, + addType=#{addType}, + deviceRecordKey=#{deviceRecordKey}, + isUseDy=#{isUseDy}, + thirdProductName=#{thirdProductName}, + cpmctymc=#{cpmctymc}, + cplb=#{cplb}, + flbm=#{flbm}, + ggxh=#{ggxh}, + qxlb=#{qxlb}, + tyshxydm=#{tyshxydm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + uuid=#{uuid}, + sjcpbm=#{sjcpbm}, + versionNumber=#{versionNumber}, + diType=#{diType}, + isNewest=#{isNewest}, + updateTime=#{updateTime}, + + + WHERE id = #{id} + + + + UPDATE productinfo + + scbssfbhph=#{scbssfbhph}, + scbssfbhxlh=#{scbssfbhxlh}, + scbssfbhscrq=#{scbssfbhscrq}, + scbssfbhsxrq=#{scbssfbhsxrq}, + ybbm=#{ybbm}, + spmc=#{spmc}, + cphhhbh=#{cphhhbh}, + cpms=#{cpms}, + cpbsbmtxmc=#{cpbsbmtxmc}, + isNewest=#{isNewest}, + updateTime=#{updateTime}, + + WHERE uuid = #{uuid} + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml new file mode 100644 index 00000000..278cf7ad --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + REPLACE + INTO udicompany + ( + id,tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh, + qylxrcz,qylxryx + ) + values + ( + #{id}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{qylxrdh}, + #{qylxrcz}, + #{qylxryx} + ) + + + + replace INTO udicompany(id, + tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh, + qylxrcz,qylxryx) + values + + + ( + #{item.id}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.ylqxzcrbarywmc}, + #{item.qylxrdh}, + #{item.qylxrcz}, + #{item.qylxryx}) + + + + + DELETE + FROM udicompany + WHERE id = #{id} + + + + DELETE FROM udicompany WHERE id in + + #{item} + + + + + UPDATE udicompany + + tyshxydm=#{tyshxydm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + qylxrdh=#{qylxrdh}, + qylxrcz=#{qylxrcz}, + qylxryx=#{qylxryx}, + + WHERE id = #{id} + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 070cb20d..ae093a96 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -249,6 +249,9 @@ AND mainId = #{mainId} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 99e80246..6f318deb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -19,7 +19,21 @@ ORDER BY actDate DESC - + diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index 88d96788..dbcff3ea 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -16,6 +16,9 @@ AND thirdSysFk = #{thirdSysFk} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index 7558c836..b40f6d4c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -28,6 +28,9 @@ and code like concat('%',#{key},'%') or `name` like concat('%',#{key},'%') + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 2f6bb56c..5cd606de 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -37,20 +37,64 @@ - 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}, - #{billdate}, - #{corpId}, - #{corpName}, - #{billType}, - #{billFlag}, - #{thirdSysFk}, #{updateTime}, #{originType}, - #{startDate}, #{endDate}, #{createUser}, #{reviewUser}, - #{address}, #{linkMan}, #{linkTel}, #{remark}, #{remark1}, - #{remark2}, #{remark3}) + values ( + #{billNo}, + #{billdate}, + #{corpId}, + #{corpName}, + #{billType}, + #{billFlag}, + #{thirdSysFk}, + #{updateTime}, + #{originType}, + #{startDate}, + #{endDate}, + #{createUser}, + #{reviewUser}, + #{address}, + #{linkMan}, + #{linkTel}, + #{remark}, + #{remark1}, + #{remark2}, + #{remark3} + ) + + + + 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} + ) @@ -79,11 +123,14 @@ - DELETE FROM thr_order WHERE id = #{id} + DELETE + FROM thr_order + WHERE id = #{id} - DELETE FROM thr_order + DELETE + FROM thr_order diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index b266d8fc..754dfeba 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -19,34 +19,75 @@ - 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}, - #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime}, - #{price}, #{corpName}) + values ( + #{productId}, + #{productName}, + #{spec}, + #{batchNo}, + #{expireDate}, + #{productDate}, + #{count}, + #{reCount}, + #{orderIdFk}, + #{thirdSysFk}, + #{updateTime}, + #{price}, + #{corpName} + ) + + + + 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} + ) replace INTO thr_order_detail - (productId, productName, spec, batchNo, expireDate, - productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName) - values + (productId, productName, spec, batchNo, expireDate, + productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName) + values (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate}, - #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk}, - #{item.updateTime}, - #{item.price}, #{item.corpName}) + #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk}, + #{item.updateTime}, + #{item.price}, #{item.corpName}) - DELETE FROM thr_order_detail WHERE id = #{id} + DELETE + FROM thr_order_detail + WHERE id = #{id} - DELETE FROM thr_order_detail WHERE orderIdFk = #{orderIdFk} + DELETE + FROM thr_order_detail + WHERE orderIdFk = #{orderIdFk} @@ -70,7 +111,8 @@ - DELETE FROM thr_order_detail + DELETE + FROM thr_order_detail \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index c0301f3b..36774a7e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -38,6 +38,9 @@ AND supName = #{supName} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + @@ -52,7 +55,7 @@ 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},