排产上装

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@@ -52,4 +52,7 @@ public class BusVehicleApplyDetailVo implements Vo {
 
     @ApiModelProperty
     private BusVehicleApplySzVo busVehicleApplySz;
+
+    @ApiModelProperty(value = "上装指导价")
+    private Integer guidePrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java

@@ -42,5 +42,10 @@ public class BusVehicleApplySzVo implements Vo {
     @ApiModelProperty(value = "上装sid")
     private String szSid;
 
+    @ApiModelProperty(value = "销售指导价")
+    private Integer guidePrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer costPrice;
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -142,6 +142,7 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
                 }
                 BusVehicleApplySzVo busVehicleApplySz = busVehicleApplySzService.selectByDetails(vo.getSid());
                 vo.setBusVehicleApplySz(busVehicleApplySz);
+                vo.setGuidePrice(busVehicleApplySz.getGuidePrice());
             }
         }
         return busVehicleApplyDetailVos;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Map;
 
 @Data
 public class ScmCarTransferCompleteDto implements Dto {
@@ -17,9 +16,9 @@ public class ScmCarTransferCompleteDto implements Dto {
     @ApiModelProperty(value = "用户全路径sid")
     @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
-    /* @ApiModelProperty(value = "节点id")
+    @ApiModelProperty(value = "节点id")
      @NotBlank(message = "参数错误：taskDefKey")
-     private String taskDefKey;*/
+     private String taskDefKey;
     @ApiModelProperty(value = "任务id")
     @NotBlank(message = "参数错误：taskId")
     private String taskId;
@@ -27,7 +26,6 @@ public class ScmCarTransferCompleteDto implements Dto {
     @NotBlank(message = "参数错误：instanceId")
     private String instanceId;
     @ApiModelProperty(value = "意见")
-//    @NotBlank(message = "参数错误：comment")
     private String comment;
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")