2023-2-10 修改老的布局图替换成新布局图

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpUserecordMapper.xml

@@ -109,7 +109,7 @@
         CASE WHEN cl.label_type = 1 THEN 'RFID' ELSE '二维码' END labelContent,sk.tag_code tagCode,ct.cabinet_name cabinetName,
         CONCAT((SELECT st.name FROM lab_subject st WHERE st.id = sk.`sub_id`),'-',(SELECT dt.dept_name FROM sys_dept dt,lab_subject st WHERE dt.dept_id = st.build_id AND st.id = sk.`sub_id`),
         '-',(SELECT bg.name FROM lab_building bg,lab_subject st WHERE bg.id = st.floor_id AND st.id = sk.`sub_id`),
-        '-',(SELECT slt.room FROM lab_subject_layout slt,lab_subject st WHERE slt.id = st.layout_id AND st.id = sk.`sub_id`)) posi,
+        ifnull(CONCAT('-',(SELECT slt.room_num room FROM lab_build_floor_layout slt,lab_subject st WHERE slt.sub_id = st.id AND st.id = sk.`sub_id`)),'')) posi,
         ud.collect_time collectTime,ud.return_time returnTime,CASE WHEN ud.return_type = 1 THEN '称重' ELSE CASE WHEN ud.return_type = 2 THEN '录入' ELSE NULL END END returnTypeContent,
         CONCAT(IFNULL(ud.collect_now_num,0)-IFNULL(sk.tare,0),sk.chemical_unit) collectStockNum,
         CONCAT(IFNULL(ud.collect_stock_num-IFNULL(sk.tare,0),0),sk.chemical_unit) collectWeigh,
@@ -298,8 +298,8 @@
             ca.cabinet_name cabinetName,
             CONCAT((SELECT st.name FROM lab_subject st WHERE st.id = cjc.`sub_id`),'-',
                 (SELECT dt.dept_name FROM sys_dept dt,lab_subject st WHERE dt.dept_id = st.build_id AND st.id = cjc.`sub_id`),'-',
-                (SELECT bg.name FROM lab_building bg,lab_subject st WHERE bg.id = st.floor_id AND st.id = cjc.`sub_id`),'-',
-                (SELECT slt.room FROM lab_subject_layout slt,lab_subject st WHERE slt.id = st.layout_id AND st.id = cjc.`sub_id`)) posi,
+                (SELECT bg.name FROM lab_building bg,lab_subject st WHERE bg.id = st.floor_id AND st.id = cjc.`sub_id`),
+                IFNULL(CONCAT('-',(SELECT slt.room_num room FROM lab_build_floor_layout slt,lab_subject st WHERE slt.sub_id = st.id AND st.id = cjc.`sub_id`)),'')) posi,
 
             CONCAT(IFNULL(hu.collect_now_num,0)-IFNULL(hs.tare,0),hs.chemical_unit) stockSuttle,
             concat(ifnull(hu.loss_amount, 0) , hs.chemical_unit) lossAmount,