From 6b9842c0cfa3ed478fb012a86efe6c6bb61c1dce Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Wed, 3 Jul 2024 13:26:21 +0800 Subject: [PATCH] '123' --- .../web/controller/redBook/RedBookController.java | 12 +++++++++++- .../com/ruoyi/redBook/mapper/OARedBookMapper.java | 2 +- .../redBook/service/impl/RedBookServiceImpl.java | 4 ++-- .../src/main/resources/mapper/quot/QuotMapper.xml | 1 + .../resources/mapper/redBook/OARedBookMapper.xml | 6 +++--- ruoyi-ui/src/views/quot/quot/index.vue | 8 ++++++++ ruoyi-ui/src/views/redBook/productSelect.vue | 12 +----------- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java index c8652a9..9c2a120 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java @@ -642,7 +642,17 @@ public class RedBookController extends BaseController @GetMapping(value = "/{quotId}") public AjaxResult getInfo(@PathVariable("quotId") String quotId) { - return success(redBookService.selectQuotByQuotId(quotId)); + OAQuot aAQuot = redBookService.selectQuotByQuotId(quotId); + String rbDateUid = aAQuot.getRbDateUid(); + + List aAQuotProduct= aAQuot.getSelectedResultData(); + for(OAQuotProduct p:aAQuotProduct){ + if(StringUtils.isEmpty(p.getUid_0())){ + p.setUid_0(rbDateUid); + } + } + + return success(aAQuot); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java b/ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java index bfc8fc7..f9a4465 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java @@ -114,7 +114,7 @@ public interface OARedBookMapper * @param uid_0 * @return */ - String getFixDatePrice(@Param("name_0") String name_0,@Param("spec") String spec,@Param("voltage") String voltage, @Param("uid_0") String uid_0); + String getFixDatePrice(@Param("name_0") String name_0, @Param("uid_0") String uid_0); /** * 导入明细批量获取红本价格-型号、规格、电压、数量 diff --git a/ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java index 033d71e..47397b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java @@ -194,7 +194,7 @@ public class RedBookServiceImpl implements IRedBookService */ @Override public String getFixDatePrice(String name_0,String spec,String voltage, String uid_0) { - return oaRedBookMapper.getFixDatePrice(name_0,spec,voltage,uid_0); + return oaRedBookMapper.getFixDatePrice(name_0,uid_0); } /** @@ -206,7 +206,7 @@ public class RedBookServiceImpl implements IRedBookService @DataSource(DataSourceType.OAREDBOOK) public List setRedBookPrice(List list) { for(OAQuotProduct oAQuotProduct : list){ - String price = oaRedBookMapper.getFixDatePrice(oAQuotProduct.getName_0(),oAQuotProduct.getSpec(),oAQuotProduct.getVoltage(),oAQuotProduct.getUid_0()); + String price = oaRedBookMapper.getFixDatePrice(oAQuotProduct.getName_0(),oAQuotProduct.getUid_0()); oAQuotProduct.setPrice(price); if(StringUtils.isEmpty(price)){ oAQuotProduct.setName_1(""); diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 4d13c50..a991f8c 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -142,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quot_code like concat('%', #{quotCode}, '%') and quot_customer_name like concat('%', #{quotCustomerName}, '%') and quot_project like concat('%', #{quotProject}, '%') + and quot_quotation_require like concat('%', #{quotQuotationRequire}, '%') and quot_salesman_name like concat('%', #{quotSalesmanName}, '%') and quot_print = #{quotPrint} and quot_approval_status = #{quotApprovalStatus} diff --git a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml index 513b1a5..fd054b6 100644 --- a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml @@ -168,8 +168,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -260,7 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.uid_0,b.quot_product_id, b.name_0, b.name_1, b.spec, b.voltage, b.stu, - isnull(b.per,1) per,isnull(b.per2,1) per2,b.price,b.setPrice,b.count,b.allPrice,b.quot_id + b.per,b.per2,b.price,b.setPrice,b.count,b.allPrice,b.quot_id from OAQuot a left join OAQuotProduct b on b.quot_id = a.quot_id where a.quot_id = #{quotId} order by b.number diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 7b00638..5bf1ca2 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -25,6 +25,14 @@ @keyup.enter.native="handleQuery" /> + + +