Explorar o código

fix:
设备出入库 关联关系更改 编号和编号(流水号没用)
设备出入库查询列表当前所在地为当前记录发生时的所在地

caozixuan hai 1 ano
pai
achega
50f35edaf4

+ 6 - 8
sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -18,8 +18,7 @@
             su.real_name AS userName,
             IFNULL(tbdio.custom_name,'--') AS customName,
             tbdio.type AS inOutType,
-            sd.location AS location,
-            sd.location_arr AS locationArrTemp,
+            tbdio.location AS location,
             tbdio.address AS address,
             tbdio.address_arr AS addressArrTemp,
             tbdio.serial_no AS serialNo,
@@ -31,7 +30,7 @@
                 LEFT JOIN
             t_b_service tbs ON tbdio.service_id = tbs.id
                 LEFT JOIN
-            sys_device sd ON tbdio.device_no = sd.serial_no
+            sys_device sd ON tbdio.device_no = sd.device_code
                 LEFT JOIN
             sys_user su ON tbdio.user_id = su.id
                 LEFT JOIN
@@ -111,8 +110,7 @@
             su.real_name AS userName,
             IFNULL(tbdio.custom_name,'--') AS customName,
             tbdio.type AS inOutType,
-            sd.location AS location,
-            sd.location_arr AS locationArrTemp,
+            tbdio.location AS location,
             tbdio.address AS address,
             tbdio.address_arr AS addressArrTemp,
             tbdio.serial_no AS serialNo,
@@ -125,7 +123,7 @@
                 LEFT JOIN
             t_b_service tbs ON tbdio.service_id = tbs.id
                 LEFT JOIN
-            sys_device sd ON tbdio.device_no = sd.serial_no
+            sys_device sd ON tbdio.device_no = sd.device_code
                 LEFT JOIN
             sys_user su ON tbdio.user_id = su.id
                 LEFT JOIN
@@ -244,10 +242,10 @@
             </if>
             <choose>
                 <when test="sopNo != null and sopNo != ''">
-                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.serial_no AND tbdio.sop_no = #{sopNo})
+                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.device_code AND tbdio.sop_no = #{sopNo})
                 </when>
                 <otherwise>
-                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.serial_no AND tbdio.service_id IS NULL)
+                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.device_code AND tbdio.service_id IS NULL)
                 </otherwise>
             </choose>
         </where>