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/AgvMobileController.java | 465 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 382 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index c8e678a..5795120 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,20 +1,28 @@
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.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.asrs.utils.OrderUtils;
import com.zy.common.web.BaseController;
-import io.swagger.models.auth.In;
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.*;
+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.*;
import java.util.stream.Collectors;
@@ -25,8 +33,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
@@ -43,13 +53,19 @@
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){
+ public R comb(@RequestBody CombParam combParam) {
agvMobileService.comb(combParam, getUserId());
return R.ok();
@@ -58,30 +74,30 @@
// 鍐嶆鎷ｆ枡
@RequestMapping("/pick/again/auth")
@ManagerAuth(memo = "鍐嶆鎷ｆ枡")
- public R pickAgain(@RequestBody PickParam pickParams){
+ public R pickAgain(@RequestBody PickParam pickParams) {
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) {
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- Short containerType = Short.valueOf(barcode.substring(0,2));
- 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) {
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("鍙傛暟閿欒");
@@ -91,7 +107,7 @@
鑾峰彇杈撻�佺嚎绔欑偣
*/
@PostMapping("/getBasDevp/noCacheShelves/auth")
- public R getBasDevpByNoCacheShelves(){
+ public R getBasDevpByNoCacheShelves() {
return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
}
@@ -100,31 +116,36 @@
*/
@PostMapping("/pakin/auth")
@Synchronized
- public R pakin(@RequestBody Map<String,Object> map){
+ public R pakin(@RequestBody Map<String, Object> map) {
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
-
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);
+
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
/*
- 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熸垚宸ヤ綔妗�
*/
@PostMapping("/start/pakin/auth")
@Synchronized
@Transactional
- public R startPakin(@RequestBody AgvMobileStartPakin params){
+ @ManagerAuth(memo = "鍚姩鍏ュ簱")
+ public R startPakin(@RequestBody AgvMobileStartPakin params) {
+ log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
// 缁勬墭
params.getCombParams().forEach(combParam -> {
- agvMobileService.comb(combParam,getUserId());
+ agvMobileService.comb(combParam, getUserId());
});
- params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+ //鑾峰彇鍒ゆ柇鏃跺摢涓巶鐨勮鍗�
+ String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode();
+ String factory = OrderUtils.getFactory(csocode);
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
+ workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false,factory);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
@@ -134,11 +155,12 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
- public R pakinEmpty(@RequestBody AgvMobileStartParam params){
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params) {
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
+ pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
+ workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false,null);
}
return R.ok();
@@ -149,20 +171,21 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
+ 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) {
String devNo = params.get("devNo");
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
@@ -170,35 +193,129 @@
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
-
+
/*
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@PostMapping("/query/locDetl/v1")
- public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+ 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);
+ 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);
+ 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);
+ 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"));
+ 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));
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 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");
+
+ 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");
+
+ 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;
@@ -215,7 +332,9 @@
鐩樼偣鎺ュ彛
*/
@PostMapping("/check/detl/v1")
- public R checkLocDetl(@RequestBody HashMap<String,String> param){
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ @Synchronized
+ public R checkLocDetl(@RequestBody HashMap<String, String> param) {
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
@@ -223,16 +342,16 @@
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
- Map<String,Object> result = new HashMap<String,Object>();
- result.put("locNo",listByLocNo);
- result.put("containerCode",listByContainerCode);
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("locNo", listByLocNo);
+ result.put("containerCode", listByContainerCode);
return R.ok(result);
@@ -242,21 +361,23 @@
鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
*/
@PostMapping("/update/detl/v1")
- public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
+ @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)){
+ if (Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)) {
return R.error("鍙傛暟涓嶅叏");
}
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
// 婧愬簱浣�
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
// 鐩爣搴撲綅
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
@@ -264,37 +385,37 @@
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
- String barcode1 = agvLocMastByLocNo.getBarcode();
+ String barcode1 = agvLocMastByLocNo.getBarcode();
-
- if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
- && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
- || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
- && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){
+ if ((!Cools.eq("F", agvLocMastByLocNo.getLocSts())
+ && !Cools.eq("D", agvLocMastByLocNo.getLocSts()))) {
return R.error("搴撲綅鐘舵�佷笉涓篎鎴栬�匘锛屾棤娉曠淮鎶�");
}
// -------------1-----------------------------
//搴撲綅淇℃伅涓虹┖ 璐ф灦淇℃伅涓嶄负绌�
- if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
+ if (Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)) {
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByContainerCode.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(locNo);
- agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
});
agvLocMastByLocNo.setLocSts("F");
agvLocMastByLocNo.setBarcode(containerCode);
agvLocMastService.updateById(agvLocMastByLocNo);
- if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
+ 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("缁存姢鎴愬姛");
}
@@ -302,13 +423,13 @@
// -------------2-----------------------------
//搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
- if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
+ 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);
+ agvLocDetlService.updateLocNo(newLocNo, sourceLoc, agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
@@ -322,10 +443,15 @@
return R.ok("缁存姢鎴愬姛");
}
- if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
- 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----------------------------
@@ -333,7 +459,7 @@
listByContainerCode.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
- agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
});
if (!Cools.isEmpty(listByLocNo)) {
@@ -342,7 +468,7 @@
supp_codes.forEach(agvLocDetl -> {
agvLocDetl.setLocNo(locNo1);
- agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
});
}
@@ -364,11 +490,12 @@
@PostMapping("/agv/v1/locMove")
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
- public R agvLocMove(@RequestBody HashMap<String,Object> params){
+ @Synchronized
+ 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");
+ 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")) {
@@ -382,15 +509,18 @@
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
- agvLocMastService.update(agvLocMast,wrapper);
+ 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()));
+ 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());
+ 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());
}
}
}
@@ -400,18 +530,25 @@
@PostMapping("/agv/v2/locMove")
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
- public R agvLocMove2(@RequestBody HashMap<String,Object> params){
+ @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");
+ 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;
@@ -419,7 +556,106 @@
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
String barcode = map.get("suppCode");
- AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
+ 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(ioType, 22L, locNo, "", barcode, now, getUserId(), 30, 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(), 30, 1);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
@@ -436,10 +672,20 @@
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ // 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
+
+ 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","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ 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 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
+ }
}
}
// 鏇存柊婧愬簱浣�
@@ -453,7 +699,8 @@
@PostMapping("/hand/control/locMove")
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
- public R handControlLocMove(@RequestBody LocMoveParam param){
+ @Synchronized
+ public R handControlLocMove(@RequestBody LocMoveParam param) {
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
}
@@ -461,7 +708,8 @@
@PostMapping("/hand/control/allocationOut")
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
- public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ @Synchronized
+ public R allocationOut(@RequestBody AgvMobileStartPakin param) {
agvMobileService.allocationOut(param, getUserId());
return R.ok();
}
@@ -469,10 +717,60 @@
@PostMapping("/hand/control/allocationIn")
@Transactional
@ManagerAuth(memo = "璋冩嫧杩涘満")
- public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ @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();
+ }
+
public static void main(String[] args) {
List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
@@ -492,10 +790,11 @@
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){
+ 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);
@@ -508,9 +807,9 @@
wrkMast.setSourceLocNo(sourceLocNo);
//鐩爣绔欑偣
wrkMast.setLocNo(locNo);
- //瀹瑰櫒缂栫爜
+ //璐ф灦缂栫爜
wrkMast.setBarcode(barcode);
- //瀹瑰櫒绫诲瀷
+ //璐ф灦绫诲瀷
wrkMast.setWhsType(containerType);
// 鐩爣妤煎眰
wrkMast.setCrnNo(floor);
@@ -524,7 +823,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));
return wrkMast;
}
--
Gitblit v1.9.1