From b267af1b816f646fa02c6f4983ebb3f9825cc192 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 13 四月 2024 15:00:44 +0800 Subject: [PATCH] 单据管理:1.销售账号,在系统里面单据管理这里A销售员做的单子,在它的账号只显示自己的客户信息,不同的账号,看不到别人的信息,管理员是可以全部看的 2.增加客户名称,操作员搜索 --- src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java index 5622335..babb339 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java @@ -28,8 +28,8 @@ } @Override - public List<Integer> getAvailableOutSite() { - return this.baseMapper.getAvailableOutSite(101); + public List<Integer> getAvailableOutSite(Integer typeNo) { + return this.baseMapper.getAvailableOutSite(typeNo); } @Override @@ -43,21 +43,24 @@ } @Override - public BasDevp checkSiteStatus(Integer devpNo, boolean put) { + public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) { BasDevp station = selectById(devpNo); if (station == null){ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�"); } - if (put) { + if (pakin) { if(station.getAutoing()==null || !station.getAutoing().equals("Y")) { throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��"); } if(station.getLoading()==null || !station.getLoading().equals("Y")) { throw new CoolException(devpNo+"绔欑偣鏃犵墿"); } - if(station.getWrkNo()!=null && station.getWrkNo()>0) { + if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) { throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�"); } +// if(!station.getInEnable().equals("Y")) { +// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��"); +// } if(wrkMastService.getWorkingMast(devpNo)>0){ throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�"); } -- Gitblit v1.9.1