Merge remote-tracking branch 'origin/dev' into dev

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);

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;
 
 
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -320,6 +320,12 @@
                 AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%')
             </if>
         </where>
+        <choose>
+            <when test="key !=null and key != '' ">
+                GROUP BY basic_udirel.id
+            </when>
+        </choose>
+
     </select>
 
     <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"