Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java

@@ -45,4 +45,10 @@ public class AppCompanyShuntingListVo implements Vo {
     @ApiModelProperty("sid")
     private String sid;
     private AppVehicleVersionVo carDetailPage;
+
+    @ApiModelProperty("是否可编辑车架号")
+    private Boolean editVin;
+
+    @ApiModelProperty("是否可编辑销售指导价")
+    private Boolean editPrice;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -733,6 +733,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 appSubVersionVo.setJson(JSONObject.toJSONString(map));
                 BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo);
                 appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo);
+                appCompanyShuntingListVo.setEditVin("调入".equals(vo.getShuntingTypeValue()));
+                appCompanyShuntingListVo.setEditPrice("调出".equals(vo.getShuntingTypeValue()));
                 if(StringUtils.isBlank(appCompanyShuntingListVo.getWitPinMoney())){
                     appCompanyShuntingListVo.setWitPinMoney("-");
                 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java

@@ -55,4 +55,10 @@ public class CompanyShuntingList implements Vo {
     private String remarks;
 
     private CompanyShutingVersionVo carDetailPage;
+
+    @ApiModelProperty("是否可编辑车架号")
+    private Boolean editVin;
+
+    @ApiModelProperty("是否可编辑销售指导价")
+    private Boolean editPrice;
 }