仓库仓储费计算修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.java

@@ -107,7 +107,7 @@ public class TStorageFeeCalculationController extends BaseController {
         return itWarehouseBillsService.insertStorageFee(warehouseBills, warehouseItems, warehouseFees, loginUser, billsType);
     }
     /**
-     * 新增库存费计算
+     * 新增库存费批量计算
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
@@ -135,7 +135,7 @@ public class TStorageFeeCalculationController extends BaseController {
         return itWarehouseBillsService.calculateStorageFees(tWarehouseBills, loginUser, billsType);
     }
     /**
-     * 出库库存费计算
+     * 出库库存费批量计算
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)

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

@@ -296,7 +296,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(tWarehouseAgreement.getfBillno());
             auditItems.setRefno1(String.valueOf(tWarehouseAgreement.getfCorpid()));
-            if (tWarehouseAgreement.getfFeetypeid() == 0) {
+            if (fFeetypeid == 0) {
                 auditItems.setRefno2("CCF");// 存储业务类型（业务类型）
             } else {
                 auditItems.setRefno2("ZYF");// 存储业务类型（业务类型）

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

@@ -3881,7 +3881,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         /*if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
             return AjaxResult.error("未找到应收款明细无法提交");
         }*/
-        tWarehousebills.setfTimes(tWarehousebills.getfTimes() + 1);
+        if (tWarehousebills.getfTimes() == null){
+            tWarehousebills.setfTimes(1L);
+        }else {
+            tWarehousebills.setfTimes(tWarehousebills.getfTimes() + 1);
+        }
         if (StringUtils.isNotNull(tWarehousebills.getfId())) {
             fPid = tWarehousebills.getfId();
             tWarehousebills.setUpdateTime(new Date());
@@ -3989,7 +3993,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         /*if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
             return AjaxResult.error("未找到应收款明细无法提交");
         }*/
-            tWarehousebills.setfTimes(tWarehousebills.getfTimes() + 1);
+            if (tWarehousebills.getfTimes() == null){
+                tWarehousebills.setfTimes(1L);
+            }else {
+                tWarehousebills.setfTimes(tWarehousebills.getfTimes() + 1);
+            }
             if (StringUtils.isNotNull(tWarehousebills.getfId())) {
                 fPid = tWarehousebills.getfId();
                 tWarehousebills.setUpdateTime(new Date());

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

@@ -108,7 +108,7 @@
             agreement.f_corpid = #{fCorpid}
             AND agreement.t_packages = #{fGoodsid}
             AND items.f_feeUnitid = #{feeUnitid}
-            AND agreement.f_status = 0
+            AND agreement.f_status = '1'
             AND agreement.del_flag = '0'
             AND agreement.f_feetypeid = '0'
             AND items.del_flag = '0'