From 65cc55a45a7235ee3736dcc8f4bdee30fdbfb9a7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 21 二月 2025 08:25:40 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 0951bb4..505e6a4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -69,7 +69,7 @@
@Transactional
public R update(AgvLocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
AgvWrkMast wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("source_loc_no", locMast.getLocNo())
@@ -80,6 +80,29 @@
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;
+ 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();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
@@ -99,18 +122,21 @@
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("");
}
}
}
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
if(!agvLockMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
}
return R.ok();
}
@@ -120,7 +146,7 @@
public R delete(@RequestParam String param){
List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (AgvLocMast entity : list){
agvLockMastService.delete(new EntityWrapper<>(entity));
@@ -153,11 +179,13 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- agvLockMastService.clearLoc();
+// agvLockMastService.clearLoc();
+ //鍒濆鍖栦竴妤煎簱浣�
+ agvLockMastService.initLocFloor1();
//鍒濆鍖栦簩妤煎簱浣�
- agvLockMastService.initLocFloor2();
+// agvLockMastService.initLocFloor2();
//鍒濆鍖栦笁妤肩珯鐐�
- //agvLockMastService.initLocFloor3();
+// agvLockMastService.initLocFloor3();
return R.ok();
}
--
Gitblit v1.9.1