From 8d88121854bd7793a8a1300c1ef94961b8f1e56c Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 15 Feb 2023 17:42:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E5=85=BB=E6=8A=A4=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/inv/DeviceMaOrderDetailEntity.java | 13 ++--- .../api/entity/inv/DeviceMaOrderEntity.java | 5 +- .../entity/inv/DeviceReceiveOrderEntity.java | 5 +- .../api/req/inv/AddDeviceMAOrderRequest.java | 50 +++++++++++++++++++ .../AddDeviceReceiveOrderDetailRequest.java | 39 +++++++++++++++ .../inv/FilterDeviceMAOrderDetailRequest.java | 18 +++++++ .../req/inv/FilterDeviceMAOrderRequest.java | 39 +++++++++++++++ ...FilterDeviceReceiveOrderDetailRequest.java | 47 +++++++++++++++++ .../inv/FilterDeviceReceiveOrderRequest.java | 33 ++++++++++++ .../mybatis/mapper/inv/DeviceMaOrderDao.xml | 18 ------- .../mapper/inv/DeviceMaOrderDetailDao.xml | 25 +--------- .../mapper/inv/DeviceReceiveOrderDao.xml | 19 ------- .../inv/DeviceReceiveOrderDetailDao.xml | 25 ---------- 13 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java create mode 100644 src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java index 4070118da..025ad7ce6 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderDetailEntity.java @@ -4,9 +4,10 @@ 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; +import java.util.Date; + /** * 设备养护记录详情表 */ @@ -40,8 +41,8 @@ public class DeviceMaOrderDetailEntity { /** * 产品ID */ - @TableField(value = "productId") - private String productId; + @TableField(value = "relId") + private String relId; /** * 批次号 @@ -83,13 +84,13 @@ public class DeviceMaOrderDetailEntity { * 设备状态 0：异常 1：正常 */ @TableField(value = "deviceStatus") - private Boolean deviceStatus; + private Integer deviceStatus; /** * 养护状态 0：未养护 1：已养护 */ @TableField(value = "maintenanceStatus") - private Boolean maintenanceStatus; + private Integer maintenanceStatus; /** * 养护人 @@ -111,7 +112,7 @@ public class DeviceMaOrderDetailEntity { public static final String COL_NAMECODE = "nameCode"; - public static final String COL_PRODUCTID = "productId"; + public static final String COL_RELID = "relId"; public static final String COL_BATCHNO = "batchNo"; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java index 825a55bc0..03606205d 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceMaOrderEntity.java @@ -4,9 +4,10 @@ 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; +import java.util.Date; + /** * 设备养护记录表 */ @@ -32,7 +33,7 @@ public class DeviceMaOrderEntity { * 状态 */ @TableField(value = "`status`") - private Boolean status; + private Integer status; /** * 养护时间 diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java index 1d529adec..caff7f976 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java @@ -4,9 +4,10 @@ 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; +import java.util.Date; + /** * 设备领用记录表 */ @@ -35,7 +36,7 @@ public class DeviceReceiveOrderEntity { * 状态 0：草稿 1：未审核 2：已审核 */ @TableField(value = "`status`") - private Boolean status; + private Integer status; /** * 创建人 diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java new file mode 100644 index 000000000..3b70f3e1a --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java @@ -0,0 +1,50 @@ +package com.glxp.api.req.inv; + +import lombok.Data; + +/** + * 添加设备养护记录请求参数 + */ +@Data +public class AddDeviceMAOrderRequest { + + /** + * 设备号 + */ + private String code; + + /** + * 创建人 + */ + private String createUser; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 养护状态：0：未养护 1：已养护 + */ + private Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + + /** + * 备注 + */ + private String remark; + + /** + * 设备领用记录ID + */ + private String collOrderId; +} diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java new file mode 100644 index 000000000..f99300fb6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java @@ -0,0 +1,39 @@ +package com.glxp.api.req.inv; + +import lombok.Data; + +import java.util.List; + +/** + * 添加设备领用记录详情参数 + */ +@Data +public class AddDeviceReceiveOrderDetailRequest { + + /** + * 领用记录号 + */ + private String orderIdFk; + + /** + * 扫描条码内容 + */ + private String code; + + /** + * 产品库存ID集合 + */ + private List invProductIds; + + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 货位编码 + */ + private String invSpaceCode; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java new file mode 100644 index 000000000..8e29c7f5b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.inv; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 设备养护记录详情查询接口参数 + */ +@Data +public class FilterDeviceMAOrderDetailRequest extends ListPageRequest { + + /** + * 设备养护记录号 + */ + private String orderIdFk; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java new file mode 100644 index 000000000..d3e5eccca --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java @@ -0,0 +1,39 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterDeviceMAOrderRequest extends ListPageRequest { + + /** + * 设备养护记录ID + */ + private Integer id; + + /** + * 设备养护记录号 + */ + private String orderId; + + /** + * 设备领用记录号 + */ + private String receiveOrderId; + + /** + * 状态 0：草稿 1：已完成 + */ + private Integer status; + + /** + * 设备编号 + */ + private String code; + + /** + * 打印模板ID + */ + private String templateId; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java new file mode 100644 index 000000000..b8b8fe880 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java @@ -0,0 +1,47 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 设备领用记录详情接口参数 + */ +@Data +public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest { + + /** + * 设备领用记录详情ID + */ + private Integer id; + + /** + * 设备领用记录号 + */ + private String orderIdFk; + + /** + * 码 + */ + private String code; + + /** + * DI + */ + private String nameCode; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 领用人 + */ + private String receiveUser; + + /** + * 状态 + */ + private Integer status; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java new file mode 100644 index 000000000..18c2dd714 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java @@ -0,0 +1,33 @@ +package com.glxp.api.req.inv; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 设备领用记录相关参数 + */ +@Data +public class FilterDeviceReceiveOrderRequest extends ListPageRequest { + + /** + * 设备领用记录ID + */ + private Integer id; + + /** + * 设备领用记录号 + */ + private String orderId; + + /** + * 状态 0：草稿 1：未审核 2：已审核 + */ + private Integer status; + + /** + * 部门编码 + */ + private String deptCode; + +} diff --git a/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml index fb0b5e258..0bd83408b 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml @@ -1,22 +1,4 @@ - - - - - - - - - - - - - - - - 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 index 409814fdc..7ce42e49d 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml @@ -1,28 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - 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 index bc1b04a51..cd14f0a75 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml @@ -1,23 +1,4 @@ - - - - - - - - - - - - - - - - - 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 index 5f1e72ceb..0c34db147 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml @@ -1,29 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - id, orderIdFk, originCode, code, relId, nameCode, batchNo, produceDate, expireDate, - serialNo, invCode, invSpaceCode, receiveInvCode, receiveSpaceCode, createTime, updateTime - \ No newline at end of file