From 5cc40452e260550c709928d0679f6e713448ffe7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 01 十一月 2023 16:50:54 +0800
Subject: [PATCH] 库存编码规则 拣料更改料箱拣料
---
src/main/java/com/zy/common/service/AgvCommonService.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 9049ce8..9b2e5f1 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -27,6 +27,10 @@
private AgvLocRuleService agvLocRuleService;
@Autowired
private AgvLocMastService agvLocMastService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private LocRuleService locRuleService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -72,9 +76,19 @@
AgvLocMast locMast = null;
//搴撲綅瑙勫垯
- locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
- if(!Cools.isEmpty(locMast)){
- return locMast;
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
+ }
+ }
+
+ //搴撲綅缂栫爜瑙勫垯
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
+ if(!Cools.isEmpty(locMast)){
+ return locMast;
+ }
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
@@ -83,6 +97,15 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
//return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
+
+ //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
+ Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
+ if(true){
+
+ }else {
+
+ }
+
//
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
// locMast = getLocNoStep4(staDescId, locTypeDto);
@@ -137,14 +160,78 @@
}
/*
+ 搴撲綅瑙勫垯鏌ユ壘
+ */
+ private AgvLocMast getLocByLocCodeRule(AgvWaitPakin agvWaitPakin, int floor) {
+ if(Cools.isEmpty(agvWaitPakin.getBrand())){
+ return null;
+ }
+
+ //搴撳尯
+ String other = "agv-" + floor;
+ List<LocRule> locRules = locRuleService.findCode(agvWaitPakin.getMatnr(), other);
+ if(Cools.isEmpty(locRules)){
+ return null;
+ }
+
+ for (LocRule agvLocRule : locRules) {
+ EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
+ wrapper.between("row1",agvLocRule.getRowBeg(),agvLocRule.getRowEnd())
+ .between("bay1",agvLocRule.getBayBeg(),agvLocRule.getBayEnd())
+ .between("lev1",agvLocRule.getLevBeg(),agvLocRule.getLevEnd())
+ .eq("floor",floor)
+ .eq("loc_sts","O");
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ if(!Cools.isEmpty(agvLocMast)){
+ return agvLocMast;
+ }
+ }
+
+ return null;
+ }
+
+ /*
闈犺繎鎽嗘斁瑙勫垯
*/
-
private AgvLocMast getLocByProximityRule(){
//to do
return null;
}
+ /*
+ 鏍规嵁鐗╂枡棰戠巼鏌ユ壘
+ */
+ private AgvLocMast getLocByFre(int fre, int floor){
+ if(floor == 1){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1"));
+ }
+ }
+ if(floor == 3){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1"));
+ }
+ }
+
+ throw new CoolException("鎼滅储搴撲綅鏃讹紝妤煎眰鍑洪敊銆�");
+ }
+
//闅忔満鍙栦竴涓揣浣�
private AgvLocMast getLocNoRule(int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
--
Gitblit v1.9.1