From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 108 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index fb407d4..d86ae85 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -11,7 +11,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.AdjDetl;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.AdjDetlService;
import com.zy.asrs.service.AgvLocDetlService;
@@ -41,16 +44,18 @@
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
convert1(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status", 0)));
}
@RequestMapping(value = "/locMast/add/auth")
@@ -67,40 +72,42 @@
@RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
@Transactional
- public R update(AgvLocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
+ public R update(AgvLocMast locMast) {
+ if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
+ return R.error("鍙傛暟缂哄け");
}
AgvWrkMast wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("source_loc_no", locMast.getLocNo())
.or().eq("loc_no", locMast.getLocNo()));
- if(!Cools.isEmpty(wrkMast)){
- return R.error("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
+ if (!Cools.isEmpty(wrkMast)) {
+ return R.error("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
}
AgvLocMast oldLocMast = agvLockMastService.selectById(locMast.getLocNo());
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
int br = 0;
- switch (locMast.getBarcode().substring(0,2)) {
- case "10":
- br = 1;
- break;
- case "20":
- br = 2;
- break;
- case "21":
- br = 4;
- break;
- case "30":
- br = 3;
- break;
- case "40":
- br = 5;
- break;
- }
- if (oldLocMast.getLocType1() != br) {
- return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X") {
+ switch (locMast.getBarcode().substring(0, 2)) {
+ case "10":
+ br = 1;
+ break;
+ case "20":
+ br = 2;
+ break;
+ case "21":
+ br = 4;
+ break;
+ case "30":
+ br = 3;
+ break;
+ case "40":
+ br = 5;
+ break;
+ }
+ if (oldLocMast.getLocType1() != br) {
+ return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ }
}
Date now = new Date();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
@@ -120,33 +127,37 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(getUserId());
if (!adjDetlService.insert(adjDetl)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅淇敼澶辫触");
}
}
if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鏄庣粏鍒犻櫎澶辫触");
}
if (locMast.getLocSts().equals("O")) {
locMast.setBarcode("");
}
}
+ } else if (oldLocMast.getLocSts().equals("D")) {
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setBarcode("");
+ }
}
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
- if(!agvLockMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ if (!agvLockMastService.updateById(locMast)) {
+ throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
}
return R.ok();
}
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
- if (Cools.isEmpty(list)){
- return R.error();
+ if (Cools.isEmpty(list)) {
+ return R.error("鍙傛暟缂哄け");
}
- for (AgvLocMast entity : list){
+ for (AgvLocMast entity : list) {
agvLockMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -154,7 +165,7 @@
@RequestMapping(value = "/locMast/export/auth")
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -167,7 +178,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != agvLockMastService.selectOne(wrapper)){
+ if (null != agvLockMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AgvLocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -194,10 +205,10 @@
return R.ok(agvLockMastService.selectById(String.valueOf(id)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -206,10 +217,11 @@
}
}
}
- private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+
+ private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
--
Gitblit v1.9.1