From 5e2ff3cdc241783e28c67bb7187a418e44a822de Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 15 Feb 2023 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E5=85=BB=E6=8A=A4=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=8F=8Adao=E6=8E=A5=E5=8F=A3=E5=92=8Cxml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/dao/inv/DeviceMaOrderDao.java | 7 + .../api/dao/inv/DeviceMaOrderDetailDao.java | 7 + .../api/dao/inv/DeviceReceiveOrderDao.java | 7 + .../dao/inv/DeviceReceiveOrderDetailDao.java | 7 + .../entity/inv/DeviceMaOrderDetailEntity.java | 135 +++++++++++++++++ .../api/entity/inv/DeviceMaOrderEntity.java | 84 ++++++++++ .../inv/DeviceReceiveOrderDetailEntity.java | 143 ++++++++++++++++++ .../entity/inv/DeviceReceiveOrderEntity.java | 95 ++++++++++++ .../mybatis/mapper/inv/DeviceMaOrderDao.xml | 22 +++ .../mapper/inv/DeviceMaOrderDetailDao.xml | 28 ++++ .../mapper/inv/DeviceReceiveOrderDao.xml | 23 +++ .../inv/DeviceReceiveOrderDetailDao.xml | 29 ++++ 12 files changed, 587 insertions(+) create mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDao.java create mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDetailDao.java create mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java create mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java create mode 100644 src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java create mode 100644 src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java create mode 100644 src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml create mode 100644 src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml create mode 100644 src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml create mode 100644 src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDao.java new file mode 100644 index 000000000..3cc65ed72 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceMaOrderEntity; + +public interface DeviceMaOrderDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDetailDao.java new file mode 100644 index 000000000..5f8a5b56d --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceMaOrderDetailDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceMaOrderDetailEntity; + +public interface DeviceMaOrderDetailDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java new file mode 100644 index 000000000..7fdb18b65 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; + +public interface DeviceReceiveOrderDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java new file mode 100644 index 000000000..f585c4551 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; + +public interface DeviceReceiveOrderDetailDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java new file mode 100644 index 000000000..4070118da --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java @@ -0,0 +1,135 @@ +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 java.util.Date; +import lombok.Data; + +/** + * 设备养护记录详情表 + */ +@Data +@TableName(value = "device_ma_order_detail") +public class DeviceMaOrderDetailEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备养护记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 条码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 产品ID + */ + @TableField(value = "productId") + private String productId; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 设备状态 0：异常 1：正常 + */ + @TableField(value = "deviceStatus") + private Boolean deviceStatus; + + /** + * 养护状态 0：未养护 1：已养护 + */ + @TableField(value = "maintenanceStatus") + private Boolean maintenanceStatus; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 养护说明 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_CODE = "code"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_PRODUCTID = "productId"; + + 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_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_DEVICESTATUS = "deviceStatus"; + + public static final String COL_MAINTENANCESTATUS = "maintenanceStatus"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java new file mode 100644 index 000000000..825a55bc0 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java @@ -0,0 +1,84 @@ +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 java.util.Date; +import lombok.Data; + +/** + * 设备养护记录表 + */ +@Data +@TableName(value = "device_ma_order") +public class DeviceMaOrderEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备养护记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 设备领用单据号 + */ + @TableField(value = "receiveOrderId") + private String receiveOrderId; + + /** + * 状态 + */ + @TableField(value = "`status`") + private Boolean status; + + /** + * 养护时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 养护说明 + */ + @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_RECEIVEORDERID = "receiveOrderId"; + + public static final String COL_STATUS = "status"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file 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..c4fa33d0f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java @@ -0,0 +1,143 @@ +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 java.util.Date; +import lombok.Data; + +/** + * 设备领用记录详情 + */ +@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 String relId; + + /** + * 产品DI + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @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..1d529adec --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java @@ -0,0 +1,95 @@ +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 java.util.Date; +import lombok.Data; + +/** + * 设备领用记录表 + */ +@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 Boolean 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/DeviceMaOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml new file mode 100644 index 000000000..fb0b5e258 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, orderId, receiveOrderId, `status`, createTime, updateTime, `createUser`, auditUser, + remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml new file mode 100644 index 000000000..409814fdc --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, orderIdFk, code, nameCode, productId, batchNo, produceDate, expireDate, serialNo, + createTime, updateTime, deviceStatus, maintenanceStatus, `createUser`, 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 new file mode 100644 index 000000000..bc1b04a51 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + id, orderId, deptCode, `status`, `createUser`, auditUser, createTime, updateTime, + receiveUser, remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml new file mode 100644 index 000000000..5f1e72ceb --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, orderIdFk, originCode, code, relId, nameCode, batchNo, produceDate, expireDate, + serialNo, invCode, invSpaceCode, receiveInvCode, receiveSpaceCode, createTime, updateTime + + \ No newline at end of file