2023年5月16日11:15:49 仓储分析合计重量双倍问题

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseAgreementitems.java

@@ -71,11 +71,24 @@ public class TWarehouseAgreementitems extends BaseEntity {
     private String fStatus;
 
     /**
+     * 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name
+     */
+    private String tPackages;
+
+    /**
      * 删除状态
      */
     @TableLogic
     private String delFlag;
 
+    public String gettPackages() {
+        return tPackages;
+    }
+
+    public void settPackages(String tPackages) {
+        this.tPackages = tPackages;
+    }
+
     public void setfId(Long fId) {
         this.fId = fId;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitemsNew.java

@@ -67,6 +67,12 @@ public class TWarehousebillsitemsNew extends BaseEntity {
     private BigDecimal fGrossweight;
 
     /**
+     * 净重
+     */
+    @Excel(name = "净重")
+    private BigDecimal fNetweight;
+
+    /**
      * 仓库
      */
     //@Excel(name = "仓库")
@@ -100,6 +106,14 @@ public class TWarehousebillsitemsNew extends BaseEntity {
     @Excel(name = "仓储费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fStorageFeeDeadline;
 
+    public BigDecimal getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfNetweight(BigDecimal fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+
     public Long getfId() {
         return fId;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/dto/TWarehouseAgreementitem.java

@@ -53,6 +53,18 @@ public class TWarehouseAgreementitem extends BaseEntity {
     @Excel(name = "作业费类型")
     private String  fBilltype;
 
+    /**
+     * 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name
+     */
+    private String tPackages;
+
+    public String gettPackages() {
+        return tPackages;
+    }
+
+    public void settPackages(String tPackages) {
+        this.tPackages = tPackages;
+    }
 
     public Long getfId() {
         return fId;

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementitemsMapper.xml

@@ -20,10 +20,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="tPackages" column="t_packages"/>
     </resultMap>
 
     <sql id="selectTWarehouseAgreementitemsVo">
-        select f_id, f_pid, f_lineno, f_feeid, f_feeUnitid, f_fromdays, f_endays, f_price, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse_agreementitems
+        select f_id, f_pid, f_lineno, f_feeid, f_feeUnitid, f_fromdays, f_endays, f_price, f_status, del_flag, create_by, create_time, update_by, update_time, remark,t_packages from t_warehouse_agreementitems
     </sql>
 
     <select id="selectTWarehouseAgreementitemsList" parameterType="TWarehouseAgreementitems"
@@ -165,6 +166,9 @@
             <if test="fBilltype != null  and fBilltype != ''">
                 and agre.f_billtype  like concat('%', #{fBilltype}, '%')
             </if>
+            <if test="tPackages != null  and tPackages != ''">
+                and itme.t_packages  = #{tPackages}
+            </if>
             and agre.f_billstatus = 6
             and agre.f_status = 0
             and agre.f_feetypeid = 1
@@ -189,6 +193,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="tPackages != null">t_packages,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
@@ -205,6 +210,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="tPackages != null">#{tPackages},</if>
         </trim>
     </insert>
 
@@ -225,6 +231,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="tPackages != null">t_packages = #{tPackages},</if>
         </trim>
         where f_id = #{fId}
     </update>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsNewMapper.xml

@@ -27,7 +27,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsNewVo">
-        select b.f_id as f_id,
+        select DISTINCT b.f_id as f_id,
                a.f_billtype,
                a.is_calculate_storage_fees,
                b.f_corpid,