单据字段缺失，新增首营资质数据传输

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java

@@ -60,4 +60,11 @@ public class OrderEntity {
     private String subInvName;
     private String invName;
     private String printRemark;
+    private String deptCode;
+    private String deptName;
+
+    private boolean codeFillCheck;
+
+    private String preInBillNo;
+    private String preOutBillNo;
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupCertEntity.java

@@ -0,0 +1,33 @@
+package com.glxp.sale.admin.entity.sync;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+//供应商企业资质表
+
+@Data
+public class SupCertEntity {
+
+    private Integer id;
+    private String customerId;
+    private String name;
+    private String code;
+    private String filePath;
+    private String remark;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date vailDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expireDate;
+    private Integer type;           //证书类型：1:供应商；2.生产企业；3.产品品种
+    private String manufacturerIdFk;
+    private String productIdFk;
+    private Integer auditStatus;            //审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过
+    private String auditComment;
+    private int status;                 //0：启用，1:禁用
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupCompanyEntity.java

@@ -0,0 +1,80 @@
+package com.glxp.sale.admin.entity.sync;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupCompanyEntity {
+
+    private String companyName;        //企业名称
+    private Integer bussinessStatus;    //企业类型
+    private String creditNum;  //统一社会信用代码
+    private String classes;     //企业类别         //企业类别：1.生产企业，2.流通企业，3。医疗机构
+
+    private String area;
+    private String areaCode;
+    private String detailAddr;
+    private String appId;
+    private String appSecret;
+    private String customerId;
+    private String contacts;
+    private String mobile;
+    private String tel;
+    private String email;
+
+    private String refEntId;
+    private String entId;
+    private int networkType;
+    private int certIdFk;
+
+    private String parentCompany;
+    private String parentIdFk;
+
+    private String contactsPapersType;
+    private String contactsPapersCode;
+    private String registerStatus;
+    private String jyxkzh;
+    private String jyxkzfzjg;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date jyxkzyxq;
+    private String jybapzh;
+    private String jybabm;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date fzrq;
+    private String suihao;
+    private String kaihuhang;
+    private String kaihuzhanghao;
+
+    private Integer auditStatus;
+    private String unitIdFk;
+
+    private String filePath;
+    private String newFilePath;
+    private String filePath2;
+    private String newFilePath2;
+    private String filePath3;
+    private String newFilePath3;
+    private String filePath4;
+    private String newFilePath4;
+
+    private String updateCause;
+    private String newAuditStatus;
+    private String noPassCause;
+    private String auditor;
+
+    private String auditStatusList;
+
+    private Date createTime;
+    private String createBy;
+    private Date updateTime;
+    private Date auditTime;
+    private String auditComment;
+    private Integer editStatus;
+
+    private int status;         //0：启用，1:禁用
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupManufacturerEntity.java

@@ -0,0 +1,40 @@
+package com.glxp.sale.admin.entity.sync;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupManufacturerEntity {
+
+    private Long id;
+    private String companyName;
+    private String creditCode;
+    private String companyType;
+    private String placeArea;
+    private String placeAreaCode;
+    private String placeAddress;
+    private String detailAddr;
+    private String legalPersonName;
+    private String legalPersonPapersType;
+    private String legalPersonPapersCode;
+    private String productionArea;
+    private String productionAreaCode;
+    private String productionAddress;
+    private String registerStatus;
+    private String productionLicenceNum;
+    private Date productionLicenceDate;
+    private String productionRecordNum;
+    private String productionRecordSection;
+    private Date productionRecordDate;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String customerId;
+    private String manufacturerId;
+
+    private Integer auditStatus;
+    private String supName;
+    private String auditComment;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/SupProductEntity.java

@@ -0,0 +1,60 @@
+package com.glxp.sale.admin.entity.sync;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupProductEntity {
+
+    private Long id;
+    private String productId;
+    private Long enterpriseId;
+    private String recordCode;
+    private String recordProductName;
+    private String productManageType;
+    private String recordPeopleName;
+    private String recordPeopleArea;
+    private String recordPeopleAreaCode;
+    private String recordPeopleAddress;
+    private String productType;
+    private String productDirectoryCode;
+    private String agentName;
+    private String agentArea;
+    private String agentAreaCode;
+    private String agentAddress;
+    private String instructions;
+    private String productAddress;
+    private String recordText;
+    private String placeOrigin;
+    private String productionRegion;
+    private String productionCompanyName;
+    private String afterSale;
+    private String specification;
+    private String structure;
+    private String scope;
+    private String other;
+    private String filePath;
+    private String remark;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private Date updateTime;
+
+    private String newFilePath;
+    private String newInstructions;
+
+    private String manufacturerIdFk;
+    private String customerId;
+
+
+    private Integer auditStatus;
+    private String auditComment;
+    private String sptm;
+    private String ybbm;
+    private String measname;
+    private String cpms;
+    private String hchzsb;
+    private String relIdFk;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderEntity.java

@@ -36,4 +36,7 @@ public class ThrOrderEntity {
     private String locStorageCode;
     private Integer editStatus;
     private String invWarehouseCode;
+
+    private String fromSubInvCode;
+    private int allocateStatus;     //1:已配货；0：未配货
 }

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

@@ -45,6 +45,12 @@ public class SpsSyncDataResponse {
     //新增配送产品信息
     List<NewUploadDiEntity> newUploadDiEntities;
 
+
+    List<SupCompanyEntity> supCompanyEntities;
+    List<SupManufacturerEntity> supManufacturerEntities;
+    List<SupProductEntity> supProductEntities;
+    List<SupCertEntity> supCertEntities;
+
     @Override
     public String toString() {
         StringBuffer remark = new StringBuffer();
@@ -102,6 +108,23 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(newUploadDiEntities)) {
             remark.append("新增配送产品信息：").append(newUploadDiEntities.size()).append(" 条\n");
         }
+
+
+        if (CollUtil.isNotEmpty(supCompanyEntities)) {
+            remark.append("配送企业证书：").append(supCompanyEntities.size()).append(" 条\n");
+        }
+
+        if (CollUtil.isNotEmpty(supManufacturerEntities)) {
+            remark.append("生产企业证书：").append(supManufacturerEntities.size()).append(" 条\n");
+        }
+
+        if (CollUtil.isNotEmpty(supProductEntities)) {
+            remark.append("产品资质证书：").append(supProductEntities.size()).append(" 条\n");
+        }
+
+        if (CollUtil.isNotEmpty(supCertEntities)) {
+            remark.append("相关证书总数：").append(supCertEntities.size()).append(" 条\n");
+        }
         return remark.toString();
     }
 }

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

@@ -4,7 +4,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udispsync?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 #spring.datasource.password=root
-spring.datasource.password=123456
+spring.datasource.password=mysql80
 #server.servlet.context-path=
 logging.level.com.glxp.sale.admin.dao=debug
 # \u8DE8\u57DF\u8BBE\u7F6E