diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java index f75a132..ba6f9d0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BasicUnitMaintainEntity.java index 2fff893..b54631c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BasicUnitMaintainEntity.java +++ b/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 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/NewUploadDiEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/NewUploadDiEntity.java new file mode 100644 index 0000000..a0913b0 --- /dev/null +++ b/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; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrInvWarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrInvWarehouseEntity.java index 3db7407..7963fb9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrInvWarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrInvWarehouseEntity.java @@ -33,4 +33,6 @@ public class ThrInvWarehouseEntity { * 第三方系统标识 */ private String thirdSysFk; + + } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderDetailEntity.java index b102f1e..354756f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderDetailEntity.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderEntity.java index 05f6867..adce0dc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderEntity.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsEntity.java index c777115..19eea24 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsEntity.java +++ b/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; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoEntity.java index 95c0f6a..a38b831 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoEntity.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java index 71300c8..aafb031 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java @@ -41,6 +41,10 @@ public class SpsSyncDataResponse { List invSubWarehouseEntities; List invBusUserEntities; + + //新增配送产品信息 + List 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(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java index b491e96..13aceff 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java +++ b/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(); }