From 874381b7c3c816b4052a431125ee7128fd6e09a7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 10 Feb 2023 16:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 110 ++++-------------- .../main/resources/ftl/existingvehicles.ftl | 2 +- .../resources/ftl/existingvehicles_black.ftl | 16 ++- .../src/main/resources/ftl/orderacar.ftl | 17 ++- .../main/resources/ftl/orderacar_black.ftl | 17 ++- 5 files changed, 73 insertions(+), 89 deletions(-) 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 ffea6381a8..f0aee2a4e8 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 @@ -58,6 +58,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -166,6 +168,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -778,14 +782,14 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); } else { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } } else { //获取模板 ftl = "orderacar"; - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } map.put("remarks", remarks); @@ -821,14 +825,14 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); } else { - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } } else { //获取模板 ftl = "orderacar"; - remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } map.put("remarks", remarks); @@ -850,36 +854,6 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { - String url = ""; - String typeName = ""; - String docName = ""; - map.put("totalPrice", ""); - map.put("priceRemarks", ""); - map.put("depositTotal", ""); - // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） - if ("1".equals(dto.getDiscountKey())) { - // 现车 - if ("现车".equals(appOrderDetailsVo.getOrderType())) { - typeName = ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName(); - } else { - // 订车 - typeName = ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName(); - } - docName = typeName + "（" + appOrderDetailsVo.getName() + "）.doc"; - Map map2 = docPdfComponent.createDocToPdf(map, typeName, docName); - url += map2.get("prefixTemplateUrl"); - } - return url; - }*/ private String genCarSaleContractBlank(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; map.put("totalPrice", ""); @@ -899,14 +873,14 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); } else { - remarks = "主车" + num + "台，单台成交价： 元。"; + remarks = "数量" + num + "台，单台成交价： 元。"; } } else { // 订车获取模板 ftl = "orderacar_black"; - remarks = "主车" + num + "台，单台成交价： 元。"; + remarks = "数量" + num + "台，单台成交价： 元。"; } map.put("remarks", remarks); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); @@ -948,14 +922,14 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getOrderVinList(); if (stringList.size() > 0) { - remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); } else { - remarks = "主车" + num + "台，单台成交价： 元。"; + remarks = "数量" + num + "台，单台成交价： 元。"; } } else { // 订车获取模板 ftl = "orderacar_black"; - remarks = "主车" + num + "台，单台成交价： 元。"; + remarks = "数量" + num + "台，单台成交价： 元。"; } map.put("remarks", remarks); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); @@ -1023,18 +997,11 @@ public class CommonContractService extends MybatisBaseService 0) { for (int i = 0; i < stringList.size(); i++) { InvoicMessageContractVo vo = new InvoicMessageContractVo(); - if (stringList.get(i).length() > 8) { - vo.setVinNo(stringList.get(i).substring(stringList.get(i).length() - 8)); - } else { - vo.setVinNo(stringList.get(i)); - } - vo.setType(appOrderDetailsVo.getInvoiceType()); invoicMessageContractVos.add(vo); } }else{ for (int i = 0; i < Integer.parseInt(orderModelInfoVo.getTotal()); i++) { InvoicMessageContractVo vo = new InvoicMessageContractVo(); -// vo.setType(appOrderDetailsVo.getInvoiceType()); invoicMessageContractVos.add(vo); } } @@ -1069,21 +1036,6 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; //查询销售订单的现车 - /*AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); - AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); - AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); - String singleFinalPrice = priceInfo.getSingleFinalPrice(); - String deposit = depositInfo.getDeposit(); - if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) { - //单台成交价-单台订金 = 单台车款 - BigDecimal money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).multiply(new BigDecimal(priceInfo.getNumber())); - map.put("money", money); - map.put("moneyDx", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(money.toString()).doubleValue()))); - } - List stringList = orderModelInfoVo.getVinList(); - if (stringList.size() > 0) { - map.put("vinNo", String.join(",", stringList)); - }*/ //车款：money,大写：moneyDx String ftl = "carFin"; InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); @@ -1108,14 +1060,6 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; //查询销售订单的现车 - /* AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); - AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); - AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); - String singleFinalPrice = priceInfo.getSingleFinalPrice(); - String deposit = depositInfo.getDeposit(); - map.put("money", new BigDecimal(singleFinalPrice).multiply(new BigDecimal(priceInfo.getNumber()))); - map.put("moneyDx", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(new BigDecimal(singleFinalPrice).multiply(new BigDecimal(priceInfo.getNumber())).toString()).doubleValue()))); - map.put("moneyXx", new BigDecimal(deposit).multiply(new BigDecimal(priceInfo.getNumber())));*/ //车款：money,大写：moneyDx String ftl = "moneyFin"; InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); @@ -1147,16 +1091,6 @@ public class CommonContractService extends MybatisBaseService 0) { for (int i = 0; i < vinNoList.size(); i++) { CarContractListVo carContractListVo = new CarContractListVo(); - /*carContractListVo.setBrand(orderModelInfoVo.getBrand()); - carContractListVo.setVinNo(vinNoList.get(i).getVinNo()); - String vinSid = vinNoList.get(i).getVinSid(); - if (StringUtils.isNotBlank(vinSid)) { - //根据车辆sid查询车辆信息获取发动机号 - BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleService.details(vinSid); - if (baseVehicleSelectVo != null) { - carContractListVo.setEnginNo(baseVehicleSelectVo.getEngineNo()); - } - }*/ carContractListVos.add(carContractListVo); } } @@ -1703,7 +1637,7 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); @@ -2033,6 +1972,7 @@ public class CommonContractService extends MybatisBaseService future3 = pool.submit(() -> { //新增合同信息 CommonContract commonContract = new CommonContract(); @@ -2061,7 +2001,7 @@ public class CommonContractService extends MybatisBaseService - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票。由于车辆自身问题等甲方原因导致车辆不能登记上牌的，由甲方负责解决；由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的问题等非甲方原因导致不能办理车辆登记上牌手续的，由乙方自行解决。 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index 5bd01a9b09..0bf90087b4 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1106,6 +1106,20 @@ + + + + + + + + + + + + + + @@ -1309,7 +1323,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票。由于车辆自身问题等甲方原因导致车辆不能登记上牌的，由甲方负责解决；由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的问题等非甲方原因导致不能办理车辆登记上牌手续的，由乙方自行解决。 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 3a422a31f0..3eb1d06fc5 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 @@ -1229,6 +1229,21 @@ + + + + + + + + + + + + + + + @@ -1432,7 +1447,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票。由于车辆自身问题等甲方原因导致车辆不能登记上牌的，由甲方负责解决；由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的问题等非甲方原因导致不能办理车辆登记上牌手续的，由乙方自行解决。 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 713217839d..b152d549e4 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 @@ -1229,6 +1229,21 @@ + + + + + + + + + + + + + + + @@ -1432,7 +1447,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票。由于车辆自身问题等甲方原因导致车辆不能登记上牌的，由甲方负责解决；由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的问题等非甲方原因导致不能办理车辆登记上牌手续的，由乙方自行解决。