From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 101 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 58b89f5..8b9dfd1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -10,10 +10,13 @@
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;
@@ -29,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
@@ -39,7 +48,7 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ 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)));
}
@@ -58,8 +67,77 @@
@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("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
+ 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();
+ // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ 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("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setBarcode("");
+ }
+ }
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(now);
+ if(!agvLockMastService.updateById(locMast)) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
return R.ok();
}
@@ -101,11 +179,13 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- agvLockMastService.clearLoc();
- //鍒濆鍖栦竴妤肩珯鐐�
- //agvLockMastService.initLocFloor1();
+// agvLockMastService.clearLoc();
+ //鍒濆鍖栦竴妤煎簱浣�
+ agvLockMastService.initLocFloor1();
+ //鍒濆鍖栦簩妤煎簱浣�
+// agvLockMastService.initLocFloor2();
//鍒濆鍖栦笁妤肩珯鐐�
- agvLockMastService.initLocFloor3();
+// agvLockMastService.initLocFloor3();
return R.ok();
}
@@ -128,4 +208,16 @@
}
}
}
+ 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)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
}
--
Gitblit v1.9.1