问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java

@@ -77,4 +77,10 @@ public class BaseModelModpriceModel extends BaseEntity {
     
 	@ApiModelProperty("价格增减数额")
     private String incOrDecInPrice; // 价格增减数额
+
+	@ApiModelProperty("调整后全款销售指导价")
+	private String tzhGuidedPrice; // 调整后全款销售指导价
+
+	@ApiModelProperty("调整后贷款销售指导价")
+	private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java

@@ -69,4 +69,8 @@ public class BaseModelModpriceModelDto implements Dto {
     private String incOrDecInPrice; // 价格增减数额
 	@ApiModelProperty("备注")
 	private String remarks; // 备注
+	@ApiModelProperty("调整后全款销售指导价")
+	private String tzhGuidedPrice; // 调整后全款销售指导价
+	@ApiModelProperty("调整后贷款销售指导价")
+	private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java

@@ -68,6 +68,10 @@ public class BaseModelModpriceModelVo implements Vo {
 	private String guidedPrice; // 现全款销售指导价
 	@ApiModelProperty("价格增减数额")
     private String incOrDecInPrice; // 价格增减数额
+	@ApiModelProperty("调整后全款销售指导价")
+	private String tzhGuidedPrice; // 调整后全款销售指导价
+	@ApiModelProperty("调整后贷款销售指导价")
+	private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
 	@ApiModelProperty("备注")
 	private String remarks; // 备注
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -146,4 +146,12 @@ public class ScmApplyInbound extends BaseEntity {
 
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice; // 销售指导价
+    @ApiModelProperty("价格")
+    private String price; // 价格
+    @ApiModelProperty("最新更新时间")
+    private String newUpdateDate; // 最新更新时间
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -161,6 +161,13 @@ public class ScmApplyInboundDto implements Dto {
     private String pcApplicationCode;
     @ApiModelProperty("部门sid")
     private String orgSid;
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice; // 销售指导价
+    @ApiModelProperty("价格")
+    private String price; // 价格
+    @ApiModelProperty("最新更新时间")
+    private String newUpdateDate; // 最新更新时间
+
 
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -162,5 +162,10 @@ public class ScmApplyInboundVo implements Vo {
     private String configSid;
     @ApiModelProperty("部门sid")
     private String orgSid;
-
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice; // 销售指导价
+    @ApiModelProperty("价格")
+    private String price; // 价格
+    @ApiModelProperty("最新更新时间")
+    private String newUpdateDate; // 最新更新时间
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -221,6 +221,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             inboundVehicle.setApplicationCode(billNo);
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
+            inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
             save(inboundVehicle);
             String num = dto.getNum();
             if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@@ -245,6 +246,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
         } else { // 修改
+            if (StringUtils.isBlank(dto.getGuidedPrice())) {
+                return new ResultBean().fail().setMsg("请填写销售指导价");
+            }
             if (StringUtils.isBlank(dto.getDepartureDate())) {
                 return new ResultBean().fail().setMsg("请填写厂家发车日期");
             }
@@ -291,6 +295,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, scmApplyInbound);
             scmApplyInbound.setOrgSidPath(dto.getOrgPath());
+            scmApplyInbound.setNewUpdateDate(DateUtil.formatDate(new Date()));
             updateById(scmApplyInbound);
             scmFileService.delByMainSid(dto.getSid());
             if (scmFiles.size() > 0) {