2024年2月20日15:05:35

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/ForeignApiController.java

@@ -69,11 +69,7 @@ public class ForeignApiController extends BaseController {
                                                          @RequestParam(value = "lockStatus", required = false) String lockStatus,
                                                          @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                                          @RequestParam(value = "pageSize", required = false) Integer pageSize) {
-        if (ObjectUtils.isNotNull(lockStatus)) {
-            lockStatus = "1";
-        } else {
-            lockStatus = "0";
-        }
+        System.out.println("queryGoodsAccountByPageV1:"+lockStatus);
         List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountByPageV1(warehouseCode, ownerSocialIdentifier, ownerCode, ownerName, goodsName, specifications,
                 producing, materialQuality, level, pageNo, pageSize, lockStatus);
 
@@ -124,11 +120,7 @@ public class ForeignApiController extends BaseController {
                                                          @RequestParam(value = "lockStatus", required = false) String lockStatus,
                                                          @RequestParam(value = "pageNo") Integer pageNo,
                                                          @RequestParam(value = "pageSize") Integer pageSize) {
-        if (ObjectUtils.isNotNull(lockStatus)) {
-            lockStatus = "1";
-        } else {
-            lockStatus = "0";
-        }
+        System.out.println("queryGoodsAccountDetailByPageV1:"+lockStatus);
         List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
                 producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, goodsCode, pageNo, pageSize, lockStatus);
 

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

@@ -423,7 +423,7 @@
         <where>
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0
-            <if test="lockStatus != null  and lockStatus != '' and lockStatus == '1'">and TWG.lock_status != '1'</if>
+            <if test="lockStatus != null  and lockStatus != ''">and TWG.lock_status != '1'</if>
             <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>
@@ -489,7 +489,7 @@
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0
             and TWB.del_flag = '0'
-            <if test="lockStatus != null  and lockStatus != '' and lockStatus == '1'">and TWG.lock_status != '1'</if>
+            <if test="lockStatus != null  and lockStatus != ''">and TWG.lock_status != '1'</if>
             <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>