diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java index 56e821848..d004d5fba 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java @@ -9,7 +9,6 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface DeviceReceiveOrderDao extends BaseMapper { - /** * 查询设备领用记录VO集合 * diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java index b991e33bf..3e3efbb8e 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java @@ -9,7 +9,6 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface DeviceReceiveOrderDetailDao extends BaseMapper { - /** * 根据单据号查询设备领用详情扩列表 * diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java new file mode 100644 index 000000000..4a8aa8ccf --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java @@ -0,0 +1,144 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备领用记录详情 + */ +@Data +@TableName(value = "device_receive_order_detail") +public class DeviceReceiveOrderDetailEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备领用记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 原始码 + */ + @TableField(value = "originCode") + private String originCode; + + /** + * 码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "relId") + private Long relId; + + /** + * 产品DI + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 领用仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 领用货位 + */ + @TableField(value = "invSpaceCode") + private String invSpaceCode; + + /** + * 接收仓库 + */ + @TableField(value = "receiveInvCode") + private String receiveInvCode; + + /** + * 接收货位 + */ + @TableField(value = "receiveSpaceCode") + private String receiveSpaceCode; + + /** + * 领用时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_ORIGINCODE = "originCode"; + + public static final String COL_CODE = "code"; + + public static final String COL_RELID = "relId"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCEDATE = "produceDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_SERIALNO = "serialNo"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_INVSPACECODE = "invSpaceCode"; + + public static final String COL_RECEIVEINVCODE = "receiveInvCode"; + + public static final String COL_RECEIVESPACECODE = "receiveSpaceCode"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java new file mode 100644 index 000000000..caff7f976 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java @@ -0,0 +1,96 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备领用记录表 + */ +@Data +@TableName(value = "device_receive_order") +public class DeviceReceiveOrderEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 领用记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 领用部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 状态 0：草稿 1：未审核 2：已审核 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 领用时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 领用人 + */ + @TableField(value = "receiveUser") + private String receiveUser; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERID = "orderId"; + + public static final String COL_DEPTCODE = "deptCode"; + + public static final String COL_STATUS = "status"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_RECEIVEUSER = "receiveUser"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml index d5fc5fc31..6dcba1196 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml @@ -1,7 +1,6 @@ - - + update device_receive_order_detail