Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -145,5 +145,5 @@ public interface BaseTrailerFeign {
 
     @ApiOperation("付款申请选择挂车")
     @PostMapping("/payApply")
-    public ResultBean<List<PayApplyTrailerVo>> payApply(@RequestBody PayApplyTrailerQuery query);
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(@RequestBody PagerQuery<PayApplyTrailerQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -108,4 +108,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -98,5 +98,5 @@ public interface BaseVehinstallFeign {
 
     @ApiOperation("付款申请选择上装")
     @PostMapping("/payApply")
-    public ResultBean<List<PayApplyTopVo>> payApply(@RequestBody PayApplyTopQuery query);
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(@RequestBody PagerQuery<PayApplyTopQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -89,4 +89,9 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 	public ResultBean vehinstallOutNew(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -110,5 +110,5 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
 
-    List<PayApplyTrailerVo> payApply(@Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
+    IPage<PayApplyTrailerVo> payApply(IPage<BaseTrailer> page, @Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -138,7 +138,7 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     }
 
     @Override
-    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
         return baseTrailerService.payApply(query);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -984,8 +984,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return baseMapper.fetchTypeAndMan(vehSid);
     }
 
-    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
+        PayApplyTrailerQuery query = pq.getParams();
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("bt.useOrgSid", query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
@@ -1000,7 +1001,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
             qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
         }
-        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(qw);
-        return rb.success().setData(payApplyTrailerVoList);
+        IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
+        IPage<PayApplyTrailerVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTrailerVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -77,5 +77,5 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 
     String selectNum(String billNo);
 
-    List<PayApplyTopVo> payApply(@Param(Constants.WRAPPER) QueryWrapper qw);
+    IPage<PayApplyTopVo> payApply(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -299,7 +299,7 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     }
 
     @Override
-    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
         return baseVehinstallService.payApply(query);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -521,8 +521,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         return rb.success();
     }
 
-    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
+        PayApplyTopQuery query = pq.getParams();
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("bv.useOrgSid", query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
@@ -534,7 +535,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         if (StringUtils.isNotBlank(query.getInstallNameValue())) {
             qw.like("bvm.installNameValue", query.getInstallNameValue());
         }
-        List<PayApplyTopVo> payApplyTopVoList = baseMapper.payApply(qw);
-        return rb.success().setData(payApplyTopVoList);
+        IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
+        IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
 }

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -130,7 +130,7 @@ const codemenu = [
     component: Layout,
     redirect: '/anruifinmanagement',
     meta: {
-      title: '款项结转申请'
+      title: '付款信息管理'
     },
     children: [{
       path: '/anruifinmanagement/paymentInformation',

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue

@@ -367,6 +367,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -388,6 +394,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue

@@ -49,6 +49,7 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
             <el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />

anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue

@@ -349,6 +349,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -377,6 +383,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue

@@ -49,6 +49,7 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
             <el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />