2022年10月31日17:16:56

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -278,7 +278,18 @@ public class TWhgenleg extends BaseEntity {
     private String timeStartBsdate;
     private String timeEndBsdate;
 
+    /**
+     *核注清单
+     */
+    private String checklists;
 
+    public String getChecklists() {
+        return checklists;
+    }
+
+    public void setChecklists(String checklists) {
+        this.checklists = checklists;
+    }
 
     public String getfEmsSeqNo() {
         return fEmsSeqNo;

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

@@ -734,6 +734,17 @@ public class TWarehouseBills extends BaseEntity {
      */
     private String isPledge;
 
+    //核注清单
+    private String checklists;
+
+    public String getChecklists() {
+        return checklists;
+    }
+
+    public void setChecklists(String checklists) {
+        this.checklists = checklists;
+    }
+
     public String getFinancialBillType() {
         return financialBillType;
     }

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

@@ -363,6 +363,9 @@ public class TWarehousebillsitems extends BaseEntity {
 
     //报关单号
     private String fCustomno;
+
+    //核注清单
+    private String checklists;
     //修改日期
     private Date bsdate;
 
@@ -387,6 +390,14 @@ public class TWarehousebillsitems extends BaseEntity {
      */
     private String type;
 
+    public String getChecklists() {
+        return checklists;
+    }
+
+    public void setChecklists(String checklists) {
+        this.checklists = checklists;
+    }
+
     public String getCargoName() {
         return cargoName;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -4193,12 +4193,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     if (StringUtils.isNotEmpty(tWarehouseBills.getfCustomno())) {
                         item.setfCustomno(tWarehouseBills.getfCustomno());
                     }
+                    if (StringUtils.isNotEmpty(tWarehouseBills.getChecklists())) {
+                        item.setfCustomno(tWarehouseBills.getfCustomno());
+                    }
                     // 防止主表备注进入明细从表备注中
                     /*if (StringUtils.isNotEmpty(tWarehouseBills.getRemark())) {
                         item.setRemark(tWarehouseBills.getRemark());
                     }*/
                 }
                 if (StringUtils.isNotNull(tWhgenle)) {
+                    item.setChecklists(tWarehouseBills.getChecklists());
                     updateTWhgenlegData(item, tWhgenle.getfId(), billsType);
                     item.setfSrcid(tWhgenle.getfId());
                 } else {

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

@@ -53,6 +53,7 @@
         <result property="lockTime" column="lock_time"/>
         <result property="unlockTime" column="unlock_time"/>
         <result property="wrNumber" column="wr_number"/>
+        <result property="checklists" column="checklists"/>
     </resultMap>
 
     <resultMap type="CalculateStorageFeesInfoVO" id="StorageFeesInfoResult">
@@ -102,7 +103,7 @@
          f_pregrossweight, f_warehouseid, f_prenetweight, f_bsdate, f_chargedate, f_volumnD, f_qtyD, f_billingway, f_grossweightD, f_netweightD, f_volumnC,
           f_qtyC, f_grossweightC, f_qtyblc, f_grossweightblc, f_netweightC, f_netweightblc, f_cntrno, f_status, del_flag, f_marks, create_by,
            create_time, update_by, f_volumnblc, update_time, remark, f_business_type, f_originalbilldate, f_localcntrno,f_customno,f_ems_seq_no,
-               lock_status, belong_to, lock_time, unlock_time, wr_number from t_whgenleg
+               lock_status, belong_to, lock_time, unlock_time, wr_number,checklists from t_whgenleg
     </sql>
 
     <select id="selectTWhgenlegList" parameterType="TWhgenleg" resultMap="TWhgenlegResult">
@@ -139,6 +140,7 @@
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
             <if test="fOriginalbilldate != null ">and f_originalbilldate = #{fOriginalbilldate}</if>
+            <if test="checklists != null and checklists != ''">and checklists = #{checklists}</if>
             <if test="fMblno != null and fMblno != ''">and f_mblno like concat('%',#{fMblno},'%')</if>
         </where>
         ${params.dataScope}
@@ -232,6 +234,7 @@
             <if test="lockTime != null">lock_time,</if>
             <if test="unlockTime != null">unlock_time,</if>
             <if test="wrNumber != null">wr_number,</if>
+            <if test="checklists != null">checklists,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fAccyear != null">#{fAccyear},</if>
@@ -280,6 +283,7 @@
             <if test="lockTime != null">#{lockTime},</if>
             <if test="unlockTime != null">#{unlockTime},</if>
             <if test="wrNumber != null">#{wrNumber},</if>
+            <if test="checklists != null">#{checklists},</if>
         </trim>
     </insert>
 
@@ -332,6 +336,7 @@
             <if test="lockTime != null">lock_time = #{lockTime},</if>
             <if test="unlockTime != null">unlock_time = #{unlockTime},</if>
             <if test="wrNumber != null">wr_number = #{wrNumber},</if>
+            <if test="checklists != null and checklists != ''">checklists = #{checklists},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -346,7 +351,8 @@
                 f_netweightD = f_netweightD + #{map.warehousebillsitems.fNetweight},
                 f_grossweightD = f_grossweightD + #{map.warehousebillsitems.fGrossweight},
                 f_qtyblc = f_qtyblc + #{map.warehousebillsitems.fQty}
-                ,f_chargedate = #{map.warehousebillsitems.fBsdate}
+                ,f_chargedate = #{map.warehousebillsitems.fBsdate},
+                checklists = #{map.warehousebillsitems.checklists},
                 <if test="map.warehousebillsitems.fCustomno != null  and map.warehousebillsitems.fCustomno != ''">
                     ,f_customno = #{map.warehousebillsitems.fCustomno}
                 </if>
@@ -770,6 +776,7 @@
             <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno LIKE  concat('%', #{fCntrno}, '%')</if>
             <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </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}
@@ -877,6 +884,7 @@
             <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="checklists != null and checklists !='' ">and leg.checklists = #{checklists}</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>
             <if test="fLocation != null  and fLocation ==0 ">and ware.ancestors  LIKE  concat('%', #{fWarehouseLocationid}, '%')</if>

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

@@ -138,6 +138,7 @@
         <result property="isPledge"    column="is_pledge"    />
         <result property="documentSummary" column="document_summary"    />
         <result property="financialBillType" column="financial_bill_type"   />
+        <result property="checklists" column="checklists"   />
     </resultMap>
 
     <resultMap type="WarehouseBillsVO" id="WarehousebillsVOResult">
@@ -163,7 +164,7 @@
         f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed, f_chargetype,f_weigh_weight,
         f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees,f_cargo_planning,
         f_arrival_status,f_dismount_status,f_serviceitems_new,f_receivable,f_recycle,f_due,f_pay,f_carego_status, f_ship_two, f_voy_two, pick_up_person, pick_up_time, facility_person, facility_time,is_pledge,
-        document_summary,financial_bill_type from t_warehousebills
+        document_summary,financial_bill_type,checklists from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -230,6 +231,7 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fNewTrademodeid != null ">and f_new_trademodeid = #{fNewTrademodeid}</if>
             <if test="isPledge != null and isPledge != ''">and is_pledge = #{isPledge}</if>
+            <if test="checklists != null and checklists != ''">and checklists = #{checklists}</if>
         </where>
         ORDER BY ware.create_time desc
         ${params.dataScope}
@@ -363,7 +365,8 @@
             twfD.f_invoicing_date AS fAccbilldate,
             bill.is_pledge AS isPledge,
             bill.document_summary AS documentSummary,
-            bill.financial_bill_type AS financialBillType
+            bill.financial_bill_type AS financialBillType,
+            bill.checklists AS checklists
         FROM
             t_warehousebills bill
             LEFT JOIN t_goods g ON g.f_id = bill.f_goodsid
@@ -501,6 +504,7 @@
             <if test="fVslid != null ">and bill.f_vslid = #{fVslid}</if>
             <if test="fVoyid != null ">and bill.f_voyid = #{fVoyid}</if>
             <if test="isPledge != null and isPledge != ''">and bill.is_pledge = #{isPledge}</if>
+            <if test="checklists != null and checklists != ''">and bill.checklists = #{checklists}</if>
             <if test="remark != null  and remark != ''">and bill.remark like concat('%', #{remark}, '%')</if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
                 and bill.f_bsdate &gt;= #{timeInterval[0]}
@@ -592,7 +596,8 @@
             tf.f_apply_money AS fApplyMoney,
             tf.invoice_no AS invoiceNo,
             tf.f_accbilldate AS fAccbilldate,
-            bill.is_pledge AS isPledge
+            bill.is_pledge AS isPledge,
+            bill.checklists AS checklists
         FROM
             t_warehousebills bill
             LEFT JOIN t_goods g ON g.f_id = bill.f_goodsid
@@ -687,6 +692,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
             <if test="warehouseStatus != null and warehouseStatus != ''">and bill.warehouse_status = #{warehouseStatus}</if>
             <if test="isPledge != null and isPledge != ''">and bill.is_pledge = #{isPledge}</if>
+            <if test="checklists != null and checklists != ''">and bill.checklists = #{checklists}</if>
         </where>
         ${params.dataScope}
         ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
@@ -1270,6 +1276,7 @@
             <if test="isPledge != null and isPledge != ''">is_pledge,</if>
             <if test="documentSummary != null and documentSummary != ''">document_summary,</if>
             <if test="financialBillType != null and financialBillType != ''">financial_bill_type,</if>
+            <if test="checklists != null and checklists != ''">checklists,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -1404,6 +1411,7 @@
             <if test="isPledge != null and isPledge != ''">#{isPledge},</if>
             <if test="documentSummary != null and documentSummary != ''">#{documentSummary},</if>
             <if test="financialBillType != null and financialBillType != ''">#{financialBillType},</if>
+            <if test="checklists != null and checklists != ''">#{checklists},</if>
         </trim>
     </insert>
 
@@ -1542,6 +1550,7 @@
             <if test="isPledge != null and isPledge != ''">is_pledge = #{isPledge},</if>
             <if test="documentSummary != null and documentSummary != ''">document_summary = #{documentSummary},</if>
             <if test="financialBillType != null and financialBillType != ''">financial_bill_type = #{financialBillType},</if>
+            <if test="checklists != null and checklists != ''">checklists = #{checklists},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1679,6 +1688,7 @@
             <if test="facilityPerson != null">facility_person = #{facilityPerson},</if>
             <if test="facilityTime != null">facility_time = #{facilityTime},</if>
             <if test="isPledge != null and isPledge != ''">is_pledge = #{isPledge},</if>
+            <if test="checklists != null and checklists != ''">checklists = #{checklists},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -3493,7 +3503,7 @@
     <select id="selecStorageFeeList" resultType="Map">
         SELECT DISTINCT w.f_id AS fId, w.f_billno AS fBillno, corp.f_name AS fCorpid, w.f_billing_deadline AS fBillingDeadline, w.remark,
                         w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime, w.f_fee_status fFeeStatus,
-                        w.f_trademodeid AS fTrademodeid,dict.dict_label AS fTrademodeName
+                        w.f_trademodeid AS fTrademodeid,dict.dict_label AS fTrademodeName ,w.checklists AS checklists
         FROM t_warehousebills w LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
             LEFT JOIN t_corps corp ON corp.f_id = w.f_corpid
             left join sys_user u on w.create_by = u.user_name
@@ -3514,6 +3524,7 @@
             <if test="fMblno != null and fMblno != ''">and w.f_mblno like concat('%', #{fMblno}, '%')</if>
             <if test="fCorpid != null and fCorpid != ''">and w.f_corpid = #{fCorpid}</if>
             <if test="fTrademodeid != null and fTrademodeid != ''">and w.f_trademodeid = #{fTrademodeid}</if>
+            <if test="checklists != null and checklists != ''">and w.checklists = #{checklists}</if>
         </where>
             ${params.dataScope}
             ORDER BY w.f_bsdate DESC, w.f_bstime DESC,w.f_id DESC,w.f_billstatus