20221215 18:09

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

@@ -360,7 +360,7 @@
         SELECT
             TW.f_id AS warehouseCode,
             TW.f_name AS warehouseName,
-            TC.f_no AS ownerCode,
+            TC.f_id AS ownerCode,
             TC.f_name AS ownerName,
             TG.f_name AS goodsName,
             TG.f_packagespecs AS specifications,
@@ -394,15 +394,15 @@
         SELECT
             DISTINCT
             TWG.f_id AS id,
-            TW.f_no AS warehouseCode,
+            TW.f_id AS warehouseCode,
             TW.f_name AS warehouseName,
             ware.f_name AS areaName,
-            ware.f_no AS areaCode,
+            ware.f_id AS areaCode,
             ware.f_name AS slotName,
-            ware.f_no AS slotCode,
+            ware.f_id AS slotCode,
             TWG.f_originalbillno AS receiptDoc,
             TWG.f_mblno AS billOfLading,
-            TC.f_no AS ownerCode,
+            TC.f_id AS ownerCode,
             TC.f_name AS ownerName,
             TG.f_name AS goodsName,
             TG.f_packagespecs AS specifications,
@@ -432,16 +432,16 @@
             and TWG.f_warehouseid = #{warehouseCode}
             AND TW.del_flag = '0'
             <if test="ownerName != null  and ownerName != ''"> and TC.f_name like concat('%', #{ownerName}, '%')</if>
-            <if test="ownerCode != null  and ownerCode != ''"> and TC.f_no = #{ownerCode}</if>
+            <if test="ownerCode != null  and ownerCode != ''"> and TC.f_id = #{ownerCode}</if>
             <if test="goodsName != null  and goodsName != ''"> and TG.f_name like concat('%', #{goodsName}, '%')</if>
             <if test="specifications != null  and specifications != ''"> and TG.f_packagespecs like concat('%', #{specifications}, '%')</if>
             <if test="materialQuality != null  and materialQuality != ''"> and TWG.f_marks like concat('%', #{materialQuality}, '%')</if>
             <if test="receiptDoc != null  and receiptDoc != ''"> and TWG.f_originalbillno like concat('%', #{receiptDoc}, '%')</if>
             <if test="billOfLading != null  and billOfLading != ''"> and TWG.f_mblno like concat('%', #{billOfLading}, '%')</if>
             <if test="areaName != null  and areaName != ''"> and ware.f_name like concat('%', #{areaName}, '%')</if>
-            <if test="areaCode != null  and areaCode != ''"> and ware.f_no = #{areaCode}</if>
+            <if test="areaCode != null  and areaCode != ''"> and ware.f_id = #{areaCode}</if>
             <if test="slotName != null  and slotName != ''"> and ware.f_name like concat('%', #{slotName}, '%')</if>
-            <if test="slotCode != null  and slotCode != ''"> and ware.f_no = #{slotCode}</if>
+            <if test="slotCode != null  and slotCode != ''"> and ware.f_id = #{slotCode}</if>
         </where>
     </select>