From 2bf97ebc3361878fdb5373b870a3c0c2c604175d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 5 Sep 2024 09:31:06 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatetobechecked.vue | 268 +++++++++--------- 1 file changed, 128 insertions(+), 140 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index a228679a9d..9fff9326f5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -48,8 +48,10 @@
单车返利待核对列表
- 导入 - 导出 + 一次导出 + 一次导入 + 二次导出 + 二次导入
@@ -113,12 +115,12 @@ @@ -133,17 +135,17 @@ @@ -155,13 +157,13 @@ - + @@ -172,8 +174,11 @@
+ + +
@@ -201,13 +206,13 @@ 其中含费用 - + 其中含返利 - + {{ formobj.firstRebate }}
@@ -243,13 +248,13 @@ 其中含费用 - + 其中含返利 - + {{ formobj.secondRebate }} @@ -257,7 +262,7 @@ 调整金额合计 - {{ adjustmentMoneyAdd() }} + {{ formobj.adjustmentMoney }}
@@ -295,13 +300,6 @@ export default { btnKey: 'toAdd', btnLabel: '核对审核申请' }, - { - type: 'primary', - size: 'small', - icon: '', - btnKey: 'toClick', - btnLabel: '调整' - }, { type: 'info', size: 'small', @@ -373,7 +371,8 @@ export default { secondaryUploadMoney: '', secondCost: '', secondRebate: '', - adjustmentMoney: '' + adjustmentMoney: '', + cost: '' } } }, @@ -451,7 +450,7 @@ export default { req.listPage(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 { @@ -486,43 +485,112 @@ export default { } this.init() }, - UpNumber(e) { - e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符 - e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0 - if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') { - // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 - console.log(e.target.value) - e.target.value = parseFloat(e.target.value) + getNumber(val, limit) { + val = val.replace(/[^0-9.]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') } + return val }, - changeIsAdjustment(row) { - if (row.isAdjustment === '是') { - if (row.uploadMoney === '') { - row.isAdjustment = '' - this.$message({ showClose: true, type: 'error', message: '上传金额不能为空' }) - return - } - if (row.money === '') { - row.isAdjustment = '' - this.$message({ showClose: true, type: 'error', message: '费用不能为空' }) - return - } - if (row.stayDetermineMoney === '') { - row.isAdjustment = '' - this.$message({ showClose: true, type: 'error', message: '待确定金额不能为空' }) - return - } - if (row.uploadMoney !== '' && row.money !== '' && row.stayDetermineMoney !== '') { - row.adjustmentMoney = parseInt(row.uploadMoney) - parseInt(row.money) - parseInt(row.stayDetermineMoney) - parseInt(row.estimateRebate) + isAdjustmentInput(row) { + let money = '0' + // 上传金额 - 费用 - 待确定金额 - 预提返利 + money = parseFloat(row.uploadMoney !== '' ? row.uploadMoney : 0) - parseFloat(row.money !== '' ? row.money : 0) - parseFloat(row.stayDetermineMoney !== '' ? row.stayDetermineMoney : 0) - parseFloat(row.estimateRebate !== '' ? row.estimateRebate : 0) + if (row.stayDetermineMoney === '0') { + if (parseFloat(money) > 0) { + row.isAdjustment = '是' + row.adjustmentMoney = parseFloat(money) + row.adjustOrNot = true + } else if (parseFloat(money) === 0) { + row.isAdjustment = '是' + row.adjustmentMoney = parseFloat(money) + row.adjustOrNot = false + } else { + row.isAdjustment = '否' + row.adjustmentMoney = '0' + row.adjustmentRemarks = '' + row.adjustOrNot = true } - } else if (row.isAdjustment === '否') { - row.adjustmentMoney = 0 + } else { + row.isAdjustment = '否' + row.adjustmentMoney = '0' row.adjustmentRemarks = '' + row.adjustOrNot = false + } + }, + handleClick() { + this.viewState = 2 + }, + // 新增核对审核申请 + toAdd() { + this.viewState = 3 + this.$refs['divCheckAdd'].showAdd(this.listQuery.params.createOrgSid) + }, + // 保存 + toSave(row) { + if (row.uploadDate === '') { + this.$message({ showClose: true, type: 'error', message: '上传日期不能为空' }) + return + } + if (row.uploadMoney === '') { + this.$message({ showClose: true, type: 'error', message: '上传金额不能为空' }) + return } + if (row.stayDetermineMoney === '') { + this.$message({ showClose: true, type: 'error', message: '待确定金额不能为空' }) + return + } + if (row.money === '') { + this.$message({ showClose: true, type: 'error', message: '费用不能为空' }) + return + } + req.updateDate(row).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + } + }) + }, + // 二次调整 + toAdjust(row) { + this.dialogVisible = true + this.formobj.stayDetermineMoney = row.stayDetermineMoney + this.formobj.sid = row.sid + this.formobj.firstCost = 0 + this.formobj.firstRebate = 0 + this.formobj.secondCost = 0 + this.formobj.secondRebate = 0 + this.formobj.secondaryUploadMoney = 0 + this.formobj.cost = row.money + this.formobj.surplusRebate = parseFloat(row.estimateRebate !== '' ? row.estimateRebate : 0) - parseFloat(row.uploadMoney !== '' ? row.uploadMoney : 0) }, + // 二次调整页面--待确定金额模块 + firstCostInput() { + // 其中含返利 = 待确定金额 - 其中含费用 + this.formobj.firstRebate = parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0) + this.adjustmentMoneyAdd() + }, + // 二次调整页面--返利二次上传模块 + secondCostInput() { + // 其中含返利 = 二次上传金额 - 其中含费用 + this.formobj.secondRebate = parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.secondCost !== '' ? this.formobj.secondCost : 0) + this.adjustmentMoneyAdd() + }, + // 二次调整页面--返利二次上传模块 adjustmentMoneyAdd() { - this.formobj.adjustmentMoney = parseInt(this.formobj.firstRebate - 0) + parseInt(this.formobj.secondRebate - 0) - parseInt(this.formobj.surplusRebate - 0) - return this.formobj.adjustmentMoney + // 调整金额合计 = 其中含返利之和 - 剩余预提返利 + this.formobj.adjustmentMoney = parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0) }, handleSave() { let aa = null @@ -530,16 +598,16 @@ export default { aa = { sid: this.formobj.sid, stayDetermineMoney: 0, - cost: this.formobj.firstCost, + cost: parseFloat(this.formobj.cost !== '' ? this.formobj.cost : 0) + parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0), secondaryUploadDate: '', secondaryUploadMoney: 0, - adjustmentMoney: this.formobj.firstRebate + adjustmentMoney: this.formobj.adjustmentMoney } } else { aa = { sid: this.formobj.sid, stayDetermineMoney: 0, - cost: parseInt(this.formobj.firstCost) + parseInt(this.formobj.secondCost), + cost: parseFloat(this.formobj.cost !== '' ? this.formobj.cost : 0) + parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0) + parseFloat(this.formobj.secondCost !== '' ? this.formobj.secondCost : 0), secondaryUploadDate: this.formobj.secondaryUploadDate, secondaryUploadMoney: this.formobj.secondaryUploadMoney, adjustmentMoney: this.formobj.adjustmentMoney @@ -565,91 +633,11 @@ export default { secondaryUploadMoney: '', secondCost: '', secondRebate: '', - adjustmentMoney: '' + adjustmentMoney: '', + cost: '' } this.checked = false }, - handleClick() { - this.viewState = 2 - }, - toAdd() { - this.viewState = 3 - this.$refs['divCheckAdd'].showAdd(this.listQuery.params.createOrgSid) - }, - toSave(row) { - if (row.uploadDate === '') { - this.$message({ showClose: true, type: 'error', message: '上传日期不能为空' }) - return - } - if (row.uploadMoney === '') { - this.$message({ showClose: true, type: 'error', message: '上传金额不能为空' }) - return - } - if (row.stayDetermineMoney === '') { - this.$message({ showClose: true, type: 'error', message: '待确定金额不能为空' }) - return - } - if (row.money === '') { - this.$message({ showClose: true, type: 'error', message: '费用不能为空' }) - return - } - if (row.stayDetermineMoney !== '0') { - if (row.isAdjustment === '是') { - this.$message({ showClose: true, type: 'error', message: '因待确定金额大于0,是否调整选项需选择否' }) - return - } - } else if (row.stayDetermineMoney === '0') { - if (row.adjustmentMoney.toString().indexOf('-') !== -1) { - if (row.isAdjustment === '是') { - this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额小于0,是否调整选项需选择否' }) - return - } - } else if (row.adjustmentMoney !== '0') { - if (row.isAdjustment === '否') { - if ((parseInt(row.uploadMoney) - parseInt(row.estimateRebate)) > 0) { - this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额大于0,是否调整选项需选择是' }) - return - } - } - } else if (row.adjustmentMoney === '0') { - if (row.isAdjustment === '否') { - this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额等于0,是否调整选项需选择是' }) - return - } - } - } - if (row.isAdjustment === '是') { - if (row.adjustmentMoney === '') { - this.$message({ showClose: true, type: 'error', message: '调整金额不能为空' }) - return - } - if (row.adjustmentRemarks === '') { - this.$message({ showClose: true, type: 'error', message: '调整说明不能为空' }) - return - } - } - req.updateDate(row).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - } - }) - }, - toInfo(row) { - this.viewState = 4 - this.$refs['divInfo'].showInfo(row) - }, - toAdjust(row) { - this.dialogVisible = true - this.formobj.stayDetermineMoney = row.stayDetermineMoney - this.formobj.sid = row.sid - this.formobj.firstCost = 0 - this.formobj.firstRebate = 0 - this.formobj.secondCost = 0 - this.formobj.secondRebate = 0 - this.formobj.secondaryUploadMoney = 0 - this.formobj.surplusRebate = parseInt(row.estimateRebate) - parseInt(row.uploadMoney) - }, resetState() { this.viewState = 1 }, From c07ae3aa0729848ebce5ca70f8638a56000173c0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 5 Sep 2024 09:40:23 +0800 Subject: [PATCH 02/14] 1 --- .../java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java | 2 ++ .../com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index 8709a7d081..699e948db1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -127,4 +127,6 @@ public class ScmVehRebateVo implements Vo { private String uploadState; // 上传状态 @ApiModelProperty("是否可以点击是否调整") private Boolean adjustOrNot; + @ApiModelProperty("调整状态(1已调整0未调整)") + private Integer adjustmentState; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index c0005377d3..b99caaecb7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -256,7 +256,7 @@ public class ScmVehRebateService extends MybatisBaseService Date: Thu, 5 Sep 2024 10:14:08 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huikuanguanli/collectionrebatemanagementAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue index edbc15f93b..9dbc5ae3b0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue @@ -79,7 +79,7 @@ 预计返利 - {{ estimateRebateSum() }} + {{ estimateRebateSum }}
From 2edb085c8c2e2eafb399529a6e74f4f34e3ade62 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 5 Sep 2024 10:26:13 +0800 Subject: [PATCH 04/14] 1 --- .../scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java | 1 + .../biz/scmcollectionrebate/ScmCollectionRebateService.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java index 1d2838617d..c9b525b1b0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -61,6 +61,7 @@ public class ScmCollectionRebateQuery implements Query { private String createStartTime; @ApiModelProperty("创建结束日期") private String createEndTime; + private String createOrgSid; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index 6e3989b103..e564aed1fc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -223,8 +223,7 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("createOrgSid", useOrgSid); + qw.eq("createOrgSid", query.getCreateOrgSid()); qw.eq("state", 0); if (query.getSidList().size() > 0) { qw.notIn("sid", query.getSidList()); From c59201fbeb82f174f60c33a4080392473cbb096a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 5 Sep 2024 10:35:26 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huikuanyuti/relation/huikuanfanliselect.vue | 1 - .../huikuanfanliyutiFlow/relation/huikuanfanliselect.vue | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue index e95bf296c2..d1cafc3361 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue @@ -207,7 +207,6 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') req.pageList(this.listQuery).then((response) => { console.log('列表查询结果：', response) this.listLoading = false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue index 74ecaa9a2b..2f5b333ccb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue @@ -207,11 +207,10 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') 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 { From d2d4dfd86d4b327d27e3bd34630f7cfd6f6d8ad4 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 5 Sep 2024 11:56:17 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/zhuanxiangfanliselect.vue | 3 +-- .../relation/zhuanxiangfanliyutichoose.vue | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue index f937e71ca1..9d81bc9d99 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue @@ -187,11 +187,10 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') 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 { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue index ae0cbbb9d6..e0250311fb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue @@ -187,11 +187,10 @@ export default { // 查询列表信息 getList() { this.listLoading = true - this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') 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 { From ffc20a7e424596ea1c504b4f90e25ee80802f8f3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 5 Sep 2024 15:36:13 +0800 Subject: [PATCH 07/14] 1 --- .../com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index b99caaecb7..5451c73f12 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -261,7 +261,7 @@ public class ScmVehRebateService extends MybatisBaseService Date: Thu, 5 Sep 2024 16:16:47 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E8=B0=83=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleBrandRest.java | 8 +- .../sysorganization/SysOrganizationFeign.java | 16 ++++ .../SysOrganizationFeignFallback.java | 20 +++++ .../anrui/portal/api/sysuser/SysUserVo.java | 2 + .../anrui/portal/api/sysuser/app/OrgList.java | 3 + .../SysOrganizationMapper.java | 8 ++ .../sysorganization/SysOrganizationMapper.xml | 73 +++++++++++++++++++ .../sysorganization/SysOrganizationRest.java | 20 +++++ .../SysOrganizationService.java | 16 ++++ .../WmsInventoryAlloSelectList.java | 24 ++++-- .../wmsinventory/WmsInventoryMapper.xml | 17 +++-- .../WmsInventoryAllocateBill.java | 3 +- .../WmsInventoryAllocateBillDetailsVoNew.java | 6 +- .../WmsInventoryAllocateBillDtoNew.java | 6 +- .../WmsInventoryAllocateBillDetail.java | 50 ++++++------- .../WmsInventoryAllocateBillDetailDtoNew.java | 54 +++++++------- ...WmsInventoryAllocateBillDetailService.java | 8 -- ...ventoryAllocatebillDetailDetailsVoNew.java | 54 +++++++------- 18 files changed, 277 insertions(+), 111 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index ab95799104..7c24b31e80 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -64,10 +64,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { ResultBean rb = ResultBean.fireFail(); String brandCode = dto.getBrandCode();//品牌编码 //查询品牌编码是否有重复的 - int count = baseVehicleBrandService.selectCountByBrandCode(brandCode); + /*int count = baseVehicleBrandService.selectCountByBrandCode(brandCode); if (count > 0) { return ResultBean.fireFail().setMsg("品牌编码已存在"); - } + }*/ BaseVehicleBrand entity = new BaseVehicleBrand(); dto.fillEntity(entity); boolean isSave = baseVehicleBrandService.save(entity); @@ -86,10 +86,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { } String brandCode = dto.getBrandCode();//品牌编码 //查询品牌编码是否有重复的 - int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid); + /*int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid); if (count > 0) { return ResultBean.fireFail().setMsg("品牌编码已存在"); - } + }*/ int i = baseVehicleBrandService.updateBySid(dto.toMap(), sid); if (i == 0) { return ResultBean.fireFail().setMsg("修改失败"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 18fda29e5a..3b6dc92a7c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -54,6 +54,22 @@ public interface SysOrganizationFeign { @GetMapping("/selectChildrenListBySid/{sid}") public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid); + @ApiOperation("调出一级站-调入当前一级站内所有二级站") + @GetMapping("/tranOne/{sid}") + public ResultBean> tranOne(@PathVariable("sid") String sid); + + @ApiOperation("调出一级站-调入当前分公司内所有一级站，不包含自身") + @GetMapping("/tranTwo/{sid}") + public ResultBean> tranTwo(@PathVariable("sid") String sid); + + @ApiOperation("调出一级站-本集团内调入所有一级站，不包含自身") + @GetMapping("/tranThree/{sid}") + public ResultBean> tranThree(@PathVariable("sid") String sid); + + @ApiOperation("调出二级站-调入上级一级站及站下所有二级站，不包含自身") + @GetMapping("/tranfour/{sid}") + public ResultBean> tranfour(@PathVariable("sid") String sid); + @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody SysOrganizationDto dto); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 86da604ebc..e8c81b494f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -54,6 +54,26 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问"); } + @Override + public ResultBean> tranOne(String sid) { + return null; + } + + @Override + public ResultBean> tranTwo(String sid) { + return null; + } + + @Override + public ResultBean> tranThree(String sid) { + return null; + } + + @Override + public ResultBean> tranfour(String sid) { + return null; + } + @Override public ResultBean save(SysOrganizationDto dto) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java index cdb54502bb..58f0f42195 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -90,6 +90,8 @@ public class SysUserVo implements Vo { private String defaultDeptName; private String defaultDeptSid; + private String defaultOrgAttributeKey; + private String defaultOrgAttributeValue; @ApiModelProperty("是否需要更换密码") private Boolean needResetPsd; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java index 394edef935..f86e1a6b4e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java @@ -18,4 +18,7 @@ public class OrgList implements Vo { private String deptName; private String deptSid; + + private String orgAttributeKey; + private String orgAttributeValue; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index b869be61a3..a8a832aed0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -130,4 +130,12 @@ public interface SysOrganizationMapper extends BaseMapper { List selectByOrgDeptSid2(String orgDeptSid); List selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); + + List tranOne(String sid); + + List tranTwo(String sid); + + List tranThree(String sid); + + List tranfour(String sid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index f865a63a38..95938d9767 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -249,4 +249,77 @@ where psid = #{pSid} and orgCode =#{orgCode} + + + + + + + + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 8713261da6..40d6591de9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -109,6 +109,26 @@ public class SysOrganizationRest implements SysOrganizationFeign { return new ResultBean>().success().setData(sysOrganizationService.selectChildrenListBySid(sid)); } + @Override + public ResultBean> tranOne(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranOne(sid)); + } + + @Override + public ResultBean> tranTwo(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranTwo(sid)); + } + + @Override + public ResultBean> tranThree(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranThree(sid)); + } + + @Override + public ResultBean> tranfour(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranfour(sid)); + } + @Override @Transactional(rollbackFor = Exception.class) public ResultBean update(SysOrganizationDto dto, String sid) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 4776975b27..e879117e18 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -719,4 +719,20 @@ public class SysOrganizationService extends MybatisBaseService selectByOrgCodeAndPsid(String orgCode, String pSid) { return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid); } + + public List tranOne(String sid) { + return baseMapper.tranOne(sid); + } + + public List tranTwo(String sid) { + return baseMapper.tranTwo(sid); + } + + public List tranThree(String sid) { + return baseMapper.tranThree(sid); + } + + public List tranfour(String sid) { + return baseMapper.tranfour(sid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java index 92e3835cdd..0638752bf2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java @@ -12,28 +12,36 @@ public class WmsInventoryAlloSelectList { //sid private String sid; - //商品名称 + //商品spuSid + private String goodsSpuSid; + //商品spu名称 private String goodsSpuName; - //零件号 + //商品skuSid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; + //图号 private String goodsSkuCode; //规格 private String goodsSkuOwnSpec; - //车型 - private String carModel; + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; //商品单位 private String unit; //仓库sid private String warehouseSid; //仓库名称 private String warehouseName; + //库区sid + private String warehouseAreasid; + //库区名称 + private String warehouseArea; //库位sid private String warehouseRackSid; //库位编码 private String warehouseRackCode; - //库位名称 - private String areaName; - //含税价 - private String taxPrice; //库存数量 private String count; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index dd03252783..cf1504dfd1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -238,20 +238,27 @@