Merge remote-tracking branch 'origin/master'

src/main/java/com/example/backend/pAndSExe/dto/InfShoukuanrenlingExcelDTO.java

@@ -26,4 +26,6 @@ public class InfShoukuanrenlingExcelDTO {
     private String curcy;
     @ExcelProperty(index = 7)
     private String costCenter;
+    @ExcelProperty(index = 8)
+    private Double whactkFee;
 }

src/main/java/com/example/backend/pAndSExe/model/InfShoukuanrenling.java

@@ -78,4 +78,6 @@ public class InfShoukuanrenling implements Serializable {
 
     @TableField(value ="costCenter")
     private String costCenter;
+    @TableField(value ="whactkFee")
+    private BigDecimal whactkFee;
 }

src/main/java/com/example/backend/pAndSExe/service/impl/ShoukuanrenlingSettleServiceImpl.java

@@ -81,6 +81,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
                 breceiptctrl.setSoAdd(inf.getSono());
                 breceiptctrl.setRptg(salesContract.getRptg());
                 breceiptctrl.setCostCenter(inf.getCostCenter());
+                breceiptctrl.setWhactkFee(inf.getWhactkFee());
 
 
                 String s = mdkcctrlMapper.selectCreateByName(inf.getCreateBy());

src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java

@@ -1372,6 +1372,15 @@ public class PsExeExcelUtil {
         if (createBy.isEmpty()) {
             errorLogList.add("制单人为空");
         }
+        // 认领金额：非空 + 正数校验
+        BigDecimal whactkFee = BigDecimal.ZERO;
+        if (dto.getWhactkFee() == null) {
+        } else {
+            whactkFee = BigDecimal.valueOf(dto.getWhactkFee()).setScale(6, BigDecimal.ROUND_HALF_UP);
+            /*if (claimedAmt.compareTo(BigDecimal.ZERO) <= 0) {
+                errorLogList.add("认领金额必须大于0，当前值：" + dto.getClaimedAmt());
+            }*/
+        }
 
         // 3. 构建错误日志
         String errorLog = errorLogList.isEmpty() ? "" : String.join("；", errorLogList);
@@ -1412,6 +1421,7 @@ public class PsExeExcelUtil {
         StringBuilder liushuihao = sb.append("BR").append(yearMonth).append(String.format(String.valueOf(id))).append("-QC");
         entity.setFno(liushuihao.toString());
         entity.setCostCenter(costCenter);
+        entity.setWhactkFee(whactkFee);
 
         return entity;
     }