20230605 16:30

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TWarehouse.java

@@ -107,6 +107,54 @@ public class TWarehouse extends BaseEntity
     @TableField(exist = false)
     private Boolean hasChildren;
 
+    /** 仓库属性 */
+    @Excel(name = "仓库属性")
+    private String fProperties;
+
+    /** 仓库类型 */
+    @Excel(name = "仓库类型")
+    private String fType;
+
+    /** 货物类型 */
+    @Excel(name = "货物类型")
+    private String fGoodsType;
+
+    /** 占地面积 */
+    @Excel(name = "占地面积")
+    private String fCoverArea;
+
+    public String getfProperties() {
+        return fProperties;
+    }
+
+    public void setfProperties(String fProperties) {
+        this.fProperties = fProperties;
+    }
+
+    public String getfType() {
+        return fType;
+    }
+
+    public void setfType(String fType) {
+        this.fType = fType;
+    }
+
+    public String getfGoodsType() {
+        return fGoodsType;
+    }
+
+    public void setfGoodsType(String fGoodsType) {
+        this.fGoodsType = fGoodsType;
+    }
+
+    public String getfCoverArea() {
+        return fCoverArea;
+    }
+
+    public void setfCoverArea(String fCoverArea) {
+        this.fCoverArea = fCoverArea;
+    }
+
     public Boolean getHasChildren() {
         return hasChildren;
     }

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

@@ -29,6 +29,10 @@
         <result property="hasChildren" column="has_children"/>
         <result property="fWarehouseInformation" column="f_warehouse_information"/>
         <result property="supervise" column="supervise"/>
+        <result property="fProperties" column="f_properties"/>
+        <result property="fType" column="f_type"/>
+        <result property="fGoodsType" column="f_goods_type"/>
+        <result property="fCoverArea" column="f_cover_area"/>
     </resultMap>
 
     <sql id="selectTWarehouseVo">
@@ -54,7 +58,11 @@
                remark,
                f_location,
                f_warehouse_information,
-               supervise
+               supervise,
+               f_properties,
+               f_type,
+               f_goods_type,
+               f_cover_area
         from t_warehouse
     </sql>
 
@@ -84,6 +92,7 @@
         select
             ware.f_id, ware.parent_id, ware.ancestors, ware.order_num, ware.f_no, ware.f_name, ware.f_cname, ware.f_totalgross, ware.f_location,
                ware.f_addr, ware.f_contacts, ware.f_tel, ware.f_charg, ware.f_is_bonded, ware.remark, ware.supervise, ware.f_status,
+               ware.f_properties, ware.f_type, ware.f_goods_type, ware.f_cover_area
             (
             SELECT
                 CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END
@@ -155,6 +164,10 @@
             <if test="fLocation != null">f_location,</if>
             <if test="fWarehouseInformation != null">f_warehouse_information,</if>
             <if test="supervise != null">supervise,</if>
+            <if test="fProperties != null">f_properties,</if>
+            <if test="fType != null">f_type,</if>
+            <if test="fGoodsType != null">f_goods_type,</if>
+            <if test="fCoverArea != null">f_cover_area,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null and parentId != 0">#{parentId},</if>
@@ -179,6 +192,10 @@
             <if test="fLocation != null">#{fLocation},</if>
             <if test="fWarehouseInformation != null">#{fWarehouseInformation},</if>
             <if test="supervise != null">#{supervise},</if>
+            <if test="fProperties != null">#{supervise},</if>
+            <if test="fType != null">#{supervise},</if>
+            <if test="fGoodsType != null">#{supervise},</if>
+            <if test="fCoverArea != null">#{supervise},</if>
         </trim>
     </insert>
 
@@ -207,6 +224,10 @@
             <if test="fLocation != null">f_location = #{fLocation},</if>
             <if test="fWarehouseInformation != null">f_warehouse_information = #{fWarehouseInformation},</if>
             <if test="supervise != null">supervise = #{supervise},</if>
+            <if test="fProperties != null">f_properties = #{fProperties},</if>
+            <if test="fType != null">f_type = #{fType},</if>
+            <if test="fGoodsType != null">f_goods_type = #{fGoodsType},</if>
+            <if test="fCoverArea != null">f_cover_area = #{fCoverArea},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -377,10 +398,12 @@
             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
             <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>
@@ -428,11 +451,13 @@
             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
             <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>