Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -5,6 +5,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
+import java.util.Random;
+
 /**
  * 启动程序
  *
@@ -27,4 +29,6 @@ public class RuoYiApplication {
                 " |  |  \\    /  \\      /           \n" +
                 " ''-'   `'-'    `-..-'              ");
     }
+
+
 }

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

@@ -473,7 +473,7 @@
             JSON_CONTAINS( f_typeid -> '$[*]', #{fTypeid}, '$')
             AND f_status = #{fStatus}
         ORDER BY CONVERT(f_name USING gbk) asc
-        limit 1, 200
+        limit 0, 200
     </select>
     <select id="getClientMessage" parameterType="TCorps" resultMap="TCorpsResult">
         SELECT

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

@@ -398,12 +398,11 @@
             CONCAT_WS('-',IFNULL( TG.f_name, '' ),CONCAT_WS( IFNULL( TG.f_packagespecs, '' ), '/袋' ),IFNULL( TWG.f_marks, '' )) AS spu
         FROM t_warehouse TW
         LEFT JOIN t_whgenleg TWG ON TWG.f_warehouseid = TW.f_id
-        LEFT JOIN t_warehousebills TWB ON TWB.f_warehouseid = TW.f_id
         LEFT JOIN t_corps TC ON TC.f_id = TWG.f_corpid
         LEFT JOIN t_goods TG ON TG.f_id = TWG.f_goodsid
         <where>
             TW.del_flag = '0'
-            AND TWB.f_items_status != 4
+            and TWG.f_qtyblc > 0
             <if test="warehouseCode != null  and warehouseCode != ''"> and TW.f_id = #{warehouseCode}</if>
             <if test="ownerName != null  and ownerName != ''"> and TC.f_name like concat('%', #{ownerName}, '%')</if>
             <if test="goodsName != null  and goodsName != ''"> and TG.f_name like concat('%', #{goodsName}, '%')</if>
@@ -451,13 +450,12 @@
             t_whgenleg TWG
         LEFT JOIN t_warehouse TW ON TWG.f_warehouseid = TW.f_id
         LEFT JOIN t_warehouse ware ON ware.f_id = TWG.f_warehouse_locationid
-        LEFT JOIN t_warehousebills TWB ON TWB.f_warehouseid = TW.f_id
         LEFT JOIN t_corps TC ON TC.f_id = TWG.f_corpid
         LEFT JOIN t_goods TG ON TG.f_id = TWG.f_goodsid
         LEFT JOIN t_warehousebills TWB ON TWG.f_originalbillno = TWB.f_billno
         <where>
             TW.del_flag = '0'
-            AND TWB.f_items_status != 4
+            and TWG.f_qtyblc > 0
             <if test="warehouseCode != null  and warehouseCode != ''"> and TWG.f_warehouseid = #{warehouseCode}</if>
             <if test="ownerName != null  and ownerName != ''"> and TC.f_name like concat('%', #{ownerName}, '%')</if>
             <if test="ownerCode != null  and ownerCode != ''"> and TC.f_id = #{ownerCode}</if>