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

src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java

@@ -328,6 +328,21 @@ public class IoOrderMutiController {
     @PostMapping("/udiwms/inout/order/muti/addMutiDetail")
     public BaseResponse addMutiDetail(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) {
 
+
+        if (ioOrderMutiUseEntity.getCheckType() !=null && ioOrderMutiUseEntity.getCheckType() == 1) {
+            IoOrderMutiRequest ioOrderMutiRequest=new IoOrderMutiRequest();
+            ioOrderMutiRequest.setStatus(0);
+            ioOrderMutiRequest.setUdiCode(ioOrderMutiUseEntity.getUdiCode());
+            ioOrderMutiRequest.setMark(ioOrderMutiUseEntity.getMark());
+            List<IoOrderMutiResponse> ioOrderMutiEntityList = ioOrderMutiService.filterList(ioOrderMutiRequest);
+            if (ioOrderMutiEntityList.size() <= 0) {
+                return ResultVOUtils.error(999, "该产品不存在此标识！");
+            }
+            if (ioOrderMutiEntityList.get(0).getReCount() <= 0) {
+                return ResultVOUtils.error(999, "该产品可使用数量不足！");
+            }
+        }
+
         //判断是不是个人使用
         AuthAdmin authAdmin = customerService.getUserBean();
         QueryWrapper<IoOrderMutiSetEntity> setEw = new QueryWrapper<>();

src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java

@@ -64,4 +64,13 @@ public class IoOrderMutiUseEntity {
 
     @TableField(exist=false)
     private String createUserName;
+
+    @TableField(exist = false)
+    private Integer checkType;
+
+    @TableField(exist = false)
+    private String mark;
+
+    @TableField(exist = false)
+    private String udiCode;
 }

src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml

@@ -33,7 +33,7 @@
                 and b1.ggxh = #{ggxh}
             </if>
             <if test=" cpmctymc!= '' and cpmctymc != null">
-                and b1.cpmctymc = #{cpmctymc}
+                AND b1.cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
             </if>
             <if test="status != null">
                 and io.status = #{status}