Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java

@@ -52,10 +52,10 @@ public class PriceSheetVO {
     private String stairflag;
 
     /**
-     * 阶梯价标记key
+     * 阶梯价标记value
      */
-    @Schema(description = "阶梯价标记key")
-    private String stairflagkey;
+    @Schema(description = "阶梯价标记value")
+    private String stairflagvalue;
 
     /**
      * 阶梯上限

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -2067,11 +2067,11 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private boolean ruleTieredPricing(StatementVO statementVO, PriceSheetVO priceSheet) {
         //匹配阶梯价
         // 非阶梯价直接返回
-        if ("1".equals(priceSheet.getStairflagkey())) {
+        if ("1".equals(priceSheet.getStairflag())) {
             return true;
         }
         // 单批阶梯价（按件数）
-        else if ("4".equals(priceSheet.getStairflagkey())) {
+        else if ("4".equals(priceSheet.getStairflag())) {
             try {
                 double makeQty = statementVO.getMakeQty().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2082,7 +2082,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单件面积）
-        else if ("5".equals(priceSheet.getStairflagkey())) {
+        else if ("5".equals(priceSheet.getStairflag())) {
             try {
                 double ypArea = statementVO.getYpArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2093,7 +2093,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单批面积）
-        else if ("6".equals(priceSheet.getStairflagkey())) {
+        else if ("6".equals(priceSheet.getStairflag())) {
             try {
                 double totalArea = statementVO.getTotalArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java

@@ -253,7 +253,7 @@ public class FmProjectApplicationServiceImpl extends BaseServiceImpl<FmProjectAp
                 Objects.isNull(fmProjectApplication.getApprovalStatus())) {
             throw new RuntimeException("参数错误");
         }
-        if (!fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_REJECTED.getCode()) ||
+        if (!fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_REJECTED.getCode()) &&
                 !fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_IN_PROGRESS.getCode())) {
             throw new RuntimeException("审批结果参数错误");
         }

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@@ -350,9 +350,9 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
         if (Objects.isNull(fmProjectMilestone.getExecuteResult())) {
             throw new RuntimeException("请选择执行结果");
         }
-        if (StrUtil.isEmpty(fmProjectMilestone.getPaIndex())) {
-            throw new RuntimeException("请填写序号");
-        }
+        //if (StrUtil.isEmpty(fmProjectMilestone.getPaIndex())) {
+        //    throw new RuntimeException("请填写序号");
+        //}
         FmProjectApplicationEntity fmProjectApplication = fmProjectMilestone.getFmProjectApplication();
         if (BeanUtil.isEmpty(fmProjectApplication) || Objects.isNull(fmProjectApplication.getId())) {
             throw new RuntimeException("参数异常");