调整仓储费计算 结果

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

@@ -457,23 +457,36 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         Long dayLength = 0L;
         Long feeId = 0L;
 
+        String remark = null;
         for (TWarehouseAgreementitems tWarehouseAgreementitems : itemList) {
-            if (days < 1) break;
+            if (days  < 1) break;
             if (earlySumDays >= tWarehouseAgreementitems.getfEndays()) continue; //将已算账的天数 与 计费规则的 最后一天作比较如果 已算10天 > 规则结束  不算帐
 
             dayLength = tWarehouseAgreementitems.getfEndays() - tWarehouseAgreementitems.getfFromdays() + 1L; //阶梯中的结束-开始日期
+            String information = dayLength + "天X" + tWarehouseAgreementitems.getfPrice() + "元";
 
             if (days >= dayLength) {
+                if (StringUtils.isEmpty(remark)) {
+                    remark = information;
+                } else {
+                    remark = remark + "," + information;
+                }
                 feeId = tWarehouseAgreementitems.getfFeeid();
                 money = money.add(this.getCalculate(itemNums,tWarehouseAgreementitems.getfPrice(),dayLength));
                 days = days - dayLength;
             } else {
+                if (StringUtils.isEmpty(remark)) {
+                    remark = information;
+                } else {
+                    remark = remark + "," + information;
+                }
                 feeId = tWarehouseAgreementitems.getfFeeid();
                 money = money.add(this.getCalculate(itemNums,tWarehouseAgreementitems.getfPrice(),days));
             }
         }
         map.put("amt", money);
         map.put("feeId", feeId);
+        map.put("remark", remark);
         return map;
     }
 

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

@@ -1243,8 +1243,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return map;
             }
             String fBilltype = (String) item.get("fBilltype");
-            feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
+            String remark = objectMap.get("remark").toString();
             long fId = Long.valueOf(String.valueOf(item.get("fId"))).longValue();
+            feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
             map.put("feeId", feeId);
             map.put("itemFeeId", objectMap.get("feeId"));
@@ -1252,6 +1253,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
             tWarehousebillsitems.setfAmt(amt);
             tWarehousebillsitems.setfSrcid(fId);
+            tWarehousebillsitems.setRemark(remark);
             tWarehousebillsitems.setfBillstatus(50L);
             tWarehousebillsitems.setfBillingQty(fQty);
             tWarehousebillsitems.setfBilltype(fBilltype);