From 97e045fb1271016af2777580b980f974977909f3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 五月 2024 09:58:20 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 28 ++++
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 13 ++
src/main/java/com/zy/common/service/AgvCommonService.java | 27 ++++
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 27 +++
src/main/java/com/zy/asrs/service/AgvWrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 92 ++++++++++++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 9 +
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 3
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 11 +
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 18 +++
src/main/java/com/zy/asrs/service/AgvMobileService.java | 15 +
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 82 +++++++++++++
12 files changed, 306 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 968f3eb..e8b9a8e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -34,6 +34,8 @@
AgvWaitPakinService agvWaitPakinService;
@Autowired
AgvWorkService agvWorkService;
+ @Autowired
+ AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
@@ -177,6 +179,15 @@
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevp.getDevNo())
.or().eq("source_loc_no",agvBasDevp.getDevNo()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
+ .eq("supp_code", agvBasDevp.getBarcode()));
+ if (agvLocDetlPage.getRecords().size() > 0) {
+ return R.ok(agvLocDetlPage);
+ } else {
+ return R.error("褰撳墠璐ф灦鐮佸紓甯革紒");
+ }
+ }
Page<AgvWrkDetl> agvWrkDetlPage = agvWrkDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWrkDetl>()
.eq("wrk_no", agvWrkMast.getWrkNo()));
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index de60dca..4d3394b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -368,15 +368,18 @@
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 moveType = params.get("moveType");
- if (moveType == "unAuto") {
- return R.error("鎵嬪姩鍔熻兘鏆傛椂鏃犳硶浣跨敤");
+ 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);
- agvLocMast.setLocType("1");
+ agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
agvLocMastService.update(agvLocMast,wrapper);
// 鍚屾璋冩嫧鍗�
@@ -401,6 +404,22 @@
return R.ok();
}
+ @PostMapping("/hand/control/allocationOut")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧绂诲満")
+ public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationIn")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧杩涘満")
+ public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
public static void main(String[] args) {
List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/service/AgvMobileService.java b/src/main/java/com/zy/asrs/service/AgvMobileService.java
index ff4ff95..fdaa1dd 100644
--- a/src/main/java/com/zy/asrs/service/AgvMobileService.java
+++ b/src/main/java/com/zy/asrs/service/AgvMobileService.java
@@ -1,10 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.LocMoveParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.PickParam;
+import com.zy.asrs.entity.param.*;
import java.util.List;
@@ -41,4 +38,14 @@
*/
String handControlLocMove(LocMoveParam param, Long userId);
+ /**
+ * 璋冩嫧绂诲満
+ */
+ String allocationOut(AgvMobileStartPakin param, Long userId);
+
+ /**
+ * 璋冩嫧绂诲満
+ */
+ String allocationIn(AgvMobileStartPakin param, Long userId);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
index d419903..449a8e5 100644
--- a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
@@ -28,4 +28,6 @@
public int callCancelTask(int wrkNo);
+ public int startAllcationIn(AgvWrkMast agvWrkMast) throws IOException;
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 5a91cb0..57ee21d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -7,10 +7,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.LocMoveParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.PickParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.service.AgvCommonService;
@@ -55,6 +52,10 @@
private AgvLocMastService agvLocMastService;
@Autowired
private AgvCommonService agvCommonService;
+ @Autowired
+ private AgvWrkMastLogService agvWrkMastLogService;
+ @Autowired
+ private AgvWrkDetlLogService agvWrkDetlLogService;
/*
@@ -449,6 +450,89 @@
}
/*
+ 璋冩嫧绂诲満
+ */
+ @Override
+ @Transactional
+ public String allocationOut(AgvMobileStartPakin param, Long userId) {
+ Date now = new Date();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", param.getDevNo()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ throw new CoolException("宸ヤ綔妗ｄ腑娌℃湁姝ょ珯鐐逛换鍔�");
+ }
+ //鐢熸垚AGV宸ヤ綔鍘嗗彶妗� + 鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
+ agvWrkMastLogService.save(agvWrkMast);
+ agvWrkDetlLogService.save(agvWrkMast.getWrkNo());
+
+ //鐢熸垚宸ヤ綔妗�
+ AgvWrkMast mast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ mast.setWrkSts(210L);
+ //鍏ュ嚭搴撶被鍨�
+ mast.setIoType(111);
+ mast.setIoTime(now);
+ //浼樺厛绾�
+ mast.setIoPri(300.0);
+ //婧愮珯鐐�
+ mast.setSourceLocNo("");
+ //鐩爣绔欑偣
+ mast.setLocNo("");
+ //瀹瑰櫒缂栫爜
+ mast.setBarcode(agvWrkMast.getBarcode());
+ //瀹瑰櫒绫诲瀷
+ mast.setWhsType(30);
+ // 鐩爣妤煎眰
+ mast.setPauseMk(agvWrkMast.getPauseMk());
+ mast.setAppeUser(userId);
+ mast.setAppeTime(now);
+ mast.setModiUser(userId);
+ mast.setModiTime(now);
+ if (!agvWrkMastService.insertByIncrease(mast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊宸ヤ綔鏄庣粏
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+ agvWrkDetl.setWrkNo(mast.getWrkNo());
+ if (!agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("supp_code", agvWrkMast.getBarcode()))) {
+ throw new CoolException("鏇存柊宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ // 鏇存柊绔欑偣鐘舵��
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
+ // 鏇存柊婧愬簱浣嶇姸鎬�
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+ //鍒犻櫎AGV宸ヤ綔妗�
+ agvWrkMastService.deleteById(agvWrkMast);
+ return "ok";
+ }
+ /*
+ 璋冩嫧杩涘満
+ */
+ @Override
+ @Transactional
+ public String allocationIn(AgvMobileStartPakin param, Long userId) {
+ Date now = new Date();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ throw new CoolException("宸ヤ綔妗ｄ腑娌℃湁姝よ揣鏋朵换鍔�");
+ }
+ //宸ヤ綔鐘舵��
+ agvWrkMast.setWrkSts(211L);
+ //鍏ュ嚭搴撶被鍨�
+ agvWrkMast.setIoType(112);
+ agvWrkMast.setSourceLocNo(param.getDevNo());
+ agvWrkMast.setModiUser(userId);
+ agvWrkMast.setModiTime(now);
+ if (!agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no",agvWrkMast.getWrkNo()))) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊婧愬簱浣嶇姸鎬�
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+ //鍒犻櫎AGV宸ヤ綔妗�
+ return "ok";
+ }
+ /*
鏇存柊鐩爣搴撲綅淇℃伅
*/
private void updateAgvLocMast(AgvLocMast locMast, String locSts){
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index a8263ce..a5cd6e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -609,13 +609,18 @@
agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
// 鑷姩璋冩嫧鍑哄簱鍙栨秷
- } else if(wrkMast.getIoType() == 108 ) {
+ } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) {
// 婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ if (wrkMast.getIoType() == 108) {
+ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ } else {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+ }
+
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
// 鏇存柊璁㈠崟
for (AgvLocDetl agvLocDetl : agvLocDetls) {
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 4663e33..865dcb5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -7,11 +7,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.AgvTaskCreateParam;
import com.zy.asrs.entity.param.AgvTaskParam;
import com.zy.asrs.mapper.AgvWrkMastMapper;
import com.zy.asrs.service.*;
+import com.zy.common.service.AgvCommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +56,10 @@
ApiLogService apiLogService;
@Autowired
AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvCommonService agvCommonService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
AgvWrkMast agvWrkMast = this.selectById(wrkNo);
@@ -82,6 +89,17 @@
//return containerMoveParam;
}
+ public int startAllcationIn(AgvWrkMast agvWrkMast) throws IOException {
+ AgvBasDevp basDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast locMast = agvCommonService.getLocNo(basDevp.getLocType1(),basDevp.getFloor());
+ agvWrkMast.setLocNo(locMast.getLocNo());
+ agvWrkMast.setWrkSts(201L);
+ agvWrkMastService.updateById(agvWrkMast);
+ return 0;
+
+ }
+
//瀹瑰櫒鍏ュ満
public int containerMoveIn(List<AgvWrkMast> agvWrkMastList) throws IOException {
//璋冪敤瀹瑰櫒鍏ュ満鏃舵墍闇�瑕佸弬鏁�
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 025217f..79c41fc 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -54,7 +54,8 @@
.or().eq("io_type",11)
.or().eq("io_type",12)
.or().eq("io_type",108)
- .or().eq("io_type",109));
+ .or().eq("io_type",109)
+ .or().eq("io_type",112));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
@@ -111,7 +112,8 @@
.or().eq("io_type", 11)
.or().eq("io_type", 12)
.or().eq("io_type", 109)
- .or().eq("io_type", 108)).getRecords();
+ .or().eq("io_type", 108)
+ .or().eq("io_type", 112)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.forEach(agvWrkMast -> {
@@ -125,6 +127,28 @@
}
/*
+ putaway锛氫笂鏋�
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void startAllcationIn(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
+ ,new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 211)
+ .andNew().eq("io_type", 112)).getRecords();
+
+ if(!Cools.isEmpty(agvWrkMastList)){
+ agvWrkMastList.forEach(agvWrkMast -> {
+ try {
+ agvWrkMastHandler.startAllcationIn(agvWrkMast);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ });
+ }
+ }
+
+ /*
carry锛氭惉杩愶紝缁熸寚鍑哄簱銆佺Щ搴撱�佺偣鍒扮偣鎼繍绛�
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓�(鍑哄簱绫诲瀷涓� 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 11.搴撴牸绉绘牻 || 110.绌烘澘鍑哄簱 || 107.鐩樼偣鍑哄簱)鐨勬暟鎹�
*/
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 8e08e43..c1d9027 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -22,7 +22,7 @@
@Autowired
private AutoMoveHandler autoMoveHandler;
-
+ // 璋冩嫧鍑哄簱
@Scheduled(cron = "0/2 * * * * ? ")
private void execute(){
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -40,6 +40,7 @@
}
+ // 绌烘澘鑷姩鍥炲簱
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 5c2a65e..903c93b 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -236,6 +236,19 @@
}
+ @Transactional
+ @Synchronized
+ public ReturnT<String> startAllcationIn(AgvWrkMast agvWrkMast) throws IOException {
+
+ //涓嬪彂浠诲姟
+ int startWrkCode = agvWrkMastService.startAllcationIn(agvWrkMast);
+ if(startWrkCode != 0){
+ throw new CoolException("浠诲姟涓嬪彂澶辫触");
+ }
+ return SUCCESS;
+
+ }
+
// @Transactional
// public ReturnT<String> startCarryWrk(AgvWrkMast agvWrkMast) throws IOException {
// //log.info(agvWrkMastList.toString());
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 256f695..1aca5fd 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -5,10 +5,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.AgvLocMastService;
-import com.zy.asrs.service.AgvWrkDetlService;
-import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.AgvCommonService;
@@ -35,6 +32,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ AgvBasDevpService agvBasDevpService;
public ReturnT<String> start(AgvLocMast agvLocMast) {
// locType 1. 鑷姩锛� 2. 鎵嬪姩
@@ -107,6 +106,65 @@
}
private ReturnT<String> doHandMove(AgvLocMast agvLocMast) {
+ Date now = new Date();
+ //鏌ヨ宸ヤ綔妗�
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+ if(!Cools.isEmpty(agvWrkMast)){
+ throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+ }
+// //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+// AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3());
+ // 妫�绱gv鎺ラ┏浣�
+ AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+ //鐢熸垚宸ヤ綔妗�
+ AgvWrkMast mast = new AgvWrkMast();
+ //宸ヤ綔鐘舵��
+ mast.setWrkSts(21L);
+ //鍏ュ嚭搴撶被鍨�
+ mast.setIoType(111);
+ mast.setIoTime(now);
+ //浼樺厛绾�
+ mast.setIoPri(300.0);
+ //婧愮珯鐐�
+ mast.setSourceLocNo(agvLocMast.getLocNo());
+ //鐩爣绔欑偣
+ mast.setLocNo(devpNo.getDevNo());
+ //瀹瑰櫒缂栫爜
+ mast.setBarcode(agvLocMast.getBarcode());
+ //瀹瑰櫒绫诲瀷
+ mast.setWhsType(30);
+ // 鐩爣妤煎眰
+ mast.setPauseMk(agvLocMast.getLocType3().toString());
+
+ mast.setAppeUser(9527L);
+ mast.setAppeTime(now);
+ mast.setModiUser(9527L);
+ mast.setModiTime(now);
+ if (!agvWrkMastService.insertByIncrease(mast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devpNo.getDevNo()).eq("source_loc_no",agvLocMast.getLocNo()));
+ //鐢熸垚宸ヤ綔妗ｆ槑缁�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+ agvLocDetls.forEach(agvLocDetl -> {
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.setWrkNo(mast1.getWrkNo());
+ wrkDetl.sync(agvLocDetl);
+ wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
+ wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeUser(9527L);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(9527L);
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ updateAgvLocMast(agvLocMast,"R");
+ updateAgvBasDevp(devpNo,"S",null,agvLocMast.getBarcode());
return SUCCESS;
}
@@ -117,6 +175,22 @@
locMast.setLocSts(locSts);
agvLocMastService.updateById(locMast);
}
+ /*
+ 鏇存柊婧愮珯鐐逛俊鎭�
+ */
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
+ }
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevp.setBarcode(containerCode);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
+ }
public ReturnT<String> autoEmptyBack(AgvLocMast agvLocMast) {
Date now = new Date();
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index ccf1f43..d8e1dff 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -31,6 +31,8 @@
private MatService matService;
@Autowired
private LocRuleService locRuleService;
+ @Autowired
+ AgvBasDevpService agvBasDevpService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -233,6 +235,31 @@
.eq("floor",floor)
.eq("loc_type1",type));
}
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ public AgvBasDevp getDevpNo(int type, int floor) {
+ // 鐩爣搴撲綅
+ AgvBasDevp basDevp = null;
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ basDevp = getDevpNoRule(type,floor);
+ if (basDevp != null) {
+ return basDevp;
+ }
+
+ //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+ throw new CoolException("璇ユゼ灞傛病鏈夌┖搴撲綅");
+ }
+
+ //闅忔満鍙栦竴涓揣浣�
+ private AgvBasDevp getDevpNoRule(int type,int floor){
+ return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
+ .eq("loc_sts","O")
+ .eq("floor",floor)
+ .eq("loc_type1",type)
+ .like("dev_no","DB"));
+ }
}
--
Gitblit v1.9.1