From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 862 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 831 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 69e0bb0..480ee3d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,21 +1,29 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.param.AgvMobileStartParam;
-import com.zy.asrs.entity.param.CombParam;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderServiceImpl;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -24,8 +32,10 @@
*/
@RestController
@RequestMapping("agvMobile")
-public class AgvMobileController extends BaseController {
+public class AgvMobileController extends BaseController {
+
+ private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);
@Autowired
private AgvMobileService agvMobileService;
@Autowired
@@ -36,36 +46,69 @@
private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private FlowLogService flowLogService;
+ @Autowired
+ private OrderServiceImpl orderService;
/*
locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
*/
@PostMapping("/comb/auth")
- public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ public R comb(@RequestBody CombParam combParam) {
+ if (combParam == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ agvMobileService.comb(combParam, getUserId());
+
+ return R.ok();
+ }
+
+ // 鍐嶆鎷ｆ枡
+ @RequestMapping("/pick/again/auth")
+ @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
+ public R pickAgain(@RequestBody PickParam pickParams) {
+ if (pickParams == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ agvMobileService.pickAgain(pickParams, 1l);
+ return R.ok("鎷ｆ枡鎴愬姛");
}
/*
- 缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+ 缁戝畾璐ф灦鏉＄爜涓庢殏瀛樹綅
*/
@PostMapping("/combBinging/auth")
- public R combBinding(@RequestBody Map<String,Object> map){
+ public R combBinding(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("barcode")) || Cools.isEmpty(map.get("stationCode"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- Short containerType = Short.valueOf(map.get("containerType").toString());
- agvMobileService.combBinding(barcode,stationCode,containerType);
- return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
+ Short containerType = Short.valueOf(barcode.substring(0, 2));
+ agvMobileService.combBinding(barcode, stationCode, containerType);
+ return R.ok("璐ф灦缁戝畾绔欑偣鎴愬姛");
}
/*
鑾峰彇褰撳墠宸茬粦瀹氱殑杩樻病鐢熸垚宸ヤ綔妗ｇ殑鏆傚瓨浣�
*/
@PostMapping("/getBasDevp/auth")
- public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
+ public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("floor"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String floor = map.get("floor").toString();
- if("1".equals(floor) || "3".equals(floor)){
+ if ("1".equals(floor) || "3".equals(floor)) {
return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
}
return R.error("鍙傛暟閿欒");
@@ -75,7 +118,7 @@
鑾峰彇杈撻�佺嚎绔欑偣
*/
@PostMapping("/getBasDevp/noCacheShelves/auth")
- public R getBasDevpByNoCacheShelves(){
+ public R getBasDevpByNoCacheShelves() {
return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
}
@@ -84,15 +127,92 @@
*/
@PostMapping("/pakin/auth")
@Synchronized
- public R pakin(@RequestBody Map<String,Object> map){
+ public R pakin(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("devNo"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
+ if (agvBasDevpList == null) {
+ return R.error("鏆傚瓨浣嶄笉瀛樺湪");
+ }
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
-
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熸垚宸ヤ綔妗�
+ */
+ @PostMapping("/start/pakin/auth")
+ @Synchronized
+ @Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱")
+ public R startPakin(@RequestBody AgvMobileStartPakin params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
+ // 缁勬墭
+ if (params.getBarcode().startsWith("31")) {
+ //绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉�
+ if (!Cools.isEmpty(params.getCombParams())) {
+ if (params.getCombParams().size() > 1) {
+ return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�");
+ } else {
+ List<CombParam.CombMat> combMats = params.getCombParams().get(0).getCombMats();
+ if (!Cools.isEmpty(combMats) && combMats.size() > 1) {
+ return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�");
+ }
+ }
+
+ }
+ }
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam, getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
+ workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熸垚宸ヤ綔妗�,涓昏鐢ㄤ簬鍚稿涓�妤肩殑鍏ュ簱
+ */
+ @PostMapping("/start/pakin/auth/v2")
+ @Synchronized
+ @Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱v2")
+ public R startPakinV2(@RequestBody AgvMobileStartPakin params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ log.info("鍚姩鍏ュ簱v2,{}", JSON.toJSONString(params));
+ // 缁勬墭
+ if (params.getBarcode().startsWith("30")) {
+ //绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉�
+ if (!Cools.isEmpty(params.getCombParams())) {
+ if (params.getCombParams().size() > 1) {
+ return R.error("绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉嶇墿鏂�");
+ } else {
+ List<CombParam.CombMat> combMats = params.getCombParams().get(0).getCombMats();
+ if (!Cools.isEmpty(combMats) && combMats.size() > 1) {
+ return R.error("绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉嶇墿鏂�");
+ }
+ }
+
+ }
+ }
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam, getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
+ workService.emptyPlateInV2(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false, params.getFactory());
+
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
@@ -101,11 +221,17 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
- public R pakinEmpty(@RequestBody AgvMobileStartParam params){
-
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+ if (pda == null || Cools.isEmpty(pda.getContainerCode())) {
+ return R.error("缂哄皯瀹瑰櫒鍙傛暟");
+ }
+ pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
+ workService.emptyPlateInV3(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
}
return R.ok();
@@ -116,26 +242,700 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
-
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
+ if (pda == null || Cools.isEmpty(pda.getDevNo()) || Cools.isEmpty(pda.getContainerType())) {
+ return R.error("缂哄皯绔欑偣淇℃伅");
+ }
+ workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
}
return R.ok();
}
/*
- 绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+ 绌烘澘鍑哄簱璐ф灦鐮侀�夋嫨
*/
@PostMapping("/pakout/empty/container/selector/auth")
- public R containerType(@RequestBody HashMap<String,String> params){
-
+ public R containerType(@RequestBody HashMap<String, String> params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String devNo = params.get("devNo");
+ if (Cools.isEmpty(devNo)) {
+ return R.error("缂哄皯绔欑偣鏁版嵁");
+ }
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v1")
+ public R queryAgvLocDetl(@RequestBody HashMap<String, String> params) {
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+ String floor = params.get("floor");
+
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
+
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
+ } else {
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
+ if ("JG".equals(orderNo.substring(0, 2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ }
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
+ }
+
+
+ return R.ok(locDetls);
+ }
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v3")
+ public R queryAgvLocDetl3(@RequestBody HashMap<String, String> params) {
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+ String floor = params.get("floor");
+ if (Cools.isEmpty(matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
+
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
+ }
+
+
+ return R.ok(locDetls);
+ }
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v2")
+ public R queryAgvLocDetl2(@RequestBody HashMap<String, String> params) {
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+ String floor = params.get("floor");
+ if (Cools.isEmpty(orderNo, threeCode, matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", matnr));
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
+ } else {
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
+ if (orderDetl.getSource().equals(35)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ }
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
+ }
+
+
+ return R.ok(locDetls);
+ }
+
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/detl/v1")
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ @Synchronized
+ public R checkLocDetl(@RequestBody HashMap<String, String> param) {
+
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ List<AgvLocDetl> listByLocNo = null;
+ List<AgvLocDetl> listByContainerCode = null;
+
+ if (!Cools.isEmpty(locNo)) {
+ listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ if (listByLocNo != null) {
+ for (AgvLocDetl agvLocDetl : listByLocNo) {
+ agvLocDetl.setCount(agvLocDetl.getAnfme());
+ }
+ }
+ }
+ if (!Cools.isEmpty(containerCode)) {
+ listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+ if (listByContainerCode != null) {
+ for (AgvLocDetl agvLocDetl : listByContainerCode) {
+ agvLocDetl.setCount(agvLocDetl.getAnfme());
+ }
+ }
+ }
+
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("locNo", listByLocNo);
+ result.put("containerCode", listByContainerCode);
+
+ return R.ok(result);
+
+ }
+
+ /*
+ 鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
+ */
+ @PostMapping("/update/detl/v1")
+ @ManagerAuth(memo = "绾犳搴撲綅")
+ @Synchronized
+ public R updateLocDetlLocNo(@RequestBody HashMap<String, String> param) {
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ if (Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)) {
+ return R.error("鍙傛暟涓嶅叏");
+ }
+
+ List<AgvLocDetl> listByLocNo = null;
+ List<AgvLocDetl> listByContainerCode = null;
+ if (!Cools.isEmpty(locNo)) {
+ // 婧愬簱浣�
+ listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ }
+ if (!Cools.isEmpty(locNo)) {
+ // 鐩爣搴撲綅
+ listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+ }
+
+ AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
+ AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ if (agvLocMastByLocNo == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
+ String barcode1 = agvLocMastByLocNo.getBarcode();
+
+
+ if ((!Cools.eq("F", agvLocMastByLocNo.getLocSts())
+ && !Cools.eq("D", agvLocMastByLocNo.getLocSts()))) {
+
+ return R.error("搴撲綅鐘舵�佷笉涓篎鎴栬�匘锛屾棤娉曠淮鎶�");
+
+ }
+ // -------------1-----------------------------
+ //搴撲綅淇℃伅涓虹┖ 璐ф灦淇℃伅涓嶄负绌�
+ if (Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)) {
+ //鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
+ listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
+ agvLocDetl.setLocNo(locNo);
+ agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
+ });
+
+ agvLocMastByLocNo.setLocSts("F");
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ if (!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F", agvLocMastByContainerCode.getLocSts())) {
+ agvLocMastByContainerCode.setLocSts("D");
+ agvLocMastByContainerCode.setBarcode(barcode1);
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+ }
+ // 淇濆瓨璋冩暣璁板綍
+ AdjDetl adjDetl = new AdjDetl();
+
+
+ return R.ok("缁存姢鎴愬姛");
+ }
+
+
+ // -------------2-----------------------------
+ //搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
+ if (!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)) {
+ String newLocNo = agvLocMastByContainerCode.getLocNo();
+ //鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
+ listByLocNo.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
+ agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+ agvLocDetlService.updateLocNo(newLocNo, sourceLoc, agvLocDetl);
+ });
+
+ agvLocMastByContainerCode.setLocSts("F");
+ agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setLocSts("D");
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ return R.ok("缁存姢鎴愬姛");
+ }
+
+ if ((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)) {
+ //agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ //agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+ //return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ return R.ok("缁存姢鎴愬姛");
+ }
+
+
+ // --------------3----------------------------
+ String locNo1 = listByContainerCode.get(0).getLocNo();
+ listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
+ agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
+ agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
+ });
+
+ if (!Cools.isEmpty(listByLocNo)) {
+ String suppCode = listByLocNo.get(0).getSuppCode();
+ List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));
+
+ supp_codes.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(locNo1);
+ agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
+ });
+ }
+
+// listByLocNo.forEach(agvLocDetl -> {
+// String sourceLoc = agvLocDetl.getLocNo();
+// agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+// agvLocDetlService.updateLocNo(sourceLoc,locNo,agvLocDetl);
+// });
+ agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ return R.ok("缁存姢鎴愬姛");
+
+ }
+
+ @PostMapping("/agv/v1/locMove")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
+ @Deprecated //涓嶇敤浜�
+ public R agvLocMove(@RequestBody HashMap<String, Object> params) {
+ String fl = String.valueOf(params.get("floor"));
+ short floor = (short) Integer.parseInt(fl.substring(0, 1));
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
+ Object mT = params.get("moveType");
+ String moveType = "";
+ if (mT.equals("unAuto")) {
+ moveType = "2";
+ } else {
+ moveType = "1";
+ }
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ if (agvLocMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
+ agvLocMast.setLocType(moveType);
+ agvLocMast.setLocType3(floor);
+ agvLocMastService.update(agvLocMast, wrapper);
+ // 鍚屾璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ // 鏇存柊璁㈠崟
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
+ if (orderDetl == null) {
+ throw new CoolException("璋冩嫧鍗曟槑缁嗕笉瀛樺湪");
+ }
+ orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/agv/v2/locMove")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
+ public R agvLocMove2(@RequestBody HashMap<String, Object> params) {
+ Date now = new Date();
+ String fl = String.valueOf(params.get("floor"));
+ Integer floor = Integer.parseInt(fl.substring(0, 1));
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
+ Object mT = params.get("moveType");
+ String orderNo = params.get("orderNo").toString();
+ String moveType = "";
+ Integer ioType = 0;
+ if (mT.equals("unAuto")) {
+ moveType = "2";
+ ioType = 111;
+ //int count = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("io_type", ioType));
+ //if (count>3){
+ // log.equals("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒锛侊紒褰撳墠闄愬埗鏁伴噺3鏉★紝闄愬埗鏉′欢锛歩o_type = 111");
+ // throw new CoolException("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒");
+ //}
+ } else {
+ moveType = "1";
+ ioType = 108;
+ }
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ String barcode = map.get("suppCode");
+ AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+ if (!Cools.isEmpty(source_loc_no) && source_loc_no.getWrkSts() < 204) {
+ throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+ }
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
+ if (Cools.isEmpty(locMastS)) {
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
+ }
+ AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0, 2)), floor);
+ // 鍚屾璋冩嫧鍗�
+ long flowId = snowflakeIdWorker.nextId();
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.sync(agvLocDetl);
+ wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setModel(orderNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeUser(getUserId());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(getUserId());
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊璁㈠崟
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
+ // 鍒ゆ柇璁㈠崟鏄惁瓒呴噺
+ if (orderDetl.getQty() >= orderDetl.getAnfme()) {
+ throw new CoolException("璋冩嫧鍗�:" + orderNo + "鐨�<" + agvLocDetl.getMatnr() + ">宸插畬鎴愯皟鎷ㄦ暟閲�,璇锋鏌�!");
+ }
+ // FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(wrkMast.getSourceLocNo());
+// flowLog.setSpare1(barcode);
+// flowLog.setOpType(5L);
+// flowLog.setOrderNo(orderDetl.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(agvLocDetl.getMatnr());
+// flowLog.setMaktx(agvLocDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
+// flowLog.setQtyChanged(agvLocDetl.getAnfme());
+//
+// flowLog.setLocPrevious(agvLocDetl.getAnfme());
+// flowLog.setLocCurrent(0.0d);
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
+ orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("璁㈠崟鍙凤細{" + orderNo + "}鏇存柊璁㈠崟鏄庣粏澶辫触锛� 寮傚父鐗╂枡:" + agvLocDetl.getMatnr() + "(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
+ }
+ // 鏇存柊璁㈠崟鐘舵��
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ Long settle = order.getSettle();
+ if (settle == 1L) {
+ if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{" + order.getOrderNo() + "}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
+ }
+ }
+ }
+ // 鏇存柊婧愬簱浣�
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ locMast.setLocSts("R");
+ agvLocMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/agv/v3/locMove")
+ @Transactional
+ @ManagerAuth(memo = "鍥炶皟鍗曚换鍔′笅鍙�")
+ @Synchronized
+ public R agvLocMove3(@RequestBody HashMap<String, Object> params) {
+ Date now = new Date();
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
+ String orderNo = params.get("orderNo").toString();
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ String barcode = map.get("suppCode");
+ AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+ if (!Cools.isEmpty(source_loc_no)) {
+ throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+ }
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
+ if (Cools.isEmpty(locMastS)) {
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
+ }
+ AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0,2)), 1);
+ // 鍚屾璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.sync(agvLocDetl);
+ wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeUser(getUserId());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(getUserId());
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊璁㈠崟
+ // 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
+
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
+ orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
+ }
+ // 鏇存柊璁㈠崟鐘舵��
+ Order order = orderService.selectByNo(orderNo);
+ Long settle = order.getSettle();
+ if (settle == 1L) {
+ if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{" + order.getOrderNo() + "}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
+ }
+ }
+ }
+ // 鏇存柊婧愬簱浣�
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ locMast.setLocSts("R");
+ agvLocMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/locMove")
+ @Transactional
+ @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+ @Synchronized
+ public R handControlLocMove(@RequestBody LocMoveParam param) {
+ agvMobileService.handControlLocMove(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationOut")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧绂诲満")
+ @Synchronized
+ public R allocationOut(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.allocationOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationIn")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧杩涘満")
+ @Synchronized
+ public R allocationIn(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empOut")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦绂诲満")
+ @Synchronized
+ public R empOut(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.empOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empIn")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦杩涘満")
+ @Synchronized
+ public R empIn(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.empIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/doBack")
+ @Transactional
+ @ManagerAuth(memo = "绔欑偣鍥為��")
+ @Synchronized
+ public R doBack(@RequestBody AgvMobileStartPakin param) {
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ agvMobileService.doBack(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/handBack")
+ @Transactional
+ @ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
+ @Synchronized
+ public R handBack(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.handBack(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/processed")
+ @Transactional
+ @ManagerAuth(memo = "纭鍔犲伐瀹屾垚")
+ @Synchronized
+ public R processed(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.processed(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/processed/v2")
+ @Transactional
+ @ManagerAuth(memo = "纭鍔犲伐瀹屾垚V2")
+ @Synchronized
+ public R processedV2(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.processedV2(param, getUserId());
+ return R.ok();
+ }
+
+
+ public static void main(String[] args) {
+ List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
+ List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
+
+ AgvLocDetl agvLocDetl1 = new AgvLocDetl();
+ agvLocDetl1.setLocNo("AA");
+ AgvLocDetl agvLocDetl2 = new AgvLocDetl();
+ agvLocDetl2.setLocNo("AA");
+
+ agvLocDetls1.add(agvLocDetl1);
+ agvLocDetls2.add(agvLocDetl2);
+
+ System.out.println(agvLocDetls1.equals(agvLocDetls2));
+
+ List<AgvLocDetl> agvLocDetls22 = null;
+
+ System.out.println(agvLocDetls22.equals(agvLocDetls2));
+ }
+
+ /*
+ 鐢熸垚宸ヤ綔妗�
+ */
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
+ AgvWrkMast wrkMast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ wrkMast.setWrkSts(wrkSts);
+ //鍏ュ嚭搴撶被鍨�
+ wrkMast.setIoType(ioType);
+ wrkMast.setIoTime(now);
+ //浼樺厛绾�
+ wrkMast.setIoPri(300.0);
+ //婧愮珯鐐�
+ wrkMast.setSourceLocNo(sourceLocNo);
+ //鐩爣绔欑偣
+ wrkMast.setLocNo(locNo);
+ //璐ф灦缂栫爜
+ wrkMast.setBarcode(barcode);
+ //璐ф灦绫诲瀷
+ wrkMast.setWhsType(containerType);
+ // 鐩爣妤煎眰
+ wrkMast.setCrnNo(floor);
+
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+
+ if (!agvWrkMastService.insertByIncrease(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));
+
+ return wrkMast;
+ }
+
}
--
Gitblit v1.9.1