#

zjj

2024-09-18 4e237c87a21438b1fc115d344dfb0362747d14bb

 src/main/java/com/zy/asrs/controller/NodeController.java

@@ -151,10 +151,10 @@
    @RequestMapping(value = "/node/update/auth")
    @ManagerAuth
    public R update(Node node){
        Node node1 = nodeService.selectByUuid(node.getName());
        if (!Cools.isEmpty(node1)) {
            throw new CoolException("该编号/名称已存在");
        }
//        Node node1 = nodeService.selectByUuid(node.getName());
//        if (!Cools.isEmpty(node1)) {
//            throw new CoolException("该编号/名称已存在");
//        }
        if (Cools.isEmpty(node) || null==node.getId()){
            return R.error();
        }
@@ -348,7 +348,7 @@
        EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
        nodeEntityWrapper.eq("id",param.getValue());
        nodeEntityWrapper.eq("name",param.getName());
        nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
//        nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
        Node node = nodeService.selectOne(nodeEntityWrapper);
        String[] string = node.getNamePath().split(",");
        int tno=1; int no=1;
@@ -385,7 +385,7 @@
                        }

                    }else {
                        locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
                        locNo = param.getName()+String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
                    }

                    //客户要求格式位A-01-01-01
@@ -416,10 +416,15 @@
                    node1.setRow1(r);
                    node1.setBay1(b);
                    node1.setLev1(l);
                    if (!nodeService.insert(node1)){
                        return R.error("数据插入失败");
                    try {
                        if (!nodeService.insert(node1)){
                            return R.error("数据插入失败");
                        }
                    }catch (Exception e){
                      throw new CoolException("库位号重复");
                    }


                }
            }
            if (param.getName().equals("DT-B")){