问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -355,9 +355,11 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
             return rb.setMsg("字符串长度不是17位");
         }
         BaseVehicleVo baseVehicleVo = baseVehicleService.selVehicleByVinNo(vinNo).getData();
-        BaseVehicleCertificate baseVehicleCertificateCar = selectByVehicleSid(baseVehicleVo.getSid());
+        if (baseVehicleVo != null){
-        if (baseVehicleCertificateCar != null){
+            BaseVehicleCertificate baseVehicleCertificateCar = selectByVehicleSid(baseVehicleVo.getSid());
-            return rb.setMsg("新的车架号已存在，不能修改。");
+            if (baseVehicleCertificateCar != null){
+                return rb.setMsg("新的车架号已存在，不能修改。");
+            }
         }
         BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java

@@ -68,4 +68,10 @@ public class AppBillApplicationIInfoVo implements Vo {
 
     @ApiModelProperty("是否能填写开票价")
     private Boolean canEdit;
+
+    @ApiModelProperty("不可修改类型和名称")
+    private Boolean noEditInvoiceTypeAndName;
+
+    @ApiModelProperty("不可修改开票金额")
+    private Boolean noEditInvoiceMoney;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@@ -73,6 +73,10 @@ public class BillApplicationIInfoVo implements Vo {
     private String billNo; // 单据编号
     @ApiModelProperty("是否可以编辑开票价")
     private Boolean isCanEdit; // 是否可以编辑开票价
+    @ApiModelProperty("不可修改类型和名称")
+    private Boolean noEditInvoiceTypeAndName;
+    @ApiModelProperty("不可修改开票金额")
+    private Boolean noEditInvoiceMoney;
 
     @ApiModelProperty("任务id")
     private String taskId;

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java

@@ -50,7 +50,6 @@ import lombok.Data;
 public class AsServiceGroup extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    private String sid;
 	@ApiModelProperty("班组名称")
     private String groupName;
 	@ApiModelProperty("排序")

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java

@@ -50,7 +50,6 @@ import lombok.Data;
 public class AsServiceSubject extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    private String sid;
 	@ApiModelProperty("科目名称")
     private String subjectName;
 	@ApiModelProperty("科目编码")

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java

@@ -52,7 +52,6 @@ import java.math.BigDecimal;
 public class AsServiceType extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    private String sid;
 	@ApiModelProperty("服务类别名称")
     private String serviceTypeName;
 	@ApiModelProperty("服务类别编码")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java

@@ -76,7 +76,7 @@ public class AsServiceTypeRest{
 	}
 
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		asServiceTypeService.delBySids(sids);