Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleRebateVo.java

@@ -30,4 +30,6 @@ public class BaseVehicleRebateVo implements Vo {
     private String costPrice;
     @ApiModelProperty(value = "运费")
     private String freight;
+    @ApiModelProperty(value = "上装金额")
+    private String topAmount;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1319,11 +1319,15 @@
         bvm.sid AS modelSid,
         bv.vinNo,
         bv.`freight`,
-        bv.`costPrice`
+        bv.`costPrice`,
+        IFNULL(bs.costPrice, 0) AS topAmount
         FROM
         base_vehicle bv
         LEFT JOIN base_vehicle_model bvm
-        ON bv.`modelSid` = bvm.`sid` AND bv.createOrgSid = bvm.createOrg
+        ON bv.`modelSid` = bvm.`sid`
+        AND bv.createOrgSid = bvm.createOrg
+        LEFT JOIN base_vehinstall bs
+        ON RIGHT(bv.`vinNo`, 8) = RIGHT(bs.`vinNo`, 8)
         <where>
             ${ew.sqlSegment}
         </where>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelInfo.java

@@ -25,6 +25,8 @@ public class OneExcelInfo {
     private String rebateTypeValue;
     //预提返利
     private String estimateRebate;
+    //其中预提费用
+    private String withholdCost;
     //所属年月
     private String palceGenDate;
     //上传日期
@@ -33,8 +35,18 @@ public class OneExcelInfo {
     private String uploadMoney;
     //待确定金额
     private String stayDetermineMoney;
-    //费用
-    private String money;
+    //一次待支付费用
+    private String onceTreatCost;
+    //一次抵顶费用
+    private String onceSuppCost;
+    //一次抵顶费用说明
+    private String onceSuppRemark;
     //调整说明
     private String adjustmentRemarks;
+    //是否调整
+    private String isAdjustment;
+    //调整金额
+    private String adjustmentMoney;
+    //差异金额
+    private String diffAmount;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java

@@ -42,6 +42,9 @@ public class OneExcelVo {
     @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
     private String estimateRebate;
 
+    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    private String withholdCost;
+
     //所属年月
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
@@ -58,9 +61,14 @@ public class OneExcelVo {
     @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    //费用
-    @ExportEntityMap(CnName = "费用", EnName = "money")
-    private String money;
+    @ExportEntityMap(CnName = "待支付费用", EnName = "onceTreatCost")
+    private String onceTreatCost;
+
+    @ExportEntityMap(CnName = "抵顶费用", EnName = "onceSuppCost")
+    private String onceSuppCost;
+
+    @ExportEntityMap(CnName = "抵顶费用说明", EnName = "onceSuppRemark")
+    private String onceSuppRemark;
 
     //调整说明
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -93,8 +94,6 @@ public class ScmVehRebate extends BaseEntity {
     private String secondaryUploadMoney; // 二次上传金额
 	@ApiModelProperty("待确定金额")
     private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
 	@ApiModelProperty("调整金额")
@@ -107,6 +106,35 @@ public class ScmVehRebate extends BaseEntity {
     private String calculationModeValue; // 计算方式Value
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
+
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+    @ApiModelProperty("上装金额")
+    private BigDecimal topAmount;
+
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -54,6 +55,8 @@ public class ScmVehRebateDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("状态")
+    private String state;
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("创建日期")
@@ -101,8 +104,6 @@ public class ScmVehRebateDetailsVo implements Vo {
     private String secondaryUploadMoney; // 二次上传金额
 	@ApiModelProperty("待确定金额")
     private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
 	@ApiModelProperty("调整金额")
@@ -115,6 +116,35 @@ public class ScmVehRebateDetailsVo implements Vo {
     private String calculationModeValue; // 计算方式Value
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
+
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+    @ApiModelProperty("上装金额")
+    private BigDecimal topAmount;
+
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -96,8 +97,6 @@ public class ScmVehRebateVehDto implements Dto {
     private String secondaryUploadMoney; // 二次上传金额
 	@ApiModelProperty("待确定金额")
     private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
 	@ApiModelProperty("调整金额")
@@ -110,6 +109,35 @@ public class ScmVehRebateVehDto implements Dto {
     private String calculationModeValue; // 计算方式Value
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
+
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+    @ApiModelProperty("上装金额")
+    private BigDecimal topAmount;
+
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -101,8 +102,6 @@ public class ScmVehRebateVo implements Vo {
     private String secondaryUploadMoney; // 二次上传金额
 	@ApiModelProperty("待确定金额")
     private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
 	@ApiModelProperty("调整金额")
@@ -118,7 +117,7 @@ public class ScmVehRebateVo implements Vo {
 	@ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
 	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
+    private String createOrgSid; // 创建组织sidu
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("上传状态(0未上传、1已上传)")
@@ -127,4 +126,17 @@ public class ScmVehRebateVo implements Vo {
     private Boolean adjustOrNot;
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
+
+    @ApiModelProperty("备注")
+    private Integer remarks;
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelInfo.java

@@ -24,6 +24,8 @@ public class TwoExcelInfo {
     private String rebateTypeValue;
     //预提返利
     private String estimateRebate;
+    //其中预提费用
+    private String withholdCost;
     //所属年月
     private String palceGenDate;
     //上传日期
@@ -32,12 +34,24 @@ public class TwoExcelInfo {
     private String uploadMoney;
     //待确定金额
     private String stayDetermineMoney;
+    //其中费用
+    private String qzMoney;
     //二次上传日期
     private String secondaryUploadDate;
     //二次上传金额
     private String secondaryUploadMoney;
-    //费用
-    private String money;
+    //二次待支付费用
+    private String secondTreatCost;
+    //二次抵顶费用
+    private String secondSuppCost;
+    //二次抵顶费用说明
+    private String secondSuppRemark;
     //调整说明
     private String adjustmentRemarks;
+    //是否调整
+    private String isAdjustment;
+    //调整金额
+    private String adjustmentMoney;
+    //差异金额
+    private String diffAmount;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java

@@ -41,6 +41,9 @@ public class TwoExcelVo {
     @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
     private String estimateRebate;
 
+    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    private String withholdCost;
+
     //所属年月
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
@@ -57,6 +60,9 @@ public class TwoExcelVo {
     @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
+    @ExportEntityMap(CnName = "其中费用", EnName = "qzMoney")
+    private String qzMoney;
+
     //二次上传日期
     @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
     private String secondaryUploadDate;
@@ -65,9 +71,14 @@ public class TwoExcelVo {
     @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
     private String secondaryUploadMoney;
 
-    //费用
-    @ExportEntityMap(CnName = "费用", EnName = "money")
-    private String money;
+    @ExportEntityMap(CnName = "待支付费用", EnName = "secondTreatCost")
+    private String secondTreatCost;
+
+    @ExportEntityMap(CnName = "抵顶费费用", EnName = "secondSuppCost")
+    private String secondSuppCost;
+
+    @ExportEntityMap(CnName = "抵顶费用说明", EnName = "secondSuppRemark")
+    private String secondSuppRemark;
 
     //调整说明
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java

@@ -58,7 +58,11 @@ public class ScmVehRebateWithDetailsVo implements Vo {
     private String remarks; // 备注
 	@ApiModelProperty("预提返利")
     private BigDecimal withRebate; // 预提返利
-	@ApiModelProperty("台数")
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("台数")
     private String num; // 台数
 	@ApiModelProperty("单车返利sid")
     private String vehRebateSid; // 单车返利sid

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyQuery.java

@@ -49,6 +49,10 @@ import lombok.Data;
 @ApiModel(value = "单车返利预提申请表 查询条件", description = "单车返利预提申请表 查询条件")
 public class ScmVehRebateWithApplyQuery implements Query {
 
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("创建人")
+    private String createByName;
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("预提申请")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java

@@ -66,6 +66,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String withApply; // 预提申请
     @ApiModelProperty("预提返利合计")
     private BigDecimal withRebateTotal; // 预提返利合计
+    @ApiModelProperty("预提费用")
+    private BigDecimal withholdCost;
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -57,28 +57,34 @@ import java.util.List;
 @Mapper
 public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
-	IPage<ScmVehRebateVo> selectPageVo(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
-	
-	List<ScmVehRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
-	
-	@Select("select * from scm_veh_rebate")
-	List<ScmVehRebateVo> selectListVo();
+    IPage<ScmVehRebateVo> selectPageVo(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
 
-	@Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")
-    void updateState(@Param("sid") String sid,@Param("state") Integer state);
+    List<ScmVehRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
 
-	@Update("update scm_veh_rebate set withholdingDate = #{withApply} where sid = #{vehRebateSid}")
-    void updateWithholdingDateBySid(@Param("vehRebateSid") String vehRebateSid,@Param("withApply") String withApply);
+    @Select("select * from scm_veh_rebate")
+    List<ScmVehRebateVo> selectListVo();
+
+    @Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")
+    void updateState(@Param("sid") String sid, @Param("state") Integer state);
+
+    @Update("update scm_veh_rebate set withholdingDate = #{withApply} where sid = #{vehRebateSid}")
+    void updateWithholdingDateBySid(@Param("vehRebateSid") String vehRebateSid, @Param("withApply") String withApply);
 
     List<OneExcelVo> excelListOne(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 
     List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 
-	ScmVehRebateVo selectExcelInfo(@Param("vinNo") String vinNo,@Param("rebateName") String rebateName,@Param("palceGenDate") String palceGenDate);
+    ScmVehRebateVo selectExcelInfo(@Param("vinNo") String vinNo, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate);
+
+    void updateOneExcelInfo(@Param("uploadDate") String uploadDate, @Param("uploadMoney") String uploadMoney, @Param("stayDetermineMoney") String stayDetermineMoney, @Param("onceTreatCost") String onceTreatCost, @Param("onceSuppCost") String onceSuppCost, @Param("onceSuppRemark") String onceSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid);
+
+    void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid);
 
-	void updateOneExcelInfo(@Param("uploadDate") String uploadDate,@Param("uploadMoney") String uploadMoney,@Param("stayDetermineMoney") String stayDetermineMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
+    ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("estimateRebate") String estimateRebate, @Param("useOrgSid") String useOrgSid);
 
-	void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate,@Param("secondaryUploadMoney") String secondaryUploadMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
+    @Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{vehRebateSid}")
+    void updateAdjustmentState(@Param("vehRebateSid") String vehRebateSid,@Param("adjustmentState") int adjustmentState);
 
-	ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("rebateTypeKey") String rebateTypeKey,@Param("rebateName") String rebateName,@Param("palceGenDate") String palceGenDate,@Param("useOrgSid") String useOrgSid);
+    @Update("update scm_veh_rebate set onceCheckState = #{onceCheckState} where sid = #{sid}")
+    void updateOnceCheckState(@Param("sid") String sid,@Param("onceCheckState") int onceCheckState);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -21,15 +21,17 @@
         SELECT *
         FROM scm_veh_rebate
         WHERE vinNo = #{vinNo}
-          AND rebateTypeKey = #{rebateTypeKey}
+          AND rebateTypeValue = #{rebateTypeValue}
           AND rebateName = #{rebateName}
           AND palceGenDate = #{palceGenDate}
+          AND estimateRebate = #{estimateRebate}
           AND createOrgSid = #{useOrgSid}
     </select>
 
     <select id="excelListOne" resultType="com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo">
         SELECT
-        *
+        *,
+        expectTreatCost + expectSuppCost AS withholdCost
         FROM
         scm_veh_rebate
         <where>
@@ -60,8 +62,10 @@
                 scm_veh_rebate
         SET uploadDate         = #{uploadDate},
             uploadMoney        = #{uploadMoney},
+            onceTreatCost      = #{onceTreatCost},
+            onceSuppCost       = #{onceSuppCost},
+            onceSuppRemark     = #{onceSuppRemark},
             stayDetermineMoney = #{stayDetermineMoney},
-            money              = #{money},
             adjustmentRemarks  = #{adjustmentRemarks}
         WHERE sid = #{sid}
     </update>
@@ -71,7 +75,9 @@
                 scm_veh_rebate
         SET secondaryUploadDate  = #{secondaryUploadDate},
             secondaryUploadMoney = #{secondaryUploadMoney},
-            money                = #{money},
+            secondTreatCost      = #{secondTreatCost},
+            secondSuppCost       = #{secondSuppCost},
+            secondSuppRemark     = #{secondSuppRemark},
             adjustmentRemarks    = #{adjustmentRemarks}
         WHERE sid = #{sid}
     </update>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -288,7 +288,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             //是否调整
             if (0 == record.getAdjustmentState()) {
                 if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
-                    BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
+                    BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(record.getExpectCost()).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
                     int i = decimal.compareTo(BigDecimal.ZERO);
                     if (i < 0) {//小于
                         record.setIsAdjustment("否");
@@ -376,11 +376,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.ne("adjustmentState", 1);
+        qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
-        if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("state", query.getState());
-        }
+        qw.eq("onceCheckState", 0);
         qw.orderByDesc("createTime");
         List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
         for (OneExcelVo oneExcelVo : oneExcelVos) {
@@ -451,12 +449,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.ne("adjustmentState", 1);
+        qw.ne("adjustmentState", 0);
         qw.eq("state", 2);
         qw.isNotNull("uploadDate");
-        if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("state", query.getState());
-        }
         qw.orderByDesc("createTime");
         List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);
         for (TwoExcelVo twoExcelVo : twoExcelVos) {
@@ -489,8 +484,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("adjustmentState", 1);
-        qw.isNotNull("uploadDate");
+        qw.eq("adjustmentState", 0);
+        qw.eq("state", 2);
         if (query.getSidList().size() > 0) {
             qw.notIn("sid", query.getSidList());
         }
@@ -525,13 +520,14 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (scmVehRebateVehs.size() < 1) {
             rb.setMsg("请选择返利车辆");
         }
+
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
         for (ScmVehRebateVehDto scmVehRebateVeh : scmVehRebateVehs) {
             ScmVehRebate scmVehRebate = new ScmVehRebate();
             BeanUtil.copyProperties(scmVehRebateVeh, scmVehRebate, "sid");
             String vinNo = scmVehRebateVeh.getVinNo();
-            ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(vinNo,dto.getRebateTypeKey(),dto.getRebateName(),dto.getPalceGenDate(), useOrgSid);
+            ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, dto.getRebateTypeValue(), dto.getRebateName(), dto.getPalceGenDate(), scmVehRebateVeh.getEstimateRebate(), useOrgSid);
             if (scmVehRebateVo != null) {
                 return rb.setMsg("车架号为" + vinNo + "的单车返利信息已存在");
             }
@@ -542,6 +538,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             scmVehRebate.setCalculationModeKey(dto.getCalculationModeKey());
             scmVehRebate.setCalculationModeValue(dto.getCalculationModeValue());
             scmVehRebate.setCalculationStandard(dto.getCalculationStandard());
+            scmVehRebate.setExpectCost(scmVehRebateVeh.getExpectTreatCost().add(scmVehRebateVeh.getExpectSuppCost()));
             scmVehRebate.setCreateOrgSid(useOrgSid);
             scmVehRebate.setCreateOrgName(sysOrganizationVo.getName());
             scmVehRebate.setUseOrgSid(useOrgSid);
@@ -554,8 +551,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return rb.success().setMsg("保存成功");
     }
 
-    public void updateState(String sid,Integer state) {
-        baseMapper.updateState(sid,state);
+    public void updateState(String sid, Integer state) {
+        baseMapper.updateState(sid, state);
     }
 
     public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
@@ -567,10 +564,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         scmVehRebateVehDto.setSecondaryUploadDate(dto.getSecondaryUploadDate());
         scmVehRebateVehDto.setSecondaryUploadMoney(dto.getSecondaryUploadMoney());
         scmVehRebateVehDto.setStayDetermineMoney(dto.getStayDetermineMoney());
-        /*int mon = Integer.parseInt(scmVehRebateVehDto.getMoney());
-        int cost = Integer.parseInt(dto.getCost());
-        String money = String.valueOf(mon + cost);*/
-        scmVehRebateVehDto.setMoney(dto.getCost());
         scmVehRebateVehDto.setAdjustmentMoney(dto.getAdjustmentMoney());
         scmVehRebateVehDto.setIsAdjustment("是");
         scmVehRebateVehDto.setAdjustmentState(1);
@@ -578,8 +571,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return rb.success().setMsg("调整成功");
     }
 
-    public void updateWithholdingDateBySid(String vehRebateSid,String withApply) {
-        baseMapper.updateWithholdingDateBySid(vehRebateSid,withApply);
+    public void updateWithholdingDateBySid(String vehRebateSid, String withApply) {
+        baseMapper.updateWithholdingDateBySid(vehRebateSid, withApply);
     }
 
     public void downloadExcel() {
@@ -632,7 +625,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             wb = new XSSFWorkbook(is);
         }
         Sheet sheet = wb.getSheetAt(0);
-        VehRebateExcelInfo importReturn = getSheetVal(sheet, resultCell, userSid);
+        VehRebateExcelInfo importReturn = getSheetVal(sheet, resultCell, userSid, orgPath);
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
             return rb.setMsg(importReturn.getCheckInfo());
         } else {
@@ -676,7 +669,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
     }
 
-    private VehRebateExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String userSid) {
+    private VehRebateExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String userSid, String orgPath) {
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         VehRebateExcelInfo importReturn = new VehRebateExcelInfo();
         List<ScmVehRebateExcelInfo> importVoList = new ArrayList<>();
         Set<String> checkWord = new HashSet<>();
@@ -759,6 +753,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         if (!importVoList.isEmpty()) {
             for (ScmVehRebateExcelInfo excelInfo : importVoList) {
+                ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getEstimateRebate(), useOrgSid);
+                if (scmVehRebateVo != null) {
+                    checkWord.add("车架号为" + excelInfo.getVinNo() + "的单车返利信息已存在");
+                    break;
+                }
                 if (StringUtils.isBlank(excelInfo.getVinNo())) {
                     checkWord.add("车架号不能为空");
                     break;
@@ -913,7 +912,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -935,7 +934,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 ScmVehRebateVo scmVehRebateVo = baseMapper.selectExcelInfo(info.getVinNo(), info.getRebateName(), info.getPalceGenDate());
                 Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000));
                 String uploadDate = DateUtil.formatDate(javaDate);
-                baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getMoney(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid());
+                baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -988,21 +987,30 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                     importVo.setEstimateRebate(temp);
                                     break;
                                 case 7:
-                                    importVo.setPalceGenDate(temp);
+                                    importVo.setWithholdCost(temp);
                                     break;
                                 case 8:
-                                    importVo.setUploadDate(temp);
+                                    importVo.setPalceGenDate(temp);
                                     break;
                                 case 9:
-                                    importVo.setUploadMoney(temp);
+                                    importVo.setUploadDate(temp);
                                     break;
                                 case 10:
-                                    importVo.setStayDetermineMoney(temp);
+                                    importVo.setUploadMoney(temp);
                                     break;
                                 case 11:
-                                    importVo.setMoney(temp);
+                                    importVo.setStayDetermineMoney(temp);
                                     break;
                                 case 12:
+                                    importVo.setOnceTreatCost(temp);
+                                    break;
+                                case 13:
+                                    importVo.setOnceSuppCost(temp);
+                                    break;
+                                case 14:
+                                    importVo.setOnceSuppRemark(temp);
+                                    break;
+                                case 15:
                                     importVo.setAdjustmentRemarks(temp);
                                     break;
                                 default:
@@ -1038,21 +1046,30 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                 word = "预提返利";
                                 break;
                             case 7:
-                                word = "所属年月";
+                                word = "其中预提费用";
                                 break;
                             case 8:
-                                word = "上传日期";
+                                word = "所属年月";
                                 break;
                             case 9:
-                                word = "上传金额";
+                                word = "上传日期";
                                 break;
                             case 10:
-                                word = "待确定金额";
+                                word = "上传金额";
                                 break;
                             case 11:
-                                word = "费用";
+                                word = "待确定金额";
                                 break;
                             case 12:
+                                word = "待支付费用";
+                                break;
+                            case 13:
+                                word = "抵顶费用";
+                                break;
+                            case 14:
+                                word = "抵顶费用说明";
+                                break;
+                            case 15:
                                 word = "调整说明";
                                 break;
                             default:
@@ -1129,10 +1146,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getCreateTime())) {
                     String createTime = "";
-                    if (isNumber(excelInfo.getCreateTime())){
+                    if (isNumber(excelInfo.getCreateTime())) {
                         Date javaDate = new Date((long) ((Double.valueOf(excelInfo.getCreateTime()) - 25569) * 86400 * 1000));
                         createTime = DateUtil.formatDate(javaDate);
-                    }else {
+                    } else {
                         createTime = excelInfo.getCreateTime();
                     }
                     String[] split = createTime.split("-");
@@ -1172,6 +1189,19 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
+                if (StringUtils.isBlank(excelInfo.getWithholdCost())) {
+                    checkWord.add("其中预提费用不能为空");
+                    break;
+                }
+                if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
+                    String withholdCost = excelInfo.getWithholdCost();
+                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    boolean matches = pattern.matcher(withholdCost).matches();
+                    if (!matches) {
+                        checkWord.add("其中预提费用必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getPalceGenDate())) {
                     checkWord.add("所属年月不能为空");
                     break;
@@ -1193,10 +1223,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
-                    if (isNumber(excelInfo.getUploadDate())){
+                    if (isNumber(excelInfo.getUploadDate())) {
                         Date javaDate = new Date((long) ((Double.valueOf(excelInfo.getUploadDate()) - 25569) * 86400 * 1000));
                         uploadDate = DateUtil.formatDate(javaDate);
-                    }else {
+                    } else {
                         uploadDate = excelInfo.getUploadDate();
                     }
                     String[] split = uploadDate.split("-");
@@ -1234,19 +1264,59 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getMoney())) {
-                    checkWord.add("费用不能为空");
+                if (StringUtils.isBlank(excelInfo.getOnceTreatCost())) {
+                    checkWord.add("待支付费用不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getMoney())) {
-                    String money = excelInfo.getMoney();
+                if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
+                    String onceTreatCost = excelInfo.getOnceTreatCost();
                     Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
-                    boolean matches = pattern.matcher(money).matches();
+                    boolean matches = pattern.matcher(onceTreatCost).matches();
                     if (!matches) {
-                        checkWord.add("费用必须为数字");
+                        checkWord.add("待支付费用必须为数字");
                         break;
                     }
                 }
+                if (StringUtils.isBlank(excelInfo.getOnceSuppCost())) {
+                    checkWord.add("抵顶费用不能为空");
+                    break;
+                }
+                if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
+                    String onceSuppCost = excelInfo.getOnceSuppCost();
+                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    boolean matches = pattern.matcher(onceSuppCost).matches();
+                    if (!matches) {
+                        checkWord.add("抵顶费用必须为数字");
+                        break;
+                    }
+                }
+                if (StringUtils.isBlank(excelInfo.getOnceSuppRemark())) {
+                    checkWord.add("抵顶费用说明不能为空");
+                    break;
+                }
+                int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
+                //上传返利金额
+                BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
+                //预提返利-其中预提费用
+                BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost()));
+                //调整金额
+                BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate()));
+                if (i > 0) {
+                    excelInfo.setIsAdjustment("否");
+                    excelInfo.setAdjustmentMoney("0");
+                } else if (i == 0) {
+                    if (scflje.compareTo(ytfy) > 0) {
+                        excelInfo.setIsAdjustment("是");
+                        excelInfo.setAdjustmentMoney(tzje.toString());
+                    } else if (scflje.compareTo(ytfy) == 0) {
+                        excelInfo.setIsAdjustment("是");
+                        excelInfo.setAdjustmentMoney(tzje.toString());
+                    } else if (scflje.compareTo(ytfy) < 0) {
+                        excelInfo.setIsAdjustment("否");
+                        excelInfo.setAdjustmentMoney("0");
+                    }
+                }
+                excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
             }
         }
         StringBuffer sbcheck1 = new StringBuffer();
@@ -1280,7 +1350,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -1302,7 +1372,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 ScmVehRebateVo scmVehRebateVo = baseMapper.selectExcelInfo(info.getVinNo(), info.getRebateName(), info.getPalceGenDate());
                 Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000));
                 String secondaryUploadDate = DateUtil.formatDate(javaDate);
-                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getMoney(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid());
+                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -1355,27 +1425,39 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                     importVo.setEstimateRebate(temp);
                                     break;
                                 case 7:
-                                    importVo.setPalceGenDate(temp);
+                                    importVo.setWithholdCost(temp);
                                     break;
                                 case 8:
-                                    importVo.setUploadDate(temp);
+                                    importVo.setPalceGenDate(temp);
                                     break;
                                 case 9:
-                                    importVo.setUploadMoney(temp);
+                                    importVo.setUploadDate(temp);
                                     break;
                                 case 10:
-                                    importVo.setStayDetermineMoney(temp);
+                                    importVo.setUploadMoney(temp);
                                     break;
                                 case 11:
-                                    importVo.setSecondaryUploadDate(temp);
+                                    importVo.setStayDetermineMoney(temp);
                                     break;
                                 case 12:
-                                    importVo.setSecondaryUploadMoney(temp);
+                                    importVo.setQzMoney(temp);
                                     break;
                                 case 13:
-                                    importVo.setMoney(temp);
+                                    importVo.setSecondaryUploadDate(temp);
                                     break;
                                 case 14:
+                                    importVo.setSecondaryUploadMoney(temp);
+                                    break;
+                                case 15:
+                                    importVo.setSecondTreatCost(temp);
+                                    break;
+                                case 16:
+                                    importVo.setSecondSuppCost(temp);
+                                    break;
+                                case 17:
+                                    importVo.setSecondSuppRemark(temp);
+                                    break;
+                                case 18:
                                     importVo.setAdjustmentRemarks(temp);
                                     break;
                                 default:
@@ -1411,27 +1493,39 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                 word = "预提返利";
                                 break;
                             case 7:
-                                word = "所属年月";
+                                word = "其中预提费用";
                                 break;
                             case 8:
-                                word = "上传日期";
+                                word = "所属年月";
                                 break;
                             case 9:
-                                word = "上传金额";
+                                word = "上传日期";
                                 break;
                             case 10:
-                                word = "待确定金额";
+                                word = "上传金额";
                                 break;
                             case 11:
-                                word = "二次上传日期";
+                                word = "待确定金额";
                                 break;
                             case 12:
-                                word = "二次上传金额";
+                                word = "其中费用";
                                 break;
                             case 13:
-                                word = "费用";
+                                word = "二次上传日期";
                                 break;
                             case 14:
+                                word = "二次上传金额";
+                                break;
+                            case 15:
+                                word = "待支付费用";
+                                break;
+                            case 16:
+                                word = "抵顶费费用";
+                                break;
+                            case 17:
+                                word = "抵顶费用说明";
+                                break;
+                            case 18:
                                 word = "调整说明";
                                 break;
                             default:
@@ -1545,6 +1639,19 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
+                if (StringUtils.isBlank(excelInfo.getWithholdCost())) {
+                    checkWord.add("其中预提费用不能为空");
+                    break;
+                }
+                if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
+                    String withholdCost = excelInfo.getWithholdCost();
+                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    boolean matches = pattern.matcher(withholdCost).matches();
+                    if (!matches) {
+                        checkWord.add("其中预提费用必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getPalceGenDate())) {
                     checkWord.add("所属年月不能为空");
                     break;
@@ -1566,10 +1673,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
-                    if (isNumber(excelInfo.getUploadDate())){
+                    if (isNumber(excelInfo.getUploadDate())) {
                         Date javaDate = new Date((long) ((Double.valueOf(excelInfo.getUploadDate()) - 25569) * 86400 * 1000));
                         uploadDate = DateUtil.formatDate(javaDate);
-                    }else {
+                    } else {
                         uploadDate = excelInfo.getUploadDate();
                     }
                     String[] split = uploadDate.split("-");
@@ -1607,16 +1714,29 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
+                if (StringUtils.isBlank(excelInfo.getQzMoney())) {
+                    checkWord.add("其中费用不能为空");
+                    break;
+                }
+                if (StringUtils.isNotBlank(excelInfo.getQzMoney())) {
+                    String qzMoney = excelInfo.getQzMoney();
+                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    boolean matches = pattern.matcher(qzMoney).matches();
+                    if (!matches) {
+                        checkWord.add("其中费用必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getUploadDate())) {
                     checkWord.add("二次上传日期不能为空");
                     break;
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
                     String secondaryUploadDate = "";
-                    if (isNumber(excelInfo.getSecondaryUploadDate())){
+                    if (isNumber(excelInfo.getSecondaryUploadDate())) {
                         Date javaDate = new Date((long) ((Double.valueOf(excelInfo.getSecondaryUploadDate()) - 25569) * 86400 * 1000));
                         secondaryUploadDate = DateUtil.formatDate(javaDate);
-                    }else {
+                    } else {
                         secondaryUploadDate = excelInfo.getSecondaryUploadDate();
                     }
                     String[] split = secondaryUploadDate.split("-");
@@ -1641,19 +1761,59 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getMoney())) {
-                    checkWord.add("费用不能为空");
+                if (StringUtils.isBlank(excelInfo.getSecondTreatCost())) {
+                    checkWord.add("待支付费用不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getMoney())) {
-                    String money = excelInfo.getMoney();
+                if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
+                    String secondTreatCost = excelInfo.getSecondTreatCost();
                     Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
-                    boolean matches = pattern.matcher(money).matches();
+                    boolean matches = pattern.matcher(secondTreatCost).matches();
                     if (!matches) {
-                        checkWord.add("费用必须为数字");
+                        checkWord.add("待支付费用必须为数字");
                         break;
                     }
                 }
+                if (StringUtils.isBlank(excelInfo.getSecondSuppCost())) {
+                    checkWord.add("抵顶费费用不能为空");
+                    break;
+                }
+                if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
+                    String secondSuppCost = excelInfo.getSecondSuppCost();
+                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    boolean matches = pattern.matcher(secondSuppCost).matches();
+                    if (!matches) {
+                        checkWord.add("抵顶费费用必须为数字");
+                        break;
+                    }
+                }
+                if (StringUtils.isBlank(excelInfo.getSecondSuppRemark())) {
+                    checkWord.add("抵顶费用说明不能为空");
+                    break;
+                }
+                int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
+                //上传返利金额
+                BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
+                //预提返利-其中预提费用
+                BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost()));
+                //调整金额
+                BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate()));
+                if (i > 0) {
+                    excelInfo.setIsAdjustment("否");
+                    excelInfo.setAdjustmentMoney("0");
+                } else if (i == 0) {
+                    if (scflje.compareTo(ytfy) > 0) {
+                        excelInfo.setIsAdjustment("是");
+                        excelInfo.setAdjustmentMoney(tzje.toString());
+                    } else if (scflje.compareTo(ytfy) == 0) {
+                        excelInfo.setIsAdjustment("是");
+                        excelInfo.setAdjustmentMoney(tzje.toString());
+                    } else if (scflje.compareTo(ytfy) < 0) {
+                        excelInfo.setIsAdjustment("否");
+                        excelInfo.setAdjustmentMoney("0");
+                    }
+                }
+                excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
             }
         }
         StringBuffer sbcheck1 = new StringBuffer();
@@ -1674,4 +1834,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         importReturn.setInfos(importVoList);
         return importReturn;
     }
+
+    public void updateAdjustmentState(String vehRebateSid, int adjustmentState) {
+        baseMapper.updateAdjustmentState(vehRebateSid, adjustmentState);
+    }
+
+    public void updateOnceCheckState(String sid, int onceCheckState) {
+        baseMapper.updateOnceCheckState(sid,onceCheckState);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.GetNodeVo;
@@ -370,6 +371,10 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
                 scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 3);
+                ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
+                if (scmVehRebate.getOnceCheckState() == 0) {
+                    scmVehRebateService.updateOnceCheckState(scmVehRebate.getSid(), 2);
+                }
             }
             return voResultBean;
         }
@@ -434,7 +439,12 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
                 for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
-                    scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
+                    ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
+                    if ("是".equals(scmVehRebate.getIsAdjustment())) {
+                        scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
+                        scmVehRebateService.updateAdjustmentState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
+                        scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getSid(), 1);
+                    }
                 }
             }
             return rb.success().setData(resultBean.getData());
@@ -514,6 +524,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                 updateFlowFiled(map);
                 for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
                     scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 2);
+                    ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
+                    scmVehRebateService.updateOnceCheckState(scmVehRebate.getSid(), 0);
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -528,6 +540,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                     updateFlowFiled(map);
                     for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
                         scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 2);
+                        ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
+                        scmVehRebateService.updateOnceCheckState(scmVehRebate.getSid(), 0);
                     }
                     return rb.success().setData(resultBean.getData());
                 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml

@@ -21,6 +21,8 @@
         SELECT svr.rebateTypeKey,
                svr.`rebateTypeValue`,
                SUM(svr.`estimateRebate`)         withRebate,
+               SUM(svr.expectTreatCost) as expectTreatCost,
+               SUM(svr.expectSuppCost) as expectSuppCost,
                COUNT(*)                          num,
                GROUP_CONCAT(svrw.`vehRebateSid`) vehRebateSid
         FROM scm_veh_rebate_with svrw

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml

@@ -6,7 +6,8 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
         SELECT
         svrwa.*,
-        SUM(svr.`estimateRebate`) withRebateTotal
+        SUM(svr.`estimateRebate`) withRebateTotal,
+        SUM(svr.expectTreatCost + expectSuppCost) as withholdCost
         FROM
         scm_veh_rebate_with_apply svrwa
         LEFT JOIN scm_veh_rebate_with svrw

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -151,6 +151,12 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                 return p;
             }
         }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.eq("svrwa.useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.eq("svrwa.createByName", query.getCreateByName());
+        }
         if (StringUtils.isNotBlank(query.getBrandSid())) {
             qw.eq("svrwa.brandSid", query.getBrandSid());
         }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue

@@ -45,36 +45,17 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createOrgName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="createOrgName" label="分公司" align="center" />
+            <el-table-column prop="brandName" label="品牌" align="center" />
             <el-table-column label="名称" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.withApply }}单车返利预提申请</span>
               </template>
             </el-table-column>
-            <el-table-column label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebateTotal }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建人" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createByName }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="withRebateTotal" label="预提返利" align="center" />
+            <el-table-column prop="expectCost" label="其中预提费用" align="center" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="createByName" label="创建人" align="center" width="120" />
           </el-table>
         </div>
         <div class="pages">

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@@ -7,10 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
-          </el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
-          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -18,63 +16,47 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</span></div>
+            <el-col :span="24" class="colOneStyle">
+              <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="4" class="colOneStyle">
+            <el-col :span="6" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
               <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
+                <el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
                   <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
+            <el-col :span="18" class="colOneStyle">
+              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="返利类型" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="num" label="台数" align="center" width="80" />
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="台数" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.num }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="withRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column label="备注" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -208,6 +190,8 @@ export default {
           if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
             this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
             this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+            this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
+            this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
             this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
             v = 1
             break
@@ -219,10 +203,12 @@ export default {
             rebateTypeValue: cval.rebateTypeValue,
             num: 1,
             withRebate: cval.withRebate,
+            expectTreatCost: cval.expectTreatCost,
+            expectSuppCost: cval.expectSuppCost,
             brandName: cval.brandName,
             brandSid: cval.brandSid,
             vehRebateSids: [cval.sid],
-            // remarks: '',
+            remarks: '',
             sid: '',
             mainSid: ''
           })
@@ -246,6 +232,8 @@ export default {
             if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
               aa[j].num = parseInt(aa[j].num) + parseInt(1)
               aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+              aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
+              aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
               aa[j].vehRebateSids.push(cval.sid)
               v = 1
               break
@@ -257,10 +245,12 @@ export default {
               rebateTypeValue: cval.rebateTypeValue,
               num: 1,
               withRebate: cval.withRebate,
+              expectTreatCost: cval.expectTreatCost,
+              expectSuppCost: cval.expectSuppCost,
               brandName: cval.brandName,
               brandSid: cval.brandSid,
               vehRebateSids: [cval.sid],
-              // remarks: '',
+              remarks: '',
               sid: '',
               mainSid: ''
             })
@@ -272,6 +262,8 @@ export default {
             this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
             this.formobj.scmVehRebateWiths[k].num = aa[0].num
             this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
+            this.formobj.scmVehRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
+            this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
             this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
             this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
             this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
@@ -347,21 +339,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -400,5 +377,15 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
 </style>
 

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue

@@ -14,58 +14,36 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</span></div>
+            <el-col :span="24" class="colOneStyle">
+              <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="22" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="返利类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="台数" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.num }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="withRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="num" label="台数" align="center" width="80" />
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.remarks }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -139,21 +117,6 @@ export default {
             }
           }, 0)
           sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -177,5 +140,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue

@@ -18,61 +18,20 @@
           <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
+            <el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </el-form>
       </div>
@@ -148,6 +107,8 @@ export default {
           rebateTypeValue: this.list[i].rebateTypeValue,
           rebateTypeKey: this.list[i].rebateTypeKey,
           withRebate: this.list[i].estimateRebate,
+          expectTreatCost: this.list[i].expectTreatCost,
+          expectSuppCost: this.list[i].expectSuppCost,
           brandName: this.list[i].brandName,
           brandSid: this.list[i].brandSid
         })

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue

@@ -16,61 +16,20 @@
         <el-form ref="form_obj" :rules="rules" class="formadd">
           <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center" width="220">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
+            <el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </el-form>
       </div>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue

@@ -42,61 +42,19 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="250">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="140" />
+            <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <div class="pages">
@@ -204,6 +162,8 @@ export default {
           rebateTypeValue: element.rebateTypeValue,
           rebateTypeKey: element.rebateTypeKey,
           withRebate: element.estimateRebate,
+          expectTreatCost: element.expectTreatCost,
+          expectSuppCost: element.expectSuppCost,
           brandName: element.brandName,
           brandSid: element.brandSid
         })
@@ -215,9 +175,8 @@ export default {
     getList() {
       this.listLoading = true
       req.pageList(this.listQuery).then((response) => {
-        console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue

@@ -16,58 +16,36 @@
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</span></div>
+            <el-col :span="24" class="colOneStyle">
+              <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="22" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="返利类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="台数" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.num }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="withRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="num" label="台数" align="center" width="80" />
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.remarks }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -333,21 +311,6 @@ export default {
             }
           }, 0)
           sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -371,5 +334,11 @@ export default {
 .rowClass {
   border-top: 1px solid #E0E3EB;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue

@@ -7,73 +7,55 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
-          </el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
-          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
         </div>
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</span></div>
+            <el-col :span="24" class="colOneStyle">
+              <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="4" class="colOneStyle">
+            <el-col :span="6" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
               <el-form-item>
-                <el-select disabled v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
+                <el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
                   <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="18" class="tleftb colOneStyle">
-              <el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
+            <el-col :span="18" class="colOneStyle">
+              <div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="返利类型" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="num" label="台数" align="center" width="80" />
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="台数" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.num }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="withRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column label="备注" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -196,6 +178,8 @@ export default {
           if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
             this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
             this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+            this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
+            this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
             this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
             v = 1
             break
@@ -207,10 +191,12 @@ export default {
             rebateTypeValue: cval.rebateTypeValue,
             num: 1,
             withRebate: cval.withRebate,
+            expectTreatCost: cval.expectTreatCost,
+            expectSuppCost: cval.expectSuppCost,
             brandName: cval.brandName,
             brandSid: cval.brandSid,
             vehRebateSids: [cval.sid],
-            // remarks: '',
+            remarks: '',
             sid: '',
             mainSid: ''
           })
@@ -234,6 +220,8 @@ export default {
             if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
               aa[j].num = parseInt(aa[j].num) + parseInt(1)
               aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+              aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
+              aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
               aa[j].vehRebateSids.push(cval.sid)
               v = 1
               break
@@ -245,10 +233,12 @@ export default {
               rebateTypeValue: cval.rebateTypeValue,
               num: 1,
               withRebate: cval.withRebate,
+              expectTreatCost: cval.expectTreatCost,
+              expectSuppCost: cval.expectSuppCost,
               brandName: cval.brandName,
               brandSid: cval.brandSid,
               vehRebateSids: [cval.sid],
-              // remarks: '',
+              remarks: '',
               sid: '',
               mainSid: ''
             })
@@ -260,6 +250,8 @@ export default {
             this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
             this.formobj.scmVehRebateWiths[k].num = aa[0].num
             this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
+            this.formobj.scmVehRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
+            this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
             this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
             this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
             this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
@@ -296,21 +288,6 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -384,5 +361,15 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
 </style>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue

@@ -14,58 +14,36 @@
       <!--Start 新增修改部分-->
       <div class="">
         <div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colOneStyle">
-              <div><span style="font-size: 16px">金额单位：元</span></div>
+            <el-col :span="24" class="colOneStyle">
+              <div style="text-align: right;font-weight: bold">金额单位：元</div>
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="2" class="tleftb colOneStyle">
-              <span>品牌:</span>
-            </el-col>
-            <el-col :span="22" class="colOneStyle">
-              <el-form-item>
-                <span>{{ formobj.brandName }}</span>
-              </el-form-item>
+            <el-col :span="24" class="colOneStyle">
+              <div class="span-sty" style="border-right: 0px !important;">品牌：</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="返利类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="台数" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.num }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="withRebate" label="预提返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="num" label="台数" align="center" width="80" />
+            <el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
+            <el-table-column label="明细" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.remarks }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
           <el-row>
-            <el-col :span="2" class="tleftb">
-              <span>备注</span>
-            </el-col>
-            <el-col :span="22">
-              <el-form-item>
-                <span>{{ formobj.remarks }}</span>
-              </el-form-item>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -212,21 +190,6 @@ export default {
             }
           }, 0)
           sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
         }
       })
       return sums
@@ -247,5 +210,11 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue

@@ -18,61 +18,20 @@
           <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
+            <el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </el-form>
       </div>
@@ -148,6 +107,8 @@ export default {
           rebateTypeValue: this.list[i].rebateTypeValue,
           rebateTypeKey: this.list[i].rebateTypeKey,
           withRebate: this.list[i].estimateRebate,
+          expectTreatCost: this.list[i].expectTreatCost,
+          expectSuppCost: this.list[i].expectSuppCost,
           brandName: this.list[i].brandName,
           brandSid: this.list[i].brandSid
         })

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue

@@ -16,61 +16,20 @@
         <el-form ref="form_obj" :rules="rules" class="formadd">
           <el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center" width="220">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
+            <el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
+            <el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
           </el-table>
         </el-form>
       </div>

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

@@ -42,61 +42,19 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="250">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="140" />
+            <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <div class="pages">
@@ -204,6 +162,8 @@ export default {
           rebateTypeValue: element.rebateTypeValue,
           rebateTypeKey: element.rebateTypeKey,
           withRebate: element.estimateRebate,
+          expectTreatCost: element.expectTreatCost,
+          expectSuppCost: element.expectSuppCost,
           brandName: element.brandName,
           brandSid: element.brandSid
         })
@@ -217,7 +177,7 @@ export default {
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -345,6 +345,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         String createBySid = pmsPurchaseBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
+        //是否储备配件
+        variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
         //流程定义id
         bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId());
         bv.setFormVariables(variables);
@@ -430,6 +432,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         String createBySid = pmsPurchaseBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
+        //是否储备配件
+        variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
@@ -563,6 +567,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         String createBySid = purchaseBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
+        //是否储备配件
+        variables.put("iscb","001".equals(purchaseBill.getManufacturersOrderTypeKey()));
         bv.setModelId(purchaseBill.getProcDefId());
         bv.setFormVariables(variables);
         //=======================================
@@ -584,6 +590,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         String createBySid = purchaseBill.getCreateBySid();
         List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
         variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
+        //是否储备配件
+        variables.put("iscb","001".equals(purchaseBill.getManufacturersOrderTypeKey()));
         bv.setModelId(purchaseBill.getProcDefId());
         bv.setFormVariables(variables);
         //=======================================
@@ -619,6 +627,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                 String createBySid = pmsPurchaseBill.getCreateBySid();
                 List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
                 variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
+                //是否储备配件
+                variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {