laoyao hace 3 años
padre
commit
3ccf3cad88

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -151,7 +151,7 @@ GROUP BY
             union all
             -- 锁定库位
             select 0 as shelvesCount,0 as storgeCount,0 as instockCount,count(1) as lockstockCount
-            from imcs_s_storge where id in(select storge_id from imcs_s_stock_info where lock_status = '0')
+            from imcs_s_storge where lock_status = '0'
         )r
     </select>
 

+ 6 - 0
imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -68,6 +68,9 @@
             left join ${gatherSql} g on g.resource_id = v.id
         </if>
         where 1=1
+        <if test="linkStatus != null  and linkStatus != ''">
+            and link_status =  #{linkStatus}
+        </if>
         <if test="zoneId != null">
             and a.zoneId =  #{zoneId}
         </if>
@@ -133,6 +136,9 @@
             left join ${gatherSql} g on g.resource_id = v.id
         </if>
         where 1=1
+        <if test="linkStatus != null  and linkStatus != ''">
+            and link_status =  #{linkStatus}
+        </if>
         <if test="zoneId != null">
             and a.zoneId =  #{zoneId}
         </if>