From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/common/service/CommonService.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bd943cc..b0f21c5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -188,7 +188,8 @@
//鎼滅储婊℃墭鐩樺簱浣�
public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
LocMast targetLocMast = null;
- List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
+ //鏌ヨ鐩稿悓鐗╂枡
+ List<String> locNos = locDetlService.getSameDetlList2(findLocNoAttributeVo.getOrderNo(),findLocNoAttributeVo.getAreaId());
for (String locNo : locNos) {
//鑾峰彇閫氶亾缁�
List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
@@ -214,14 +215,20 @@
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
//鑾峰彇璁惧妤煎眰
- List<Integer> levList = basCrnpService.getLevList();
- Collections.shuffle(levList);
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
List<Integer> locLevList = locMastService.getLevList();
- levList.addAll(locLevList);
+// levList.addAll(locLevList);
- for (Integer lev : levList) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
+ for (Integer lev : locLevList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("lev1", lev)
+ .eq("loc_type1",locTypeDto.getLocType1())
+ .eq("loc_type2",findLocNoAttributeVo.getAreaId())
+ .orderBy("bay1", true)
+ .orderBy("row1",true));
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
@@ -278,7 +285,7 @@
continue;
}
- if (deepLoc.getLocSts().equals("F")){
+ if (deepLoc.getLocSts().equals("D")){
continue;
}else if (deepLoc.getLocSts().equals("O")){
targetLocMast = deepLoc;
@@ -291,15 +298,15 @@
if (targetLocMast == null){
//鑾峰彇璁惧妤煎眰
- List<Integer> levList = basCrnpService.getLevList();
- Collections.shuffle(levList);
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
List<Integer> locLevList = locMastService.getLevList();
- levList.addAll(locLevList);
+// levList.addAll(locLevList);
- for (Integer lev : levList) {
+ for (Integer lev : locLevList) {
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
--
Gitblit v1.9.1