调整作业费bug

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

@@ -197,6 +197,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             fPid = tWarehouseAgreement.getfId();
         } else {
             fPid = tWarehouseAgreement.getfId();
+            tWarehouseAgreement.setfBillstatus("2");
             tWarehouseAgreement.setUpdateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setUpdateTime(new Date());
             tWarehouseAgreementMapper.updateTWarehouseAgreement(tWarehouseAgreement);

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

@@ -1226,6 +1226,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success("成功", map);
     }
 
+    /**
+     *  生成计算仓储费信息
+     * @param warehouseBills
+     * @param mapItem
+     * @param loginUser
+     * @return
+     */
     public Map<String, Object> getWarehouseItems(TWarehouseBills warehouseBills, List<Map<String, Object>> mapItem, LoginUser loginUser) {
         Map<String, Object> map = new HashMap<>();
         long feeId = 0L;

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

@@ -510,8 +510,10 @@
         FROM
             t_whgenleg wh
             LEFT JOIN t_goods goods ON goods.f_id = wh.f_goodsid
+            LEFT JOIN t_warehouse ware ON ware.f_id = wh.f_warehouseid
         <where>
             wh.f_corpid = #{warehouse.fCorpid}
+            and ware.f_charg = 1
             and wh.f_chargedate &lt;= #{warehouse.fBillingDeadline}
             <if test="warehouse.fGoodsid != null">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fMblno != null">and wh.f_mblno = #{warehouse.fMblno}</if>

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

@@ -374,9 +374,11 @@
             t_warehousebills ware
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = ware.f_id
             LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
+            LEFT JOIN t_warehouse wa ON wa.f_id = ware.f_warehouseid
         <where>
             ware.f_corpid = #{warehouse.fCorpid}
             and ware.f_billtype in ("HQZY", "SJCK")
+            and wa.f_charg = 1
             and item.f_billstatus = 40
             and item.f_chargedate &lt;= #{warehouse.fBillingDeadline}
             <if test="warehouse.fGoodsid != null">and item.f_goodsid = #{warehouse.fGoodsid}</if>