bug修改，多个缺失字段补齐

api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java

@@ -29,4 +29,7 @@ public class AuthAdmin {
     private long CustomerId;
     private String locInvCode;
     private String locSubInvCode;
+
+    private String dept;
+    private String deptName;
 }

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

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.entity.sync;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 @Data

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

@@ -0,0 +1,19 @@
+package com.glxp.sale.admin.entity.sync;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class NewUploadDiEntity {
+    private Integer id;
+    private String relId;
+    private String thirdSysFk;
+    private Integer uploadStatus;
+    private String uploadMsg;
+    private String uploadCode;
+    private String remark;
+    private Date updateTime;
+    private Date submitTime;
+
+}

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

@@ -33,4 +33,6 @@ public class ThrInvWarehouseEntity {
      * 第三方系统标识
      */
     private String thirdSysFk;
+
+
 }

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

@@ -25,4 +25,28 @@ public class ThrOrderDetailEntity {
     private BigDecimal price; //单价
     private String corpName; //往来单位
 
+    private String sweepCount;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+
+    //销售清单号（第二票）
+    private String secSalesListNo;
+
+    //销售发票号（第一票）
+    private String firstSalesInvNo;
+
+    //销售发票号（第二票）
+    private String secSalesInvNo;
+
+    //开票日期
+    private String invoiceDate;
+    private String manufactory;
+    private boolean allowNoBatch;
+    private boolean allowNoExpire;
+    private boolean allowNoProduct;
+    private String code;
+    private String serialNo;
+
+    private Integer codeId;
+
 }

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

@@ -35,4 +35,5 @@ public class ThrOrderEntity {
 
     private String locStorageCode;
     private Integer editStatus;
+    private String invWarehouseCode;
 }

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

@@ -39,4 +39,7 @@ public class ThrProductsEntity {
     private String remark2; //备注2
     private String remark3; //备注3
 
+    private String relId;
+
+
 }

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

@@ -66,6 +66,23 @@ public class UdiInfoEntity {
 
     private String price;
 
+
+    private String cplx;
+    private String hchzsb;
+
+    //产品代理商
+    private String cpdls;
+
+
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
+
     public Integer getId() {
         return id;
     }

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

@@ -41,6 +41,10 @@ public class SpsSyncDataResponse {
     List<InvSubWarehouseEntity> invSubWarehouseEntities;
     List<InvBusUserEntity> invBusUserEntities;
 
+
+    //新增配送产品信息
+    List<NewUploadDiEntity> newUploadDiEntities;
+
     @Override
     public String toString() {
         StringBuffer remark = new StringBuffer();
@@ -94,6 +98,10 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(deptEntityList)) {
             remark.append("部门信息：").append(deptEntityList.size()).append(" 条\n");
         }
+
+        if (CollUtil.isNotEmpty(newUploadDiEntities)) {
+            remark.append("新增配送产品信息：").append(newUploadDiEntities.size()).append(" 条\n");
+        }
         return remark.toString();
     }
 }

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

@@ -60,6 +60,8 @@ public class HeartTask implements SchedulingConfigurer {
 
 
     private void process() {
+
+        logger.info("------------心跳任务-----------------");
         dlData();
     }