From 309748f32ab0e9b96de4202a8a3b45be6ab50420 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 11:05:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E8=AE=BE=E7=BD=AE=E8=A7=92=E8=89=B2--?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2=E6=97=B6=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-system-ui/src/views/userManage/userManageList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-system-ui/src/views/userManage/userManageList.vue b/anrui-system-ui/src/views/userManage/userManageList.vue index 219df52f20..2bf9b53251 100644 --- a/anrui-system-ui/src/views/userManage/userManageList.vue +++ b/anrui-system-ui/src/views/userManage/userManageList.vue @@ -70,7 +70,7 @@ - + From 8ea548e1d62f2b6f4c00240d100c6a8f1b63994a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 11:41:17 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=90=A7=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue | 2 +- .../workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index 955fbc7aa0..da14bf82e7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -34,7 +34,7 @@
采购订单编号
- {{ formobj.purchaseOrderNo }} +
内部编码
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index e388e3c89c..f650ec176f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -33,7 +33,7 @@
采购订单编号
- {{ formobj.purchaseOrderNo }} +
内部编码
From 860a9033f7fd14a5a827296074aa5bd14997fae9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 11:43:41 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86--=E9=A1=B5=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue index 545a0f0c65..63d849d671 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue @@ -38,7 +38,7 @@ - + From 6fee3a90229dbf03e33853abecedb476e85a0b07 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 11:47:53 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E8=A3=85?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86--=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shangzhuangtaizhangAdd.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue index 0904b31358..091f2ccc6a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue @@ -96,7 +96,7 @@
主车信息
-
主车车架号
+
*主车车架号
@@ -122,11 +122,11 @@
上装价格信息
-
厂家结算价(元)
+
*厂家结算价(元)
 -
销售指导价(元)
+
*销售指导价(元)
 @@ -287,6 +287,18 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择上装配置' }) return } + if (this.formobj.vinNo === '') { + this.$message({ showClose: true, type: 'error', message: '主车车架号不能为空' }) + return + } + if (this.formobj.costPrice === '') { + this.$message({ showClose: true, type: 'error', message: '厂家结算价不能为空' }) + return + } + if (this.formobj.guidePrice === '') { + this.$message({ showClose: true, type: 'error', message: '销售指导价不能为空' }) + return + } this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true From 71b24c47b45e0b28c541691cd546d659b7c61e6e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 11:52:32 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9+=E8=AE=A2=E8=BD=A6=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/ftl/existingvehicles.ftl | 2 + .../src/main/resources/ftl/orderacar.ftl | 20 +- .../src/main/resources/ftl/orderacar2.ftl | 1699 +++++++++++++++++ .../main/resources/ftl/orderacar_black.ftl | 18 +- .../main/resources/ftl/orderacar_black2.ftl | 1699 +++++++++++++++++ .../SelectCustomerVo.java | 19 + .../FinCollectionConfirmationService.java | 227 ++- .../FinSelectedReceivablesDetailedMapper.java | 17 +- .../FinSelectedReceivablesDetailedMapper.xml | 49 +- ...FinSelectedReceivablesDetailedService.java | 37 +- 10 files changed, 3729 insertions(+), 58 deletions(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index a2bef1ac59..ca6a5ec966 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -1044,6 +1044,7 @@ + <#if insuranceInfo??> @@ -1067,6 +1068,7 @@ ${insuranceInfo!} + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index 52c3a44b7e..56817eeac0 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -900,7 +900,7 @@ - ${customerName!} + ${customerName!} @@ -919,7 +919,7 @@ - ${mobile!} + ${mobile!} @@ -1257,7 +1257,7 @@ - ${totalPrice!} + ${totalPrice!} @@ -1317,7 +1317,7 @@ - ${depositTotal!} + ${depositTotal!} @@ -1358,7 +1358,7 @@ - ${address!} + ${address!} @@ -1535,7 +1535,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1630,7 +1630,7 @@ - + <#-- @@ -1656,7 +1656,7 @@ - + --> @@ -1665,7 +1665,7 @@ - 地址： + 地址： @@ -1685,7 +1685,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl new file mode 100644 index 0000000000..56817eeac0 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl @@ -0,0 +1,1699 @@ + + + + + Administrator + 孟哲 + 2 + 1 + 2022-01-06T06:45:00Z + 2022-08-17T08:57:00Z + 2022-08-17T08:57:00Z + 1 + 148 + 844 + 7 + 1 + 991 + 16 + + + 2052-11.1.0.12302 + B71BDE97B2C641119C880AE97128EC86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（订车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话： + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + <#if insuranceInfo??> + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#-- + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl index 5401c3687f..15eb4e9e4a 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl @@ -1257,7 +1257,7 @@ - ${totalPrice!} + ${totalPrice!} @@ -1317,7 +1317,7 @@ - ${depositTotal!} + ${depositTotal!} @@ -1326,7 +1326,7 @@ - 元 ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 @@ -1358,7 +1358,7 @@ - ${address!} + ${address!} @@ -1535,7 +1535,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1630,7 +1630,7 @@ - + <#-- @@ -1656,7 +1656,7 @@ - + --> @@ -1665,7 +1665,7 @@ - 地址： + 地址： @@ -1685,7 +1685,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl new file mode 100644 index 0000000000..15eb4e9e4a --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl @@ -0,0 +1,1699 @@ + + + + + Administrator + 孟哲 + 2 + 1 + 2022-01-06T06:45:00Z + 2022-08-17T08:57:00Z + 2022-08-17T08:57:00Z + 1 + 148 + 844 + 7 + 1 + 991 + 16 + + + 2052-11.1.0.12302 + B71BDE97B2C641119C880AE97128EC86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同（订车） + + + + + + + + + + + + + + + + + + + + + 合同编号：${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方(出卖方) ： + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + 乙方(买受方）： + + + + + + + + + + ${customerName!} + + + + + + + + + 联系电话： + + + + + + + + + + ${mobile!} + + + + + + + + + 身份证号码： + + + + + + + + + + ${idNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + <#if insuranceInfo??> + + + + + + + + + + + + + + + + + + + + + + ${insuranceInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆含税总价 + + + + + + + + + 为 + + + + + + + + + + ${totalPrice!} + + + + + + + + + 元（大写 + + + + + + + + + + ${priceRemarks!} + + + + + + + + + ）。 + + + + + + + + + + + + + + + + + + + + + + 三、乙方向甲方交纳订金 + + + + + + + + + + ${depositTotal!} + + + + + + + + + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交付地点 + + + + + + + + + + ${address!} + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 + + + + + + + + + + + + + + + + + + + + + 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + 九、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#-- + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + 地址： + + + + + + + + + + + + + + + + + + + + 年 月 日 年 月 日 + + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java new file mode 100644 index 0000000000..3d0e54bd76 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/4 9:45 + * @Description + */ +@Data +public class SelectCustomerVo implements Vo { + private static final long serialVersionUID = 4691661516865204703L; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户联系方式") + private String customerPhone; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index e0c207f416..6c33bd4c13 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -53,10 +53,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill; @@ -913,7 +910,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) > 0) { return rb.setMsg("认款金额不允许超过收款金额"); } if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) { @@ -1290,20 +1287,119 @@ public class FinCollectionConfirmationService extends MybatisBaseService fEntityList = new ArrayList<>(); ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //推送车款 - List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); + List voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "车款"); + //查询是否含有车架号 + List stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList()); + stringsVin.removeAll(Collections.singleton(null)); + if(finSelectedReceivablesDetailedVos1.size()>0){ + if (!stringsVin.isEmpty()) { + //查询根据客户名称和手机号有哪些客户 + List customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "车款"); + for (SelectCustomerVo vo : customerList) { + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone()); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + //查询该客户的车架号不为空的情况 + List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN()); +// freceivebillentry.setF_PAEZ_Base(vvvv.getReceivablesName()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(vvVo.getReceivablesSid()); + if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("001"); + } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("002"); + } + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + } + + } else { + fEntityList = new ArrayList<>(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); + if (!finSelectedReceivablesDetailedVos1.isEmpty()) { + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid()); + if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("001"); + } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("002"); + } + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + } + } + } + + } + + + /* List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); if (!finSelectedReceivablesDetailedVos1.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1){ + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); //往来单位 arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); -// BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //收款金额 freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); //登记日期 @@ -1316,9 +1412,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); + if(finSelectedReceivablesDetailedVos2.size()>0){ + voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金"); + //查询是否含有车架号 + stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList()); + stringsVin.removeAll(Collections.singleton(null)); + if (!stringsVin.isEmpty()) { + //查询根据客户名称和手机号有哪些客户 + List customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "订金"); + for (SelectCustomerVo vo : customerList) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone()); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + //查询该客户的车架号不为空的情况 + List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN()); +// freceivebillentry.setF_PAEZ_Base(vvvv.getReceivablesName()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + arReceivebill.setF_PAEZ_AssistantKey("006"); + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + + } + } else { + fEntityList = new ArrayList<>(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); + if (!finSelectedReceivablesDetailedVos2.isEmpty()) { + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); +// BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + arReceivebill.setF_PAEZ_AssistantKey("006"); + ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); + } + } + } } //推送订金 - List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); + /*List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); fEntityList = new ArrayList<>(); freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); if (!finSelectedReceivablesDetailedVos2.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2){ + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); //往来单位 arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); -// BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //收款金额 freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); //登记日期 @@ -1361,14 +1547,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); @@ -1391,7 +1577,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); if (resultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index fb5c415500..b9d0ac7c0f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -35,6 +35,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.*; @@ -94,17 +95,25 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectDetailedGroupConAndRecAndPay(); @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}") - void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState); + void updateAuditDateBySid(@Param("sid1") String sid1, @Param("auditState") String auditState); List selectByCollSid(@Param("collectionBillSid") String collectionBillSid); List selByContractNo(String contractNo); - List selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid); + List selectListByAuditState(@Param("i") int i, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid); - List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin,@Param("state") int state); + List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin, @Param("state") int state); List getList(@Param("list") List sidsList); - List fetchByAuditState1(@Param("sid") String sid, @Param("state") int i,@Param("type") String type); + List fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectDetailsList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone); + + FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index eb29cda57c..51aff0e1de 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -45,7 +45,8 @@ , #{name} , '%') - and length(furd.busVinSid)>0 + and length(furd.busVinSid) + >0 order by furd.contractNo desc @@ -124,11 +125,53 @@ + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 13ce095cbe..235798b909 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -200,8 +197,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) { @@ -213,19 +210,35 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectListByAuditState(int i,String userSid,String useOrgSid) { - return baseMapper.selectListByAuditState(i,userSid,useOrgSid); + public List selectListByAuditState(int i, String userSid, String useOrgSid) { + return baseMapper.selectListByAuditState(i, userSid, useOrgSid); } - public List selectListByVin(String contractNo, String vin,int state) { - return baseMapper.selectListByVin(contractNo, vin,state); + public List selectListByVin(String contractNo, String vin, int state) { + return baseMapper.selectListByVin(contractNo, vin, state); } public List getList(List sidsList) { return baseMapper.getList(sidsList); } - public List fetchByAuditState1(String sid, int i,String type) { - return baseMapper.fetchByAuditState1(sid,i,type); + public List fetchByAuditState1(String sid, int i, String type) { + return baseMapper.fetchByAuditState1(sid, i, type); + } + + public List selectCustomerList(String sid, int i, String type) { + return baseMapper.selectCustomerList(sid, i, type); + } + + public List selectDetailsList(String sid, int i, String type) { + return baseMapper.selectDetailsList(sid, i, type); + } + + public List selectVinListVo(String sid, int i, String type, String customerName, String customerPhone) { + return baseMapper.selectVinListVo(sid, i, type,customerName,customerPhone); + } + + public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) { + return baseMapper.fetchByAuditStateV(sid, i, type,customerName,customerPhone); } } \ No newline at end of file From 2378a47f2c5a0b4f7a66956b6cf40577c3a324a4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 11:57:22 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 98 +- .../main/resources/ftl/existingvehicles2.ftl | 1573 --------------- .../resources/ftl/existingvehicles_black2.ftl | 1575 --------------- .../src/main/resources/ftl/orderacar2.ftl | 1699 ----------------- .../main/resources/ftl/orderacar_black2.ftl | 1699 ----------------- 5 files changed, 47 insertions(+), 6597 deletions(-) delete mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl delete mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl delete mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl delete mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ad7c06d986..d41bdc2a4f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -759,24 +759,25 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String ftl = ""; - if ("现车".equals(appOrderDetailsVo.getOrderType())) { - //获取模板 - ftl = "existingvehicles"; - } else { - //获取模板 - ftl = "orderacar"; - } AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); //查询台数 String num = priceInfo.getNumber(); //单台成交价 String transactionPrice = priceInfo.getSingleFinalPrice(); String remarks = ""; - AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); - List stringList = orderModelInfoVo.getVinList(); - if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + //获取模板 + ftl = "existingvehicles"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + } } else { + //获取模板 + ftl = "orderacar"; remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; } map.put("remarks", remarks); @@ -801,24 +802,25 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String ftl = ""; - if ("现车".equals(appOrderDetailsVo.getOrderType())) { - //获取模板 - ftl = "existingvehicles2"; - } else { - //获取模板 - ftl = "orderacar"; - } AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); //查询台数 String num = priceInfo.getNumber(); //单台成交价 String transactionPrice = priceInfo.getSingleFinalPrice(); String remarks = ""; - AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); - List stringList = orderModelInfoVo.getVinList(); - if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + //获取模板 + ftl = "existingvehicles"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + } } else { + //获取模板 + ftl = "orderacar"; remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; } map.put("remarks", remarks); @@ -879,19 +881,7 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getVinList(); - if ("1".equals(dto.getDiscountKey())) { - if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); - } else { - remarks = "主车" + num + "台，单台成交价： 元。"; - } - map.put("remarks", remarks); - } String ftl = ""; // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） if ("1".equals(dto.getDiscountKey())) { @@ -899,10 +889,19 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价： 元。"; + } } else { // 订车获取模板 ftl = "orderacar_black"; + remarks = "主车" + num + "台，单台成交价： 元。"; } + map.put("remarks", remarks); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -931,30 +930,27 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getVinList(); - if ("1".equals(dto.getDiscountKey())) { - if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); - } else { - remarks = "主车" + num + "台，单台成交价： 元。"; - } - map.put("remarks", remarks); - } String ftl = ""; // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） if ("1".equals(dto.getDiscountKey())) { // 现车 if ("现车".equals(appOrderDetailsVo.getOrderType())) { //获取模板 - ftl = "existingvehicles_black2"; + ftl = "existingvehicles_black"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价： 元。"; + } } else { // 订车获取模板 ftl = "orderacar_black"; + remarks = "主车" + num + "台，单台成交价： 元。"; } + map.put("remarks", remarks); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -1674,7 +1670,8 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - /* Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); Future future1_2 = pool.submit(() -> { @@ -1781,7 +1777,7 @@ public class CommonContractService extends MybatisBaseService future2 = pool.submit(() -> { + /* Future future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); }); Future future2_2 = pool.submit(() -> { diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl deleted file mode 100644 index a2bef1ac59..0000000000 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl +++ /dev/null @@ -1,1573 +0,0 @@ - - - - - Administrator - 孟哲 - 2 - 0 - 2022-01-06T06:45:00Z - 2022-08-17T08:56:00Z - 2022-08-17T08:56:00Z - 1 - 147 - 839 - 6 - 1 - 985 - 16 - - - 2052-11.1.0.12302 - 00792B5205314B0BB2CF2B94EA12F497 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（现车） - - - - - - - - - - - - - - - - - - - - - 合同编号：${contractNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - ${createOrgName!} - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - ${customerName!} - - - - - - - - - 联系电话 - - - - - - - - - - ${mobile!} - - - - - - - - - 身份证号码： - - - - - - - - - - ${idNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 标的车辆基本信息 - - - - - - - - - - - - - - - - - - - - - - - - <#if modelName??> - - - - - - - - - - - - - - - - - - - ${modelName!} - - - - <#if modelConfig??> - - - - - - - - - - - - - - - - - - - ${modelConfig!} - - - - <#if topName??> - - - - - - - - - - - - - - - - - - - ${topName!} - - - - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - - <#if remarks??> - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - <#if discountDetail??> - - - - - - - - - - - - - - - - - - - ${discountDetail!} - - - - - - - - - - - - - - - - - - - - - - - - ${insuranceInfo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 二、 - - - - - - - - - - 车辆含税总价 - - - - - - - - - 为 - - - - - - - - - - ${totalPrice!} - - - - - - - - - 元（大写 - - - - - - - - - - ${priceRemarks!} - - - - - - - - - ）。 - - - - - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - ${depositTotal!} - - - - - - - - - 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 - - - - - - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - ${address!} - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - - - - - 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： 乙方： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#-- - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - 地址： - - - - - - - - - - - - - - - - - - - - 年 月 日 年 月 日 - - - - - - - - - - \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl deleted file mode 100644 index 3f623227ab..0000000000 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl +++ /dev/null @@ -1,1575 +0,0 @@ - - - - - Administrator - 孟哲 - 2 - 0 - 2022-01-06T06:45:00Z - 2022-08-17T08:56:00Z - 2022-08-17T08:56:00Z - 1 - 147 - 839 - 6 - 1 - 985 - 16 - - - 2052-11.1.0.12302 - 00792B5205314B0BB2CF2B94EA12F497 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（现车） - - - - - - - - - - - - - - - - - - - - - 合同编号：${contractNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - ${createOrgName!} - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - ${customerName!} - - - - - - - - - 联系电话 - - - - - - - - - - ${mobile!} - - - - - - - - - 身份证号码： - - - - - - - - - - ${idNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 标的车辆基本信息 - - - - - - - - - - - - - - - - - - - - - - - - <#if modelName??> - - - - - - - - - - - - - - - - - - - ${modelName!} - - - - <#if modelConfig??> - - - - - - - - - - - - - - - - - - - ${modelConfig!} - - - - <#if topName??> - - - - - - - - - - - - - - - - - - - ${topName!} - - - - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - - <#if remarks??> - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - <#if discountDetail??> - - - - - - - - - - - - - - - - - - - ${discountDetail!} - - - - <#if insuranceInfo??> - - - - - - - - - - - - - - - - - - - - - ${insuranceInfo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 二、 - - - - - - - - - - 车辆含税总价 - - - - - - - - - 为 - - - - - - - - - - ${totalPrice!} - - - - - - - - - 元（大写 - - - - - - - - - - ${priceRemarks!} - - - - - - - - - ）。 - - - - - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - ${depositTotal!} - - - - - - - - - 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 - - - - - - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - ${address!} - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - - - - - 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： 乙方： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#-- - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - 地址： - - - - - - - - - - - - - - - - - - - - 年 月 日 年 月 日 - - - - - - - - - - \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl deleted file mode 100644 index 56817eeac0..0000000000 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar2.ftl +++ /dev/null @@ -1,1699 +0,0 @@ - - - - - Administrator - 孟哲 - 2 - 1 - 2022-01-06T06:45:00Z - 2022-08-17T08:57:00Z - 2022-08-17T08:57:00Z - 1 - 148 - 844 - 7 - 1 - 991 - 16 - - - 2052-11.1.0.12302 - B71BDE97B2C641119C880AE97128EC86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（订车） - - - - - - - - - - - - - - - - - - - - - 合同编号：${contractNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - ${createOrgName!} - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - ${customerName!} - - - - - - - - - 联系电话： - - - - - - - - - - ${mobile!} - - - - - - - - - 身份证号码： - - - - - - - - - - ${idNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方按照乙方要求订购排产的车辆信息如下： - - - - - - - - - - - - - - - - - - - - - - - - <#if modelName??> - - - - - - - - - - - - - - - - - - - - ${modelName!} - - - - <#if modelConfig??> - - - - - - - - - - - - - - - - - - - - ${modelConfig!} - - - - <#if topName??> - - - - - - - - - - - - - - - - - - - - ${topName!} - - - - <#if trailerName??> - - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - - <#if remarks??> - - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - <#if discountDetail??> - - - - - - - - - - - - - - - - - - - - ${discountDetail!} - - - - <#if insuranceInfo??> - - - - - - - - - - - - - - - - - - - - - - ${insuranceInfo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 二、 - - - - - - - - - - 车辆含税总价 - - - - - - - - - 为 - - - - - - - - - - ${totalPrice!} - - - - - - - - - 元（大写 - - - - - - - - - - ${priceRemarks!} - - - - - - - - - ）。 - - - - - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - ${depositTotal!} - - - - - - - - - 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 - - - - - - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - ${address!} - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - - - - - 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： 乙方： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#-- - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - 地址： - - - - - - - - - - - - - - - - - - - - 年 月 日 年 月 日 - - - - - - - - - - \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl deleted file mode 100644 index 15eb4e9e4a..0000000000 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black2.ftl +++ /dev/null @@ -1,1699 +0,0 @@ - - - - - Administrator - 孟哲 - 2 - 1 - 2022-01-06T06:45:00Z - 2022-08-17T08:57:00Z - 2022-08-17T08:57:00Z - 1 - 148 - 844 - 7 - 1 - 991 - 16 - - - 2052-11.1.0.12302 - B71BDE97B2C641119C880AE97128EC86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（订车） - - - - - - - - - - - - - - - - - - - - - 合同编号：${contractNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - ${createOrgName!} - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - ${customerName!} - - - - - - - - - 联系电话： - - - - - - - - - - ${mobile!} - - - - - - - - - 身份证号码： - - - - - - - - - - ${idNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式订购车辆，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方按照乙方要求订购排产的车辆信息如下： - - - - - - - - - - - - - - - - - - - - - - - - <#if modelName??> - - - - - - - - - - - - - - - - - - - - ${modelName!} - - - - <#if modelConfig??> - - - - - - - - - - - - - - - - - - - - ${modelConfig!} - - - - <#if topName??> - - - - - - - - - - - - - - - - - - - - ${topName!} - - - - <#if trailerName??> - - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - - <#if remarks??> - - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - <#if discountDetail??> - - - - - - - - - - - - - - - - - - - - ${discountDetail!} - - - - <#if insuranceInfo??> - - - - - - - - - - - - - - - - - - - - - - ${insuranceInfo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 二、 - - - - - - - - - - 车辆含税总价 - - - - - - - - - 为 - - - - - - - - - - ${totalPrice!} - - - - - - - - - 元（大写 - - - - - - - - - - ${priceRemarks!} - - - - - - - - - ）。 - - - - - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - ${depositTotal!} - - - - - - - - - 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 - - - - - - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - ${address!} - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - - - - - 五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - - - - - - 七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： 乙方： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#-- - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - 地址： - - - - - - - - - - - - - - - - - - - - 年 月 日 年 月 日 - - - - - - - - - - \ No newline at end of file From 84771fe5465e56be4395397b6826b70c4996c51b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 15:19:44 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95list=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arreceivebill/ArReceivebillCastToKingDeeBillFields.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java index 5380de3256..9eadc25f9a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java @@ -29,7 +29,9 @@ public class ArReceivebillCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json"); + /* String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_FRECEIVEBILLENTRY.json"); + */ //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -42,6 +44,7 @@ public class ArReceivebillCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { From 219d26a43a435b4a298be72ed3c91c83261c1d91 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 15:22:46 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 6c33bd4c13..d788e8fc79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -39,14 +39,10 @@ import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; -import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; From 08ca47f2bfa686438347a0e20c0640cce3a62afd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 15:28:33 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index d788e8fc79..6c33bd4c13 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -39,10 +39,14 @@ import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; From abe5ac66288da19cd6df6669fd7e28aeb565f5b5 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 15:29:35 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD--=E9=87=87=E8=B4=AD=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BD=A6=E8=BE=86=E5=9E=8B=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 8 ++++++++ .../paichanguanli/cheliangpaichanEdit.vue | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index f216d6542c..96f29ee962 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -501,6 +501,8 @@ export default { message: resp.msg }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -532,6 +534,10 @@ export default { this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' }) return } + if (this.formobj.busVehicleApplyDetailList[i].vehicleNo === '' || this.formobj.busVehicleApplyDetailList[i].vehicleNo === null) { + this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' }) + return + } } } this.$refs['form_obj'].validate((valid) => { @@ -545,6 +551,8 @@ export default { message: '提交成功' }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index 3667ff696c..25cab842fa 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -481,6 +481,8 @@ export default { } }, '*') // this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -512,6 +514,10 @@ export default { this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中厂家回款通路不能为空' }) return } + if (this.formobj.busVehicleApplyDetailList[i].vehicleNo === '' || this.formobj.busVehicleApplyDetailList[i].vehicleNo === null) { + this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' }) + return + } } } this.$refs['form_obj'].validate((valid) => { @@ -532,6 +538,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false From 2f1819095ac7cab7267d71e09f3432e955047e0f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 4 Jan 2023 15:41:14 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=BF=90=E8=B4=B9=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruzhang/ruzhangguanli/ruzhangAdd.vue | 30 ++++++++++++++- .../ruzhangguanli/ruzhangEdit.vue | 38 ++++++++++++++----- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index da14bf82e7..cbd45e3e62 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -264,7 +264,7 @@ export default { policyRemarks: '', policyThree: '', policyTwo: '', // 政策3 - policyTwoo: '', //政策2 + policyTwoo: '', // 政策2 priceDate: '', purchaseOrderNo: '', remarks: '', @@ -706,7 +706,15 @@ export default { saveEdit() { this.getUrl() if (this.formobj.departureDate === '') { - alert('厂家发车日期不能为空!') + this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' }) + return + } + if (this.formobj.onceFreight === '') { + this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) + return + } + if (this.formobj.onceFreight == 0) { + this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) return } if (this.freightChecked) { @@ -746,6 +754,8 @@ export default { if (resp.success) { this.$message({ showClose: true, type: 'success', message: '保存成功' }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -757,6 +767,10 @@ export default { }, submitVehicleApply() { this.getUrl() + if (this.formobj.purchaseOrderNo === '') { + this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) + return + } if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) return @@ -765,6 +779,14 @@ export default { this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) return } + if (this.formobj.onceFreight === '') { + this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) + return + } + if (this.formobj.onceFreight == 0) { + this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) + return + } if (this.freightChecked) { this.formobj.deductionFreight = 0 } else { @@ -822,6 +844,8 @@ export default { message: '提交成功' }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -843,6 +867,8 @@ export default { message: '提交成功' }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index f650ec176f..1e25a7e4c7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -720,7 +720,15 @@ export default { saveEdit() { this.getUrl() if (this.formobj.departureDate === '') { - alert('厂家发车日期不能为空!') + this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' }) + return + } + if (this.formobj.onceFreight === '') { + this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) + return + } + if (this.formobj.onceFreight == 0) { + this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) return } if (this.freightChecked) { @@ -757,11 +765,6 @@ export default { if (valid) { this.submitdisabled = true req.saveOrUpdate(this.formobj).then((resp) => { - /* this.$message({ - showClose: true, - type: 'success', - message: resp.msg - })*/ if (resp.success) { // 子页面向父级页面传递值(关闭弹框) window.parent.postMessage({ @@ -771,11 +774,12 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } + }).catch(() => { + this.submitdisabled = false }) - .catch(() => { - this.submitdisabled = false - }) } else { return false } @@ -783,6 +787,10 @@ export default { }, submitVehicleApply() { this.getUrl() + if (this.formobj.purchaseOrderNo === '') { + this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) + return + } if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) return @@ -791,6 +799,14 @@ export default { this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) return } + if (this.formobj.onceFreight === '') { + this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) + return + } + if (this.formobj.onceFreight == 0) { + this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) + return + } if (this.freightChecked) { this.formobj.deductionFreight = 0 } else { @@ -855,6 +871,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -883,6 +901,8 @@ export default { code: 1 } }, '*') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false From 7f09a35a5a7b2c6e8aa3a7ac8bf91e1a8ca5bcff Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 4 Jan 2023 15:51:03 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=BD=A6=E6=9E=B6=E5=8F=B7=E6=88=AA=E5=8F=96=E5=90=8E?= =?UTF-8?q?8=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 6c33bd4c13..56dbf4243c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1313,8 +1313,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService