18231669351
/
reagent_manage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: 18231669351:208ee7c6c9cac9c0ed38f1640af98034ffdccd72
Branches Tags
18231669351:master
..
compare: 18231669351:d618c895972f51e15d86dd5060fc1c83db6fa8d6
Branches Tags
18231669351:master

No commits in common. '208ee7c6c9cac9c0ed38f1640af98034ffdccd72' and 'd618c895972f51e15d86dd5060fc1c83db6fa8d6' have entirely different histories.
208ee7c6c9 ... d618c89597

17 changed files with 43 additions and 1033 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 5
      java/local/pom.xml
  2. 71
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java
  3. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Cabin.java
  4. 64
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/CabinReagent.java
  5. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Container.java
  6. 99
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java
  7. 89
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Equipment.java
  8. 68
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Inbound.java
  9. 75
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java
  10. 63
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/LocationReagent.java
  11. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Outbound.java
  12. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentBatch.java
  13. 68
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentManufacture.java
  14. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentRisk.java
  15. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentType.java
  16. 58
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentUnit.java
  17. 68
      java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Storehouse.java

5
java/local/pom.xml
Unescape View File

@ -107,11 +107,6 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>2.2.3</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

71
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java
Unescape View File

@ -1,65 +1,20 @@
package cn.toesbieya.jxc.model.entity1; package cn.toesbieya.jxc.model.entity1;
import lombok.Getter; import lombok.Data;
import lombok.Setter; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import java.io.Serializable; import org.springframework.data.annotation.Id;
import javax.persistence.Column; @Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class BasicInfo extends Change{
@Id
private Integer id;
private String name;
private Integer manufactureId;
private Integer typeId;
private Integer riskId;
/**
*
* @author Jpanda [Jpanda@aliyun.com]
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class BasicInfo implements Serializable {
private static final long serialVersionUID = 7109045896642391211L;
@Column
private Integer id;
/**
* 试剂名称
*/
@Column
private String name;
/**
* 试剂厂商
*/
@Column
private Integer manufactureId;
/**
* 试剂类型
*/
@Column
private Integer typeId;
/**
* 危险说明
*/
@Column
private Integer riskId;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
} }

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Cabin.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Cabin implements Serializable {
private static final long serialVersionUID = 302139287110092751L;
/**
* 仓位id
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String name;
/**
* 所属设备id
*/
@Column
private Integer equId;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

64
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/CabinReagent.java
Unescape View File

@ -1,64 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class CabinReagent implements Serializable {
private static final long serialVersionUID = 37424333250113914L;
/**
* 仓位——试剂关系表
*/
@Column
private Integer id;
/**
* 仓位id
*/
@Column
private String cabinId;
/**
* 试剂id
*/
@Column
private Integer reagentDetailId;
/**
* 数量
*/
@Column
private Integer quantity;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Container.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Container implements Serializable {
private static final long serialVersionUID = 8435766218526004241L;
/**
* 货柜编码
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String name;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

99
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java
Unescape View File

@ -1,88 +1,23 @@
package cn.toesbieya.jxc.model.entity1; package cn.toesbieya.jxc.model.entity1;
import lombok.Data;
import lombok.Getter; import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import java.io.Serializable; import org.springframework.data.annotation.Id;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class DetailInfo implements Serializable {
private static final long serialVersionUID = 2581056154795300744L; @Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class DetailInfo extends Change{
@Id
private Integer id;
private Integer basicId;
private Long productionDate;
private Integer effective;
private Integer batchId;
private String specification;
private Integer unitId;
private Integer status;
private String remark;
/**
* 试剂id
*/
@Column
private Integer id;
/**
* 基础信息id
*/
@Column
private Integer basicId;
/**
* 生产日期
*/
@Column
private Long productionDate;
/**
* 有效期（天）
*/
@Column
private Integer effective;
/**
* 产品批次
*/
@Column
private Integer batchId;
/**
* 规格
*/
@Column
private String specification;
/**
* 单位
*/
@Column
private String unitId;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
/**
* 备注
*/
@Column
private String remark;
} }

89
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Equipment.java
Unescape View File

@ -1,89 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Equipment implements Serializable {
private static final long serialVersionUID = 5785871803727322715L;
/**
* 设备编码
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String name;
/**
* 型号
*/
@Column
private String spec;
/**
* 功能简述
*/
@Column
private String desc;
/**
* 厂商
*/
@Column
private String manufacture;
/**
* 制造日期
*/
@Column
private Long manuDate;
/**
* 购买日期
*/
@Column
private Long buyDate;
/**
* 存放位置
*/
@Column
private String location;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

68
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Inbound.java
Unescape View File

@ -1,68 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Inbound implements Serializable {
private static final long serialVersionUID = 4697272372063253373L;
/**
* 入库记录表
*/
@Column
private Integer id;
/**
* 试剂id
*/
@Column
private Integer reagentId;
/**
* 数量
*/
@Column
private Integer amount;
/**
* 货位id
*/
@Column
private String locationId;
/**
* 操作员id
*/
@Column
private Integer operatorId;
/**
* 操作时间
*/
@Column
private Long operationTime;
/**
* 审核人id
*/
@Column
private Integer reviewerId;
/**
* 审核时间
*/
@Column
private Long reviewTime;
/**
* 单据状态，0初始保存态，1提交态，2完成态
*/
@Column
private Integer status;
}

75
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java
Unescape View File

@ -1,68 +1,19 @@
package cn.toesbieya.jxc.model.entity1; package cn.toesbieya.jxc.model.entity1;
import lombok.Data;
import lombok.Getter; import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import java.io.Serializable; import org.springframework.data.annotation.Id;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Location implements Serializable {
private static final long serialVersionUID = 8197662636671266111L; @Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class Location extends Change{
@Id
private Integer id;
private String name;
private Integer containerId;
private Integer storehouseId;
private Integer status;
/**
* 货位id
*/
@Column
private Integer id;
/**
* 货位名称
*/
@Column
private String name;
/**
* 货柜id
*/
@Column
private Integer containerId;
/**
* 仓库id
*/
@Column
private Integer storehouseId;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
} }

63
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/LocationReagent.java
Unescape View File

@ -1,63 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class LocationReagent implements Serializable {
private static final long serialVersionUID = 390719506548402135L;
/**
* 仓位——试剂关系表
*/
@Column
private Integer id;
/**
* 货位id
*/
@Column
private String locationId;
/**
* 试剂id
*/
@Column
private Integer reagentDetailId;
/**
* 数量
*/
@Column
private Integer quantity;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Outbound.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Outbound implements Serializable {
private static final long serialVersionUID = 6905406598783486694L;
/**
* 出库记录表
*/
@Column
private Integer id;
/**
* 试剂id
*/
@Column
private Integer reagentId;
/**
* 仓位id
*/
@Column
private Integer cabinId;
/**
* 货位id
*/
@Column
private Integer locationId;
/**
* 数量
*/
@Column
private Integer amount;
/**
* 操作员id
*/
@Column
private Integer user;
/**
* 操作时间
*/
@Column
private Long date;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentBatch.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class ReagentBatch implements Serializable {
private static final long serialVersionUID = 6586256490114771506L;
/**
* 入库批号编码
*/
@Column
private Integer id;
/**
* 批号
*/
@Column
private String description;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

68
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentManufacture.java
Unescape View File

@ -1,68 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class ReagentManufacture implements Serializable {
private static final long serialVersionUID = 1872172189322861429L;
/**
* 试剂厂商id
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String name;
/**
* 地址
*/
@Column
private String address;
/**
* 联系方式
*/
@Column
private String phone;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentRisk.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class ReagentRisk implements Serializable {
private static final long serialVersionUID = 8987285373475948163L;
/**
* 危险类型编码
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String description;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentType.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class ReagentType implements Serializable {
private static final long serialVersionUID = 1504622734461896784L;
/**
* 试剂l类型编码
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String description;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

58
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/ReagentUnit.java
Unescape View File

@ -1,58 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class ReagentUnit implements Serializable {
private static final long serialVersionUID = 9140172683108996775L;
/**
* 试剂单位编码
*/
@Column
private Integer id;
/**
* 单位
*/
@Column
private String description;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}

68
java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Storehouse.java
Unescape View File

@ -1,68 +0,0 @@
package cn.toesbieya.jxc.model.entity1;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import javax.persistence.Column;
/**
*
* @author 强子烨
* @version 1.0
* @since 2022-02-28
*/
@Getter
@Setter
@ToString
public class Storehouse implements Serializable {
private static final long serialVersionUID = 8192385674391362980L;
/**
* 仓库编码
*/
@Column
private Integer id;
/**
* 名称
*/
@Column
private String name;
/**
* 级别，1一级、2二级
*/
@Column
private Integer level;
/**
* 类型，1常温，2冷藏
*/
@Column
private Integer type;
/**
* 状态，0停用，1启用
*/
@Column
private Integer status;
/**
* 创建人id
*/
@Column
private Integer creatorId;
/**
* 创建时间
*/
@Column
private Long createTime;
/**
* 修改人id
*/
@Column
private Integer updateId;
/**
* 修改时间
*/
@Column
private Long updateTime;
}
Write Preview
Loading…
Cancel
Save