From 6e4c6a06ca542cb5af2ab36960577d7acc9818c1 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 27 Sep 2023 18:08:30 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aucma/base/domain/BaseDeviceLedger.java   |  27 +++
 .../mapper/base/BaseDeviceLedgerMapper.xml    | 201 ++++++++++--------
 2 files changed, 141 insertions(+), 87 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
index 2cde3f7..4c8813d 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
@@ -83,6 +83,18 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "所属工位")
     private String productLineCode;
 
+    /**
+     * 工厂编号
+     */
+    @Excel(name = "工厂编号")
+    private String factoryCode;
+
+    /**
+     * 工厂名称
+     */
+    @Excel(name = "工厂名称")
+    private String factoryName;
+
     /**
      * 启用标识
      */
@@ -115,6 +127,21 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
 
     public String getCostCenter() {
         return costCenter;
diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
index fe92e0f..8692444 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
@@ -5,123 +5,150 @@
 <mapper namespace="com.aucma.base.mapper.BaseDeviceLedgerMapper">
 
     <resultMap type="BaseDeviceLedger" id="BaseDeviceLedgerResult">
-            <result property="objId"    column="obj_id"    />
-            <result property="deviceCode"    column="device_code"    />
-            <result property="deviceName"    column="device_name"    />
-            <result property="deviceModel"    column="device_model"    />
-            <result property="deviceType"    column="device_type"    />
-            <result property="deviceAddress"    column="device_address"    />
-            <result property="deviceStatus"    column="device_status"    />
-            <result property="usedDepartment"    column="used_department"    />
-            <result property="productLineCode"    column="product_line_code"    />
-            <result property="costCenter"    column="cost_center"    />
-            <result property="manufacturer"    column="manufacturer"    />
-            <result property="enableDate"    column="enable_date"    />
-            <result property="isFlag"    column="is_flag"    />
-            <result property="createdBy"    column="created_by"    />
-            <result property="createdTime"    column="created_time"    />
-            <result property="updatedBy"    column="updated_by"    />
-            <result property="updatedTime"    column="updated_time"    />
+        <result property="objId" column="obj_id"/>
+        <result property="deviceCode" column="device_code"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="deviceModel" column="device_model"/>
+        <result property="deviceType" column="device_type"/>
+        <result property="deviceAddress" column="device_address"/>
+        <result property="deviceStatus" column="device_status"/>
+        <result property="usedDepartment" column="used_department"/>
+        <result property="productLineCode" column="product_line_code"/>
+        <result property="costCenter" column="cost_center"/>
+        <result property="manufacturer" column="manufacturer"/>
+        <result property="enableDate" column="enable_date"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
+        <result property="factoryCode" column="factory_code"/>
     </resultMap>
 
     <sql id="selectBaseDeviceLedgerVo">
-        select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, cost_center, manufacturer, enable_date,product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger
+        select obj_id,
+               device_code,
+               device_name,
+               device_model,
+               device_type,
+               device_address,
+               device_status,
+               used_department,
+               cost_center,
+               manufacturer,
+               enable_date,
+               product_line_code,
+               factory_code,
+               is_flag,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from base_deviceledger
     </sql>
 
     <select id="selectBaseDeviceLedgerList" parameterType="BaseDeviceLedger" resultMap="BaseDeviceLedgerResult">
         <include refid="selectBaseDeviceLedgerVo"/>
         <where>
-                        <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
-                        <if test="deviceName != null  and deviceName != ''"> and device_name like concat(concat('%', #{deviceName}), '%')</if>
-                        <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
-                        <if test="deviceType != null "> and device_type = #{deviceType}</if>
-                        <if test="deviceAddress != null  and deviceAddress != ''"> and device_address = #{deviceAddress}</if>
-                        <if test="deviceStatus != null "> and device_status = #{deviceStatus}</if>
-                        <if test="usedDepartment != null  and usedDepartment != ''"> and used_department = #{usedDepartment}</if>
-                        <if test="productLineCode != null  and productLineCode != ''"> and product_line_code = #{productLineCode}</if>
-                        <if test="isFlag != null "> and is_flag = #{isFlag}</if>
-                        <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-                        <if test="createdTime != null "> and created_time = #{createdTime}</if>
-                        <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-                        <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
+            <if test="deviceName != null  and deviceName != ''">and device_name like concat(concat('%', #{deviceName}),
+                '%')
+            </if>
+            <if test="deviceModel != null  and deviceModel != ''">and device_model = #{deviceModel}</if>
+            <if test="deviceType != null ">and device_type = #{deviceType}</if>
+            <if test="deviceAddress != null  and deviceAddress != ''">and device_address = #{deviceAddress}</if>
+            <if test="deviceStatus != null ">and device_status = #{deviceStatus}</if>
+            <if test="usedDepartment != null  and usedDepartment != ''">and used_department = #{usedDepartment}</if>
+            <if test="productLineCode != null  and productLineCode != ''">and product_line_code = #{productLineCode}
+            </if>
+            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
     </select>
 
     <select id="selectBaseDeviceLedgerByObjId" parameterType="Long" resultMap="BaseDeviceLedgerResult">
-            <include refid="selectBaseDeviceLedgerVo"/>
-            where obj_id = #{objId}
+        <include refid="selectBaseDeviceLedgerVo"/>
+        where obj_id = #{objId}
     </select>
 
     <insert id="insertBaseDeviceLedger" parameterType="BaseDeviceLedger">
-            <selectKey keyProperty="objId" resultType="long" order="BEFORE">
-                SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL
-            </selectKey>
+        <selectKey keyProperty="objId" resultType="long" order="BEFORE">
+            SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL
+        </selectKey>
         insert into base_deviceledger
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="objId != null">obj_id,</if>
-                <if test="deviceCode != null">device_code,</if>
-                <if test="deviceName != null">device_name,</if>
-                <if test="deviceModel != null">device_model,</if>
-                <if test="deviceType != null">device_type,</if>
-                <if test="deviceAddress != null">device_address,</if>
-                <if test="deviceStatus != null">device_status,</if>
-                <if test="usedDepartment != null">used_department,</if>
-                <if test="productLineCode != null">product_line_code,</if>
-                <if test="costCenter != null">cost_center,</if>
-                <if test="manufacturer != null">manufacturer,</if>
-                <if test="enableDate != null">enable_date,</if>
-                <if test="isFlag != null">is_flag,</if>
-                <if test="createdBy != null">created_by,</if>
-                <if test="createdTime != null">created_time,</if>
-                <if test="updatedBy != null">updated_by,</if>
-                <if test="updatedTime != null">updated_time,</if>
+            <if test="objId != null">obj_id,</if>
+            <if test="deviceCode != null">device_code,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceAddress != null">device_address,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <if test="usedDepartment != null">used_department,</if>
+            <if test="productLineCode != null">product_line_code,</if>
+            <if test="costCenter != null">cost_center,</if>
+            <if test="manufacturer != null">manufacturer,</if>
+            <if test="enableDate != null">enable_date,</if>
+            <if test="factoryCode != null">factory_code,</if>
+            <if test="isFlag != null">is_flag,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="objId != null">#{objId},</if>
-                <if test="deviceCode != null">#{deviceCode},</if>
-                <if test="deviceName != null">#{deviceName},</if>
-                <if test="deviceModel != null">#{deviceModel},</if>
-                <if test="deviceType != null">#{deviceType},</if>
-                <if test="deviceAddress != null">#{deviceAddress},</if>
-                <if test="deviceStatus != null">#{deviceStatus},</if>
-                <if test="usedDepartment != null">#{usedDepartment},</if>
-                <if test="productLineCode != null">#{productLineCode},</if>
-                <if test="costCenter != null">cost_center,</if>
-                <if test="manufacturer != null">manufacturer,</if>
-                <if test="enableDate != null">enable_date,</if>
-                <if test="isFlag != null">#{isFlag},</if>
-                <if test="createdBy != null">#{createdBy},</if>
-                <if test="createdTime != null">#{createdTime},</if>
-                <if test="updatedBy != null">#{updatedBy},</if>
-                <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="objId != null">#{objId},</if>
+            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceAddress != null">#{deviceAddress},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="usedDepartment != null">#{usedDepartment},</if>
+            <if test="productLineCode != null">#{productLineCode},</if>
+            <if test="costCenter != null">#{costCenter},</if>
+            <if test="manufacturer != null">#{manufacturer},</if>
+            <if test="enableDate != null">#{enableDate},</if>
+            <if test="factoryCode != null">#{factoryCode},</if>
+            <if test="isFlag != null">#{isFlag},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
         </trim>
     </insert>
 
     <update id="updateBaseDeviceLedger" parameterType="BaseDeviceLedger">
         update base_deviceledger
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="deviceCode != null">device_code = #{deviceCode},</if>
-                    <if test="deviceName != null">device_name = #{deviceName},</if>
-                    <if test="deviceModel != null">device_model = #{deviceModel},</if>
-                    <if test="deviceType != null">device_type = #{deviceType},</if>
-                    <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
-                    <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
-                    <if test="usedDepartment != null">used_department = #{usedDepartment},</if>
-                    <if test="costCenter != null">#{costCenter},</if>
-                    <if test="manufacturer != null">#{manufacturer},</if>
-                    <if test="enableDate != null">#{enableDate},</if>
-                    <if test="productLineCode != null">product_line_code = #{productLineCode},</if>
-                    <if test="isFlag != null">is_flag = #{isFlag},</if>
-                    <if test="createdBy != null">created_by = #{createdBy},</if>
-                    <if test="createdTime != null">created_time = #{createdTime},</if>
-                    <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-                    <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="usedDepartment != null">used_department = #{usedDepartment},</if>
+            <if test="costCenter != null">cost_center = #{costCenter},</if>
+            <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
+            <if test="enableDate != null">enable_date = #{enableDate},</if>
+            <if test="productLineCode != null">product_line_code = #{productLineCode},</if>
+            <if test="factoryCode != null">factory_code = #{factoryCode},</if>
+            <if test="isFlag != null">is_flag = #{isFlag},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
         </trim>
         where obj_id = #{objId}
     </update>
 
     <delete id="deleteBaseDeviceLedgerByObjId" parameterType="Long">
-        delete from base_deviceledger where obj_id = #{objId}
+        delete
+        from base_deviceledger
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteBaseDeviceLedgerByObjIds" parameterType="String">