From a073250f6f4f8c32888bc60b24ff6984e29af51e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 01 八月 2024 17:04:01 +0800
Subject: [PATCH] #增加弃车功能
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index e287d77..869706c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -10,17 +10,17 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.LocMast;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.AdjDetlService;
+import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.AgvLocMastService;
+import com.zy.asrs.service.AgvWrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
@@ -32,6 +32,12 @@
@Autowired
private AgvLocMastService agvLockMastService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private AdjDetlService adjDetlService;
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
@@ -61,8 +67,51 @@
@RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
@Transactional
- public R update(LocMast locMast){
- //to do
+ 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("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
+ }
+ AgvLocMast oldLocMast = agvLockMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
+ Date now = new Date();
+ // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F") || oldLocMast.getLocSts().equals("S")) {
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
+ List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()));
+ for (AgvLocDetl locDetl : locDetls) {
+ // 淇濆瓨璋冩暣璁板綍
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(locDetl.getAnfme());
+ adjDetl.setAdjQty(0.0D);
+ adjDetl.setModiTime(now);
+ adjDetl.setModiUser(getUserId());
+ adjDetl.setAppeTime(now);
+ adjDetl.setAppeUser(getUserId());
+ if (!adjDetlService.insert(adjDetl)) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(now);
+ if(!agvLockMastService.updateById(locMast)) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
return R.ok();
}
@@ -104,15 +153,21 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- agvLockMastService.clearLoc();
+ //agvLockMastService.clearLoc();
//鍒濆鍖栦竴妤肩珯鐐�
- agvLockMastService.initLocFloor1();
+ //agvLockMastService.initLocFloor1();
//鍒濆鍖栦笁妤肩珯鐐�
agvLockMastService.initLocFloor3();
return R.ok();
}
+ @RequestMapping(value = "/locMast/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ 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()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1