Selaa lähdekoodia

优化查询库存总账条件,去除多余权限标识

阿伏兔 4 vuotta sitten
vanhempi
commit
f8403a29a8

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -89,7 +89,6 @@ public class TWarehouseInStockController extends BaseController {
      * 导入【入库明细箱信息】Excel
      * 待完成
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntrno:import')")
     @Log(title = "导入集装箱动态", businessType = BusinessType.IMPORT)
     @PostMapping(value = "/importInstock")
     public AjaxResult importInstock(@RequestParam("file") MultipartFile file)

+ 3 - 1
ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -639,12 +639,14 @@
             <if test="fNetweightc != null ">and leg.f_netweightC = #{fNetweightc}</if>
             <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
             <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
-            <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno = #{fCntrno}</if>
             <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
             <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
             <if test="fLocation != null and fLocation ==1 ">
                 and leg.f_warehouse_locationid = #{fWarehouseLocationid}
             </if>
+            <if test="fCntrno != null  and fCntrno != ''">
+                and leg.f_cntrno  LIKE  concat('%', #{fCntrno}, '%')
+            </if>
             <if test="fLocalcntrno != null  and fLocalcntrno != ''">
                 and leg.f_localcntrno  LIKE  concat('%', #{fLocalcntrno}, '%')
             </if>