From 086cbafadb77ebb95eaadc641f060f0518da747b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 17 Apr 2023 18:09:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemodelmodpricemodel/BaseModelModpriceModel.java | 6 ++++++ .../basemodelmodpricemodel/BaseModelModpriceModelDto.java | 4 ++++ .../basemodelmodpricemodel/BaseModelModpriceModelVo.java | 4 ++++ .../anrui/scm/api/scmapplyinbound/ScmApplyInbound.java | 8 ++++++++ .../anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java | 7 +++++++ .../anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java | 7 ++++++- .../scm/biz/scmapplyinbound/ScmApplyInboundService.java | 5 +++++ 7 files changed, 40 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java index 4d920f290e..322f8fedc9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java @@ -77,4 +77,10 @@ public class BaseModelModpriceModel extends BaseEntity { @ApiModelProperty("价格增减数额") private String incOrDecInPrice; // 价格增减数额 + + @ApiModelProperty("调整后全款销售指导价") + private String tzhGuidedPrice; // 调整后全款销售指导价 + + @ApiModelProperty("调整后贷款销售指导价") + private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java index d95192be8e..d4cb964608 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java @@ -69,4 +69,8 @@ public class BaseModelModpriceModelDto implements Dto { private String incOrDecInPrice; // 价格增减数额 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("调整后全款销售指导价") + private String tzhGuidedPrice; // 调整后全款销售指导价 + @ApiModelProperty("调整后贷款销售指导价") + private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java index 306ca47771..22f79f239f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java @@ -68,6 +68,10 @@ public class BaseModelModpriceModelVo implements Vo { private String guidedPrice; // 现全款销售指导价 @ApiModelProperty("价格增减数额") private String incOrDecInPrice; // 价格增减数额 + @ApiModelProperty("调整后全款销售指导价") + private String tzhGuidedPrice; // 调整后全款销售指导价 + @ApiModelProperty("调整后贷款销售指导价") + private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价 @ApiModelProperty("备注") private String remarks; // 备注 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java index b3370cf21c..aedd2bece1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java @@ -146,4 +146,12 @@ public class ScmApplyInbound extends BaseEntity { @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + + @ApiModelProperty("销售指导价") + private String guidedPrice; // 销售指导价 + @ApiModelProperty("价格") + private String price; // 价格 + @ApiModelProperty("最新更新时间") + private String newUpdateDate; // 最新更新时间 + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index d1b089816b..f81f46d6a7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -161,6 +161,13 @@ public class ScmApplyInboundDto implements Dto { private String pcApplicationCode; @ApiModelProperty("部门sid") private String orgSid; + @ApiModelProperty("销售指导价") + private String guidedPrice; // 销售指导价 + @ApiModelProperty("价格") + private String price; // 价格 + @ApiModelProperty("最新更新时间") + private String newUpdateDate; // 最新更新时间 + @ApiModelProperty("车辆列表") private List vehicleList; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 9bc6f30805..b455d4bc26 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -162,5 +162,10 @@ public class ScmApplyInboundVo implements Vo { private String configSid; @ApiModelProperty("部门sid") private String orgSid; - + @ApiModelProperty("销售指导价") + private String guidedPrice; // 销售指导价 + @ApiModelProperty("价格") + private String price; // 价格 + @ApiModelProperty("最新更新时间") + private String newUpdateDate; // 最新更新时间 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index c1c01e8b35..976453807a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -221,6 +221,7 @@ public class ScmApplyInboundService extends MybatisBaseService 0) { From 4ed32ac87e531bd507582e2589eebadafdad8902 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 17 Apr 2023 18:10:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E3=80=81=E5=BE=85=E9=98=85=E3=80=81=E5=B7=B2=E9=98=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B5=B7=E4=BA=BA,=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E5=B7=A5=E4=BD=9C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-system-ui/src/views/flow/doneList.vue | 2 +- anrui-system-ui/src/views/flow/havereadList.vue | 8 ++++++-- anrui-system-ui/src/views/flow/tobereadList.vue | 8 ++++++-- anrui-system-ui/src/views/flow/todoList.vue | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue index 73fbceee2d..d1c12cae34 100644 --- a/anrui-system-ui/src/views/flow/doneList.vue +++ b/anrui-system-ui/src/views/flow/doneList.vue @@ -9,7 +9,7 @@
- + diff --git a/anrui-system-ui/src/views/flow/havereadList.vue b/anrui-system-ui/src/views/flow/havereadList.vue index 0dbb9887bd..1e3fc817bf 100644 --- a/anrui-system-ui/src/views/flow/havereadList.vue +++ b/anrui-system-ui/src/views/flow/havereadList.vue @@ -8,9 +8,12 @@
- + + + + 至 @@ -166,7 +169,8 @@ export default { createEndTime: '', userSid: '', state: '1', // 0是待阅,1是已阅 - orgPath: '' + orgPath: '', + startUserName: '' } } } diff --git a/anrui-system-ui/src/views/flow/tobereadList.vue b/anrui-system-ui/src/views/flow/tobereadList.vue index c471dae009..10ae7d9cf1 100644 --- a/anrui-system-ui/src/views/flow/tobereadList.vue +++ b/anrui-system-ui/src/views/flow/tobereadList.vue @@ -8,9 +8,12 @@
- + + + + 至 @@ -156,7 +159,8 @@ export default { createEndTime: '', userSid: '', state: '0', // 0是待阅,1是已阅 - orgPath: '' + orgPath: '', + startUserName: '' } } } diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index 2c5cd31c36..ded89f8ad3 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -9,7 +9,7 @@
- + From 7e3d4d19ef993b7b9cd70dae4754a6f6c773bc37 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Apr 2023 09:08:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/biz/flow/FlowableRest.java | 5 ++ .../flowable/biz/flowtask/FlowTaskMapper.xml | 7 +- .../biz/flowtask/FlowTaskService.java | 68 +++++++++++-------- 3 files changed, 50 insertions(+), 30 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 63faca6404..eb43f7840b 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -186,6 +186,11 @@ public class FlowableRest implements FlowableFeign { return rb.setMsg("抄送失败，流程定义不存在！"); } mfq.setModuleName(process.get("NAME_")); + if(processVariables.containsKey("orderNames")){ + mfq.setMsgTitle(processVariables.get("orderNames").toString()); + }else{ + mfq.setMsgTitle(process.get("NAME_")); + } mfq.setMsgTitle(process.get("NAME_")); mfq.setUserSids(userSids.toString()); ResultBean resultBean = messageFeign.pushMessageCC(mfq); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index e392111903..ade8538b75 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -150,15 +150,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_ LEFT JOIN sys_form_link sfl ON ahpi.PROC_INST_ID_ = sfl.procInsId - + AND ahpi.START_TIME_ = ]]> #{startDate} AND ahpi.START_TIME_ #{endDate} + + and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%')) + ) flow GROUP BY flow.PROC_INST_ID_ diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 2b18bb1de4..3ce16a9139 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -500,6 +500,11 @@ public class FlowTaskService extends MybatisBaseService taskList = taskQuery.listPage(p, pageSize); - List taskList = taskQuery.list(); + }*/ + page.setTotal(taskQuery.count()); + int p = (pageNum - 1) * pageSize; + List taskList = taskQuery.listPage(p, pageSize); +// List taskList = taskQuery.list(); List flowList = new ArrayList<>(); for (Task task : taskList) { FlowTaskDto flowTask = new FlowTaskDto(); @@ -578,7 +583,7 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); } @@ -588,7 +593,7 @@ public class FlowTaskService extends MybatisBaseService> rb = new ResultBean>(); return rb.success().setData(page); @@ -716,18 +721,19 @@ public class FlowTaskService extends MybatisBaseService> maps = baseMapper.finishedList1(paraMap); int count = baseMapper.finishedListCount(paraMap); List hisTaskList = new ArrayList(); @@ -816,7 +822,7 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); } @@ -826,8 +832,8 @@ public class FlowTaskService extends MybatisBaseService> rb = new ResultBean>(); return rb.success().setData(page); @@ -860,14 +866,15 @@ public class FlowTaskService extends MybatisBaseService> maps = baseMapper.finishedList1(paraMap); int count = baseMapper.finishedListCount(paraMap); List hisTaskList = new ArrayList(); @@ -963,7 +970,7 @@ public class FlowTaskService extends MybatisBaseService userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); List namesHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); //对hisTaskList进行筛选发起人 - if (StringUtils.isNotBlank(names)) { + /* if (StringUtils.isNotBlank(names)) { String finalStartUserNameParams = names; userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList()); @@ -974,9 +981,10 @@ public class FlowTaskService extends MybatisBaseService> rb = new ResultBean>(); return rb.success().setData(page); } @@ -1989,7 +1997,6 @@ public class FlowTaskService extends MybatisBaseService taskList = taskQuery.listPage(p, pageSize);*/ - List taskList = taskQuery.list(); + List taskList = taskQuery.listPage(p, pageSize); +// List taskList = taskQuery.list(); List flowList = new ArrayList<>(); for (Task task : taskList) { FlowTaskDto flowTask = new FlowTaskDto(); @@ -2081,7 +2093,7 @@ public class FlowTaskService extends MybatisBaseService userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); + /*List userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); List namesHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); if (StringUtils.isNotBlank(names)) { String finalStartUserNameParams = names; @@ -2093,8 +2105,8 @@ public class FlowTaskService extends MybatisBaseService> rb = new ResultBean>(); return rb.success().setData(page); } From 7b546fe24ddc2b77d184a5c4d026f0eada26b85e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 18 Apr 2023 14:24:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E4=BB=B7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kucunguanli/tiaojiaguanli/priceAdd.vue | 19 +++++++++++-------- .../kucunguanli/tiaojiaguanli/priceInfo.vue | 9 +++++++-- .../tiaojiaguanli/tiaojiaDaiBanInfo.vue | 9 +++++++-- .../tiaojiaguanli/tiaojiaEdit.vue | 19 +++++++++++-------- .../tiaojiaguanli/tiaojianYibanInfo.vue | 9 +++++++-- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue index 80756e2e34..46ba69b494 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue @@ -72,9 +72,14 @@ {{ scope.row.manufactorSettlementPrice }} - + + + + @@ -141,11 +146,8 @@ export default { this.formobj.createTime = year + '-' + month + '-' + day }, UpNumber(e) { - e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符 - e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0 - e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的 - e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个- - e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数 + 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的金额 e.target.value = parseFloat(e.target.value) @@ -200,7 +202,8 @@ export default { configName: e.configName, costPrice: '', guidedPrice: e.guidedPrice, - incOrDecInPrice: '', + tzhGuidedPrice: '', + tzhManufactorSettlementPrice: '', manufactorSettlementPrice: e.manufactorSettlementPrice, remarks: '' }) diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue index 1c4900e9cb..c011339902 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue @@ -61,9 +61,14 @@ {{ scope.row.manufactorSettlementPrice }} - + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue index 3d39ecd009..b16b8f7eef 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue @@ -61,9 +61,14 @@ {{ scope.row.manufactorSettlementPrice }} - + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue index 8691a717ef..7cce20b0a8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue @@ -71,9 +71,14 @@ {{ scope.row.manufactorSettlementPrice }} - + + + + @@ -143,11 +148,8 @@ export default { }, methods: { UpNumber(e) { - e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符 - e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0 - e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的 - e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个- - e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数 + 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的金额 e.target.value = parseFloat(e.target.value) @@ -198,7 +200,8 @@ export default { configName: e.configName, costPrice: '', guidedPrice: e.guidedPrice, - incOrDecInPrice: '', + tzhGuidedPrice: '', + tzhManufactorSettlementPrice: '', manufactorSettlementPrice: e.manufactorSettlementPrice, remarks: '' }) diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue index 24106feb86..a47c51c06c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue @@ -59,9 +59,14 @@ {{ scope.row.manufactorSettlementPrice }} - + + + + From 98d81e0e40546008a6e4abf08782eeae3b714a85 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Apr 2023 16:33:53 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basetrailer/BaseTrailerFeign.java | 4 +- .../basetrailer/BaseTrailerFeignFallback.java | 2 +- .../base/api/basetrailer/TraliveredVo.java | 3 + .../BaseVehinstallmodelDetailsVo.java | 6 +- .../base/biz/basetrailer/BaseTrailerRest.java | 4 +- .../biz/basetrailer/BaseTrailerService.java | 57 ++-- .../api/busdelivered/BusDeliveredFeign.java | 7 + .../BusDeliveredFeignFallback.java | 6 + .../api/busdelivered/DeliverDetailsQuery.java | 23 ++ .../app/order/AppOrderTopInfoVo.java | 2 + .../biz/busdelivered/BusDeliveredRest.java | 8 + .../biz/busdelivered/BusDeliveredService.java | 65 +++- .../BusSalesOrderMakeupMapper.xml | 2 +- .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 26 +- .../BusSalesOrderVehicleService.java | 4 + .../retrieval/AppBusDeliveredApplyFeign.java | 9 +- .../AppBusDeliveredApplyFeignFallback.java | 7 +- .../retrieval/DeliveredDetailssQuery.java | 22 ++ .../retrieval/DeliveredTralierVo.java | 8 +- .../retrieval/AppBusDeliveredApplyRest.java | 9 +- .../AppBusDeliveredApplyService.java | 310 +++++++++++------- 22 files changed, 418 insertions(+), 168 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index bf8bf995f1..b39e7f8519 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -114,9 +114,9 @@ public interface BaseTrailerFeign { @PostMapping("/trailerOut/{sid}") ResultBean trailerOut(@PathVariable("sid") String sid); - @ApiOperation("查询主车的挂车信息") + @ApiOperation("查询主车的挂车信息/上装信息") @GetMapping("/trailerList") - ResultBean trailerList(@RequestParam("vinSid") String vinSid); + ResultBean trailerList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo); @ApiOperation("根据挂车车架号获取一条记录") @GetMapping("/fetchByGcVinNo/{gcVinNo}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index 20b8b6cf46..f9e0f02e94 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java @@ -85,7 +85,7 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign { } @Override - public ResultBean trailerList(String vinSid) { + public ResultBean trailerList(String vinSid,String contractNo) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java index 9a300390fd..286a8e178d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.api.basetrailer; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import lombok.Data; import java.util.ArrayList; @@ -18,4 +19,6 @@ public class TraliveredVo { private String modelName; private List list = new ArrayList<>(); + + private List vehillModelList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java index 1fbc74ac9c..6f9c0fd579 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java @@ -27,9 +27,6 @@ package com.yxt.anrui.base.api.basevehinstallmodel; import com.yxt.common.core.vo.Vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -108,4 +105,7 @@ public class BaseVehinstallmodelDetailsVo implements Vo { @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("销售订单中上装价格") + private String topPrice; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index 6159a527b6..f2175a27ea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -111,8 +111,8 @@ public class BaseTrailerRest implements BaseTrailerFeign { } @Override - public ResultBean trailerList(String vinSid) { - return baseTrailerService.trailerList(vinSid); + public ResultBean trailerList(String vinSid,String contractNo) { + return baseTrailerService.trailerList(vinSid,contractNo); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index d496264ce6..7e7d61159a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -29,56 +29,47 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basetrailer.*; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; -import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; -import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; -import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; -import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService; import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService; -import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService; +import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService; +import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign; -import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; -import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -86,11 +77,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -103,7 +92,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -163,6 +151,10 @@ public class BaseTrailerService extends MybatisBaseService createQueryWrapper(BaseTrailerQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -716,16 +708,43 @@ public class BaseTrailerService extends MybatisBaseService trailerList(String vinSid) { + public ResultBean trailerList(String vinSid,String contractNo) { ResultBean rb = ResultBean.fireFail(); + //查询销售订单的上装价格 + String price = ""; + ResultBean detailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(contractNo); + if(detailsVoResultBean.getData() != null){ + if(detailsVoResultBean.getData().getTopInfo() != null){ + price = detailsVoResultBean.getData().getTopInfo().getTopPrice(); + } + } TraliveredVo traliveredVo = new TraliveredVo(); + List vehillModelList = new ArrayList<>(); //根据车辆sid查询车架号以及车型信息 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid); traliveredVo.setVinNo(baseVehicle.getVinNo()); traliveredVo.setModelName(baseVehicle.getModelName()); List voList = baseMapper.trailerList(vinSid); voList.removeAll(Collections.singleton(null)); - traliveredVo.setList(voList); + if(voList.isEmpty()){ + traliveredVo.setList(voList); + } + //查询车辆的上装配置 + List baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(baseVehicle.getCreateOrgSid(), baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length()-8)); + baseVehinstallsList.removeAll(Collections.singleton(null)); + for (int i = 0; i < baseVehinstallsList.size(); i++) { + BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = new BaseVehinstallmodelDetailsVo(); + BaseVehinstall baseVehinstall = baseVehinstallsList.get(i); + String topSid = baseVehinstall.getMainSid(); + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(topSid); + BeanUtil.copyProperties(baseVehinstallmodel,baseVehinstallmodelDetailsVo); + baseVehinstallmodelDetailsVo.setTopPrice(price); + vehillModelList.add(baseVehinstallmodelDetailsVo); + } + vehillModelList.removeAll(Collections.singleton(null)); + if(!vehillModelList.isEmpty()){ + traliveredVo.setVehillModelList(vehillModelList); + } return rb.success().setData(traliveredVo); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java index bc3e459b9d..d0fe4967bd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busdelivered; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,6 +35,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * Project: anrui-buscenter(业务管理)
@@ -95,4 +97,9 @@ public interface BusDeliveredFeign { @PostMapping("/addRetrievalApply") @ResponseBody public ResultBean addRetrievalApply(@Valid @RequestBody AddRetrievalApplyDto dto); + + @ApiOperation("补充车辆返回") + @PostMapping("/selectInfo") + @ResponseBody + ResultBean> selectInfo(@RequestBody DeliverDetailsQuery query); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java index 51579baa20..30e0c70025 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busdelivered; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -84,4 +85,9 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) { return null; } + + @Override + public ResultBean> selectInfo(DeliverDetailsQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java new file mode 100644 index 0000000000..3a0b0f0ef1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.buscenter.api.busdelivered; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/18 9:17 + * @Description + */ +@Data +public class DeliverDetailsQuery { + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("当前申请页面已选车辆的sid:app需要排除") + private List vinSelectsid = new ArrayList<>(); + @ApiModelProperty("补充车辆sid：pc需要的") + private List vinSids = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java index 150fd345cb..0ecafa1af3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java @@ -34,4 +34,6 @@ public class AppOrderTopInfoVo implements Vo { private String remarks; @ApiModelProperty("01公司采购02客户自购") private String buyTypeKey; + + private String topPrice; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java index b7bd872cf0..327c0aac68 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.busdelivered; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busdelivered.*; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,6 +36,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: anrui-buscenter(业务管理)
* File: BusDeliveredFeignFallback.java
@@ -112,4 +115,9 @@ public class BusDeliveredRest implements BusDeliveredFeign { public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) { return busDeliveredService.addRetrievalApply(dto); } + + @Override + public ResultBean> selectInfo(DeliverDetailsQuery query) { + return busDeliveredService.selectInfo(query); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 2140d01109..d2449b2230 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -325,8 +325,8 @@ public class BusDeliveredService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(vinSid); - if (trailerList.getData().getList().isEmpty()) { + ResultBean trailerList = baseTrailerFeign.trailerList(vinSid,contractNo); + if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { appCarListVo.setShowHandCarBtn(false); } else { appCarListVo.setShowHandCarBtn(true); @@ -432,8 +432,8 @@ public class BusDeliveredService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid()); - if (trailerList.getData().getList().isEmpty()) { + ResultBean trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo()); + if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { appCarListVo.setShowHandCarBtn(false); } else { appCarListVo.setShowHandCarBtn(true); @@ -533,4 +533,61 @@ public class BusDeliveredService extends MybatisBaseService> selectInfo(DeliverDetailsQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //移动端：排除已选车辆后的所有未提交及未出库的车辆集合 + //PC端：前端传的已勾选的所有的车辆的集合 + String contractNo = query.getContractNo(); + List vinSelectSid = query.getVinSelectsid(); + vinSelectSid.removeAll(Collections.singleton(null)); + List vinSids = query.getVinSids(); + vinSids.removeAll(Collections.singleton(null)); + List list = new ArrayList<>(); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSids(contractNo); + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + AppCarListVo appCarListVo = new AppCarListVo(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + String vinSid = busSalesOrderVehicle.getLinkSid(); + if(!vinSelectSid.isEmpty()){ + if(vinSelectSid.contains(vinSid)){ + continue; + } + } + if(!vinSids.isEmpty()){ + if(vinSids.contains(vinSid)){ + appCarListVo.setVinSid(vinSid); + }else{ + continue; + } + }else{ + appCarListVo.setVinSid(vinSid); + } + ResultBean trailerList = baseTrailerFeign.trailerList(vinSid,query.getContractNo()); + if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { + appCarListVo.setShowHandCarBtn(false); + } else { + appCarListVo.setShowHandCarBtn(true); + } + //优惠包使用情况 + List discountList = new ArrayList<>(); + List busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo); + for (int j = 0; j < busSalesOrderDiscountList.size(); j++) { + BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo(); + BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j); + busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain()); + busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid()); + busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice()); + busDeliveredDetailsDiscountsVo.setDiscountNum(0); + busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum()); + busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName()); + discountList.add(busDeliveredDetailsDiscountsVo); + } + appCarListVo.setDiscountUse(discountList); + BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo(); + deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8)); + appCarListVo.setRealBuyer(deliveredUseMessagesVo); + list.add(appCarListVo); + } + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index af98a2f506..c5e3a2287b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -92,7 +92,7 @@ contractPath, topName, remarks, - buyTypeKey + buyTypeKey,topPrice FROM bus_sales_order_makeup where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 817538fc1c..25ef4d3afd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -107,4 +107,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByNoAndVinSids(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index e884190b79..7bd4b730d1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -39,7 +39,8 @@ linkNo as vin, topSid from bus_sales_order_vehicle - where salesOrderSid = #{saleOrderSid} and length(linkSid)>0 + where salesOrderSid = #{saleOrderSid} + and length(linkSid) > 0 - update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid} + update bus_sales_order_vehicle + set temporaryNo = #{temporaryNo} + where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 96a03ebf48..02c0447523 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -226,4 +226,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectByNoAndVinSids(String contractNo) { + return baseMapper.selectByNoAndVinSids(contractNo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 63fe061dc9..bda3bcc11b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -133,8 +133,13 @@ public interface AppBusDeliveredApplyFeign { @ResponseBody ResultBean getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query); - @ApiOperation("主车的挂车信息") + @ApiOperation("主车的挂车信息/上装信息") @GetMapping("/tralieredDetailsList") @ResponseBody - ResultBean tralieredDetailsList(@RequestParam("vinSid") String vinSid); + ResultBean tralieredDetailsList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo")String contractNo); + + @ApiOperation("待补充车辆") + @GetMapping("/appendRetrievalCars") + @ResponseBody + public ResultBean> appendRetrievalCars(@SpringQueryMap DeliveredDetailssQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index a1866b7e4f..a2355f5481 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -124,7 +124,12 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe } @Override - public ResultBean tralieredDetailsList(String vinSid) { + public ResultBean tralieredDetailsList(String vinSid,String contractNo) { + return null; + } + + @Override + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java new file mode 100644 index 0000000000..293bf4fd68 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/18 11:50 + * @Description + */ +@Data +public class DeliveredDetailssQuery { + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("当前申请页面已选车辆的sid:app需要排除") + private List vinSelectsid = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java index 3d58dd82b0..0cbd5a13ab 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java @@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -15,6 +16,9 @@ public class DeliveredTralierVo { @ApiModelProperty("车型信息") private List modeInfo; - @ApiModelProperty("挂车列表信息") - private List> handCarInfo; + @ApiModelProperty("挂车/上装列表信息") + private List> handCarInfo = new ArrayList<>(); + + private List titles = new ArrayList<>(); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 8484950af7..0fabf9b94d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -132,7 +132,12 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { } @Override - public ResultBean tralieredDetailsList(String vinSid) { - return appBusDeliveredApplyService.tralieredDetailsList(vinSid); + public ResultBean tralieredDetailsList(String vinSid,String contractNo) { + return appBusDeliveredApplyService.tralieredDetailsList(vinSid,contractNo); + } + + @Override + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { + return appBusDeliveredApplyService.appendRetrievalCars(query); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index ff3f208a3e..0170ffc1b3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -30,8 +30,10 @@ import com.alibaba.fastjson.JSON; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.*; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -266,149 +268,200 @@ public class AppBusDeliveredApplyService { return rb.success().setData(data); } - public ResultBean tralieredDetailsList(String vinSid) { + public ResultBean tralieredDetailsList(String vinSid, String contractNo) { ResultBean rb = ResultBean.fireFail(); DeliveredTralierVo deliveredTralierVo = new DeliveredTralierVo(); - ResultBean resultBean = baseTrailerFeign.trailerList(vinSid); + ResultBean resultBean = baseTrailerFeign.trailerList(vinSid, contractNo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } TraliveredVo traliveredVo = resultBean.getData(); + //车型信息 List modelInfo = new ArrayList<>(); + //挂车/上装列表的拼接list List> handCarInfo = new ArrayList<>(); + List titles = new ArrayList<>(); String vinNo = traliveredVo.getVinNo(); modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 2)); String modelName = traliveredVo.getModelName(); modelInfo.add(getConfigValueSpanSize("车型", modelName, 2)); deliveredTralierVo.setModeInfo(modelInfo); List list = traliveredVo.getList(); - for (int i = 0; i < list.size(); i++) { - TrailerVo trailerVo = list.get(i); - List configVoList = new ArrayList<>(); - //挂车车架号 - String trailerVinNo = trailerVo.getTrailerVinNo(); - configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1)); - //成交价 - String dealPrice = trailerVo.getDealPrice(); - configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1)); - //车辆品牌 - String brandName = trailerVo.getBrandName(); - configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1)); - //车辆型号 - String carModelName = trailerVo.getCarModelName(); - configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1)); - //生产厂商名称 - String manufacturerName = trailerVo.getManufacturerName(); - configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2)); - //挂车类型 - String trailerTypeValue = trailerVo.getTrailerTypeValue(); + List vehillModelList = traliveredVo.getVehillModelList(); + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + String title = "挂车" + i + 1; + titles.add(title); + TrailerVo trailerVo = list.get(i); + List configVoList = new ArrayList<>(); + //挂车车架号 + String trailerVinNo = trailerVo.getTrailerVinNo(); + configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1)); + //成交价 + String dealPrice = trailerVo.getDealPrice(); + configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1)); + //车辆品牌 + String brandName = trailerVo.getBrandName(); + configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1)); + //车辆型号 + String carModelName = trailerVo.getCarModelName(); + configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1)); + //生产厂商名称 + String manufacturerName = trailerVo.getManufacturerName(); + configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2)); + //挂车类型 + String trailerTypeValue = trailerVo.getTrailerTypeValue(); - configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2)); - //外观尺寸 - String appearanceSizeAll = ""; - String appearanceSizeLong = trailerVo.getAppearanceSizeLong(); - if (StringUtils.isNotBlank(appearanceSizeLong)) { - appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "长 mm,"; - } - String appearanceSizeWide = trailerVo.getAppearanceSizeWide(); - if (StringUtils.isNotBlank(appearanceSizeWide)) { - appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "宽 mm,"; - } - //高 - String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh(); - if (StringUtils.isNotBlank(appearanceSizeHigh)) { - appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "高 mm,"; - } - //总高 - String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh(); - if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) { - appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh+"mm"; - }else{ - appearanceSizeAll = appearanceSizeAll + "总高 mm"; - } - //外观尺寸 - configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2)); - //内部尺寸 - String insideSizeAll = ""; - String insideSizeLong = trailerVo.getInsideSizeLong(); - if (StringUtils.isNotBlank(insideSizeLong)) { - insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,"; - } else { - insideSizeAll = insideSizeAll + "长 mm,"; - } - String insideSizeWide = trailerVo.getInsideSizeWide(); - if (StringUtils.isNotBlank(insideSizeWide)) { - insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,"; - } else { - insideSizeAll = insideSizeAll + "宽 mm,"; - } - String insideSizeHigh = trailerVo.getInsideSizeHigh(); - if (StringUtils.isNotBlank(insideSizeHigh)) { - insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm"; - } else { - insideSizeAll = insideSizeAll + "高 mm"; - } - configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2)); - String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh(); - configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2)); - //大梁尺寸 - String girderSizeAll = ""; - String girderSizeHigh = trailerVo.getGirderSizeHigh(); - if (StringUtils.isNotBlank(girderSizeHigh)) { - girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,"; - }else{ - girderSizeAll = girderSizeAll + "高度 mm,"; - } - String girderSizeWide = trailerVo.getGirderSizeWide(); - if (StringUtils.isNotBlank(girderSizeWide)) { - girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,"; - }else{ - girderSizeAll = girderSizeAll + "宽度 mm,"; - } - String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate(); - if (StringUtils.isNotBlank(girderSizeStandPlate)) { - girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm"; - }else{ - girderSizeAll = girderSizeAll + "立板 mm"; + configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2)); + //外观尺寸 + String appearanceSizeAll = ""; + String appearanceSizeLong = trailerVo.getAppearanceSizeLong(); + if (StringUtils.isNotBlank(appearanceSizeLong)) { + appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "长 mm,"; + } + String appearanceSizeWide = trailerVo.getAppearanceSizeWide(); + if (StringUtils.isNotBlank(appearanceSizeWide)) { + appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "宽 mm,"; + } + //高 + String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh(); + if (StringUtils.isNotBlank(appearanceSizeHigh)) { + appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "高 mm,"; + } + //总高 + String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh(); + if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) { + appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh + "mm"; + } else { + appearanceSizeAll = appearanceSizeAll + "总高 mm"; + } + //外观尺寸 + configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2)); + //内部尺寸 + String insideSizeAll = ""; + String insideSizeLong = trailerVo.getInsideSizeLong(); + if (StringUtils.isNotBlank(insideSizeLong)) { + insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,"; + } else { + insideSizeAll = insideSizeAll + "长 mm,"; + } + String insideSizeWide = trailerVo.getInsideSizeWide(); + if (StringUtils.isNotBlank(insideSizeWide)) { + insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,"; + } else { + insideSizeAll = insideSizeAll + "宽 mm,"; + } + String insideSizeHigh = trailerVo.getInsideSizeHigh(); + if (StringUtils.isNotBlank(insideSizeHigh)) { + insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm"; + } else { + insideSizeAll = insideSizeAll + "高 mm"; + } + configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2)); + String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh(); + configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2)); + //大梁尺寸 + String girderSizeAll = ""; + String girderSizeHigh = trailerVo.getGirderSizeHigh(); + if (StringUtils.isNotBlank(girderSizeHigh)) { + girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,"; + } else { + girderSizeAll = girderSizeAll + "高度 mm,"; + } + String girderSizeWide = trailerVo.getGirderSizeWide(); + if (StringUtils.isNotBlank(girderSizeWide)) { + girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,"; + } else { + girderSizeAll = girderSizeAll + "宽度 mm,"; + } + String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate(); + if (StringUtils.isNotBlank(girderSizeStandPlate)) { + girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm"; + } else { + girderSizeAll = girderSizeAll + "立板 mm"; + } + configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2)); + //牵引销 + String towPin = trailerVo.getTowPin(); + configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2)); + //板簧 + String plateSpring = trailerVo.getPlateSpring(); + configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2)); + //车桥 + String axle = trailerVo.getAxle(); + configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2)); + //轮胎及钢圈 + String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle(); + configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2)); + //底板 + String floorSize = trailerVo.getFloorSize(); + if (StringUtils.isNotBlank(floorSize)) { + configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2)); + } else { + configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2)); + } + + //门扇要求 + String doorFanRequirement = trailerVo.getDoorFanRequirement(); + configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1)); + //箱体颜色 + String boxColor = trailerVo.getBoxColor(); + configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1)); + //更多配置 + String moreConfig = trailerVo.getMoreConfig(); + configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2)); + handCarInfo.add(configVoList); } - configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2)); - //牵引销 - String towPin = trailerVo.getTowPin(); - configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2)); - //板簧 - String plateSpring = trailerVo.getPlateSpring(); - configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2)); - //车桥 - String axle = trailerVo.getAxle(); - configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2)); - //轮胎及钢圈 - String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle(); - configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2)); - //底板 - String floorSize = trailerVo.getFloorSize(); - if(StringUtils.isNotBlank(floorSize)){ - configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2)); - }else{ - configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2)); + } + if (!vehillModelList.isEmpty()) { + for (int i = 0; i < vehillModelList.size(); i++) { + String title = "上装" + i + 1; + titles.add(title); + BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = vehillModelList.get(i); + List configVoList = new ArrayList<>(); + //成交价2个格 + String topPrice = baseVehinstallmodelDetailsVo.getTopPrice(); + configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2)); + //车辆功能 + String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); + configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); + //上装名称 + String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue(); + configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1)); + //委改方式 + String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue(); + configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1)); + //委改厂 + configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); + //外廓尺寸 + configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1)); + //颜色 + configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1)); + //板材材质 + configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1)); + //板材厚度 + configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1)); + //篷布滑道 + configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1)); + //冷藏冷机 + configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1)); + //自卸液压盖版 + configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1)); + //底板加热 + configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1)); + //更多配置2个格 + configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2)); + handCarInfo.add(configVoList); } - //门扇要求 - String doorFanRequirement = trailerVo.getDoorFanRequirement(); - configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1)); - //箱体颜色 - String boxColor = trailerVo.getBoxColor(); - configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1)); - //更多配置 - String moreConfig = trailerVo.getMoreConfig(); - configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2)); - handCarInfo.add(configVoList); } + deliveredTralierVo.setHandCarInfo(handCarInfo); return rb.success().setData(deliveredTralierVo); } @@ -424,4 +477,13 @@ public class AppBusDeliveredApplyService { } return configInfoSpanSize; } + + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { + ResultBean> rb = ResultBean.fireFail(); + DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery(); + BeanUtil.copyProperties(query, deliverDetailsQuery); + ResultBean> selectInfo = busDeliveredFeign.selectInfo(deliverDetailsQuery); + List voList = Optional.ofNullable(selectInfo.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CarListVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file From 4c46d0124fb8f559025cd112fee94896d44ee018 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 18 Apr 2023 16:35:39 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index c443f20562..f3ae81e1fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1299,7 +1299,7 @@ public class BusDeliveredApplyService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid()); + ResultBean trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo()); if (trailerList.getData().getList().isEmpty()) { appCarListVo.setShowHandCarBtn(false); } else { From 124608419ba94e9c52f414c8ea5d9506a5605570 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 18 Apr 2023 17:08:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehiclemodel/BaseVehicleModel.java | 1 - .../BaseVehmodelConfigDto.java | 2 + .../basevehmodelconfig/BaseVehmodelVo.java | 7 ++ .../BaseVehmodelConfigMapper.java | 2 +- .../BaseVehmodelConfigMapper.xml | 2 +- .../BaseVehmodelConfigRest.java | 3 + .../AppBillApplicationPageQuery.java | 4 - .../FinBillApplicationQuery.java | 2 + .../api/finbilltrailer/FinBillTrailerDto.java | 1 - .../FinBillApplicationService.java | 12 +-- .../scmapplyinbound/ScmApplyInboundDto.java | 2 - .../scmapplyinbound/ScmApplyInboundVo.java | 6 +- .../ScmApplyInboundService.java | 20 ++++- .../invoiced/BillApplicationIInfoDto.java | 2 + .../invoiced/BillApplicationIInfoVo.java | 11 ++- .../invoiced/BillApplicationPageQuery.java | 6 +- .../invoiced/BillApplicationPageVo.java | 3 + .../invoiced/FinBillTrailerDto.java | 5 +- .../invoiced/FinBillTrailerVo.java | 5 +- .../autoservice/invoiced/InvoicedService.java | 74 +++++++++++++++++-- 20 files changed, 131 insertions(+), 39 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java index fa83a57d61..015ee96fa4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java @@ -52,7 +52,6 @@ public class BaseVehicleModel extends BaseEntity { @ApiModelProperty("产品线key值") private String productLine; - @ApiModelProperty("产品线value值") private String productLineValue; @ApiModelProperty(value = "排放标准key值") private String emissionStandard; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java index ab87bceb3f..1d0d72ca66 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java @@ -52,6 +52,8 @@ import java.math.BigDecimal; @Data public class BaseVehmodelConfigDto implements Dto { + @ApiModelProperty("修改时间") + private String modifyTime; // 修改时间 @ApiModelProperty("业务员sid") private String staffSid; // 业务员sid @ApiModelProperty("用户sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java index 7d68311441..02da2ae89c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java @@ -1,11 +1,14 @@ package com.yxt.anrui.base.api.basevehmodelconfig; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author dimengzhe * @Date 2022/4/29 10:59 @@ -34,4 +37,8 @@ public class BaseVehmodelVo implements Vo { @ApiModelProperty("sid") private String modelConfigSid; + + @ApiModelProperty("最新更新时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date modifyTime; // 最新更新时间 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java index e57e7183c2..6390861091 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java @@ -133,7 +133,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid); - @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}") + @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice},modifyTime = now() where sid = #{sid}") void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid); IPage selVehModelByUseOrgSidAll(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index f1ac567515..88803f2c6c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -219,7 +219,7 @@