1.添加设备领用养护功能相关的实体类和xml文件以及表sql

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderDetailEntity.java

@@ -0,0 +1,89 @@
+package com.glxp.api.admin.entity.inventory;
+
+import lombok.Data;
+
+/**
+    * 设备领用记录详情
+    */
+@Data
+public class DeviceCollectOrderDetailEntity {
+    /**
+    * id
+    */
+    private Integer id;
+
+    /**
+    * 设备领用记录号
+    */
+    private String orderIdFk;
+
+    /**
+    * 原始码
+    */
+    private String originCode;
+
+    /**
+    * 码
+    */
+    private String code;
+
+    /**
+    * 产品ID
+    */
+    private String productId;
+
+    /**
+    * 产品DI
+    */
+    private String nameCode;
+
+    /**
+    * 批次号
+    */
+    private String batchNo;
+
+    /**
+    * 生产日期
+    */
+    private String produceDate;
+
+    /**
+    * 失效日期
+    */
+    private String expireDate;
+
+    /**
+    * 序列号
+    */
+    private String serialNo;
+
+    /**
+    * 领用时间
+    */
+    private String createTime;
+
+    /**
+    * 更新时间
+    */
+    private String updateTime;
+
+    /**
+    * 领用仓库
+    */
+    private String invWarehouseCode;
+
+    /**
+    * 领用货位
+    */
+    private String invSpaceCode;
+
+    /**
+    * 接收仓库
+    */
+    private String receiveWarehouseCode;
+
+    /**
+    * 接收货位
+    */
+    private String receiveSpaceCode;
+}

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java

@@ -0,0 +1,49 @@
+package com.glxp.api.admin.entity.inventory;
+
+import lombok.Data;
+
+/**
+    * 设备领用记录表
+    */
+@Data
+public class DeviceCollectOrderEntity {
+    /**
+    * id
+    */
+    private Integer id;
+
+    /**
+    * 领用记录号
+    */
+    private String orderId;
+
+    /**
+    * 领用部门
+    */
+    private String deptCode;
+
+    /**
+    * 领用人
+    */
+    private String createUser;
+
+    /**
+    * 审核人
+    */
+    private String auditUser;
+
+    /**
+    * 领用时间
+    */
+    private String createTime;
+
+    /**
+    * 更新时间
+    */
+    private String updateTime;
+
+    /**
+    * 状态   0：草稿   1：未审核   2：已审核
+    */
+    private Boolean status;
+}

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java

@@ -0,0 +1,81 @@
+package com.glxp.api.admin.entity.inventory;
+
+import lombok.Data;
+
+/**
+    * 设备养护记录表
+    */
+@Data
+public class DeviceMAOrderEntity {
+    private Integer id;
+
+    /**
+    * 设备养护记录号
+    */
+    private String orderId;
+
+    /**
+    * 码
+    */
+    private String code;
+
+    /**
+    * 产品ID
+    */
+    private String productId;
+
+    /**
+    * 批次号
+    */
+    private String batchNo;
+
+    /**
+    * 生产日期
+    */
+    private String produceDate;
+
+    /**
+    * 失效日期
+    */
+    private String expireDate;
+
+    /**
+    * 序列号
+    */
+    private String serialNo;
+
+    /**
+    * 养护时间
+    */
+    private String createTime;
+
+    /**
+    * 更新时间
+    */
+    private String updateTime;
+
+    /**
+    * 设备状态   0：异常      1：正常
+    */
+    private Boolean deviceStatus;
+
+    /**
+    * 养护状态   0：未养护   1：已养护
+    */
+    private Boolean maintenanceStatus;
+
+    /**
+    * 养护人
+    */
+    private String createUser;
+
+    /**
+    * 养护说明
+    */
+    private String remark;
+
+    /**
+    * 状态
+    */
+    private Boolean status;
+}

api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml

@@ -0,0 +1,140 @@
+<?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.admin.dao.inventory.DeviceCollectOrderDao">
+    <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="orderId" jdbcType="VARCHAR" property="orderId"/>
+        <result column="deptCode" jdbcType="VARCHAR" property="deptCode"/>
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
+        <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
+        <result column="createTime" jdbcType="VARCHAR" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
+        <result column="status" jdbcType="BOOLEAN" property="status"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        orderId,
+        deptCode,
+        `createUser`,
+        auditUser,
+        createTime,
+        updateTime,
+        `status`
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from device_collect_order
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from device_collect_order
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true">
+        insert into device_collect_order (orderId, deptCode, `createUser`,
+                                          auditUser, createTime, updateTime,
+                                          `status`)
+        values (#{orderId,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
+                #{auditUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
+                #{status,jdbcType=BOOLEAN})
+    </insert>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true">
+        insert into device_collect_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                orderId,
+            </if>
+            <if test="deptCode != null">
+                deptCode,
+            </if>
+            <if test="createUser != null">
+                `createUser`,
+            </if>
+            <if test="auditUser != null">
+                auditUser,
+            </if>
+            <if test="createTime != null">
+                createTime,
+            </if>
+            <if test="updateTime != null">
+                updateTime,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="deptCode != null">
+                #{deptCode,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="auditUser != null">
+                #{auditUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=BOOLEAN},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity">
+        update device_collect_order
+        <set>
+            <if test="orderId != null">
+                orderId = #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="deptCode != null">
+                deptCode = #{deptCode,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null">
+                `createUser` = #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="auditUser != null">
+                auditUser = #{auditUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                createTime = #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=BOOLEAN},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity">
+        update device_collect_order
+        set orderId      = #{orderId,jdbcType=VARCHAR},
+            deptCode     = #{deptCode,jdbcType=VARCHAR},
+            `createUser` = #{createUser,jdbcType=VARCHAR},
+            auditUser    = #{auditUser,jdbcType=VARCHAR},
+            createTime   = #{createTime,jdbcType=VARCHAR},
+            updateTime   = #{updateTime,jdbcType=VARCHAR},
+            `status`     = #{status,jdbcType=BOOLEAN}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml

@@ -0,0 +1,246 @@
+<?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.admin.dao.inventory.DeviceCollectOrderDetailDao">
+    <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity">
+        <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="productId" jdbcType="VARCHAR" property="productId"/>
+        <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="createTime" jdbcType="VARCHAR" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
+        <result column="invWarehouseCode" jdbcType="VARCHAR" property="invWarehouseCode"/>
+        <result column="invSpaceCode" jdbcType="VARCHAR" property="invSpaceCode"/>
+        <result column="receiveWarehouseCode" jdbcType="VARCHAR" property="receiveWarehouseCode"/>
+        <result column="receiveSpaceCode" jdbcType="VARCHAR" property="receiveSpaceCode"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        orderIdFk,
+        originCode,
+        code,
+        productId,
+        nameCode,
+        batchNo,
+        produceDate,
+        expireDate,
+        serialNo,
+        createTime,
+        updateTime,
+        invWarehouseCode,
+        invSpaceCode,
+        receiveWarehouseCode,
+        receiveSpaceCode
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from device_collect_order_detail
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from device_collect_order_detail
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity">
+        insert into device_collect_order_detail (id, orderIdFk, originCode,
+                                                 code, productId, nameCode,
+                                                 batchNo, produceDate, expireDate,
+                                                 serialNo, createTime, updateTime,
+                                                 invWarehouseCode, invSpaceCode, receiveWarehouseCode,
+                                                 receiveSpaceCode)
+        values (#{id,jdbcType=INTEGER}, #{orderIdFk,jdbcType=VARCHAR}, #{originCode,jdbcType=VARCHAR},
+                #{code,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR},
+                #{batchNo,jdbcType=VARCHAR}, #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR},
+                #{serialNo,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
+                #{invWarehouseCode,jdbcType=VARCHAR}, #{invSpaceCode,jdbcType=VARCHAR},
+                #{receiveWarehouseCode,jdbcType=VARCHAR},
+                #{receiveSpaceCode,jdbcType=VARCHAR})
+    </insert>
+
+    <insert id="insertSelective" parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity">
+        insert into device_collect_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="orderIdFk != null">
+                orderIdFk,
+            </if>
+            <if test="originCode != null">
+                originCode,
+            </if>
+            <if test="code != null">
+                code,
+            </if>
+            <if test="productId != null">
+                productId,
+            </if>
+            <if test="nameCode != null">
+                nameCode,
+            </if>
+            <if test="batchNo != null">
+                batchNo,
+            </if>
+            <if test="produceDate != null">
+                produceDate,
+            </if>
+            <if test="expireDate != null">
+                expireDate,
+            </if>
+            <if test="serialNo != null">
+                serialNo,
+            </if>
+            <if test="createTime != null">
+                createTime,
+            </if>
+            <if test="updateTime != null">
+                updateTime,
+            </if>
+            <if test="invWarehouseCode != null">
+                invWarehouseCode,
+            </if>
+            <if test="invSpaceCode != null">
+                invSpaceCode,
+            </if>
+            <if test="receiveWarehouseCode != null">
+                receiveWarehouseCode,
+            </if>
+            <if test="receiveSpaceCode != null">
+                receiveSpaceCode,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="orderIdFk != null">
+                #{orderIdFk,jdbcType=VARCHAR},
+            </if>
+            <if test="originCode != null">
+                #{originCode,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="nameCode != null">
+                #{nameCode,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="invWarehouseCode != null">
+                #{invWarehouseCode,jdbcType=VARCHAR},
+            </if>
+            <if test="invSpaceCode != null">
+                #{invSpaceCode,jdbcType=VARCHAR},
+            </if>
+            <if test="receiveWarehouseCode != null">
+                #{receiveWarehouseCode,jdbcType=VARCHAR},
+            </if>
+            <if test="receiveSpaceCode != null">
+                #{receiveSpaceCode,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity">
+        update device_collect_order_detail
+        <set>
+            <if test="orderIdFk != null">
+                orderIdFk = #{orderIdFk,jdbcType=VARCHAR},
+            </if>
+            <if test="originCode != null">
+                originCode = #{originCode,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                productId = #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="nameCode != null">
+                nameCode = #{nameCode,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                batchNo = #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                produceDate = #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                expireDate = #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                serialNo = #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                createTime = #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="invWarehouseCode != null">
+                invWarehouseCode = #{invWarehouseCode,jdbcType=VARCHAR},
+            </if>
+            <if test="invSpaceCode != null">
+                invSpaceCode = #{invSpaceCode,jdbcType=VARCHAR},
+            </if>
+            <if test="receiveWarehouseCode != null">
+                receiveWarehouseCode = #{receiveWarehouseCode,jdbcType=VARCHAR},
+            </if>
+            <if test="receiveSpaceCode != null">
+                receiveSpaceCode = #{receiveSpaceCode,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity">
+        update device_collect_order_detail
+        set orderIdFk            = #{orderIdFk,jdbcType=VARCHAR},
+            originCode           = #{originCode,jdbcType=VARCHAR},
+            code                 = #{code,jdbcType=VARCHAR},
+            productId            = #{productId,jdbcType=VARCHAR},
+            nameCode             = #{nameCode,jdbcType=VARCHAR},
+            batchNo              = #{batchNo,jdbcType=VARCHAR},
+            produceDate          = #{produceDate,jdbcType=VARCHAR},
+            expireDate           = #{expireDate,jdbcType=VARCHAR},
+            serialNo             = #{serialNo,jdbcType=VARCHAR},
+            createTime           = #{createTime,jdbcType=VARCHAR},
+            updateTime           = #{updateTime,jdbcType=VARCHAR},
+            invWarehouseCode     = #{invWarehouseCode,jdbcType=VARCHAR},
+            invSpaceCode         = #{invSpaceCode,jdbcType=VARCHAR},
+            receiveWarehouseCode = #{receiveWarehouseCode,jdbcType=VARCHAR},
+            receiveSpaceCode     = #{receiveSpaceCode,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMaOrderDao.xml

@@ -0,0 +1,227 @@
+<?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.admin.dao.inventory.DeviceMaOrderDao">
+    <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="orderId" jdbcType="VARCHAR" property="orderId"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <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="VARCHAR" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" 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"/>
+        <result column="status" jdbcType="BOOLEAN" property="status"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        orderId,
+        code,
+        productId,
+        batchNo,
+        produceDate,
+        expireDate,
+        serialNo,
+        createTime,
+        updateTime,
+        deviceStatus,
+        maintenanceStatus,
+        `createUser`,
+        remark,
+        `status`
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from device_ma_order
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from device_ma_order
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true">
+        insert into device_ma_order (orderId, code, productId,
+                                     batchNo, produceDate, expireDate,
+                                     serialNo, createTime, updateTime,
+                                     deviceStatus, maintenanceStatus, `createUser`,
+                                     remark, `status`)
+        values (#{orderId,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR},
+                #{batchNo,jdbcType=VARCHAR}, #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR},
+                #{serialNo,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
+                #{deviceStatus,jdbcType=BOOLEAN}, #{maintenanceStatus,jdbcType=BOOLEAN}, #{createUser,jdbcType=VARCHAR},
+                #{remark,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN})
+    </insert>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true">
+        insert into device_ma_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                orderId,
+            </if>
+            <if test="code != null">
+                code,
+            </if>
+            <if test="productId != null">
+                productId,
+            </if>
+            <if test="batchNo != null">
+                batchNo,
+            </if>
+            <if test="produceDate != null">
+                produceDate,
+            </if>
+            <if test="expireDate != null">
+                expireDate,
+            </if>
+            <if test="serialNo != null">
+                serialNo,
+            </if>
+            <if test="createTime != null">
+                createTime,
+            </if>
+            <if test="updateTime != null">
+                updateTime,
+            </if>
+            <if test="deviceStatus != null">
+                deviceStatus,
+            </if>
+            <if test="maintenanceStatus != null">
+                maintenanceStatus,
+            </if>
+            <if test="createUser != null">
+                `createUser`,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="deviceStatus != null">
+                #{deviceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="maintenanceStatus != null">
+                #{maintenanceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=BOOLEAN},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        update device_ma_order
+        <set>
+            <if test="orderId != null">
+                orderId = #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                productId = #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                batchNo = #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                produceDate = #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                expireDate = #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                serialNo = #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                createTime = #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="deviceStatus != null">
+                deviceStatus = #{deviceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="maintenanceStatus != null">
+                maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="createUser != null">
+                `createUser` = #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=BOOLEAN},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        update device_ma_order
+        set orderId           = #{orderId,jdbcType=VARCHAR},
+            code              = #{code,jdbcType=VARCHAR},
+            productId         = #{productId,jdbcType=VARCHAR},
+            batchNo           = #{batchNo,jdbcType=VARCHAR},
+            produceDate       = #{produceDate,jdbcType=VARCHAR},
+            expireDate        = #{expireDate,jdbcType=VARCHAR},
+            serialNo          = #{serialNo,jdbcType=VARCHAR},
+            createTime        = #{createTime,jdbcType=VARCHAR},
+            updateTime        = #{updateTime,jdbcType=VARCHAR},
+            deviceStatus      = #{deviceStatus,jdbcType=BOOLEAN},
+            maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
+            `createUser`      = #{createUser,jdbcType=VARCHAR},
+            remark            = #{remark,jdbcType=VARCHAR},
+            `status`          = #{status,jdbcType=BOOLEAN}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+</mapper>

scripts/设备领用养护功能表.sql

@@ -0,0 +1,56 @@
+# 设备领用记录表
+DROP TABLE IF EXISTS `device_collect_order`;
+CREATE TABLE `device_collect_order`  (
+                                         `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                         `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '领用记录号',
+                                         `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用部门',
+                                         `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用人',
+                                         `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人',
+                                         `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间',
+                                         `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间',
+                                         `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态   0：草稿   1：未审核   2：已审核',
+                                         PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录表' ROW_FORMAT = Dynamic;
+
+# 设备领用记录详情表
+DROP TABLE IF EXISTS `device_collect_order_detail`;
+CREATE TABLE `device_collect_order_detail`  (
+                                                `id` int NOT NULL COMMENT 'id',
+                                                `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备领用记录号',
+                                                `originCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '原始码',
+                                                `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '码',
+                                                `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID',
+                                                `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI',
+                                                `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
+                                                `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
+                                                `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
+                                                `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
+                                                `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间',
+                                                `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间',
+                                                `invWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用仓库',
+                                                `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用货位',
+                                                `receiveWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收仓库',
+                                                `receiveSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收货位',
+                                                PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录详情' ROW_FORMAT = Dynamic;
+
+# 设备养护记录表
+DROP TABLE IF EXISTS `device_ma_order`;
+CREATE TABLE `device_ma_order`  (
+                                    `id` int NOT NULL AUTO_INCREMENT,
+                                    `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号',
+                                    `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '码',
+                                    `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID',
+                                    `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
+                                    `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
+                                    `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
+                                    `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
+                                    `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护时间',
+                                    `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间',
+                                    `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态   0：异常      1：正常',
+                                    `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态   0：未养护   1：已养护',
+                                    `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人',
+                                    `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明',
+                                    `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态',
+                                    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录表' ROW_FORMAT = Dynamic;