update bug

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

@@ -480,23 +480,17 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             if (storageFeesDto.getDays() < 1) {
                 break;
             }
-            if (storageFeesDto.getEarlySumDays() >= tWarehouseAgreementitems.getfEndays()) {
-                storageFeesDto.setEarlySumDays(storageFeesDto.getEarlySumDays() - tWarehouseAgreementitems.getfEndays());
-                continue; //将已算账的天数 与 计费规则的 最后一天作比较如果 已算10天 > 规则结束  不算帐
-            }
             // 计算仓储日期
             dayLength = tWarehouseAgreementitems.getfEndays() - tWarehouseAgreementitems.getfFromdays() + 1L; //阶梯中的结束-开始日期
+            if (storageFeesDto.getEarlySumDays() >= dayLength) {
+                storageFeesDto.setEarlySumDays(storageFeesDto.getEarlySumDays() - dayLength);
+                continue; //将已算账的天数 与 计费规则的 最后一天作比较如果 已算10天 > 规则结束  不算帐
+            }
 
             String details;
             String interval;
 
             if (storageFeesDto.getDays() >= dayLength) {
-                if (dayLength < storageFeesDto.getEarlySumDays()) {
-                    storageFeesDto.setEarlySumDays(storageFeesDto.getEarlySumDays() - tWarehouseAgreementitems.getfEndays());
-                } else {
-                    dayLength = dayLength - storageFeesDto.getEarlySumDays();
-                }
-
                 feeId = tWarehouseAgreementitems.getfFeeid();
                 BigDecimal calculate = this.getCalculate(qty, tWarehouseAgreementitems.getfPrice(), dayLength);
                 money = money.add(calculate);

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

@@ -4291,8 +4291,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 BigDecimal netweightcBlc = whgenleg.getfNetweightblc().add(item.getfNetweight());
                 whgenleg.setfNetweightc(netweightcBlc);
                 return whgenleg;
-            } else
-                // 调拨
+           } else
+                 // 调拨
                 if (WarehouseTypeEnum.CKDB.getType().equals(item.getfBilltype())) {
                     BigDecimal netweightcBlc;
                     BigDecimal grossweightblc;

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

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -283,14 +284,25 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
             li.setUpdateTime(new Date());
             li.setUpdateBy(SecurityUtils.getUsername());
             li.setfStatus(Long.parseLong(typeEnum.getType()));
+            li.setfBillstatus(Long.parseLong(typeEnum.getType()));
             tWarehousebillsfeesModifyMapper.updateTWarehousebillsfeesModify(li);
             if (typeEnum.getType().equals(WarehouseTypeEnum.APPROVE.getType())) {
                 // 往仓储费用表追加数据
                 TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
                 BeanUtils.copyProperties(li, warehousebillsfees);
                 warehousebillsfees.setfId(null);
+                warehousebillsfees.setfStatus(typeEnum.getType());
                 warehousebillsfees.setfPid(warehousebillsModify.getfPid());
                 warehousebillsfees.setfSrcTypeId(Long.parseLong(FeesTypeEnum.FEE_CHANGES.getType()));
+                // 制空内容
+                warehousebillsfees.setfAccamount(BigDecimal.ZERO);
+                warehousebillsfees.setfAskamount(BigDecimal.ZERO);
+                warehousebillsfees.setfInvamount(BigDecimal.ZERO);
+                warehousebillsfees.setfStlamount(BigDecimal.ZERO);
+                warehousebillsfees.setfAccamountDate(null);
+                warehousebillsfees.setfStatementNo(null);
+                warehousebillsfees.setfStlamountNo(null);
+                warehousebillsfees.setfInvnos(null);
                 warehousebillsfeesMapper.insertTWarehousebillsfees(warehousebillsfees);
             }
         });