单据类型，仓库编辑修改

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -236,14 +236,18 @@ public class InvWarehouseController extends BaseController {
         if (invWarehouseEntity.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        InvWarehouseEntity originEntity = invWarehouseService.findByInvSubByCode(invWarehouseEntity.getCode());
 
-        Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
+        if (!originEntity.getParentId().equals(invWarehouseEntity.getParentId()) || !originEntity.getParentCode().equals(invWarehouseEntity.getParentCode())) {
-        if (userCount > 0) {
+            Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
-            return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！");
+            if (userCount > 0) {
+                return ResultVOUtils.error(500, "修改部门或上级仓库时,请先移除该仓库关联用户！");
+            }
         }
 
+
         // 先判断是否有相同名字的仓库
-        boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
+        boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity);
         if (checkResult) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
         }

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -66,7 +66,7 @@ public class BasicBusTypeChangeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity);
+        boolean result = basicBusTypeChangeService.insertVerifyExists(basicBusTypeChangeEntity);
         if (result) {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
         }

src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.basic;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.Log;
@@ -208,6 +209,7 @@ public class BasicBusTypePreController {
                 InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getInvCode());
                 basicBusTypePreEntity.setDeptCode(invWarehouse.getParentId());
             }
+            basicBusTypePreEntity.setId(IdUtil.getSnowflakeNextId());
             basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity);
         } else {
             ResultVOUtils.error(999, "参数错误");

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

@@ -57,6 +57,9 @@ public class ioCodeRelController {
 
         if (StrUtil.isNotEmpty(code)) {
             UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(code);
+            if(udiEntity == null){
+                return ResultVOUtils.error(500,"UDI码格式错误！");
+            }
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi());
             if (udiProductEntity.getPackLevel() != null) {
                 if (Integer.valueOf(udiProductEntity.getPackLevel()) > 1) {

src/main/java/com/glxp/api/service/auth/InvWarehouseService.java

@@ -16,12 +16,11 @@ public interface InvWarehouseService {
 
     InvWarehouseEntity selectByThrCode(String code, String thirdSys);
 
-    InvWarehouseEntity getByWareId( String id);
+    InvWarehouseEntity getByWareId(String id);
 
     List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
 
 
-
     List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
     List<InvWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
@@ -42,6 +41,8 @@ public interface InvWarehouseService {
 
     public boolean checkDuplicateName(String parentId, String name);
 
+    boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity);
+
     /**
      * 根据分库编码，查询分库名称
      *
@@ -88,7 +89,8 @@ public interface InvWarehouseService {
      * @return
      */
     List<InvWarehouseEntity> findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
-    String selectParentIdByCode( String invCode);
+
+    String selectParentIdByCode(String invCode);
 
     List<InvWarehouseEntity> selectInvById(List<String> InvList);
 

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.auth.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.thrsys.ThrSystemDao;
@@ -142,6 +143,12 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         return false;
     }
 
+    @Override
+    public boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity) {
+        return invWarehouseDao.exists(new QueryWrapper<InvWarehouseEntity>().eq("parentId", invWarehouseEntity.getParentId())
+                .eq("name", invWarehouseEntity.getName()).ne("id", invWarehouseEntity.getId()));
+    }
+
     @Override
     public String getSubInvName(String subInvCode) {
         if (StrUtil.isBlank(subInvCode)) {

src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.WarehouseBussinessTypeDao;
@@ -64,6 +65,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
                 entity.setCode(code);
                 entity.setAction(bussinessTypeEntity.getAction());
                 entity.setName(bussinessTypeEntity.getName());
+                entity.setId(IdUtil.getSnowflakeNextId());
                 warehouseBussinessTypeEntities.add(entity);
             });
 

src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java

@@ -53,4 +53,7 @@ public interface IBasicBusTypeChangeService extends IService<BasicBusTypeChangeE
      * @return
      */
     boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+    boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java

@@ -66,23 +66,21 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChang
 
     @Override
     public boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
+        QueryWrapper<BasicBusTypeChangeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction())
+                .eq("targetAction", basicBusTypeChangeEntity.getTargetAction())
+                .eq("originName", basicBusTypeChangeEntity.getOriginName()).ne("id", basicBusTypeChangeEntity.getId());
+        return basicBusTypeChangeDao.exists(wrapper);
+    }
+
+
+    @Override
+    public boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
         QueryWrapper<BasicBusTypeChangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction())
                 .eq("targetAction", basicBusTypeChangeEntity.getTargetAction())
                 .eq("originName", basicBusTypeChangeEntity.getOriginName());
-        List<BasicBusTypeChangeEntity> list = basicBusTypeChangeDao.selectList(wrapper);
+        return basicBusTypeChangeDao.exists(wrapper);
-        if (CollUtil.isNotEmpty(list)) {
-            if (null != basicBusTypeChangeEntity.getId()) {
-                for (BasicBusTypeChangeEntity busTypeChangeEntity : list) {
-                    if (busTypeChangeEntity.getId() != basicBusTypeChangeEntity.getId()) {
-                        return true;
-                    }
-                }
-            } else {
-                return true;
-            }
-        }
-        return false;
     }
 
     private void setUpdateInfo(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {