From 359e00003fdcf6676189ac716294715c23148b38 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Thu, 13 Jun 2024 17:06:27 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 4 +- .../customer/CustomerController.java | 12 +- .../web/controller/quot/QuotController.java | 16 +- .../ruoyi/web/utils/rbExcel/excelUtil.java | 54 +++--- .../ruoyi/customer/mapper/CustomerMapper.java | 7 + .../customer/service/ICustomerService.java | 7 + .../service/impl/CustomerServiceImpl.java | 10 + .../mapper/customer/CustomerMapper.xml | 4 + .../priceVerification/hjInfo.vue | 45 ++++- ruoyi-ui/src/views/quot/quot/index.vue | 172 +++++++++++++----- ruoyi-ui/src/views/redBook/productSelect.vue | 6 + .../technicalConfirm/jsxzInfo.vue | 11 +- 12 files changed, 264 insertions(+), 84 deletions(-) diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 8c6afb3..308af89 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Wed Jun 12 17:04:18 CST 2024 +#Thu Jun 13 17:04:23 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.120 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=gR+@VS{@vcSt}PE/DW_]@6@mm8UiFKt|ELFuvqDg@R+lSEZZ +jco.client.passwd=654321 jco.client.client=300 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java index f371e4f..f4ab2a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java @@ -163,7 +163,9 @@ public class CustomerController extends BaseController public AjaxResult add(@RequestBody Customer customer) { customer.setCusId(UUID.fastUUID().toString()); - customer.setCusCode(IdUtils.createNo("KH_",0)); + //customer.setCusCode(IdUtils.createNo("KH_",0)); + String cusCode = customerService.getCode("KH"); + customer.setCusCode(cusCode); customer.setCreateBy(getUsername()); return toAjax(customerService.insertCustomer(customer)); } @@ -199,7 +201,9 @@ public class CustomerController extends BaseController if(StringUtils.isEmpty(cus_id)){ customer.setCusId(UUID.fastUUID().toString()); - customer.setCusCode(IdUtils.createNo("KH_",0)); + //customer.setCusCode(IdUtils.createNo("KH_",0)); + String cusCode = customerService.getCode("KH"); + customer.setCusCode(cusCode); customer.setCreateBy(getUsername()); customerService.insertCustomer(customer); sendNotice(customer);//发送消息至数据组 @@ -247,7 +251,9 @@ public class CustomerController extends BaseController customer.setUpdateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 }else{// 数据组创建的客户数据提交SAP - customer.setCusCode(IdUtils.createNo("KH_",0)); + //customer.setCusCode(IdUtils.createNo("KH_",0)); + String cusCode = customerService.getCode("KH"); + customer.setCusCode(cusCode); customer.setCreateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index a31d231..e705ad9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -99,6 +99,18 @@ public class QuotController extends BaseController util.exportExcel(response, list, "报价数据"); } + /** + * 导出报价明细列表 + */ + @PostMapping("/exportMaterial") + public void exportMaterial(HttpServletResponse response, Quot quot) + { + Quot q = quotService.selectQuotByQuotId(quot.getQuotId()); + List list = q.getQuotMaterialList(); + ExcelUtil util = new ExcelUtil(QuotMaterial.class); + util.exportExcel(response, list, "报价明细数据"); + } + /** * 报价单打印状态修改 */ @@ -184,7 +196,7 @@ public class QuotController extends BaseController String quotCode = quotService.getCode("BJD"); quot.setQuotCode(quotCode); quot.setCreateBy(getUsername()); - quot.setQuotSalesmanCode(getUsername()); + //quot.setQuotSalesmanCode(getUsername()); quot.setUpdateBy(getUsername()); quotService.insertQuot(quot); return success(quot); @@ -343,7 +355,7 @@ public class QuotController extends BaseController String quotCode = quotService.getCode("BJD"); quot.setQuotCode(quotCode); quot.setCreateBy(getUsername()); - quot.setQuotSalesmanCode(getUsername()); + //quot.setQuotSalesmanCode(getUsername()); quotService.insertQuot(quot); sendNoticeToBjz(quot); return success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java index 26d6dc9..9d22618 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java @@ -265,29 +265,30 @@ public class excelUtil { wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); wff_merge = new WritableCellFormat(wf_merge); wff_merge.setAlignment(Alignment.LEFT); - wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); label = new Label(1, i, "3、分支电缆为多芯分支价格，不包其它附件，不含安装费，数量以供方实际测量为准；",wff_merge); wsheet.addCell(label); - /*i++; - wsheet.setRowView(i,390); - wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); - wff_merge = new WritableCellFormat(wf_merge); - wff_merge.setAlignment(jxl.format.Alignment.LEFT); - wff_merge.setBorder(jxl.format.Border.BOTTOM,jxl.format.BorderLineStyle.THIN); - wff_merge.setBorder(jxl.format.Border.RIGHT,jxl.format.BorderLineStyle.THIN); - wsheet.mergeCells(1,i,7,i); -// label = new Label(1, i, "4、产品交货总数和单根交货长度允许有±1%公差，如有不符对方要求，需重制作报价单。",wff_merge); - wsheet.addCell(label);*/ - wsheet.mergeCells(0,i-3,0,i); + i++; + wsheet.setRowView(i,390); + wsheet.mergeCells(1,i,7,i); + + wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); + wff_merge = new WritableCellFormat(wf_merge); + wff_merge.setAlignment(Alignment.LEFT); + wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); + wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); + label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge); + wsheet.addCell(label); + + wsheet.mergeCells(0,i-4,0,i); wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); wff_merge = new WritableCellFormat(wf_merge); wff_merge.setAlignment(Alignment.CENTRE); wff_merge.setVerticalAlignment(VerticalAlignment.CENTRE); wff_merge.setBorder(Border.ALL, BorderLineStyle.THIN); - label = new Label(0, i-3, "备注",wff_merge); + label = new Label(0, i-4, "备注",wff_merge); wsheet.addCell(label); InputStream fileInputStream = new ClassPathResource("/jnlogo.png").getInputStream(); @@ -580,29 +581,30 @@ public class excelUtil { wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); wff_merge = new WritableCellFormat(wf_merge); wff_merge.setAlignment(Alignment.LEFT); - wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); label = new Label(1, i, "3、分支电缆为多芯分支价格，不包其它附件，不含安装费，数量以供方实际测量为准；",wff_merge); wsheet.addCell(label); - /*i++; - wsheet.setRowView(i,390); - wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); - wff_merge = new WritableCellFormat(wf_merge); - wff_merge.setAlignment(jxl.format.Alignment.LEFT); - wff_merge.setBorder(jxl.format.Border.BOTTOM,jxl.format.BorderLineStyle.THIN); - wff_merge.setBorder(jxl.format.Border.RIGHT,jxl.format.BorderLineStyle.THIN); - wsheet.mergeCells(1,i,7,i); -// label = new Label(1, i, "4、产品交货总数和单根交货长度允许有±1%公差，如有不符对方要求，需重制作报价单。",wff_merge); - wsheet.addCell(label);*/ - wsheet.mergeCells(0,i-3,0,i); + i++; + wsheet.setRowView(i,390); + wsheet.mergeCells(1,i,7,i); + + wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); + wff_merge = new WritableCellFormat(wf_merge); + wff_merge.setAlignment(Alignment.LEFT); + wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); + wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); + label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge); + wsheet.addCell(label); + + wsheet.mergeCells(0,i-4,0,i); wf_merge = new WritableFont(WritableFont.ARIAL,11,WritableFont.NO_BOLD,false); wff_merge = new WritableCellFormat(wf_merge); wff_merge.setAlignment(Alignment.CENTRE); wff_merge.setVerticalAlignment(VerticalAlignment.CENTRE); wff_merge.setBorder(Border.ALL, BorderLineStyle.THIN); - label = new Label(0, i-3, "备注",wff_merge); + label = new Label(0, i-4, "备注",wff_merge); wsheet.addCell(label); InputStream fileInputStream = new ClassPathResource("/jnlogo.png").getInputStream(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/mapper/CustomerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/customer/mapper/CustomerMapper.java index ee347d9..8cf544b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/customer/mapper/CustomerMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/customer/mapper/CustomerMapper.java @@ -84,4 +84,11 @@ public interface CustomerMapper * @return 结果 */ public int deleteBankByCusId(String cusId); + + /** + * 获取单据编号 + * @param type + * @return + */ + String getCode(String type); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java b/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java index 84d5842..f345d7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/customer/service/ICustomerService.java @@ -65,4 +65,11 @@ public interface ICustomerService * @return */ int changCusStatus(Customer customer); + + /** + * 获取单据编号 + * @param type + * @return + */ + String getCode(String type); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java index 9e7ef47..f65ca93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java @@ -122,6 +122,16 @@ public class CustomerServiceImpl implements ICustomerService return customerMapper.updateCustomer(customer); } + /** + * 获取单据编号 + * @param type + * @return + */ + @Override + public String getCode(String type) { + return customerMapper.getCode(type); + } + /** * 新增银行信息 * diff --git a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml index af7e430..c530ae1 100644 --- a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml @@ -257,4 +257,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.bankId}, #{item.bankName}, #{item.bankAccount}, #{item.cusId}, #{item.bankCode}, #{item.bankCountry}) + + diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue index f812fc2..b6360d5 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue @@ -126,6 +126,28 @@ + + + 技术附件 + + + + + + + + + + + + 核价附件 @@ -136,6 +158,7 @@ :action="uploadUrl" :headers="headers" :data="{ relation_id: this.form.quotHjId,file_type: 'quotHjFile' }" + :before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess" :show-file-list="false" :limit="1" @@ -147,7 +170,7 @@ - +