From 44c51c450765e98a969f9d2a48185ffa511ef3aa Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 16 十二月 2025 12:46:15 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6 +++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 1
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 8 ++++
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++
src/main/resources/mapper/LocMastMapper.xml | 3 +
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 +++
src/main/java/com/zy/asrs/service/BasCrnpService.java | 3 +
src/main/resources/mapper/BasCrnpMapper.xml | 4 ++
src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 17 ++++++++
src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java | 3 +
src/main/java/com/zy/asrs/utils/Utils.java | 13 ++++++
src/main/java/com/zy/common/properties/SlaveProperties.java | 10 ++--
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 +
src/main/java/com/zy/asrs/service/LocMastService.java | 1
src/main/java/com/zy/common/service/CommonService.java | 8 +++
16 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
new file mode 100644
index 0000000..e6969b6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+@Data
+public class FindLocNoAttributeVo {
+
+ private String matnr = "";
+
+ private String specs = "";
+
+ private String batch = "";
+
+ private String grade = "";
+
+ private String brand = "";
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
index baffc35..e97091b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
@@ -5,8 +5,11 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface BasCrnpMapper extends BaseMapper<BasCrnp> {
+ List<Integer> getLevList();
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 6d0cabd..0cd8a47 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -80,4 +80,5 @@
List<LocDetl> selectLocDetlUnilateralMoveShuttleY(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
+ List<String> getSameDetlList(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index da5eed1..6466b42 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -55,4 +55,6 @@
LocMast selectLocByLocStsPakInO2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
+
+ List<Integer> getLevList();
}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
index 10c3feb..4d3463b 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpService.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasCrnp;
+import java.util.List;
+
public interface BasCrnpService extends IService<BasCrnp> {
BasCrnp checkSiteStatus(Integer crnId);
boolean checkSiteError(Integer crnNo, boolean pakin);
+ List<Integer> getLevList();
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 6dd58c8..311dc60 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -71,4 +71,6 @@
List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);
+
+ List<String> getSameDetlList(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bbd5d2c..c2e41b9 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -66,4 +66,5 @@
*/
List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
+ List<Integer> getLevList();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index d1a6e17..3789e89 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -13,6 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
@@ -78,4 +81,9 @@
return true;
}
+
+ @Override
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 8bd5696..5210986 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.service.LocDetlService;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -147,4 +148,9 @@
}
return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
}
+
+ @Override
+ public List<String> getSameDetlList(String matnr) {
+ return this.baseMapper.getSameDetlList(matnr);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 5867094..08468a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
@Service("locMastService")
@@ -153,4 +154,9 @@
public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
}
+
+ @Override
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
+ }
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ad1411a..97487ca 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -631,4 +631,17 @@
return result;
}
+ public static List<Integer> getLocGroupDesc(SlaveProperties slaveProperties, String locNo) {
+ List<Integer> copy = getLocGroupAsc(slaveProperties,locNo);
+ Collections.reverse(copy);
+ return copy;
+ }
+
+ public static String getLocNo(Integer row, int bay, int lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ }
+
+ public static List<Integer> getLocGroupAsc(SlaveProperties slaveProperties, String locNo) {
+ return new ArrayList<>();
+ }
}
diff --git a/src/main/java/com/zy/common/properties/SlaveProperties.java b/src/main/java/com/zy/common/properties/SlaveProperties.java
index 82e16b4..434ea8d 100644
--- a/src/main/java/com/zy/common/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/common/properties/SlaveProperties.java
@@ -16,15 +16,15 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- //private boolean doubleDeep;
+ private boolean doubleDeep;
// 鍙屾繁搴撲綅鎺掑彿
- //private List<Integer> doubleLocs = new ArrayList<>();
+ private List<Integer> doubleLocs = new ArrayList<>();
// 宸︽繁搴撲綅鎺掑彿
- //private List<Integer> doubleLocsLeft = new ArrayList<>();
+ private List<Integer> doubleLocsLeft = new ArrayList<>();
// 鍙虫繁搴撲綅鎺掑彿
- //private List<Integer> doubleLocsRight = new ArrayList<>();
+ private List<Integer> doubleLocsRight = new ArrayList<>();
- //private int groupCount;
+ private int groupCount;
private List<LocGroupOrder> locGroupAscOrder;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fcc4046..d7a29de 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -185,7 +186,7 @@
}
//鎼滅储婊℃墭鐩樺簱浣�
- public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo,LocTypeDto locTypeDto){
+ public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
LocMast targetLocMast = null;
List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
for (String locNo : locNos) {
@@ -262,6 +263,11 @@
return targetLocMast;
}
+ //鎼滅储绌烘墭鐩樺簱浣�
+ public LocMast searchEmptyPallet(LocTypeDto locTypeDto){
+ return new LocMast();
+ }
+
/**
* 妫�绱㈠簱浣嶅彿
*
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
index 50d9755..8b76a73 100644
--- a/src/main/resources/mapper/BasCrnpMapper.xml
+++ b/src/main/resources/mapper/BasCrnpMapper.xml
@@ -28,4 +28,8 @@
<result column="origin" property="origin" />
</resultMap>
+
+ <select id="getLevList" resultType="integer">
+ select distinct lev1 from asr_bas_crnp
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 1faecb9..299ce41 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -409,4 +409,12 @@
order by row1
</select>
+ <select id="getSameDetlList" resultMap="java.lang.String">
+ select ld.loc_no from asr_loc_detl as ld
+ left join asr_loc_mast as lm on ld.loc_no = lm.loc_no
+ where 1 = 1
+ and ld.matnr = #{matnr}
+ and lm.loc_sts = 'F'
+ order by ld.appe_time asc
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index a819b57..770e15e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -223,4 +223,7 @@
order by loc_sts desc ,row1 desc,lev1 asc,bay1 asc
</select>
+ <select id="getLevList" resultType="integer">
+ select distinct lev1 from asr_loc_mast
+ </select>
</mapper>
--
Gitblit v1.9.1