From bbdf70526760e6c4378486b89764493b52e9afd2 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期二, 05 十一月 2024 13:40:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 3 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 1 -
src/main/java/com/zy/common/utils/TreeUtils.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 8 ++++----
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8417294..f1d4ee9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -94,7 +94,6 @@
@PostMapping("/locDetl/select/time/v1")
- @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅")
public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) TimeSelectParam param,
HttpServletRequest request) {
diff --git a/src/main/java/com/zy/common/utils/TreeUtils.java b/src/main/java/com/zy/common/utils/TreeUtils.java
index e18416c..3916b1a 100644
--- a/src/main/java/com/zy/common/utils/TreeUtils.java
+++ b/src/main/java/com/zy/common/utils/TreeUtils.java
@@ -59,7 +59,7 @@
Map<String, Object> map = new HashMap<>();
map.put("title", tag.getName());
map.put("id", tag.getId());
- map.put("spread", true);
+ map.put("spread", false);
List<Map> childrens = new ArrayList<>();
map.put("children", childrens);
dealTag(tag, childrens);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7b980c4..2690163 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -55,14 +55,14 @@
private StaDescService staDescService;
-
+ @Transactional
public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
log.info("鏀跺埌WCS鎷ｆ枡鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("鏈壘鍒颁换鍔�");
}
- StartupDto dto = null;
+ StartupDto dto = new StartupDto();
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
@@ -95,7 +95,7 @@
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
- if (wrkMastService.updateById(wrkMast)) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
// 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
@@ -279,7 +279,7 @@
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .eq("io_type", 103)
+ .in("io_type", 103,53)
.eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index a823f5a..98825f2 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -117,6 +117,9 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
+ if (user.getRoleId()!=null) {
+ entity.setRoleId(user.getRoleId());
+ }
userService.updateById(entity);
return R.ok();
}
--
Gitblit v1.9.1