UDI
/
udi-cpt-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口主键完善

Browse Source
cert
1178634255 2 years ago
parent 21b5995b3c
commit 4809c6bf13
15 changed files with 189 additions and 26 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java
Unescape Escape View File

@ -7,70 +7,84 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("追踪制造代码关联实体")
@TableName(value = "trace_manu_code_rel")
public class TraceManuCodeRelEntity implements Serializable {
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* UDI码
*/
@ApiModelProperty(value = "UDI码")
@TableField(value = "code")
private String code;
/**
* 父码
*/
@ApiModelProperty(value = "父码")
@TableField(value = "pcode")
private String pcode;
/**
* 批次号
*/
@ApiModelProperty(value = "批次号")
@TableField(value = "batchNo")
private String batchNo;
/**
* 生产日期
*/
@ApiModelProperty(value = "生产日期")
@TableField(value = "produceDate")
private String produceDate;
/**
* 失效日期
*/
@ApiModelProperty(value = "失效日期")
@TableField(value = "expireDate")
private String expireDate;
/**
* 序列号
*/
@ApiModelProperty(value = "序列号")
@TableField(value = "serialNo")
private String serialNo;
/**
* 1.满箱;2:零箱 3:拼箱满箱 4:拼箱零箱
*/
@ApiModelProperty(value = "1.满箱;2:零箱 3:拼箱满箱 4:拼箱零箱")
@TableField(value = "packState")
private Integer packState;
/**
* 包装层级
*/
@ApiModelProperty(value = "包装层级")
@TableField(value = "bzcj")
private Integer bzcj;
/**
* 生产订单号
*/
@ApiModelProperty(value = "生产订单号")
@TableField(value = "manuOrderNo")
private String manuOrderNo;
/**
* 生产订单号ID外键
*/
@ApiModelProperty(value = "生产订单号ID外键")
@TableField(value = "manuOrderIdFk")
private Long manuOrderIdFk;

2
src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java
Unescape Escape View File

@ -20,7 +20,7 @@ import lombok.Data;
@TableName(value = "trace_order")
public class TraceOrderEntity implements Serializable {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;

22
src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java
Unescape Escape View File

@ -10,106 +10,126 @@ import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 任务公告表
*/
@Data
@ApiModel("任务公告表")
@TableName(value = "trace_task_notice")
public class TraceTaskNoticeEntity implements Serializable {
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 查询记录表ID外键
*/
@ApiModelProperty(value = "查询记录表ID外键")
@TableField(value = "produdctRecordIdFk")
private Long produdctRecordIdFk;
/**
* 任务类型 1：关联关系；2:出入库单据
*/
@ApiModelProperty(value = "任务类型 1：关联关系；2:出入库单据")
@TableField(value = "taskType")
private Integer taskType;
/**
* 任务状态（1.未处理；2正在处理（任务被下载）3：已处理（任务已提交）；4:超时处理失败
*/
@ApiModelProperty(value = "任务状态（1.未处理；2正在处理（任务被下载）3：已处理（任务已提交）；4:超时处理失败")
@TableField(value = "`status`")
private Integer status;
/**
* 企业信息ID外键
*/
@ApiModelProperty(value = "企业信息ID外键")
@TableField(value = "companyIdFk")
private Long companyIdFk;
/**
* 医疗器械注册人
*
*/
@ApiModelProperty(value = "医疗器械注册人")
@TableField(value = "ylqxzcrbarmc")
private String ylqxzcrbarmc;
/**
* 医疗器械注册人统一社会信用号
*/
@ApiModelProperty(value = "医疗器械注册人统一社会信用号")
@TableField(value = "creditNum")
private String creditNum;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
@TableField(value = "cpmctymc")
private String cpmctymc;
/**
* 规格型号
*/
@ApiModelProperty(value = "规格型号")
@TableField(value = "ggxh")
private String ggxh;
/**
* 批次号
*/
@ApiModelProperty(value = "批次号")
@TableField(value = "batchNo")
private String batchNo;
/**
* 生产日期
*/
@ApiModelProperty(value = "生产日期")
@TableField(value = "produceDate")
private String produceDate;
/**
* 失效日期
*/
@ApiModelProperty(value = "失效日期")
@TableField(value = "expireDate")
private String expireDate;
/**
* 序列号
*/
@ApiModelProperty(value = "序列号")
@TableField(value = "serialNo")
private String serialNo;
/**
* 查询UDI码
*/
@ApiModelProperty(value = "查询UDI码")
@TableField(value = "udiCode")
private String udiCode;
/**
* 任务创建时间
*/
@ApiModelProperty(value = "任务创建时间")
@TableField(value = "createTime")
private Date createTime;
/**
* 任务更新时间
*/
@ApiModelProperty(value = "任务更新时间")
@TableField(value = "updateTime")
private Date updateTime;
@ApiModelProperty(value = "DI列表")
@TableField(value = "diList", typeHandler = FastjsonTypeHandler.class)
private List<String> diList;

63
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -1,75 +1,116 @@
package com.glxp.api.req.basic;
import com.glxp.api.util.page.ListPageRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("过滤UDI关联请求")
public class FilterUdiRelRequest extends ListPageRequest {
@ApiModelProperty(value = "医疗器械注册备案名称")
private String ylqxzcrbarmc;
@ApiModelProperty(value = "产品名称全称")
private String cpmctymc;
@ApiModelProperty(value = "")
private String entireCpmctymc;
@ApiModelProperty(value = "名称编码")
private String nameCode;
@ApiModelProperty(value = "uuid")
private String uuid;
@ApiModelProperty(value = "原始UUID")
private String originUuid;
@ApiModelProperty(value = "规格型号")
private String ggxh;
@ApiModelProperty(value = "第三方id")
private String thirdId;
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "第三方id1")
private String thirdId1;
@ApiModelProperty(value = "第三方id2")
private String thirdId2;
@ApiModelProperty(value = "第三方id3")
private String thirdId3;
@ApiModelProperty(value = "第三方id4")
private String thirdId4;
@ApiModelProperty(value = "第三方编码")
private String thirdCode;
@ApiModelProperty(value = "第三方系统")
private String thirdSys;
@ApiModelProperty(value = "最后更新时间")
private String lastUpdateTime;
@ApiModelProperty(value = "注册/备案证号")
private String zczbhhzbapzbh;
@ApiModelProperty(value = "DI类型")
private Integer diType;
@ApiModelProperty(value = "联合代码")
private String unionCode;
@ApiModelProperty(value = "UDI代码")
private String udiCode;
@ApiModelProperty(value = "第三方PI ID")
private String thrPiId;
@ApiModelProperty(value = "是否审核")
private Boolean isCheck;
@ApiModelProperty(value = "0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码")
private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
@ApiModelProperty(value = "锁定状态")
private Integer lockStatus;
@ApiModelProperty(value = "客户ID")
private String customerId;
@ApiModelProperty(value = "UDPLAT代码")
private String udplatCode;
@ApiModelProperty(value = "主要ID")
private String mainId;
@ApiModelProperty(value = "是否预付款")
private Boolean isAdavence;
@ApiModelProperty(value = "企业ID")
private String corpId;
@ApiModelProperty(value = "账单类型")
private String billType;
@ApiModelProperty(value = "医保编码")
private String ybbm;
@ApiModelProperty(value = "商品条码")
private String sptm;
@ApiModelProperty(value = "产品名称，规格，批文，生产厂家联合查询")
private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
@ApiModelProperty(value = "是否禁用")
private Boolean isDisable;
@ApiModelProperty(value = "关联ID列表")
List<String> relIds;
@ApiModelProperty(value = "唯一名称代码")
private String uniqueNameCode;
@ApiModelProperty(value = "供应商名称")
private String supName;
@ApiModelProperty(value = "单位外键")
private String unitFk;
@ApiModelProperty(value = "相关ID")
private String relId;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "绑定关联ID列表")
private String bindRlIds;
@ApiModelProperty(value = "关联代码")
private String relCode;
@ApiModelProperty(value = "绑定类型")
private String bindType;
@ApiModelProperty(value = "证书ID外键")
private String certIdFk;
@ApiModelProperty(value = "制造商")
private String manufactory;
@ApiModelProperty(value = "统一社会信用代码")
private String tyshxydm;
@ApiModelProperty(value = "派遣")
private Boolean dispatch;
@ApiModelProperty(value = "团购")
private Boolean groupBuy;
@ApiModelProperty(value = "企业id")
private Long companyId;
}

5
src/main/java/com/glxp/api/req/trace/TraceDlTaskRequest.java
Unescape Escape View File

@ -1,9 +1,12 @@
package com.glxp.api.req.trace;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("追踪任务请求")
public class TraceDlTaskRequest {
@ApiModelProperty(value = "任务id")
private Long taskId;
}

15
src/main/java/com/glxp/api/req/trace/TraceManuDetailRequest.java
Unescape Escape View File

@ -1,57 +1,70 @@
package com.glxp.api.req.trace;
import com.glxp.api.util.page.ListPageRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("追踪制造详情请求")
public class TraceManuDetailRequest extends ListPageRequest {
@ApiModelProperty(value = "主键")
private Long id;
/**
* UDI码
*/
@ApiModelProperty(value = "UDI码")
private String code;
/**
* 父码
*/
@ApiModelProperty(value = "父码")
private String pcode;
/**
* 批次号
*/
@ApiModelProperty(value = "批次号")
private String batchNo;
/**
* 生产日期
*/
@ApiModelProperty(value = "生产日期")
private String produceDate;
/**
* 失效日期
*/
@ApiModelProperty(value = "失效日期")
private String expireDate;
/**
* 序列号
*/
@ApiModelProperty(value = "序列号")
private String serialNo;
/**
* 1.满箱;2:零箱 3:拼箱满箱 4:拼箱零箱
*/
@ApiModelProperty(value = "1.满箱;2:零箱 3:拼箱满箱 4:拼箱零箱")
private Integer packState;
/**
* 包装层级
*/
@ApiModelProperty(value = "包装层级")
private Integer bzcj;
/**
* 生产订单号外键
*/
@ApiModelProperty(value = "生产订单号外键")
private String manuOrderNo;
@ApiModelProperty(value = "制造订单ID外键")
private String manuOrderIdFk;

19
src/main/java/com/glxp/api/req/trace/TraceManuOrderUploadRequest.java
Unescape Escape View File

@ -1,14 +1,17 @@
package com.glxp.api.req.trace;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
@ApiModel(value = "追踪制造订单上传请求")
public class TraceManuOrderUploadRequest {
@ApiModelProperty(value = "任务ID")
@NotNull(message = "任务ID")
private Long taskId;
@ -16,70 +19,82 @@ public class TraceManuOrderUploadRequest {
/**
* 生产订单号
*/
@ApiModelProperty(value = "生产订单号")
@NotNull(message = "生产订单号不能为空")
private String billNo;
/**
* 订单日期
*/
@ApiModelProperty(value = "订单日期")
@NotNull(message = "订单日期不能为空")
private String billDate;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
@NotNull(message = "产品名称不能为空")
private String cpmctymc;
/**
* 规格型号
*/
@ApiModelProperty(value = "规格型号")
private String ggxh;
/**
* 产品描述
*/
@ApiModelProperty(value = "产品描述")
private String cpms;
/**
* 注册/备案证号
*/
@ApiModelProperty(value = "注册/备案证号")
private String zczbhhzbapzbh;
/**
* DI
*/
@ApiModelProperty(value = "DI")
@NotNull(message = "DI标识不能为空")
private String nameCode;
/**
* 国家库UUID
*/
@ApiModelProperty(value = "国家库UUID")
@NotNull(message = "国家库UUID不能为空")
private String uuid;
/**
* 医疗器械注册人
*/
@ApiModelProperty(value = "医疗器械注册人")
private String ylqxzcrbarmc;
/**
* 生产企业
*/
@ApiModelProperty(value = "生产企业")
private String manufactory;
/**
* 企业信息ID外键
*/
@ApiModelProperty(value = "企业信息ID外键")
@NotNull(message = "企业信息ID不能为空")
private Long companyIdFk;
/**
* 上传者ID
*/
@ApiModelProperty(value = "上传者ID")
@NotNull(message = "上传者ID不能为空")
private Long uploadUser;
@ApiModelProperty(value = "UDI码关联关系")
@NotNull(message = "UDI码关联关系不能为空")
List<TraceManuDetailRequest> details;

25
src/main/java/com/glxp/api/req/trace/TraceOrderUploadRequest.java
Unescape Escape View File

@ -1,111 +1,134 @@
package com.glxp.api.req.trace;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "追踪订单上传请求")
public class TraceOrderUploadRequest {
@ApiModelProperty(value = "任务id")
private Long taskId;
/**
* 单据号
*/
@ApiModelProperty(value = "单据号")
private String billNo;
/**
* 单据时间
*/
@ApiModelProperty(value = "单据时间")
private String billDate;
/**
* 1:入库；2：出库
*/
@ApiModelProperty(value = "1:入库；2：出库")
private Byte inOutType;
/**
* 单据类型
*/
@ApiModelProperty(value = "单据类型")
private String billType;
/**
* 发货企业
*/
@ApiModelProperty(value = "发货企业")
private String fromCorp;
/**
* 发货企业统一社会信用号
*/
@ApiModelProperty(value = "发货企业统一社会信用号")
private String fromCorpCreditNum;
/**
* 收货企业
*/
@ApiModelProperty(value = "收货企业")
private String toCorp;
/**
* 收货企业统一社会信用号
*/
@ApiModelProperty(value = "收货企业统一社会信用号")
private String toCorpCreditNum;
/**
* 单据创建者
*/
@ApiModelProperty(value = "单据创建者")
private Long createUser;
/**
* 企业信息ID外键
*/
@ApiModelProperty(value = "企业信息ID外键")
private Long companyIdFk;
/**
* 客户端类型
*/
@ApiModelProperty(value = "客户端类型")
private Integer clientType;
/**
* 退货原因（退货时填写）
*/
@ApiModelProperty(value = "退货原因（退货时填写）")
private String returnReason;
/**
* 销毁原因（销毁时填写）
*/
@ApiModelProperty(value = "销毁原因（销毁时填写）")
private String destoryReason;
/**
* 执行销毁人（销毁时填写）
*/
@ApiModelProperty(value = "执行销毁人（销毁时填写）")
private String excuseUser;
/**
* 执行销毁人证件号（销毁时填写）
*/
@ApiModelProperty(value = "执行销毁人证件号（销毁时填写）")
private String excuseCode;
/**
* 监督人姓名【销毁出库时填写】
*/
@ApiModelProperty(value = "监督人姓名【销毁出库时填写】")
private String superviserUser;
/**
* 监督人证件号【销毁出库时填写】
*/
@ApiModelProperty(value = "监督人证件号【销毁出库时填写】")
private String superviserCode;
/**
* 上传着ID
*/
@ApiModelProperty(value = "上传着ID")
private Long uploadUser;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
/**
* 查询记录号外键
*/
@ApiModelProperty(value = "查询记录号外键")
private String recordCode;

21
src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
Unescape Escape View File

@ -1,84 +1,101 @@
package com.glxp.api.req.trace;
import com.glxp.api.util.page.ListPageRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel("追踪记录请求")
public class TraceRecordRequest extends ListPageRequest {
@ApiModelProperty(value = "主键")
private Long id;
/**
* 查询记录号
*/
@ApiModelProperty(value = "查询记录号")
private String recordCode;
/**
* 查询来源
*/
@ApiModelProperty(value = "查询来源")
private Integer fromType;
/**
* 查询者
*/
@ApiModelProperty(value = "查询者")
private String createUser;
/**
* 查询记录时间
*/
@ApiModelProperty(value = "查询记录时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 查询方式（1:源头查询；2：现在检查查询)
*/
@ApiModelProperty(value = "查询方式（1:源头查询；2：现在检查查询)")
private Integer traceSource;
/**
* 查询方案（按UDI码查询/按批次号查询）
*/
@ApiModelProperty(value = "查询方案（按UDI码查询/按批次号查询）")
private Integer traceType;
/**
* UDI码
*/
@ApiModelProperty(value = "UDI码")
private String udiCode;
/**
* 社会信用号
*/
@ApiModelProperty(value = "社会信用号")
private String creditNum;
/**
* 注册备案人
*/
@ApiModelProperty(value = "注册备案人")
private String ylqxzcrbarmc;
/**
* 产品主DI标识
*/
@ApiModelProperty(value = "产品主DI标识")
private String nameCode;
/**
* 产品通用名
*/
@ApiModelProperty(value = "产品通用名")
private String cpmctymc;
/**
* 规格型号
*/
@ApiModelProperty(value = "规格型号")
private String ggxh;
/**
* 生产批次号
*/
@ApiModelProperty(value = "生产批次号")
private String batchNo;
@ApiModelProperty(value = "企业id")
private Long companyId;

19
src/main/java/com/glxp/api/req/trace/TraceTaskDetailRequest.java
Unescape Escape View File

@ -1,80 +1,97 @@
package com.glxp.api.req.trace;
import com.glxp.api.util.page.ListPageRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ApiModel("追踪任务详情请求")
public class TraceTaskDetailRequest extends ListPageRequest {
@ApiModelProperty(value = "主键")
private Long id;
/**
* 按UDI码查询出入库信息
*/
@ApiModelProperty(value = "按UDI码查询出入库信息")
private String udiCode;
/**
* 查询记录表ID外键
*/
@ApiModelProperty(value = "查询记录表ID外键")
private Long recordCode;
/**
* 任务状态（未处理/正在处理（任务被下载）/
* 已处理（任务已提交）
*/
@ApiModelProperty(value = "* 任务状态（未处理/正在处理（任务被下载） 已处理（任务已提交）")
private Integer status;
/**
* 任务类型1：关联nte：入库；3：出库
*/
@ApiModelProperty(value = "任务类型1：关联nte：入库；3：出库")
private Integer taskType;
/**
* DI标识列表，多级包装会有多个DI
*/
@ApiModelProperty(value = "DI标识列表，多级包装会有多个DI")
private List<String> diList;
/**
* 企业信息ID外键
*/
@ApiModelProperty(value = "企业信息ID外键")
private Long companyIdFk;
/**
* 医疗器械注册人
*/
@ApiModelProperty(value = "医疗器械注册人")
private String ylqxzcrbarmc;
/**
* 医疗器械注册人统一社会信用号
*/
@ApiModelProperty(value = "医疗器械注册人统一社会信用号")
private String creditNum;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
private String cpmctymc;
/**
* 规格型号
*/
@ApiModelProperty(value = "规格型号")
private String ggxh;
/**
* 批次号
*/
@ApiModelProperty(value = "批次号")
private String batchNo;
/**
* 失效日期
*/
@ApiModelProperty(value = "失效日期")
private String expireDate;
/**
* 序列号
*/
@ApiModelProperty(value = "序列号")
private String serialNo;
/**
* 任务时间
*/
@ApiModelProperty(value = "任务时间")
private Date createTime;
}

2
src/main/java/com/glxp/api/res/trace/TraceManuCodeRellResponse.java
Unescape Escape View File

@ -11,7 +11,7 @@ import java.util.Date;
@ApiModel("追溯信息单据详情响应类")
public class TraceManuCodeRellResponse {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
private Long id;
/**

2
src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java
Unescape Escape View File

@ -13,7 +13,7 @@ import java.util.Date;
@ApiModel("追溯信息单据响应类")
public class TraceManuOrderResponse {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
private Long id;
/**

2
src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.util.Date;
@ApiModel("追溯单据响应类")
public class TraceOrderResponse {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
private Long id;
/**

2
src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.util.Date;
@ApiModel("追溯记录响应类")
public class TraceRecordResponse {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
private Long id;
/**

2
src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java
Unescape Escape View File

@ -14,7 +14,7 @@ import java.util.List;
@ApiModel("客户端查询任务列表响应类")
public class TraceTaskDlResponse {
@ApiModelProperty(value = "id")
@ApiModelProperty(value = "主键")
private Long id;
/**

Write Preview
Loading…
Cancel
Save