diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 557025b..9240fc9 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -8,7 +8,7 @@ 0.0.1 4.0.0 - jar + war api-admin @@ -285,7 +285,7 @@ com.lowagie.text 2.1.7 - + @@ -293,7 +293,7 @@ okhttp 3.10.0 - + org.apache.commons commons-text @@ -311,7 +311,7 @@ spring-boot-maven-plugin - + org.springframework.boot @@ -340,4 +340,4 @@ - \ No newline at end of file + diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoCodeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoCodeEntity.java new file mode 100644 index 0000000..6229815 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoCodeEntity.java @@ -0,0 +1,118 @@ +package com.glxp.sale.admin.entity.sync; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class IoCodeEntity implements Serializable { + + private Integer id; + + /** + * UDI码 + */ + private String code; + + /** + * 主单据类型(入库,出库) + */ + private String mainAction; + + /** + * 单据类型 + */ + private String action; + + /** + * 订单号外键 + */ + private String orderId; + + /** + * 手持终端订单号 + */ + private String corpOrderId; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 包装级别 + */ + private String packageLevel; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 耗材字典ID外键 + */ + private Long relId; + + /** + * 扫码数量 + */ + private Integer count; + + /** + * 实际数量 + */ + private Integer reCount; + /** + * 部门编码外键 + */ + private String deptCode; + + /** + * 仓库编码外键 + */ + private String invCode; + + /** + * 货位编码外键 + */ + private String warehouseCode; + + /** + * 更新日期 + */ + private Date updateTime; + + /** + * 创建日期 + */ + private Date createTime; + + private int status; //条码校验状态 + private int scanCount; + + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailBizEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailBizEntity.java new file mode 100644 index 0000000..e273c9e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailBizEntity.java @@ -0,0 +1,164 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class IoOrderDetailBizEntity { + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private Long bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private int count; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + + private String bindRlIds; + + private String filePath; + + /** + * 检验报告名称 + */ + private String checkFileName; + + + + private boolean checkSuccess; + + private int scanCount; + + + private String errMsg; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailCodeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailCodeEntity.java new file mode 100644 index 0000000..40348a7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailCodeEntity.java @@ -0,0 +1,158 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class IoOrderDetailCodeEntity { + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private Long bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private int count; + + /** + * 扫码数量 + */ + private int reCount; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + + private boolean checkSuccess; + + private int orderCount; + + private String errMsg; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailResultEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailResultEntity.java new file mode 100644 index 0000000..a0fd55c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderDetailResultEntity.java @@ -0,0 +1,151 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class IoOrderDetailResultEntity { + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private Long bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private int count; + + /** + * 扫码数量 + */ + private int reCount; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderEntity.java new file mode 100644 index 0000000..3b561fe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoOrderEntity.java @@ -0,0 +1,188 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IoOrderEntity { + + private Integer id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 手持终端订单号 + */ + private String corpOrderId; + + /** + * 主业务类型 + */ + private String mainAction; + + /** + * 业务类型 + */ + private String action; + + /** + * 往来单位 + */ + private String fromCorp; + + /** + * 往来部门 + */ + private String fromDeptCode; + + /** + * 往来仓库 + */ + private String fromInvCode; + + /** + * 单据来源(1.UDIMS平台;2.网页新增;3.pda已校验;4.pda未校验;5.pc端扫码精灵) + */ + private Integer fromType; + + /** + * 1:草稿;2:已提交待处理;3:处理成功待校验;4:处理异常;5:校验成功待审核;6:校验失败;7:审核通过;8:审核拒绝 + */ + private Integer status; + + /** + * 1.草稿;2:已提交;3:已审核 + */ + private Integer dealStatus; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 验收人 + */ + private String reviewUser; + + /** + * 验收时间 + */ + private Date auditTime; + + private Date checkTime; + + /** + * ID + */ + private String customerId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 单据流转 + */ + private Boolean outChangeEnable; + + /** + * 单据流转上级单号 + */ + private String originUllageSupNo; + + /** + * 单据流转下级单号 + */ + private String ullageSupNo; + + /** + * 平衡补单单号 + */ + private String supplementNo; + + /** + * 第三方系统单号(提交后返回) + */ + private String thirdBillNo; + + /** + * 复制单据单号,多个单号之间使用,隔开 + */ + private String replicateNo; + + /** + * 单据打印备注 + */ + private String printRemark; + + /** + * 单据备注 + */ + private String remark; + + private String errMsg; + + private String preOutBillNo; + + private String preInBillNo; + + private boolean entrustEnd; + + + /** + * 单据类型:1.业务单据,2:扫码单据,3.正常处理单据 只有草稿,异常,待处理 + */ + private Integer orderType; + + //单据同步状态 + private Integer syncStatus; + + + private String fromReceiveBillNo; + + private String fromThrBillNo; + + /** + * 导出状态/上传状态(0.未导出,1.已导出,2.导出失败) + */ + private Integer exportStatus; + + + private Integer busType; //1:正常;2:送货;3.到货 + + + private Integer deliveryStatus; //单据送货验收状态 + + private Integer processStatus; //退货单据处理状态 + private int inCodeStatus; //内部码生成状态 + + private String relKey; //关联单据唯一键 + private Integer suppleCount; //补单次数 + +} 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 69a8bf8..e5912f7 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 @@ -21,8 +21,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; -//@Component -//@EnableScheduling +@Component +@EnableScheduling public class HeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(HeartTask.class);