调整仓储费计算 问题

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

@@ -249,6 +249,14 @@ public class TWarehousebillsfees extends BaseEntity {
     @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
     private String fBilltype;
 
+    /** 入（出）库日期 */
+    @Excel(name = "入", readConverterExp = "出=")
+    private Date fBsdate;
+
+    /** 入库日期（原始） */
+    @Excel(name = "入库日期", readConverterExp = "原=始")
+    private Date fOriginalbilldate;
+
     /**
      * 计费方式
      */
@@ -263,6 +271,22 @@ public class TWarehousebillsfees extends BaseEntity {
         return fId;
     }
 
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfOriginalbilldate(Date fOriginalbilldate) {
+        this.fOriginalbilldate = fOriginalbilldate;
+    }
+
+    public Date getfOriginalbilldate() {
+        return fOriginalbilldate;
+    }
+
     public void setfPid(Long fPid) {
         this.fPid = fPid;
     }
@@ -605,6 +629,8 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("srcBillNo", getSrcBillNo())
                 .append("fMblno", getfMblno())
                 .append("fProductName", getfProductName())
+                .append("fOriginalbilldate", getfOriginalbilldate())
+                .append("fBsdate", getfBsdate())
                 .append("fMarks", getfMarks())
                 .append("fChargedate", getfChargedate())
                 .append("fBillingDeadline", getfBillingDeadline())

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

@@ -486,6 +486,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 // 检验  数量*单价=金额
                 wbDr.setfPid(fPid);
                 wbDr.setfDc("D");
+                wbDr.setfBilltype(billsType);
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
                 wbDr.setCreateTime(new Date());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
@@ -498,6 +499,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
                 wbCr.setfPid(fPid);
                 wbCr.setfDc("C");
+                wbCr.setfBilltype(billsType);
                 wbCr.setCreateBy(loginUser.getUser().getUserName());
                 wbCr.setCreateTime(new Date());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
@@ -634,6 +636,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
                 wbCr.setfPid(fPid);
                 wbCr.setfDc("C");
+                wbCr.setfBilltype(billsType);
                 wbCr.setCreateTime(new Date());
                 wbCr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
@@ -646,6 +649,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbDr.setfPid(fPid);
                 wbDr.setfDc("D");
                 wbDr.setfBillstatus(4L);
+                wbDr.setfBilltype(billsType);
                 wbDr.setCreateTime(new Date());
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
@@ -751,13 +755,22 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("更新库存明细状态失败，请联系管理员");
         }
         TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
-        warehousebillsfees.setfId(fPid);
+        warehousebillsfees.setfPid(fPid);
         List<TWarehousebillsfees> warehousebillsfeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
         for (TWarehousebillsfees wareItem : warehousebillsfeesList) {
+            if (StringUtils.isNull(wareItem.getSrcId())) {
+                continue;
+            }
             if ("KCZZ".equals(wareItem.getfBilltype())) {
                 TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getSrcId());
+                System.out.println(tWhgenleg.getfChargedate());
                 tWhgenleg.setfChargedate(wareItem.getfBillingDeadline());
-                tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
+                System.out.println(tWhgenleg.getfChargedate());
+                int i = tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
+                if (i <= 0) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("更新库存费用状态失败，请联系管理员");
+                }
             } else {
                 TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getSrcId());
                 tWarehousebillsitems.setfAmt(wareItem.getfAmt());
@@ -769,11 +782,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
             }
         }
-        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();
@@ -1294,16 +1302,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fees.setfPid(warehouseBills.getfId());
             fees.setfInventoryDays(fInventoryDays);
             fees.setfExrate(new BigDecimal(1));
-            fees.setfMarks((String) item.get("fMarks"));
+            fees.setfBsdate((Date) item.get("fBsdate"));
             fees.setfCorpid(warehouseBills.getfCorpid());
+            fees.setfMarks(item.get("fMarks").toString());
             fees.setSrcBillNo((String) item.get("fBillno"));
+            fees.setfChargedate((Date) item.get("fChargedate"));
+            fees.setCreateBy(loginUser.getUser().getUserName());
             fees.setfProductName(item.get("fGoodsids").toString());
+            fees.setfBillingDeadline(warehouseBills.getfBillingDeadline());
             fees.setfTaxrate(new BigDecimal(taxRate.get(0).getDictValue()));
-            fees.setCreateBy(loginUser.getUser().getUserName());
+            fees.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
             fees.setfBillingway(Long.valueOf(String.valueOf(item.get("fBillingway"))).longValue());
-            fees.setfChargedate((Date) item.get("fChargedate"));
-//            fees.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
-            fees.setfBillingDeadline(warehouseBills.getfBillingDeadline());
             tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             itemsList.add(fees);
         }
@@ -1350,7 +1359,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fPid = tWarehouseBills.getfId();
         }
         // 计划物资明细
-        List<TWarehousebillsitems> itemsList = new ArrayList<>();
+        List<TWarehousebillsfees> itemsList = new ArrayList<>();
         BigDecimal bigDecimal = new BigDecimal(0);
         Map<String, Object> map = new HashMap<>();
         // 库存总账id
@@ -1365,7 +1374,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error((String) mapItem.get("error"));
             }
-            itemsList = (List<TWarehousebillsitems>) mapItem.get("itemsList");
+            itemsList = (List<TWarehousebillsfees>) mapItem.get("itemsList");
         }
         List<Map<String, Object>> tWhgenlegs = tWhgenlegMapper.selectStorageFeeItemList(tWarehouseBills);
         if (tWhgenlegs.size() != 0) {
@@ -1374,17 +1383,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error((String) mapItem.get("error"));
             }
-            List<TWarehousebillsitems> itemList = (List<TWarehousebillsitems>) mapItem.get("itemsList");
+            List<TWarehousebillsfees> itemList = (List<TWarehousebillsfees>) mapItem.get("itemsList");
             if (itemList.size() != 0) {
-                for (TWarehousebillsitems ite : itemList) {
+                for (TWarehousebillsfees ite : itemList) {
                     itemsList.add(ite);
                 }
             }
         }
-        TGoods tGoods = new TGoods();
-        tGoods.setfStatus("0");
-        tGoods.setDelFlag("0");
-        List<TGoods> goods = tGoodsMapper.selectTGoodsList(tGoods);
         TFees tFees = new TFees();
         tFees.setfStatus("2");
         tFees.setDelFlag("0");
@@ -1392,7 +1397,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (itemsList.size() <= 0) {
             return AjaxResult.error("未找到合适的库存明细");
         }
-        map.put("goodsList", goods);
         map.put("feesList", feesList);
         map.put("warehouseBills", tWarehouseBills);
         map.put("warehouseItemList", itemsList);
@@ -1456,6 +1460,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 fees.setfId(null);
                 fees.setfPid(fPid);
                 fees.setfDc("D");
+                fees.setfBilltype("JSCCF");
                 fees.setfBillstatus(tWarehousebills.getfBillstatus());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             }
@@ -1504,7 +1509,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return ajaxResult;
             }
         }
-        return AjaxResult.success();
+        return AjaxResult.success(tWarehousebills);
     }
 
     /**

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

@@ -294,7 +294,7 @@
             <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
             <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
         </trim>
-        where f_accyear = #{fAccyear}
+        where f_id = #{fId}
     </update>
 
     <update id="updateTWhgenlegData" parameterType="Map">
@@ -338,13 +338,13 @@
     </update>
 
     <delete id="deleteTWhgenlegById" parameterType="Long">
-        delete from t_whgenleg where f_accyear = #{fAccyear}
+        delete from t_whgenleg where f_id = #{fId}
     </delete>
 
     <delete id="deleteTWhgenlegByIds" parameterType="String">
-        delete from t_whgenleg where f_accyear in
+        delete from t_whgenleg where f_id in
         <foreach item="fAccyear" collection="array" open="(" separator="," close=")">
-            #{fAccyear}
+            #{fId}
         </foreach>
     </delete>
 

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

@@ -49,10 +49,12 @@
         <result property="fBillingQty" column="f_billing_qty"/>
         <result property="fBilltype" column="f_billtype"/>
         <result property="fBillingway" column="f_billingway"/>
+        <result property="fBsdate" column="f_bsdate"/>
+        <result property="fOriginalbilldate" column="f_originalbilldate"/>
     </resultMap>
 
     <sql id="selectTWarehousebillsfeesVo">
-        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_review_date, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_status, f_stlamount_date, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway from t_warehousebillsfees
+        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_review_date, f_statement_no, f_accamount, f_stlamount, f_accamount_date, f_invnos, f_invamount, f_stlamount_no, f_askamount, f_status, f_stlamount_date, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway, f_bsdate, f_originalbilldate from t_warehousebillsfees
     </sql>
 
     <select id="selectTWarehousebillsfeesList" parameterType="TWarehousebillsfees" resultMap="TWarehousebillsfeesResult">
@@ -72,11 +74,11 @@
             <if test="fDc != null  and fDc != ''"> and f_dc = #{fDc}</if>
             <if test="fBillstatus != null  and fBillstatus != ''"> and f_billstatus = #{fBillstatus}</if>
             <if test="fReviewDate != null "> and f_review_date = #{fReviewDate}</if>
-            <if test="fAccamount != null "> and f_accamount = #{fAccamount}</if>
             <if test="fStatementNo != null  and fStatementNo != ''"> and f_statement_no = #{fStatementNo}</if>
+            <if test="fAccamount != null "> and f_accamount = #{fAccamount}</if>
             <if test="fStlamount != null "> and f_stlamount = #{fStlamount}</if>
-            <if test="fInvnos != null  and fInvnos != ''"> and f_invnos = #{fInvnos}</if>
             <if test="fAccamountDate != null "> and f_accamount_date = #{fAccamountDate}</if>
+            <if test="fInvnos != null  and fInvnos != ''"> and f_invnos = #{fInvnos}</if>
             <if test="fInvamount != null "> and f_invamount = #{fInvamount}</if>
             <if test="fStlamountNo != null  and fStlamountNo != ''"> and f_stlamount_no = #{fStlamountNo}</if>
             <if test="fAskamount != null "> and f_askamount = #{fAskamount}</if>
@@ -95,6 +97,8 @@
             <if test="fBillingQty != null "> and f_billing_qty = #{fBillingQty}</if>
             <if test="fBilltype != null  and fBilltype != ''"> and f_billtype = #{fBilltype}</if>
             <if test="fBillingway != null "> and f_billingway = #{fBillingway}</if>
+            <if test="fBsdate != null "> and f_bsdate = #{fBsdate}</if>
+            <if test="fOriginalbilldate != null "> and f_originalbilldate = #{fOriginalbilldate}</if>
         </where>
     </select>
 
@@ -121,11 +125,11 @@
             <if test="fDc != null">f_dc,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
             <if test="fReviewDate != null">f_review_date,</if>
-            <if test="fAccamount != null">f_accamount,</if>
             <if test="fStatementNo != null">f_statement_no,</if>
+            <if test="fAccamount != null">f_accamount,</if>
             <if test="fStlamount != null">f_stlamount,</if>
-            <if test="fInvnos != null">f_invnos,</if>
             <if test="fAccamountDate != null">f_accamount_date,</if>
+            <if test="fInvnos != null">f_invnos,</if>
             <if test="fInvamount != null">f_invamount,</if>
             <if test="fStlamountNo != null">f_stlamount_no,</if>
             <if test="fAskamount != null">f_askamount,</if>
@@ -150,6 +154,8 @@
             <if test="fBillingQty != null">f_billing_qty,</if>
             <if test="fBilltype != null">f_billtype,</if>
             <if test="fBillingway != null">f_billingway,</if>
+            <if test="fBsdate != null">f_bsdate,</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
@@ -166,11 +172,11 @@
             <if test="fDc != null">#{fDc},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
             <if test="fReviewDate != null">#{fReviewDate},</if>
-            <if test="fAccamount != null">#{fAccamount},</if>
             <if test="fStatementNo != null">#{fStatementNo},</if>
+            <if test="fAccamount != null">#{fAccamount},</if>
             <if test="fStlamount != null">#{fStlamount},</if>
-            <if test="fInvnos != null">#{fInvnos},</if>
             <if test="fAccamountDate != null">#{fAccamountDate},</if>
+            <if test="fInvnos != null">#{fInvnos},</if>
             <if test="fInvamount != null">#{fInvamount},</if>
             <if test="fStlamountNo != null">#{fStlamountNo},</if>
             <if test="fAskamount != null">#{fAskamount},</if>
@@ -195,6 +201,8 @@
             <if test="fBillingQty != null">#{fBillingQty},</if>
             <if test="fBilltype != null">#{fBilltype},</if>
             <if test="fBillingway != null">#{fBillingway},</if>
+            <if test="fBsdate != null">#{fBsdate},</if>
+            <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
         </trim>
     </insert>
 
@@ -215,11 +223,11 @@
             <if test="fDc != null">f_dc = #{fDc},</if>
             <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
             <if test="fReviewDate != null">f_review_date = #{fReviewDate},</if>
-            <if test="fAccamount != null">f_accamount = #{fAccamount},</if>
             <if test="fStatementNo != null">f_statement_no = #{fStatementNo},</if>
+            <if test="fAccamount != null">f_accamount = #{fAccamount},</if>
             <if test="fStlamount != null">f_stlamount = #{fStlamount},</if>
-            <if test="fInvnos != null">f_invnos = #{fInvnos},</if>
             <if test="fAccamountDate != null">f_accamount_date = #{fAccamountDate},</if>
+            <if test="fInvnos != null">f_invnos = #{fInvnos},</if>
             <if test="fInvamount != null">f_invamount = #{fInvamount},</if>
             <if test="fStlamountNo != null">f_stlamount_no = #{fStlamountNo},</if>
             <if test="fAskamount != null">f_askamount = #{fAskamount},</if>
@@ -244,6 +252,8 @@
             <if test="fBillingQty != null">f_billing_qty = #{fBillingQty},</if>
             <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
             <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
+            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
         </trim>
         where f_id = #{fId}
     </update>