Merge remote-tracking branch 'origin/master'

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

@@ -101,6 +101,11 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "计费方式(数据字典)")
     private Long fBillingway;
 
+    /** 入库日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fOriginalbilldate;
+
     /**
      * 计划件数
      */
@@ -350,6 +355,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fBillingway;
     }
 
+    public void setfOriginalbilldate(Date fOriginalbilldate) {
+        this.fOriginalbilldate = fOriginalbilldate;
+    }
+
+    public Date getfOriginalbilldate() {
+        return fOriginalbilldate;
+    }
+
     public void setfPlanqty(Long fPlanqty) {
         this.fPlanqty = fPlanqty;
     }
@@ -567,6 +580,7 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fGoodsval", getfGoodsval())
                 .append("fCntrtype", getfCntrtype())
                 .append("fBillingway", getfBillingway())
+                .append("fOriginalbilldate", getfOriginalbilldate())
                 .append("fPlanqty", getfPlanqty())
                 .append("fPlanvolumn", getfPlanvolumn())
                 .append("fPackagespecs", getfPackagespecs())

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

@@ -14,6 +14,7 @@
         <result property="fWarehouselocid" column="f_warehouselocid"/>
         <result property="fBsdate" column="f_bsdate"/>
         <result property="fOriginalbillno" column="f_originalbillno"/>
+        <result property="fOriginalbilldate" column="f_originalbilldate"/>
         <result property="fBoxno" column="f_boxno"/>
         <result property="fCntqty" column="f_cntqty"/>
         <result property="fGoodsval" column="f_goodsval"/>
@@ -51,7 +52,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_lineno, f_billno, f_goodsid, f_mblno, f_warehouselocid, f_bsdate, f_originalbillno, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_chargedate, f_billingway, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks,f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass from t_warehousebillsitems
+        select f_id, f_pid, f_lineno, f_billno, f_goodsid, f_mblno, f_warehouselocid, f_bsdate, f_originalbillno, f_boxno, f_originalbilldate, f_cntqty, f_goodsval, f_cntrtype, f_chargedate, f_billingway, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks,f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -67,6 +68,7 @@
             <if test="fBsdate != null ">and f_bsdate = #{fBsdate}</if>
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and f_originalbillno = #{fOriginalbillno}</if>
             <if test="fBoxno != null  and fBoxno != ''">and f_boxno = #{fBoxno}</if>
+            <if test="fOriginalbilldate != null ">and f_originalbilldate = #{fOriginalbilldate}</if>
             <if test="fCntqty != null ">and f_cntqty = #{fCntqty}</if>
             <if test="fGoodsval != null ">and f_goodsval = #{fGoodsval}</if>
             <if test="fCntrtype != null  and fCntrtype != ''">and f_cntrtype = #{fCntrtype}</if>
@@ -153,22 +155,23 @@
             <if test="fBillno != null">f_billno,</if>
             <if test="fWarehouselocid != null">f_warehouselocid,</if>
             <if test="fMblno != null">f_mblno,</if>
-            <if test="fOriginalbillno != null">f_originalbillno,</if>
             <if test="fBsdate != null">f_bsdate,</if>
+            <if test="fOriginalbillno != null">f_originalbillno,</if>
             <if test="fBoxno != null">f_boxno,</if>
             <if test="fCntqty != null">f_cntqty,</if>
             <if test="fGoodsval != null">f_goodsval,</if>
             <if test="fCntrtype != null">f_cntrtype,</if>
-            <if test="fPlanqty != null">f_planqty,</if>
             <if test="fBillingway != null">f_billingway,</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate,</if>
             <if test="fPlanvolumn != null">f_planvolumn,</if>
-            <if test="fPackagespecs != null">f_packagespecs,</if>
-            <if test="fPlangrossweight != null">f_plangrossweight,</if>
+            <if test="fPlanqty != null">f_planqty,</if>
             <if test="fChargedate != null">f_chargedate,</if>
+            <if test="fPlangrossweight != null">f_plangrossweight,</if>
+            <if test="fPackagespecs != null">f_packagespecs,</if>
             <if test="fPlannetweight != null">f_plannetweight,</if>
             <if test="fQty != null">f_qty,</if>
-            <if test="fVolumn != null">f_volumn,</if>
             <if test="fGrossweight != null">f_grossweight,</if>
+            <if test="fVolumn != null">f_volumn,</if>
             <if test="fNetweight != null">f_netweight,</if>
             <if test="fCntrno != null">f_cntrno,</if>
             <if test="fTruckno != null">f_truckno,</if>
@@ -197,22 +200,23 @@
             <if test="fBillno != null">#{fBillno},</if>
             <if test="fWarehouselocid != null">#{fWarehouselocid},</if>
             <if test="fMblno != null">#{fMblno},</if>
-            <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
             <if test="fBsdate != null">#{fBsdate},</if>
+            <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
             <if test="fBoxno != null">#{fBoxno},</if>
             <if test="fCntqty != null">#{fCntqty},</if>
             <if test="fGoodsval != null">#{fGoodsval},</if>
             <if test="fCntrtype != null">#{fCntrtype},</if>
-            <if test="fPlanqty != null">#{fPlanqty},</if>
             <if test="fBillingway != null">#{fBillingway},</if>
+            <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
             <if test="fPlanvolumn != null">#{fPlanvolumn},</if>
-            <if test="fPackagespecs != null">#{fPackagespecs},</if>
-            <if test="fPlangrossweight != null">#{fPlangrossweight},</if>
+            <if test="fPlanqty != null">#{fPlanqty},</if>
             <if test="fChargedate != null">#{fChargedate},</if>
+            <if test="fPlangrossweight != null">#{fPlangrossweight},</if>
+            <if test="fPackagespecs != null">#{fPackagespecs},</if>
             <if test="fPlannetweight != null">#{fPlannetweight},</if>
             <if test="fQty != null">#{fQty},</if>
-            <if test="fVolumn != null">#{fVolumn},</if>
             <if test="fGrossweight != null">#{fGrossweight},</if>
+            <if test="fVolumn != null">#{fVolumn},</if>
             <if test="fNetweight != null">#{fNetweight},</if>
             <if test="fCntrno != null">#{fCntrno},</if>
             <if test="fTruckno != null">#{fTruckno},</if>
@@ -245,22 +249,23 @@
             <if test="fBillno != null">f_billno = #{fBillno},</if>
             <if test="fWarehouselocid != null">f_warehouselocid = #{fWarehouselocid},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
-            <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
             <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
+            <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
             <if test="fBoxno != null">f_boxno = #{fBoxno},</if>
             <if test="fCntqty != null">f_cntqty = #{fCntqty},</if>
             <if test="fGoodsval != null">f_goodsval = #{fGoodsval},</if>
             <if test="fCntrtype != null">f_cntrtype = #{fCntrtype},</if>
-            <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
             <if test="fPlanvolumn != null">f_planvolumn = #{fPlanvolumn},</if>
-            <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
-            <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
+            <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
+            <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
+            <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
             <if test="fPlannetweight != null">f_plannetweight = #{fPlannetweight},</if>
             <if test="fQty != null">f_qty = #{fQty},</if>
-            <if test="fVolumn != null">f_volumn = #{fVolumn},</if>
             <if test="fGrossweight != null">f_grossweight = #{fGrossweight},</if>
+            <if test="fVolumn != null">f_volumn = #{fVolumn},</if>
             <if test="fNetweight != null">f_netweight = #{fNetweight},</if>
             <if test="fCntrno != null">f_cntrno = #{fCntrno},</if>
             <if test="fTruckno != null">f_truckno = #{fTruckno},</if>
@@ -300,4 +305,19 @@
         delete from t_warehousebillsitems where f_id = #{fId}
     </delete>
 
+    <select id="selectStorageFeeItemList" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehouseBills"
+            resultMap="TWarehousebillsitemsResult">
+        SELECT
+        item.*
+        FROM
+        t_warehousebills ware
+        LEFT JOIN t_warehousebillsitems item ON item.f_pid = ware.f_id
+        <where>
+            ware.f_corpid = #{fCorpid}
+            and ware.f_billtype in ("HQZY", "SJCK")
+            <if test="fBillno != null">and ware.f_billno = #{fBillno}</if>
+            <if test="fMblno != null">and ware.f_mblno = #{fMblno}</if>
+        </where>
+    </select>
+
 </mapper>