Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-18 9a6a85eecf1dd8489de45eb3ab804d3e33605be2

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -666,6 +666,10 @@
                if (!testMastService.update(testMast,wrapper)){
                    throw new CoolException("更改测试状态失败");
                }
                locMast.setPackStatus(3);
                if (!locMastService.update(locMast, wrapper)){
                    throw new CoolException("更改产品状态失败");
                }
            }else if (Cools.isEmpty(testMast.getStatus())){
                throw new CoolException("状态异常");
            }else {
@@ -674,16 +678,7 @@
        } else {
            throw new CoolException("状态异常");
        }
        LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("row1",2)
                .eq("loc_sts","O")
                .eq("fire_status", 0)
                .eq("pack_status",0));
        if (targetLocNo != null){
            workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
        }else {
            throw new CoolException("没有空库位");
        }

        return success;
    }