2022年10月10日14:03:40

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TWarehouseWebcam.java

@@ -59,6 +59,34 @@ public class TWarehouseWebcam extends BaseEntity {
      */
     private String code;
 
+    /**
+     * 库位id
+     */
+    @Excel(name = "库位id")
+    private Long libraryPositionId;
+
+    /**
+     * 库位
+     */
+    @Excel(name = "库位")
+    private String libraryPosition;
+
+    public Long getLibraryPositionId() {
+        return libraryPositionId;
+    }
+
+    public void setLibraryPositionId(Long libraryPositionId) {
+        this.libraryPositionId = libraryPositionId;
+    }
+
+    public String getLibraryPosition() {
+        return libraryPosition;
+    }
+
+    public void setLibraryPosition(String libraryPosition) {
+        this.libraryPosition = libraryPosition;
+    }
+
     public String getCode() {
         return code;
     }

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseWebcamMapper.xml

@@ -18,6 +18,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="code" column="code"/>
+        <result property="libraryPositionId" column="library_position_id"/>
+        <result property="libraryPosition" column="library_position"/>
     </resultMap>
 
     <sql id="selectTWarehouseWebcamVo">
@@ -33,7 +35,9 @@
                update_by,
                update_time,
                remark,
-               code
+               code,
+               library_position_id,
+               library_position
         from t_warehouse_webcam
     </sql>
 
@@ -49,6 +53,10 @@
             <if test="fWarehouseName != null  and fWarehouseName != ''">and f_warehouse_name like concat('%',
                 #{fWarehouseName}, '%')
             </if>
+            <if test="libraryPositionId != null">and library_position_id = #{libraryPositionId}</if>
+            <if test="libraryPosition != null  and libraryPosition != ''">and library_position like concat('%',
+                #{libraryPosition}, '%')
+            </if>
         </where>
     </select>
 
@@ -57,7 +65,8 @@
         where f_id = #{fId}
     </select>
 
-    <select id="selectTWarehouseWebcamByDeviceSerial" parameterType="TWarehouseWebcam" resultMap="TWarehouseWebcamResult">
+    <select id="selectTWarehouseWebcamByDeviceSerial" parameterType="TWarehouseWebcam"
+            resultMap="TWarehouseWebcamResult">
         <include refid="selectTWarehouseWebcamVo"/>
         where del_flag = '0'
         <if test="deviceSerial != null  and deviceSerial != ''">and device_serial = #{deviceSerial}</if>
@@ -79,6 +88,8 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="code != null  and code != ''">code,</if>
+            <if test="libraryPositionId != null">library_position_id ,</if>
+            <if test="libraryPosition != null  and libraryPosition != ''">library_position ,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null and projectId != ''">#{projectId},</if>
@@ -93,6 +104,8 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="code != null  and code != ''">#{code},</if>
+            <if test="libraryPositionId != null">#{libraryPositionId},</if>
+            <if test="libraryPosition != null  and libraryPosition != ''">#{libraryPosition},</if>
         </trim>
     </insert>
 
@@ -111,6 +124,8 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="code != null  and code != ''">code = #{code},</if>
+            <if test="libraryPositionId != null">library_position_id = #{libraryPositionId},</if>
+            <if test="libraryPosition != null  and libraryPosition != ''">library_position =#{libraryPosition},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -146,9 +161,9 @@
             <if test="fWarehouseId != null ">and f_warehouse_id = #{fWarehouseId}</if>
             <if test="external != null and external != ''">
                 and f_warehouse_id in (
-                    select distinct f_warehouseid
-                    from t_customer_contact t1 left join t_whgenleg t2 on t1.f_pid = t2.f_corpid
-                    where f_tel = #{external})
+                select distinct f_warehouseid
+                from t_customer_contact t1 left join t_whgenleg t2 on t1.f_pid = t2.f_corpid
+                where f_tel = #{external})
             </if>
         </where>
     </select>