canrd-outside / order-erp · Commits

Commit 22a2341b2689151ef2502c83f7b7d5b4167e58c6

Authored by qdlgxiemaosheng
1 parent 1379396c
build: skipped

feat:校验是否重复

Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
  View file @22a2341
@@ -68,7 +68,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable { @@ -68,7 +68,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
68 /** 68 /**
69 * 客户STYLE# 69 * 客户STYLE#
70 */ 70 */
71 - private String customerStyle; 71 + private List<String> customerStyle;
72 72
73 /** 73 /**
74 * 内部编号 74 * 内部编号
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @22a2341
@@ -142,8 +142,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -142,8 +142,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
142 @Override 142 @Override
143 public ServerResult check(OrderBaseInfoQueryVO orderBaseInfoQueryVO) { 143 public ServerResult check(OrderBaseInfoQueryVO orderBaseInfoQueryVO) {
144 List<OrderBaseInfoDO> orderBaseInfoDOS = list(new LambdaQueryWrapper<OrderBaseInfoDO>() 144 List<OrderBaseInfoDO> orderBaseInfoDOS = list(new LambdaQueryWrapper<OrderBaseInfoDO>()
145 - .eq(OrderBaseInfoDO::getInnerNo,orderBaseInfoQueryVO.getInnerNo())  
146 - .eq(OrderBaseInfoDO::getCustomerStyle,orderBaseInfoQueryVO.getCustomerStyle())); 145 + .in(CollectionUtils.isNotEmpty(orderBaseInfoQueryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, orderBaseInfoQueryVO.getInnerNo())
  146 + .in(CollectionUtils.isNotEmpty(orderBaseInfoQueryVO.getCustomerStyle()), OrderBaseInfoDO::getCustomerStyle, orderBaseInfoQueryVO.getCustomerStyle()));
147 if (CollectionUtils.isNotEmpty(orderBaseInfoDOS)) { 147 if (CollectionUtils.isNotEmpty(orderBaseInfoDOS)) {
148 throw new BusinessException("款式重复，是否继续"); 148 throw new BusinessException("款式重复，是否继续");
149 } 149 }
@@ -932,7 +932,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -932,7 +932,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
932 } 932 }
933 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) { 933 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
934 return false; 934 return false;
935 - } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) { 935 + } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
936 return false; 936 return false;
937 } 937 }
938 return true; 938 return true;
src/main/resources/application-local.yml
  View file @22a2341
@@ -57,7 +57,7 @@ spring: @@ -57,7 +57,7 @@ spring:
57 testWhileIdle: true 57 testWhileIdle: true
58 testOnBorrow: true 58 testOnBorrow: true
59 testOnReturn: true 59 testOnReturn: true
60 - password: 123456 60 + password: canrd@2024
61 time-between-eviction-runs-millis: 1000 61 time-between-eviction-runs-millis: 1000
62 url: jdbc:mysql://39.108.227.113:3307/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true 62 url: jdbc:mysql://39.108.227.113:3307/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
63 username: root 63 username: root