From 3673ce1c7b25f861ae91d41ce3e5cbbb96811276 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:43 +0800
Subject: [PATCH] #入库
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3
src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java | 5 +
src/main/java/com/zy/common/web/WcsController.java | 5 -
src/main/java/com/zy/asrs/service/AgvWaitPakinService.java | 7 +
src/main/java/com/zy/asrs/service/AgvLocMastService.java | 2
src/main/java/com/zy/asrs/controller/AgvIoWorkController.java | 23 ++--
src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java | 4
/dev/null | 13 --
src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java | 9 +
src/main/java/com/zy/common/service/AgvCommonService.java | 73 +++++++-------
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 11 +-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 111 ++++++++++++----------
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 7 +
src/main/java/com/zy/asrs/service/AgvWorkService.java | 5
14 files changed, 148 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
index aa584ea..950acd4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
@@ -9,7 +9,6 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocDetlService;
@@ -144,18 +143,18 @@
return R.ok().add(agvBasDevpService.getAvailableEmptyInSite());
}
- @RequestMapping("/empty/plate/in/start")
- @ManagerAuth(memo = "绌烘澘鍏ュ簱")
- public R emptyPlateInStart(@RequestParam String sourceStaNo, String containerCode) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo,containerCode,getUserId()));
- }
+// @RequestMapping("/empty/plate/in/start")
+// @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+// public R emptyPlateInStart(@RequestParam String sourceStaNo, String containerCode) {
+// return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo,containerCode,getUserId()));
+// }
- @RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "绌烘澘鍑哄簱")
- public R emptyPlateOutStart(EmptyPlateOutParam param) {
- agvWorkService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
- }
+// @RequestMapping("/empty/plate/out/start")
+// @ManagerAuth(memo = "绌烘澘鍑哄簱")
+// public R emptyPlateOutStart(EmptyPlateOutParam param) {
+// agvWorkService.emptyPlateOut(param, getUserId());
+// return R.ok("鍑哄簱鍚姩鎴愬姛");
+// }
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 4c7ca4c..6987853 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -96,14 +96,14 @@
}
/*
- 绌烘澘鍑哄簱
+ 鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
for (AgvMobileStartParam param : params){
- workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),getUserId());
+ workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),param.getContainerType(), getUserId());
}
return R.ok();
@@ -114,10 +114,11 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody Map<String,Object> map){
+ public R pakoutEmpty(@RequestBody List<AgvMobileStartParam> params){
- String devNo = map.get("devNo").toString();
-
+ for (AgvMobileStartParam param : params){
+ workService.emptyPlateOut(param.getDevNo(),param.getContainerType(), getUserId());
+ }
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java b/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java
deleted file mode 100644
index 398778e..0000000
--- a/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zy.asrs.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@RequestMapping("/agv")
-public class AgvMobileTaskController {
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
index 3da28ca..9766b0e 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
@@ -7,10 +7,10 @@
//绔欑偣
private String devNo;
//浠诲姟绫诲瀷
- private String type;
+ private int type;
//瀹瑰櫒鐮�
private String containerCode;
//瀹瑰櫒绫诲瀷
- private String containerType;
+ private int containerType;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 0504ed9..0809357 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -22,6 +22,9 @@
// 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
private Integer locType;
+ //绗簩鍗曚綅鏁伴噺
+ private Double anfme;
+
private List<CombMat> combMats;
@Data
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
index 56b2ec0..aaf3408 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.AgvWaitPakin;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface AgvWaitPakinMapper extends BaseMapper<AgvWaitPakin> {
+ @Update("UPDATE agv_cust_wait_pakin SET io_status = ${ioStatus} WHERE supp_code = '${containerCode}'")
+ int updateIoStatus(@Param("containerCode")String containerCode, @Param("ioStatus")String ioStatus);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvLocMastService.java b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
index ae0a38f..b8e9f7c 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -24,4 +24,6 @@
List<AgvLocMast> selectLocByLevAndFloor(int lev, int floor);
+ AgvLocMast selectEmptyZpallet(int type);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java b/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
index 842d493..23c615b 100644
--- a/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.AgvWaitPakin;
+import java.util.List;
+
public interface AgvWaitPakinService extends IService<AgvWaitPakin> {
public void updateIoStatus(int wrkNo, String ioStatus);
- public AgvWaitPakin selectByContainerCode(String containerCode);
+ public void updateIoStatus(String containerCode, String ioStatus);
+
+ public List<AgvWaitPakin> selectByContainerCode(String containerCode);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 1aa5c49..839c1ce 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -2,7 +2,6 @@
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWrkMast;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.common.model.StartupDto;
@@ -40,9 +39,9 @@
/*
绌烘澘鍏ュ簱
*/
- String emptyPlateIn(String sourceStaion,String containerCode, Long userId);
+ String emptyPlateIn(String station,String containerCode,int containerType, Long userId);
- void emptyPlateOut(EmptyPlateOutParam param, Long userId);
+ void emptyPlateOut(String station, int containerType, Long userId);
/**
* 搴撳瓨鏄庣粏璋冩暣
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index e9ed33b..88f5250 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -208,4 +208,11 @@
//return this.agvLocMastMapper.selectLocByLevAndFloor(lev,floor);
}
+ @Override
+ public AgvLocMast selectEmptyZpallet(int type) {
+
+ return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type));
+
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
index e016e71..f2b9b53 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
@@ -28,7 +28,12 @@
}
@Override
- public AgvWaitPakin selectByContainerCode(String containerCode) {
- return this.selectOne(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode));
+ public void updateIoStatus(String containerCode, String ioStatus) {
+ this.baseMapper.updateIoStatus(containerCode,ioStatus);
+ }
+
+ @Override
+ public List<AgvWaitPakin> selectByContainerCode(String containerCode) {
+ return this.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode).eq("io_status","N"));
}
}
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 d24b52b..b56e7e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -7,7 +7,6 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
@@ -90,7 +89,7 @@
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast agvLocMast = agvCommonService.getLocNo(agvWaitPakinList, agvBasDevp.getFloor());
+ AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1());
//鐢熸垚宸ヤ綔妗�
AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, isConveyor);
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
@@ -311,68 +310,79 @@
}
/*
- 绌烘澘鍏ュ簱
+ 鍏ュ簱
*/
@Transactional
- public String emptyPlateIn(String sourceStaion,String containerCode, Long userId) {
-
- if(!pakinCheck()){
-
- }
+ public String emptyPlateIn(String station,String containerCode,int containerType, Long userId) {
Date now = new Date();
// 婧愮珯鐐圭姸鎬佹娴�
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(sourceStaion);
- if(!agvBasDevp.getLocSts().equals("O")){
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+
+ //鍒濆瀹氫箟涓虹┖鏉垮叆搴撶被鍨�
+ int ioType = 10;
+
+ if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) || !agvBasDevp.getLocSts().equals("O")){
throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍏ュ簱");
}
- //鍒ゆ柇褰撳墠瀹瑰櫒鏄惁瀛樺湪浠诲姟
+
+ //鏌ヨ宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWrkMast)){
-
+ throw new CoolException("褰撳墠瀹瑰櫒宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
}
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast agvLocMast = agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1());
- // 妫�绱㈠簱浣�
- AgvLocMast locMast = agvCommonService.getLocNo(null, agvBasDevp.getFloor());
- // 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
- createWrkMast(10,201L,agvBasDevp.getDevNo(),locMast.getLocNo(),null,now,userId,false);
+ //鏌ヨ鍏ュ簱閫氱煡妗�
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ //鐢熸垚宸ヤ綔妗�
+ AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId, false);
+ //鐢熸垚宸ヤ綔妗ｆ槑缁�
+ agvWaitPakinList.forEach(wp -> {
+ createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime());
+ });
+ //淇敼鍏ュ簱閫氱煡妗ｇ姸鎬�
+ agvWaitPakinService.updateIoStatus(containerCode,"Y");
+ }else {
+ // 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
+ createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,false);
+ }
+
//鏇存柊婧愮珯鐐圭姸鎬�
updateAgvBasDevp(agvBasDevp,"R");
- //鏇存柊鐩爣搴撲綅鐘舵��
- updateAgvLocMast(locMast,"S");
- return locMast.getLocNo();
+ //鏇存柊鐩爣搴撲綅鐘舵�佸拰淇℃伅
+ updateAgvLocMast(agvLocMast,"S", (short) containerType);
+ return agvLocMast.getLocNo();
}
/*
绌烘澘鍑哄簱
*/
@Transactional
- public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
+ public void emptyPlateOut(String station, int containerType, Long userId) {
Date now = new Date();
- //鍒ゆ柇鎵�閫夊伐浣滅珯绌轰綑宸ヤ綔浣嶆暟閲忔槸鍚︽弧瓒冲嚭搴撴暟閲�
- List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
- .eq("station_code", param.getStationCode())
- .eq("loc_sts","O"));
- if(agvBasDevpList.size() < param.getLocNos().size()){
- throw new CoolException("褰撳墠宸ヤ綔绔欏彲鍑哄簱宸ヤ綔浣嶆暟閲忎负"+ agvBasDevpList.size() + "锛屽皬浜庤鍑哄簱鐨勫簱浣嶆暟閲忥紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅");
+
+ // 绔欑偣妫�娴�
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+ if(!agvBasDevp.getLocSts().equals("O")){
+ throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍑哄簱");
}
- param.getLocNos().forEach(locNo -> {
- AgvLocMast agvLocMast = agvLocMastService.selectById(locNo);
- if(!agvLocMast.getLocSts().equals("D")){
- throw new CoolException(agvLocMast.getLocNo() + "搴撲綅鐘舵�佸凡缁忎笉涓篋.绌烘《/绌烘爤鏉匡紝璇烽噸鏂伴�夋嫨搴撲綅杩涜绌烘澘鍑哄簱");
- }
- //妫�绱㈠伐浣滀綅
- AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
- .eq("station_code", param.getStationCode())
- .eq("loc_sts", "O"));
- //鐢熸垚宸ヤ綔妗�
- createWrkMast(110,21L,locNo,agvBasDevp.getDevNo(),null,now,userId,false);
- //淇敼婧愬簱浣嶇姸鎬�
- updateAgvLocMast(agvLocMast,"R");
- //淇敼鐩爣宸ヤ綔浣嶇姸鎬�
- updateAgvBasDevp(agvBasDevp,"S");
- });
+
+ //瀵绘壘鐩稿簲绫诲瀷鐨勭┖鎵樼洏
+ AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType);
+
+ //鐢熸垚宸ヤ綔妗�
+ createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,false);
+
+ //淇敼婧愬簱浣嶇姸鎬�
+ updateAgvLocMast(agvLocMast,"R");
+
+ //淇敼绔欑偣鐘舵��
+ updateAgvBasDevp(agvBasDevp,"S");
+
}
@Transactional
@@ -613,6 +623,15 @@
}
/*
+ 鏇存柊鐩爣搴撲綅淇℃伅鍜屽簱浣嶆墭鐩樼被鍨�
+ */
+ private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type){
+ locMast.setLocSts(locSts);
+ locMast.setLocType2(type);
+ agvLocMastService.updateById(locMast);
+ }
+
+ /*
鏇存柊婧愮珯鐐逛俊鎭�
*/
private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
@@ -785,14 +804,6 @@
agvBasDevp.setInQty(agvBasDevp.getInQty() + 1);
}
}
- }
-
- //鍏ュ簱鍓嶆鏌�
- private boolean pakinCheck(){
-
-
-
- return true;
}
}
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index dcf9a62..8c7f9f1 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -71,46 +71,46 @@
* 妫�绱㈠簱浣嶅彿
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public AgvLocMast getLocNo(List<AgvWaitPakin> agvWaitPakinList, int floor) {
+ public AgvLocMast getLocNo(int type) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
- if(Cools.isEmpty(agvWaitPakinList)){
- return getLocNoRule(floor); // 1. 闅忔満搴撲綅
- }
+// if(Cools.isEmpty(agvWaitPakinList)){
+// return getLocNoRule(type); // 1. 闅忔満搴撲綅
+// }
- //搴撲綅瑙勫垯
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 鎸夊簱浣嶈鍒欐悳绱�
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
-
-
- //搴撲綅缂栫爜瑙勫垯
- locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- locMast = getLocByProximityRule();
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- //return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
- Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
- if(Cools.isEmpty(mat.getBeBatch())){
- mat.setBeBatch(0);
- }
- locMast = getLocByFre(mat.getBeBatch(), floor);
- if (locMast != null) {
- return locMast;
- }
+// //搴撲綅瑙勫垯
+// locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 鎸夊簱浣嶈鍒欐悳绱�
+// if(!Cools.isEmpty(locMast)){
+// return locMast;
+// }
+//
+//
+// //搴撲綅缂栫爜瑙勫垯
+// locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
+// if(!Cools.isEmpty(locMast)){
+// return locMast;
+// }
+//
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+// locMast = getLocByProximityRule();
+// if (locMast != null) {
+// //鎵惧埌搴撲綅锛岃繑鍥瀌to
+// //return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+// }
+//
+// //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
+// Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
+// if(Cools.isEmpty(mat.getBeBatch())){
+// mat.setBeBatch(0);
+// }
+// locMast = getLocByFre(mat.getBeBatch(), floor);
+// if (locMast != null) {
+// return locMast;
+// }
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(floor);
+ locMast = getLocNoRule(type);
if (locMast != null) {
return locMast;
}
@@ -227,11 +227,10 @@
}
//闅忔満鍙栦竴涓揣浣�
- private AgvLocMast getLocNoRule(int floor){
+ private AgvLocMast getLocNoRule(int type){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
- .eq("floor",floor)
.eq("loc_sts","O")
- .eq(false,"loc_type2",1));
+ .eq(false,"loc_type1",type));
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3855940..fc8ca3a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -21,14 +21,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* Created by vincent on 2020/10/30
@@ -593,8 +590,6 @@
if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
}
-
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));
//鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
--
Gitblit v1.9.1