1.修改设备领用养护接口参数

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")
+    @TableField(value = "relId")
-    private String productId;
+    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";
 

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;
 
     /**
      * 养护时间

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;
 
     /**
      * 创建人

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;
+}

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<String> invProductIds;
+
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 货位编码
+     */
+    private String invSpaceCode;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

src/main/resources/mybatis/mapper/inv/DeviceMaOrderDao.xml

@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceMaOrderDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceMaOrderEntity">
-    <!--@mbg.generated-->
-    <!--@Table device_ma_order-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="orderId" jdbcType="VARCHAR" property="orderId" />
-    <result column="receiveOrderId" jdbcType="VARCHAR" property="receiveOrderId" />
-    <result column="status" jdbcType="BOOLEAN" property="status" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, orderId, receiveOrderId, `status`, createTime, updateTime, `createUser`, auditUser, 
-    remark
-  </sql>
 </mapper>

src/main/resources/mybatis/mapper/inv/DeviceMaOrderDetailDao.xml

@@ -1,28 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceMaOrderDetailDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceMaOrderDetailEntity">
+
-    <!--@mbg.generated-->
-    <!--@Table device_ma_order_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
-    <result column="productId" jdbcType="VARCHAR" property="productId" />
-    <result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
-    <result column="produceDate" jdbcType="VARCHAR" property="produceDate" />
-    <result column="expireDate" jdbcType="VARCHAR" property="expireDate" />
-    <result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="deviceStatus" jdbcType="BOOLEAN" property="deviceStatus" />
-    <result column="maintenanceStatus" jdbcType="BOOLEAN" property="maintenanceStatus" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, orderIdFk, code, nameCode, productId, batchNo, produceDate, expireDate, serialNo, 
-    createTime, updateTime, deviceStatus, maintenanceStatus, `createUser`, remark
-  </sql>
 </mapper>

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceReceiveOrderDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceReceiveOrderEntity">
-    <!--@mbg.generated-->
-    <!--@Table device_receive_order-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="orderId" jdbcType="VARCHAR" property="orderId" />
-    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
-    <result column="status" jdbcType="BOOLEAN" property="status" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="receiveUser" jdbcType="VARCHAR" property="receiveUser" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, orderId, deptCode, `status`, `createUser`, auditUser, createTime, updateTime, 
-    receiveUser, remark
-  </sql>
 </mapper>

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml

@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity">
-    <!--@mbg.generated-->
-    <!--@Table device_receive_order_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
-    <result column="originCode" jdbcType="VARCHAR" property="originCode" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="relId" jdbcType="VARCHAR" property="relId" />
-    <result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
-    <result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
-    <result column="produceDate" jdbcType="VARCHAR" property="produceDate" />
-    <result column="expireDate" jdbcType="VARCHAR" property="expireDate" />
-    <result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
-    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
-    <result column="invSpaceCode" jdbcType="VARCHAR" property="invSpaceCode" />
-    <result column="receiveInvCode" jdbcType="VARCHAR" property="receiveInvCode" />
-    <result column="receiveSpaceCode" jdbcType="VARCHAR" property="receiveSpaceCode" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, orderIdFk, originCode, code, relId, nameCode, batchNo, produceDate, expireDate, 
-    serialNo, invCode, invSpaceCode, receiveInvCode, receiveSpaceCode, createTime, updateTime
-  </sql>
 </mapper>