修改仓储费计算审批通过 后续操作

ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -40,7 +40,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
      * 
      * 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据
      */
-    private int intervalTime = 10;
+    private int intervalTime = 2;
 
     public void setIntervalTime(int intervalTime)
     {

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditItemsServiceImpl.java

@@ -135,7 +135,6 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("审批流第" + num + "级所选角色中没有用户");
                 }
-
             } else {
                 auditItem.setAuditUserId(userIdList.get(0));
                 int addAuditItem = auditItemsMapper.insertAuditItems(auditItem);

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/mapper/TWhgenlegMapper.java

@@ -18,10 +18,10 @@ public interface TWhgenlegMapper {
     /**
      * 查询库存总账
      *
-     * @param fAccyear 库存总账ID
+     * @param fId 库存总账ID
      * @return 库存总账
      */
-    public TWhgenleg selectTWhgenlegById(Long fAccyear);
+    public TWhgenleg selectTWhgenlegById(Long fId);
 
     /**
      * 查询库存总账列表

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

@@ -29,6 +29,10 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "PID,对应主表id")
     private Long fPid;
 
+    /** 来源id */
+    @Excel(name = "来源id")
+    private Long fSrcid;
+
     /**
      * 行号，针对pid顺序排列，1，2，3，4，
      */
@@ -210,6 +214,11 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "金额")
     private BigDecimal fAmt;
 
+    /** 仓储费截至日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fStorageFeeDeadline;
+
     /**
      * 计费天数
      */
@@ -289,6 +298,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fLineno;
     }
 
+    public void setfSrcid(Long fSrcid) {
+        this.fSrcid = fSrcid;
+    }
+
+    public Long getfSrcid() {
+        return fSrcid;
+    }
+
     public void setfGoodsid(Long fGoodsid) {
         this.fGoodsid = fGoodsid;
     }
@@ -321,6 +338,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fWarehouselocid;
     }
 
+    public void setfStorageFeeDeadline(Date fStorageFeeDeadline) {
+        this.fStorageFeeDeadline = fStorageFeeDeadline;
+    }
+
+    public Date getfStorageFeeDeadline() {
+        return fStorageFeeDeadline;
+    }
+
     public void setfOriginalbillno(String fOriginalbillno) {
         this.fOriginalbillno = fOriginalbillno;
     }
@@ -599,6 +624,7 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fId", getfId())
                 .append("fPid", getfPid())
                 .append("fLineno", getfLineno())
+                .append("fSrcid", getfSrcid())
                 .append("fGoodsid", getfGoodsid())
                 .append("fBillno", getfBillno())
                 .append("fMblno", getfMblno())
@@ -610,6 +636,7 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fGoodsval", getfGoodsval())
                 .append("fCntrtype", getfCntrtype())
                 .append("fPlanqty", getfPlanqty())
+                .append("fStorageFeeDeadline", getfStorageFeeDeadline())
                 .append("fBillingway", getfBillingway())
                 .append("fPlanvolumn", getfPlanvolumn())
                 .append("fOriginalbilldate", getfOriginalbilldate())

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

@@ -673,14 +673,20 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
-            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
-            if (code.equals(500L)) {
+//            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
+            String code = approvalFlow.get("code").toString();
+//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+            if ("500".equals(code)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             }
             return approvalFlow;
         } else {
-            AjaxResult ajaxResult = warehouseFollow(fPid, 6L);
-            Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+            AjaxResult ajaxResult = storageFeeFollow(fPid, 6L);
+            String code = ajaxResult.get("code").toString();
+//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+            if ("500".equals(code)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            }
             return ajaxResult;
         }
     }
@@ -715,6 +721,60 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
+     * 根据仓库主表id 更新对应明细表状态
+     *
+     * @param fPid 仓库主表id
+     * @return 结果
+     */
+    @Transactional
+    public AjaxResult storageFeeFollow(Long fPid, long fettle) {
+        if (StringUtils.isNull(fPid)) {
+            return AjaxResult.error("仓库更新状态未找到主表信息，请与管理员联系");
+        }
+        int warehouseUpdateResult = tWarehouseBillsMapper.warehouseFollowUpdate(fPid, fettle);
+        if (warehouseUpdateResult <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新库存明细状态失败，请联系管理员");
+        }
+        TWarehousebillsitems warehousebillsitems = new TWarehousebillsitems();
+        warehousebillsitems.setfPid(fPid);
+        List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(warehousebillsitems);
+        for (TWarehousebillsitems wareItem : warehousebillsitemsList) {
+            int returnParameter = 0;
+            if ("KCZZ".equals(wareItem.getfBilltype())) {
+                TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getfSrcid());
+                tWhgenleg.setfChargedate(wareItem.getfBillingDeadline());
+                returnParameter = tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
+            } else {
+                TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getfSrcid());
+                tWarehousebillsitems.setfAmt(wareItem.getfAmt());
+                tWarehousebillsitems.setfBillingQty(wareItem.getfBillingQty());
+                tWarehousebillsitems.setfBillingDays(wareItem.getfBillingDays());
+                tWarehousebillsitems.setfChargedate(wareItem.getfBillingDeadline());
+                tWarehousebillsitems.setfInventoryDays(wareItem.getfInventoryDays());
+                tWarehousebillsitems.setfBillingDeadline(wareItem.getfBillingDeadline());
+                returnParameter = tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
+            }
+            if (returnParameter <= 0) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("仓储费计算通过失败，更新明细状态失败，请联系管理员");
+            }
+        }
+        int itemUpdateResult = tWarehousebillsitemsMapper.warehouseItemFollowUpdate(fPid, fettle);
+        if (itemUpdateResult <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新库存明细状态失败，请联系管理员");
+        }
+        int feesUpdateResult = tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(fPid, fettle);
+        if (feesUpdateResult <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新库存费用状态失败，请联系管理员");
+        }
+        return AjaxResult.success();
+    }
+
+
+    /**
      * 入库详情入账
      *
      * @param warehouseBills      主表
@@ -1161,12 +1221,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             String fBilltype = (String) item.get("fBilltype");
             feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
+            long fId = Long.valueOf(String.valueOf(item.get("fId"))).longValue();
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
             map.put("feeId", feeId);
             map.put("itemFeeId", objectMap.get("feeId"));
             sumAmt = sumAmt.add(amt).setScale(2,BigDecimal.ROUND_HALF_UP);
             TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
             tWarehousebillsitems.setfAmt(amt);
+            tWarehousebillsitems.setfSrcid(fId);
             tWarehousebillsitems.setfBillstatus(50L);
             tWarehousebillsitems.setfBillingQty(fQty);
             tWarehousebillsitems.setfBilltype(fBilltype);
@@ -1183,6 +1245,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsitems.setfChargedate((Date) item.get("fChargedate"));
             tWarehousebillsitems.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
             tWarehousebillsitems.setfBillingDeadline(warehouseBills.getfBillingDeadline());
+            System.out.println(tWarehousebillsitems.toString());
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(tWarehousebillsitems);
             itemsList.add(tWarehousebillsitems);
         }
@@ -1315,11 +1378,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public AjaxResult insertStorageFee(String warehouseBills, String warehouseItems, String warehouseFees, LoginUser loginUser, String billsType) {
         TWarehouseBills tWarehousebills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
         long fPid = 0L;
-        Long billstatus = tWarehousebills.getfBillstatus();
-        if (billstatus.equals(6L) && (StringUtils.isNull(warehouseItems) || "[]".equals(warehouseItems))) {
+        boolean billstatus = tWarehousebills.getfBillstatus().equals(6L);
+        if (billstatus && (StringUtils.isNull(warehouseItems) || "[]".equals(warehouseItems))) {
             return AjaxResult.error("未找到计费物资明细无法提交");
         }
-        if (billstatus.equals(6L) && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
+        if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
             return AjaxResult.error("未找到应收款明细无法提交");
         }
         if (StringUtils.isNotNull(tWarehousebills.getfId())) {
@@ -1348,8 +1411,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsitems item : warehousebillsitemsList) {
                 item.setfId(null);
                 item.setfPid(fPid);
-                item.setfBilltype(billsType);
-                item.setfBillstatus(billstatus);
+                item.setfBillstatus(tWarehousebills.getfBillstatus());
                 tWarehousebillsitemsMapper.insertTWarehousebillsitems(item);
             }
         }
@@ -1360,10 +1422,54 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 fees.setfId(null);
                 fees.setfPid(fPid);
                 fees.setfDc("D");
-                fees.setfBillstatus(billstatus);
+                fees.setfBillstatus(tWarehousebills.getfBillstatus());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             }
         }
+        if (billstatus) {
+            String key = "warehouse.storageFeeCalculation.ApprovalFlow";
+            SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
+            if (StringUtils.isNull(sysConfig)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("系统参数异常，未找到开启审批流参数");
+            }
+            if ("0".equals(sysConfig.getConfigValue())) {
+                AuditItems auditItems = new AuditItems();
+                auditItems.setLevelId(0L);
+                auditItems.setBillId(fPid);
+                auditItems.setActId(150L);
+                auditItems.setIffinalItem("F");
+                auditItems.setBillNo(tWarehousebills.getfBillno());
+                // 存储委托方（货权方）
+                auditItems.setRefno1(tWarehousebills.getfCorpid() + "");
+                // 存储业务类型（业务类型）
+                auditItems.setRefno2(tWarehousebills.getfBilltype());
+                // 存储提单号（提单号）
+                auditItems.setRefno3(tWarehousebills.getfMblno());
+                auditItems.setSendUserId(loginUser.getUser().getUserId());
+                auditItems.setSendName(loginUser.getUsername());
+                auditItems.setSendTime(new Date());
+                auditItems.setAuditUserId(loginUser.getUser().getUserId());
+                auditItems.setAuditItem(new Date());
+                auditItems.setAuditMsg("提交");
+                auditItems.setAuditStatus("O");
+                AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
+                String code = approvalFlow.get("code").toString();
+//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+                if ("500".equals(code)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                }
+                return approvalFlow;
+            } else {
+                AjaxResult ajaxResult = storageFeeFollow(fPid, 6L);
+                String code = ajaxResult.get("code").toString();
+//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
+                if ("500".equals(code)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                }
+                return ajaxResult;
+            }
+        }
         return AjaxResult.success();
     }
 

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

@@ -161,7 +161,7 @@
 
     <select id="selectTWhgenlegById" parameterType="Long" resultMap="TWhgenlegResult">
         <include refid="selectTWhgenlegVo"/>
-        where f_accyear = #{fAccyear}
+        where f_id = #{fId}
     </select>
 
     <insert id="insertTWhgenleg" parameterType="TWhgenleg">
@@ -482,6 +482,7 @@
 
     <select id="selectStorageFeeItemList" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehouseBills" resultType="Map">
         SELECT
+            wh.f_id AS fId,
             wh.f_originalbillno AS fBillno,
             wh.f_goodsid AS fGoodsid,
             wh.f_originalbilldate AS fBsdate,

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

@@ -7,6 +7,7 @@
     <resultMap type="TWarehousebillsitems" id="TWarehousebillsitemsResult">
         <result property="fId" column="f_id"/>
         <result property="fPid" column="f_pid"/>
+        <result property="fSrcid"    column="f_srcid"    />
         <result property="fLineno" column="f_lineno"/>
         <result property="fGoodsid" column="f_goodsid"/>
         <result property="fBillno" column="f_billno"/>
@@ -29,6 +30,7 @@
         <result property="fQty" column="f_qty"/>
         <result property="fVolumn" column="f_volumn"/>
         <result property="fGrossweight" column="f_grossweight"/>
+        <result property="fStorageFeeDeadline" column="f_storage_fee_deadline"/>
         <result property="fNetweight" column="f_netweight"/>
         <result property="fCntrno" column="f_cntrno"/>
         <result property="fTruckno" column="f_truckno"/>
@@ -54,8 +56,8 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_lineno, f_goodsid, f_billno, f_mblno, f_warehouselocid, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planqty, f_billingway, f_planvolumn, f_originalbilldate, f_packagespecs, f_plangrossweight, f_chargedate, 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_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline from t_warehousebillsitems
-    </sql>
+        select f_id, f_pid, f_lineno, f_srcid, f_billno, f_goodsid, f_mblno, f_warehouselocid, f_originalbillno, f_bsdate, f_cntqty, f_boxno, f_cntrtype, f_goodsval, f_originalbilldate, f_planqty, f_billingway, f_planvolumn, f_packagespecs, f_chargedate, f_plangrossweight, f_plannetweight, f_qty, f_grossweight, f_volumn, 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, f_billtype, f_billing_qty, f_billing_deadline from t_warehousebillsitems
+      </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
             resultMap="TWarehousebillsitemsResult">
@@ -71,6 +73,7 @@
             <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="fStorageFeeDeadline != null "> and f_storage_fee_deadline = #{fStorageFeeDeadline}</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>
@@ -106,6 +109,7 @@
             DISTINCT
             item.f_id AS fId,
             item.f_pid AS fPid,
+            item.f_srcid AS fSrcid,
             item.f_lineno AS fLineno,
             item.f_billno AS fBillno,
             item.f_goodsid AS fGoodsid,
@@ -161,27 +165,28 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fPid != null">f_pid,</if>
             <if test="fLineno != null">f_lineno,</if>
-            <if test="fGoodsid != null">f_goodsid,</if>
+            <if test="fSrcid != null">f_srcid,</if>
             <if test="fBillno != null">f_billno,</if>
+            <if test="fGoodsid != null">f_goodsid,</if>
             <if test="fMblno != null">f_mblno,</if>
             <if test="fWarehouselocid != null">f_warehouselocid,</if>
             <if test="fOriginalbillno != null">f_originalbillno,</if>
             <if test="fBsdate != null">f_bsdate,</if>
-            <if test="fBoxno != null">f_boxno,</if>
             <if test="fCntqty != null">f_cntqty,</if>
-            <if test="fGoodsval != null">f_goodsval,</if>
+            <if test="fBoxno != null">f_boxno,</if>
             <if test="fCntrtype != null">f_cntrtype,</if>
+            <if test="fGoodsval != null">f_goodsval,</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate,</if>
             <if test="fPlanqty != null">f_planqty,</if>
             <if test="fBillingway != null">f_billingway,</if>
             <if test="fPlanvolumn != null">f_planvolumn,</if>
-            <if test="fOriginalbilldate != null">f_originalbilldate,</if>
             <if test="fPackagespecs != null">f_packagespecs,</if>
-            <if test="fPlangrossweight != null">f_plangrossweight,</if>
             <if test="fChargedate != null">f_chargedate,</if>
+            <if test="fPlangrossweight != null">f_plangrossweight,</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>
@@ -194,6 +199,7 @@
             <if test="remark != null">remark,</if>
             <if test="fMarks != null">f_marks,</if>
             <if test="fInventoryDays != null">f_inventory_days,</if>
+            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline,</if>
             <if test="fAmt != null">f_amt,</if>
             <if test="fBillingDays != null">f_billing_days,</if>
             <if test="fDriverName != null">f_driver_name,</if>
@@ -208,27 +214,28 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
             <if test="fLineno != null">#{fLineno},</if>
-            <if test="fGoodsid != null">#{fGoodsid},</if>
+            <if test="fSrcid != null">#{fSrcid},</if>
             <if test="fBillno != null">#{fBillno},</if>
+            <if test="fGoodsid != null">#{fGoodsid},</if>
             <if test="fMblno != null">#{fMblno},</if>
             <if test="fWarehouselocid != null">#{fWarehouselocid},</if>
             <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
             <if test="fBsdate != null">#{fBsdate},</if>
-            <if test="fBoxno != null">#{fBoxno},</if>
             <if test="fCntqty != null">#{fCntqty},</if>
-            <if test="fGoodsval != null">#{fGoodsval},</if>
+            <if test="fBoxno != null">#{fBoxno},</if>
             <if test="fCntrtype != null">#{fCntrtype},</if>
+            <if test="fGoodsval != null">#{fGoodsval},</if>
+            <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
             <if test="fPlanqty != null">#{fPlanqty},</if>
             <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fPlanvolumn != null">#{fPlanvolumn},</if>
-            <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
             <if test="fPackagespecs != null">#{fPackagespecs},</if>
-            <if test="fPlangrossweight != null">#{fPlangrossweight},</if>
             <if test="fChargedate != null">#{fChargedate},</if>
+            <if test="fPlangrossweight != null">#{fPlangrossweight},</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>
@@ -241,6 +248,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="fMarks != null">#{fMarks},</if>
             <if test="fInventoryDays != null">#{fInventoryDays},</if>
+            <if test="fStorageFeeDeadline != null">#{fStorageFeeDeadline},</if>
             <if test="fAmt != null">#{fAmt},</if>
             <if test="fBillingDays != null">#{fBillingDays},</if>
             <if test="fDriverName != null">#{fDriverName},</if>
@@ -259,27 +267,28 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="fPid != null">f_pid = #{fPid},</if>
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
-            <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
+            <if test="fSrcid != null">f_srcid = #{fSrcid},</if>
             <if test="fBillno != null">f_billno = #{fBillno},</if>
+            <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
             <if test="fWarehouselocid != null">f_warehouselocid = #{fWarehouselocid},</if>
             <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
             <if test="fBsdate != null">f_bsdate = #{fBsdate},</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="fBoxno != null">f_boxno = #{fBoxno},</if>
             <if test="fCntrtype != null">f_cntrtype = #{fCntrtype},</if>
+            <if test="fGoodsval != null">f_goodsval = #{fGoodsval},</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
             <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
             <if test="fPlanvolumn != null">f_planvolumn = #{fPlanvolumn},</if>
-            <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
             <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
-            <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
             <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
+            <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</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>
@@ -292,6 +301,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
             <if test="fInventoryDays != null">f_inventory_days = #{fInventoryDays},</if>
+            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline = #{fStorageFeeDeadline},</if>
             <if test="fAmt != null">f_amt = #{fAmt},</if>
             <if test="fBillingDays != null">f_billing_days = #{fBillingDays},</if>
             <if test="fDriverName != null">f_driver_name = #{fDriverName},</if>
@@ -324,6 +334,7 @@
     <select id="selectStorageFeeItemList" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehouseBills"
             resultType="Map">
         SELECT
+            item.f_id AS fId,
             item.f_billno AS fBillno,
             item.f_goodsid AS fGoodsid,
             item.f_bsdate AS fBsdate,