优化 计算仓储费 接口

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -144,7 +144,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // 获得两个时间的毫秒时间差异
         long diff = endDate.getTime() - nowDate.getTime();
         // 计算差多少天
-        long day = diff / nd;
+        long day = diff / nd + 1L;
         return day;
     }
 

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

@@ -131,7 +131,12 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
      */
     public String getSerialNumber(String billType, Date time) {
         String billNo = null;
-        String yyMMdd = DateFormatUtils.format(time, "yyMMdd");
+        String yyMMdd = null;
+        if ("CCF".equals(billType)) {
+            yyMMdd = DateFormatUtils.format(time, "yyMM");
+        } else {
+            yyMMdd = DateFormatUtils.format(time, "yyMMdd");
+        }
         BillnoSerial billnoSerial = new BillnoSerial();
         billnoSerial.setBillType(billType);
         billnoSerial.setBillPrefix(yyMMdd);
@@ -151,11 +156,12 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
             billnoSerial.setSerial(2);
             billnoSerialMapper.insertBillnoSerial(billnoSerial);
         }
-
         if ("RK".equals(billType)) {
             billNo = "RK" + billNo;
         } else if ("CK".equals(billType)) {
             billNo = "CK" + billNo;
+        } else if ("CCF".equals(billType)) {
+            billNo = "CCF" + billNo;
         }
         return billNo;
     }

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

@@ -776,7 +776,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 map.put("error", "单号：" + item.get("fBillno") + ",业务日期:" + item.get("fBsdate") + "未找到仓储费协议，请确认");
                 return map;
             }
-            String fBilltype = (String) objectMap.get("fBilltype");
+            String fBilltype = (String) item.get("fBilltype");
             feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
             map.put("feeId", feeId);
@@ -839,8 +839,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         long fPid = 0L;
         if (StringUtils.isNull(tWarehouseBills.getfId())) {
-            tWarehouseBills.setfBilltype(billsType);
+            // 生成流水号
+            Date time = new Date();
+            String billNo = billnoSerialServiceImpl.getSerialNumber("CCF", time);
+            tWarehouseBills.setfBillno(billNo);
             tWarehouseBills.setfBillstatus(6L);
+            tWarehouseBills.setfBilltype(billsType);
             tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
             tWarehouseBills.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseBills.setCreateTime(new Date());
@@ -941,6 +945,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsfeesMapper.deleteByFPid(fPid);
             tWarehousebillsitemsMapper.deleteByFPid(fPid);
         } else {
+            // 生成流水号
+            Date time = new Date();
+            String billNo = billnoSerialServiceImpl.getSerialNumber("CCF", time);
+            tWarehousebills.setfBillno(billNo);
+            tWarehousebills.setfDeptid(loginUser.getUser().getDeptId());
+            tWarehousebills.setfBsdeptid(loginUser.getUser().getDeptId());
             tWarehousebills.setCreateBy(loginUser.getUser().getUserName());
             tWarehousebills.setCreateTime(new Date());
             tWarehousebills.setfBilltype(billsType);

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

@@ -125,13 +125,21 @@
             bill.f_mblno AS fMblno,
             corpSub.f_name AS fSbu,
             bill.f_marks AS fMarks,
+            bill.remark AS remark,
+            bill.f_planqty AS fPlanqty,
+            bill.f_plangrossweight AS fPlangrossweight,
+            bill.f_plannetweight AS fPlannetweight,
+            bill.f_planvolumn AS fPlanvolumn,
             bill.f_bsdate AS fBsdate,
             bill.f_trademodeid AS fTrademodeid,
             ware.f_name AS fWarehouseid,
             bill.f_qty AS fQty,
-            bill.f_grossweight AS fGrossweight,
             bill.f_netweight AS fNetweight,
+            bill.create_time AS createTime,
+            bill.create_by AS createBy,
+            bill.f_grossweight AS fGrossweight,
             bill.f_product_name AS fProductName,
+            bill.f_billing_deadline AS fBillingDeadline,
             bill.f_billstatus AS fBillstatus,
             bill.f_items_status AS fItemsStatus,
             bill.f_billno AS fBillno