diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
index 41244d4e6..c4db5a6c2 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
@@ -197,6 +197,10 @@ public class BasicBusTypePreController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
+ if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){
+ return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同!");
+ }
+
if (basicBusTypePreEntity != null) {
//判断是否重复添加
boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
index e793b3db6..27e3f3c6c 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -97,6 +97,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private Date billDate;
private String invCode;
private String remark;
+ private String key;
}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 652f0bce9..bba16a3e9 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -320,6 +320,12 @@
AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%')
+
+
+ GROUP BY basic_udirel.id
+
+
+