diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a8379f9..51fb196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,28 @@ - - - + + + + + + + + + + + + + + + + + + + + + @@ -162,66 +184,66 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -230,10 +252,10 @@ - + - + diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination new file mode 100644 index 0000000..861af8c --- /dev/null +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -0,0 +1,11 @@ +#for tests only ! +#Thu Aug 15 08:36:29 CST 2024 +jco.client.lang=ZH +jco.client.passwd=eS(El@-%R^,S+Ln%+BaDj^~il|H,NH,oC-b~T^.mO%Dy#Eek +jco.client.sysnr=00 +jco.destination.pool_capacity=10 +jco.client.client=800 +jco.destination.peak_limit=10 +jco.client.user=RFC +jco.client.saprouter= +jco.client.ashost=172.19.0.125 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java index 9b24f2d..5eade5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java @@ -501,8 +501,8 @@ public class BidController extends BaseController bidJsqr.setBidJsxzGroupValues(bidJsxzGroup); bidJsqr.setBidJsxzTechnicalRequirement(bid.getBidJsxzTechnicalRequirement()); bidJsqr.setBidJsxzApprovalStatus("1");//投标单-技术确认单 状态设置为 协助中 - bidJsqr.setBidJsqrCheckState("2".equals(bid.getBidJsxzApprovalStatus())?"0":"1"); - bidJsqr.setBidJsqrCheckInfo(bid.getBidJsqrCheckInfo()); + bidJsqr.setBidJsqrCheckState("1");//投标单-技术确认单 业务员技术确认状态设置为 未确认 + bidJsqr.setBidJsqrCheckInfo("");//投标单-技术确认单 业务员技术确认信息设置为 空 //特缆、低压、中压、其他 协助状态设置 if(bidJsxzGroup.indexOf("TL")!=-1){ @@ -578,7 +578,7 @@ public class BidController extends BaseController bidHj.setBidId(bid.getBidId()); bidHj.setBidJsxzConfirmId(bid.getBidJsxzConfirmId()); bidHj.setBidHjApprovalStatus("1");//投标-核价单 状态设置为 协助中 - bidHj.setBidJsqrCheckState("2".equals(bid.getBidJsxzApprovalStatus())?"0":"1"); + bidHj.setBidJsqrCheckState(bid.getBidJsqrCheckState()); bidHj.setBidJsqrCheckInfo(bid.getBidJsqrCheckInfo()); bidHj.setCreateBy(String.valueOf(getUserId())); 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 771e510..6f04012 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 @@ -12,36 +12,34 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.customer.domain.Customer; import com.ruoyi.quot.domain.Quot; -import com.ruoyi.quot.domain.QuotFile; import com.ruoyi.quot.domain.QuotMaterial; import com.ruoyi.quot.service.IQuotFileService; import com.ruoyi.quot.service.IQuotService; import com.ruoyi.redBook.domain.*; import com.ruoyi.redBook.service.IRedBookService; import com.ruoyi.redBook.service.impl.AsyncRbTaskService; -import com.ruoyi.web.utils.IdUtils; import com.ruoyi.web.utils.ListSplitUtil; import com.ruoyi.web.utils.rbExcel.excelUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.commons.CommonsMultipartFile; -import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -221,14 +219,15 @@ public class RedBookController extends BaseController public List handleSearchData(Product product) { List list = new ArrayList<>(); - String name_0 = product.getName_0();//型号 - String model = product.getModel();//规格 - if(!StringUtils.isBlank(name_0) || !StringUtils.isBlank(model) ){ - if(!StringUtils.isBlank(name_0)){ - name_0 = name_0.replace(" ",""); - name_0 = name_0.toUpperCase(); + String model = product.getModel();//规格规格 + List sqlParam = new ArrayList(); + + if(!StringUtils.isBlank(model)){ + String[] split = model.split("\\s"); + for(String each : split){ + sqlParam.add(each.toUpperCase()); } - list = redBookService.handleSearchData(name_0,model); + list = redBookService.handleSearchData(sqlParam); } return list; } diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class index 40e344a..53c8f48 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index ecf2f35..b7cc4b2 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:35 CST 2024 +#Thu Aug 15 09:34:48 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index 9a02b83..a14c0fb 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index 1175651..19f0d1c 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index 894fccd..9b0c478 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:21 CST 2024 +#Thu Aug 15 09:33:56 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index df061ed..80c7d18 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index ecce124..f07c4d8 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:28 CST 2024 +#Thu Aug 15 09:34:03 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index c80f131..b394ed6 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index 85cdeac..c7465d6 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:31 CST 2024 +#Thu Aug 15 09:34:05 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index d495475..4f673b3 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index a7c90a9..ecd13b9 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:30 CST 2024 +#Thu Aug 15 09:34:04 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index 26903dc..f74d1ef 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ 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 f9a4465..a9628fb 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 @@ -1,9 +1,6 @@ package com.ruoyi.redBook.mapper; import com.ruoyi.customer.domain.Customer; -import com.ruoyi.material.domain.CMaterial; -import com.ruoyi.material.domain.CMaterialCost; -import com.ruoyi.material.domain.temp; import com.ruoyi.redBook.domain.OAQuot; import com.ruoyi.redBook.domain.OAQuotProduct; import com.ruoyi.redBook.domain.Product; @@ -71,11 +68,10 @@ public interface OARedBookMapper /** * 点击查询按钮查询数据 - * @param name_0 - * @param model + * @param sqlParam * @return */ - List handleSearchData(@Param("name_0")String name_0,@Param("model")String model); + List handleSearchData(List sqlParam); /** * 保存报价单 diff --git a/ruoyi-system/src/main/java/com/ruoyi/redBook/service/IRedBookService.java b/ruoyi-system/src/main/java/com/ruoyi/redBook/service/IRedBookService.java index 7717479..7f40abc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/redBook/service/IRedBookService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/redBook/service/IRedBookService.java @@ -1,9 +1,6 @@ package com.ruoyi.redBook.service; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.customer.domain.Customer; -import com.ruoyi.quote.domain.CalculateRBParamDto; import com.ruoyi.redBook.domain.*; import java.util.List; @@ -67,11 +64,10 @@ public interface IRedBookService /** * 点击查询按钮查询数据 - * @param name_0 - * @param model + * @param sqlParam * @return */ - List handleSearchData(String name_0,String model); + List handleSearchData(List sqlParam); /** * 保存报价单 @@ -104,7 +100,7 @@ public interface IRedBookService * @param uid_0 * @return */ - String getFixDatePrice(String name_0,String spec,String voltage,String uid_0); + String getFixDatePrice(String name_0, String spec, String voltage, 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 47397b6..3fb11ba 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 @@ -6,9 +6,7 @@ import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.UUID; -import com.ruoyi.customer.domain.Bank; import com.ruoyi.customer.domain.Customer; -import com.ruoyi.material.domain.CMaterialCost; import com.ruoyi.redBook.domain.*; import com.ruoyi.redBook.mapper.OARedBookMapper; import com.ruoyi.redBook.service.IRedBookService; @@ -103,13 +101,12 @@ public class RedBookServiceImpl implements IRedBookService /** * 点击查询按钮查询数据 - * @param name_0 - * @param model + * @param sqlParam * @return */ @Override - public List handleSearchData(String name_0,String model) { - return oaRedBookMapper.handleSearchData(name_0,model); + public List handleSearchData(List sqlParam) { + return oaRedBookMapper.handleSearchData(sqlParam); } /** @@ -193,7 +190,7 @@ public class RedBookServiceImpl implements IRedBookService * @return */ @Override - public String getFixDatePrice(String name_0,String spec,String voltage, String uid_0) { + public String getFixDatePrice(String name_0, String spec, String voltage, String uid_0) { return oaRedBookMapper.getFixDatePrice(name_0,uid_0); } diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 543b795..53d7535 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -131,7 +131,7 @@ q.bid_jsqr_dy_approval_status,q.bid_jsqr_dy_remark, q.bid_jsqr_zy_approval_status,q.bid_jsqr_zy_remark, q.bid_jsqr_qt_approval_status,q.bid_jsqr_qt_remark, - a.bid_jsqr_check_state,a.bid_jsqr_check_info, + isnull(a.bid_jsqr_check_state,1) bid_jsqr_check_state,a.bid_jsqr_check_info, a.bid_vice_president_approved,a.bid_oa_remark,a.bid_oa_isTp, diff --git a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml index 376239b..6f7bbba 100644 --- a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml @@ -73,13 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" convert(decimal,convert(float,A.红本价格)) price,convert(varchar(10),B.date_0,23) pricedate from [rb_product_price] A left join rb_productVersion B on A.version_uid_0=B.uid_0 - where B.sta_0=1 - - and A.型号 like '%${name_0}%' - - - and A.规格 = #{model} - + where B.sta_0=1 and + + A.namevoltage like '%${item}%' + order by len(A.namevoltage) diff --git a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml index 543b795..53d7535 100644 --- a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml +++ b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml @@ -131,7 +131,7 @@ q.bid_jsqr_dy_approval_status,q.bid_jsqr_dy_remark, q.bid_jsqr_zy_approval_status,q.bid_jsqr_zy_remark, q.bid_jsqr_qt_approval_status,q.bid_jsqr_qt_remark, - a.bid_jsqr_check_state,a.bid_jsqr_check_info, + isnull(a.bid_jsqr_check_state,1) bid_jsqr_check_state,a.bid_jsqr_check_info, a.bid_vice_president_approved,a.bid_oa_remark,a.bid_oa_isTp, diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index b8d41f1..d791922 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 16:08:24 CST 2024 +#Thu Aug 15 09:33:59 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 4ce5720..fbde5e5 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 12ae7f6..d699d69 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -231,7 +231,7 @@ - + - + - + - + - + - + - + - + - - + + @@ -23,7 +23,7 @@ //变更记录数据 records: [], mergeObj: {}, // 用来记录需要合并行的下标 - mergeArr: ['changeTime','title', 'createName'] // 表格中的列名 + mergeArr: ['title','changeTime','createName'] // 表格中的列名 } }, watch: { diff --git a/ruoyi-ui/src/views/expenses/expenses/index.vue b/ruoyi-ui/src/views/expenses/expenses/index.vue index 7c5d91a..caf255e 100644 --- a/ruoyi-ui/src/views/expenses/expenses/index.vue +++ b/ruoyi-ui/src/views/expenses/expenses/index.vue @@ -298,7 +298,7 @@ - + - + - + - + - + - + - - - 搜索 + + 搜索 生成报价单 @@ -71,7 +70,7 @@ - + @@ -385,7 +384,6 @@ this.tableHeight = (window.innerHeight - 340) + 'px'; }, methods: { - /** 查看报价单转报价操作 */ handleQuotInfo(row) { const quotId = row.quotId; diff --git a/ruoyi-ui/src/views/zgys/zgys/index.vue b/ruoyi-ui/src/views/zgys/zgys/index.vue index 7f3593a..ea400c1 100644 --- a/ruoyi-ui/src/views/zgys/zgys/index.vue +++ b/ruoyi-ui/src/views/zgys/zgys/index.vue @@ -281,7 +281,7 @@ - + - +