From a98a2e141895ae9c225ca2db836ae98ddc3f75b9 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 21 十二月 2024 17:04:32 +0800 Subject: [PATCH] #平库盘点 --- src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 4 +++- src/main/java/com/zy/common/web/BaseController.java | 3 --- src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2 +- src/main/java/com/zy/asrs/service/ManLocDetlService.java | 2 +- src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 10 +++++----- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java index 17fac75..6663229 100644 --- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java @@ -10,6 +10,7 @@ import com.zy.asrs.entity.param.LocDetlAdjustParam; import com.zy.asrs.service.ManLocDetlService; import com.zy.common.web.BaseController; +import com.zy.system.entity.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -76,7 +77,8 @@ @RequestMapping("/manLocDetl/adjust/start") @ManagerAuth(memo = "搴撳瓨璋冩暣") public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) { - manLocDetlService.adjustLocDetl(param, getUserId(),getUser()); + User user = getUser(); + manLocDetlService.adjustLocDetl(param, getUserId(), user == null ? "" : user.getUsername()); return R.ok("搴撳瓨璋冩暣鎴愬姛"); } diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java index 83f6cea..5bb06d8 100644 --- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java +++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java @@ -60,7 +60,7 @@ Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage); - void adjustLocDetl(LocDetlAdjustParam param, Long userId ,User user); + void adjustLocDetl(LocDetlAdjustParam param, Long userId, String username); Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param); diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java index 7f731bf..642b736 100644 --- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java @@ -152,7 +152,7 @@ @Transactional @Override - public void adjustLocDetl(LocDetlAdjustParam param, Long userId, User user) { + public void adjustLocDetl(LocDetlAdjustParam param, Long userId, String username) { Date now = new Date(); List<ManLocDetl> manLocDetls = this.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocNo())); for (ManLocDetl manLocDetl : manLocDetls){ @@ -174,14 +174,14 @@ manLocDetl.setAnfme(locDetlAdjust.getCount()); manLocDetl.setModiTime(now); this.update(manLocDetl,wrapper); - SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername()); + SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme(), username); } existFlag = true; } } if(!existFlag){ this.delete(wrapper); - SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),0.0,user.getUsername()); + SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), 0.0, username); } } @@ -205,14 +205,14 @@ manLocDetl.setAnfme(locDetlAdjust.getCount()); manLocDetl.setModiTime(now); this.update(manLocDetl,wrapper); - SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername()); + SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme(), username); } existFlag = true; } } if(!existFlag){ ManLocDetl manLocDetl = addManlocDetl(locDetlAdjust, param.getLocNo()); - SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),0.0,user.getUsername()); + SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), 0.0, username); } } diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java index e7bcbd5..3651942 100644 --- a/src/main/java/com/zy/common/web/BaseController.java +++ b/src/main/java/com/zy/common/web/BaseController.java @@ -51,9 +51,6 @@ protected User getUser(){ User user = userService.selectById(getUserId()); - if (null == user) { - throw new CoolException(BaseRes.DENIED); - } return user; } diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js index 3ebc57b..fac3893 100644 --- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js +++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js @@ -2,7 +2,7 @@ function getCol() { var cols = [ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'} - ,{field: 'containerCode', align: 'center',title: '鏂欐兂鐮�', sort:true} + ,{field: 'containerCode', align: 'center',title: '鏂欑鐮�', sort:true} ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true} ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true} ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} -- Gitblit v1.9.1