From 22193b4c9aae9ddbb1382efbcd8cc475a59f3651 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 27 Feb 2025 10:09:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java index 85bb9d5dd8..45002fafdd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java @@ -54,9 +54,9 @@ public class AppIndexEnum { JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"), FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"), DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"), - WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"), - SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"), - PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"), + WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"), + SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"), + PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"), ; /** From e276511facd7b90d583722d6ba8059fa2cb31e18 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 27 Feb 2025 10:41:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsshelfbill/WmsShelfBillService.java | 28 +++++++++++++------ .../wmsshelfbill/app/AppRecordListVo.java | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 1ad624ad9a..6427774e36 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -121,6 +121,7 @@ public class WmsShelfBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsShelfBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -855,7 +856,7 @@ public class WmsShelfBillService extends MybatisBaseService data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) { - cost = receiptBillDetail.getCost(); + cost = receiptBillDetail.getCost(); if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); @@ -958,15 +959,26 @@ public class WmsShelfBillService extends MybatisBaseService Date: Thu, 27 Feb 2025 10:57:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93?= =?UTF-8?q?=E9=A1=B9=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9--?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatecheck/bicyclerebatetobechecked.vue | 12 ++++++++++-- .../specialrebatecheck/specialrebatetobechecked.vue | 4 ++-- 2 files changed, 12 insertions(+), 4 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 53cbbf938e..03132d9e8f 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 @@ -41,7 +41,9 @@ - + + + @@ -417,7 +419,7 @@ import ButtonBar from '@/components/ButtonBar' import bicyclerebatecheck from './bicyclerebatecheck' import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate' -import { getOrgSidByPath } from '@/api/cheliang/dictcommons' +import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons' export default { name: 'BicycleRebateToBeChecked', @@ -457,6 +459,7 @@ export default { listAll: [], sids: [], FormLoading: false, + rebateType_list: [], state_list: [ { dictKey: '0', @@ -562,6 +565,11 @@ export default { }, methods: { init() { + getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => { + if (res.success) { + this.rebateType_list = res.data + } + }) getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { this.listQuery.params.createOrgSid = resp.data diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue index 259fcbd4c8..af1d677f15 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -400,7 +400,7 @@ import ButtonBar from '@/components/ButtonBar' import specialrebatecheck from './specialrebatecheck' import specialrebatecheckAdd from './specialrebatecheckAdd' import specialrebatetobecheckedByUpdate from './specialrebatetobecheckedByUpdate' -import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons' +import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons' export default { name: 'SpecialRebateToBeChecked', @@ -552,7 +552,7 @@ export default { }, methods: { init() { - typeValues({ type: 'rebateType' }).then((res) => { + getTypeValueList({ type: 'rebateType', groupNum: 'ZX' }).then((res) => { if (res.success) { this.rebateType_list = res.data }