返利模板调整

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java

@@ -60,6 +60,12 @@ import java.util.List;
         fallback = ScmFinanceAdjustApplyFeignFallback.class)
 public interface ScmFinanceAdjustApplyFeign {
 
+    @ApiOperation("重推凭证单据")
+    @PostMapping("/rePushVoucher")
+    public ResultBean rePushVoucher(@RequestParam("sid") String sid);
+
+
+
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java

@@ -50,6 +50,11 @@ import java.util.List;
 @Component
 public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApplyFeign {
 
+	@Override
+	public ResultBean rePushVoucher(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<ScmFinanceAdjustApplyVo>> listPage(PagerQuery<ScmFinanceAdjustApplyQuery> pq){
 		ResultBean rb = ResultBean.fireFail();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java

@@ -67,6 +67,14 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign {
 	private ScmFileService scmFileService;
 	@Autowired
 	private ScmFinanceAdjustDetailsService scmFinanceAdjustDetailsService;
+
+	@Override
+	public ResultBean rePushVoucher(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		scmFinanceAdjustApplyService.rePushVoucher(sid);
+		return rb.success();
+	}
+
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")

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

@@ -638,6 +638,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
                 params.setVinNo(info.getVinNo());
                 params.setUserSid(userSid);
+                params.setOrgSid(orgPath);
                 pq.setParams(params);
                 PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
                 BaseVehicleRebateVo baseVehicleRebateVo = data.getRecords().get(0);
@@ -812,6 +813,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
                     params.setVinNo(excelInfo.getVinNo());
                     params.setUserSid(userSid);
+                    params.setOrgSid(orgPath);
                     pq.setParams(params);
                     PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
                     if (data.getRecords().size() == 0) {