解决仓储费计算问题

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

@@ -1330,6 +1330,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 map.put("error", "单号：" + item.get("fBillno") + ",业务日期:" + item.get("fBsdate") + "未找到仓储费协议，请确认");
                 return map;
             }
+            String mblno = "";
+            if (StringUtils.isNotNull(item.get("fMblno"))) {
+                mblno = item.get("fMblno").toString();
+            }
             String remark = objectMap.get("remark").toString();
             feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
@@ -1341,10 +1345,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fees.setfDc("D");
             fees.setfAmt(amt);
             fees.setSrcId(fId);
+            fees.setfMblno(mblno);
             fees.setRemark(remark);
-            fees.setfBillstatus(2L);
             fees.setfFeeunitid(2L);
             fees.setfAmount(sumAmt);
+            fees.setfBillstatus(2L);
             fees.setfCurrency("RMB");
             fees.setfBillingQty(fQty);
             fees.setfUnitprice(sumAmt);

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

@@ -503,6 +503,7 @@
             wh.f_goodsid AS fGoodsid,
             wh.f_originalbilldate AS fBsdate,
             wh.f_billingway AS fBillingway,
+            wh.f_mblno AS fMblno,
             wh.f_chargedate AS fChargedate,
             wh.f_originalbilldate AS fOriginalbilldate,
             wh.f_marks AS fMarks,

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

@@ -361,6 +361,7 @@
             item.f_billingway AS fBillingway,
             item.f_chargedate AS fChargedate,
             item.f_originalbilldate AS fOriginalbilldate,
+            item.f_mblno AS fMblno,
             item.f_volumn AS fVolumn,
             item.f_marks AS fMarks,
             item.f_billing_days AS fBillingDays,