From eb9e30160e01dbf905d5514c3b6a07f5d12023ff Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 25 五月 2023 16:06:31 +0800
Subject: [PATCH] 入库找库位逻辑
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 24 ++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/utils/Utils.java | 64 ++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/resources/mapper/LocMastMapper.xml | 44 +++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 16 +
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4
src/main/java/com/zy/common/web/WcsController.java | 6
src/main/java/com/zy/asrs/service/LocMastService.java | 12 +
src/main/java/com/zy/common/service/CommonService.java | 452 +++++++++++++---------------------------
12 files changed, 274 insertions(+), 360 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 03701da..6f7e8d2 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -30,7 +30,7 @@
@Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
int updateLocNo(String newLocNo, String oldLocNo);
- List<String> selectSameDetl(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
+ List<String> selectSameDetl(@Param("matnr") String matnr);
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index a01a798..f39e414 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -31,8 +31,20 @@
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
- @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
- Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+ @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and loc_type2 = #{locType2} and crn_no = #{crnNo}")
+ Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("crnNo") Integer crnNo);
void updateLocSts(@Param("locNo") String locNo,@Param("locSts") String locSts);
+
+ //鎵惧渚х┖搴撲綅
+ LocMast findOutMast(Short locType1, List<Integer> crnNos);
+
+ //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
+ LocMast findInEmptyLocMast(Short locType1, @Param("rows") List<Integer> rows);
+
+ //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
+ LocMast findEmptyLocMastByLocNos(Short locType1, @Param("locNos") List<String> locNos);
+
+ //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
+ LocMast findEmptyLowFrequencyLocMast(Short locType1);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 6cfe1d4..81aca94 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -29,7 +29,7 @@
* @param matnr 浜у搧鍙�
* @return locNo 搴撲綅鍙�
*/
- List<String> getSameDetl(String matnr, Integer start, Integer end);
+ List<String> getSameDetl(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 1356a23..f3fb095 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -54,4 +54,16 @@
void breakUp(String locNo, List<String> excludeLocNos);
void updateLocSts(String locNo, String locSts);
+
+ //鎵惧渚х┖搴撲綅
+ LocMast findOutMast(Short locType1, List<Integer> crnNos);
+
+ //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
+ LocMast findInEmptyLocMast(Short locType1, List<Integer> rows);
+
+ //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
+ LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos);
+
+ //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
+ LocMast findEmptyLowFrequencyLocMast(Short locType1);
}
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 e7cece3..89da6aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -48,8 +48,8 @@
}
@Override
- public List<String> getSameDetl(String matnr, Integer start, Integer end) {
- return this.baseMapper.selectSameDetl(matnr, start, end);
+ public List<String> getSameDetl(String matnr) {
+ return this.baseMapper.selectSameDetl(matnr);
}
@Override
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 14d108e..7004ae0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -79,9 +79,10 @@
if (locMast == null) {
return false;
}
- boolean res = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
+ Integer nowQua = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ boolean res = nowQua > quaOfBlank;
if (!res) {
- log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank);
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
}
return res;
}
@@ -203,4 +204,23 @@
this.baseMapper.updateLocSts(locNo,locSts);
}
+ @Override
+ public LocMast findOutMast(Short locType1, List<Integer> crnNos) {
+ return this.baseMapper.findOutMast(locType1, crnNos);
+ }
+
+ @Override
+ public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
+ return this.baseMapper.findInEmptyLocMast(locType1, rows);
+ }
+
+ @Override
+ public LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
+ return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+ }
+
+ @Override
+ public LocMast findEmptyLowFrequencyLocMast(Short locType1) {
+ return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 6e070ad..94f4225 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,8 +1,6 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -93,7 +91,7 @@
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -474,7 +472,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 12cdfb4..e75e2a8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -39,6 +39,13 @@
}
/**
+ * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
+ */
+ public static String append(int row, int bay, int lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ }
+
+ /**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
@@ -146,6 +153,26 @@
}
/**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+ */
+ public static int getBay(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(2, 5));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+ */
+ public static int getLev(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(5, 7));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
* 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
*/
public static void toDeepIfEmptyByShallow(String shallowLoc) {
@@ -197,42 +224,6 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
}
-
- public static Integer getInnermostRow(String locNo){
- int row = getRow(locNo);
- switch (row) {
- case 1:
- case 2:
- case 3:
- return 1;
- case 4:
- case 5:
- case 6:
- case 7:
- return 7;
- case 8:
- case 9:
- case 10:
- case 11:
- return 8;
- case 12:
- case 13:
- case 14:
- return 14;
- case 15:
- case 16:
- case 17:
- case 18:
- return 15;
- case 19:
- case 20:
- case 21:
- return 21;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- }
-
public static List<String> getGroupLoc(String locNo){
int row = getRow(locNo);
@@ -532,7 +523,6 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
}
-
public Map<Integer, List<Integer>> getRowSeqHasSortOfPakin(int start, int end) {
Map<Integer, List<Integer>> result = new HashMap<>();
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index aaba5de..37b6c9c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,6 +1,5 @@
package com.zy.common.service;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
@@ -10,7 +9,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -100,97 +98,113 @@
return workNo;
}
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- LocTypeDto oldLocType = locTypeDto.clone();
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- }
-
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
- StartupDto startupDto = new StartupDto();
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
int start;
int end;
- Integer theCrnNo = null;
+ Integer matType = null;//鐗╂枡绫诲瀷
+ //鏍规嵁鍏ュ簱绔欙紝鍐冲畾鎼滅储鎸囧畾鍫嗗灈鏈�
+ ArrayList<Integer> crnNos = new ArrayList<>();
+ //鏍规嵁鍏ュ簱绔欙紝鎵惧埌搴撲綅缁勬渶鍐呬晶鎺�
+ ArrayList<Integer> rows = new ArrayList<>();
switch (sourceStaNo) {
- case 103:
+ case 103://103鍏ュ簱绔�
whsType = 1;
start = 1;
- end = 14;
-// if (null != wrkMastService.selectPakoutOfStaNo(104)) {
-// start = 8;
-// theCrnNo = 2;
-// }
+ end = 11;
+
+ //103绔欏垎閰�1锛�2鍫嗗灈鏈�
+ crnNos.add(1);
+ crnNos.add(2);
+
+ //鍒嗛厤1锛�7锛�8鎺�
+ rows.add(1);
+ rows.add(7);
+ rows.add(8);
break;
- case 203:
+ case 203://203鍏ュ簱绔�
whsType = 2;
- start = 8;
+ start = 12;
end = 21;
-// if (null != wrkMastService.selectPakoutOfStaNo(204)) {
-// end = 14;
-// theCrnNo = 2;
-// }
+
+ //203绔欏垎閰�3锛�4鍫嗗灈鏈�
+ crnNos.add(3);
+ crnNos.add(4);
+
+ //鍒嗛厤14锛�15锛�21鎺�
+ rows.add(14);
+ rows.add(15);
+ rows.add(21);
break;
default:
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- int curRow = rowLastno.getCurrentRow(); // 褰撳墠鍒�
- int sRow = rowLastno.getsRow(); // 璧峰鍒�
- int eRow = rowLastno.geteRow(); // 缁堟鍒�
- int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛�
- int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
// 鐩爣搴撲綅
LocMast locMast = null;
- boolean inoutEveryday = false;
if (!Cools.isEmpty(matNos)) {
for (String matNo : matNos) {
Mat mat = matService.selectByMatnr(matNo);
- if (mat.getInoutEveryday() != null && mat.getInoutEveryday()) {
- inoutEveryday = true;
- break;
+ if (matType == null) {
+ matType = mat.getMatType();
+ }
+ if (matType != mat.getMatType()) {
+ throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
}
}
- }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
- List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
- for (String locNo : locNos) {
- List<String> groupLoc = Utils.getGroupLoc(locNo);
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
- }
- }
- }
- }
+ if (matNos.size() > 1 && matType == 1) {
+ //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
+ throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
}
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ locMast = getLocNoStep1(staDescId, locTypeDto, start, end);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ if (matType != null) {
+ if (matType == 1) {//鍗曞搧绫诲瀷鍏ュ簱
+ locMast = getLocNoStep2(locTypeDto, matNos, rows);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+ } else if (matType == 2) {//楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
+ locMast = getLocNoStep3(locTypeDto, crnNos);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+ } else if (matType == 3) {//浣庨娣锋斁绫诲瀷
+ locMast = getLocNoStep4(locTypeDto);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+ }
+ }
+
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ private LocMast getLocNoStep1(Integer staDescId, LocTypeDto locTypeDto,int start,int end) {
+ LocMast locMast = null;
if (staDescId == 10) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "D").ge("row1", start).le("row1", end));
@@ -205,7 +219,6 @@
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
locMast = locMast0;
break;
}
@@ -216,282 +229,109 @@
}
}
- // 搴撳尯閿佸畾
- if (Cools.isEmpty(locMast)) {
- LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
- if (!Cools.isEmpty(locRule)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
- , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- for (LocMast one : locMasts) {
- List<String> groupLoc = Utils.getGroupLoc(one.getLocNo());
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
- }
- }
+ return locMast;
+ }
+
+ //鍗曞搧绫诲瀷鍏ュ簱
+ private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows) {
+ LocMast locMast = null;
+ //鎵惧唴渚х┖搴撲綅(闈炴渶澶栦晶搴撲綅)
+ List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
+ for (String locNo : locNos) {
+ List<String> groupLoc = Utils.getGroupLoc(locNo);
+ LocMast locMast0 = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (true || basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
+ break;
}
}
}
}
}
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- int currentRow = 1;
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- for (int i = 0; i < shelves.group; i ++) {
- if (i > 0) {
- curRow = currentRow;
- }
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- currentRow = curRow;
- int crnNo1 = shelves.get(curRow);
- if (whsType == 1) {
- switch (curRow) {
- case 1:
- curRow = 1;
- if (null != theCrnNo) {
- curRow = 8;
- crnNo1 = crnNo1 + 1;
- }
- break;
- case 2:
- curRow = 7;
- if (null != theCrnNo) {
- curRow = 14;
- crnNo1 = crnNo1 + 1;
- }
- break;
- case 3:
- curRow = 8;
- break;
- case 4:
- curRow = 14;
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ //鏈壘鍒板贩閬擄紝鎵句竴鏉℃柊鐨勭┖宸烽亾
+ if (locMast == null) {
+ locMast = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows);//鎵句竴鏉℃柊鐨勭┖宸烽亾
+ }
+
+ return locMast;
+ }
+
+ //楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
+ private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos) {
+ LocMast locMast = null;
+ //鎵炬渶澶栦晶绌哄簱浣�
+ LocMast locMast0 = locMastService.findOutMast(locTypeDto.getLocType1(), crnNos);
+ if (locMast0 != null) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (true||basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
}
- } else {
- switch (curRow) {
- case 1:
- curRow = 8;
- break;
- case 2:
- curRow = 14;
- break;
- case 3:
- curRow = 15;
- if (null != theCrnNo) {
- curRow = 8;
- crnNo1 = crnNo1 - 1;
- }
- break;
- case 4:
- curRow = 21;
- if (null != theCrnNo) {
- curRow = 14;
- crnNo1 = crnNo1 - 1;
- }
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- crnNo1 = crnNo1 + 1;
- }
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
}
}
}
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+ return locMast;
+ }
+
+ //浣庨绫诲瀷锛岀洿鎺ユ壘娣锋斁鍖哄煙
+ private LocMast getLocNoStep4(LocTypeDto locTypeDto) {
+ LocMast locMast = null;
+ LocMast locMast0 = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1());
+ if (locMast0 != null) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (true||basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
+ }
+ }
+ }
}
+
+ return locMast;
+ }
+
+ //杩斿洖dto
+ private StartupDto getLocNoFinalStep(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
+ .eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
// 妫�娴嬬洰鏍囩珯
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(currentRow);
- rowLastnoService.updateById(rowLastno);
-
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- // 楂樹綆棰戠鎺с�佸簱浣嶇粍鍏ㄩ儴涓篛
- if (locMast == null) {
- List<Integer> rows = Utils.getGroupLoc(curRow);
- List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
- if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast one : locMasts) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- break;
- }
- }
- }
-
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast, 10)) { locMast = null; }
- }
-
- // 2.1 楂樹綆棰戠鎺с�佸簱浣嶇粍鏃犻渶鍏ㄩ儴涓篛锛屾壘鍒板簱浣嶅搴旀繁搴撲綅涓嶈兘涓篜 R
- if (Cools.isEmpty(locMast)) {
- int sign = curRow;
- while (sign != 0 && Cools.isEmpty(locMast)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd1(sign, locTypeDto.getLocType1(), inoutEveryday);
- for (LocMast loc : locMasts) {
- // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
- boolean success = true;
- // 娴呭簱浣�
- List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
- for (String outerLocNo : outerLocList) {
- LocMast outerLoc = locMastService.selectById(outerLocNo);
- if (Cools.isEmpty(outerLoc)) {
- continue;
- }
- if (!outerLoc.getLocSts().equals("O")) {
- success = false; break;
- }
- }
- // 娣卞簱浣嶅垽鏂�
- List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
- for (String insideLocNo : insideLocList) {
- LocMast insideLoc = locMastService.selectById(insideLocNo);
- if (Cools.isEmpty(insideLoc)) {
- continue;
- }
- if (insideLoc.getLocSts().equals("R")
- || insideLoc.getLocSts().equals("P")
- || insideLoc.getLocSts().equals("Q")
- || insideLoc.getLocSts().equals("S")) {
- success = false; break;
- }
- }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(loc, 10)) {
- success = false;
- }
- if (success) {
- locMast = loc;
- break;
- }
- }
- sign = getCurRow(sign);
- }
- }
-
- // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
- if (Cools.isEmpty(locMast)) {
- int sign = curRow;
- while (sign != 0 && Cools.isEmpty(locMast)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
- for (LocMast loc : locMasts) {
- // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
- boolean success = true;
- // 娴呭簱浣�
- List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
- for (String outerLocNo : outerLocList) {
- LocMast outerLoc = locMastService.selectById(outerLocNo);
- if (Cools.isEmpty(outerLoc)) {
- continue;
- }
- if (!outerLoc.getLocSts().equals("O")) {
- success = false; break;
- }
- }
- // 娣卞簱浣�
- List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
- for (String insideLocNo : insideLocList) {
- LocMast insideLoc = locMastService.selectById(insideLocNo);
- if (Cools.isEmpty(insideLoc)) {
- continue;
- }
- if (insideLoc.getLocSts().equals("R")
- || insideLoc.getLocSts().equals("P")
- || insideLoc.getLocSts().equals("Q")
- || insideLoc.getLocSts().equals("S")) {
- success = false; break;
- }
- }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(loc, 10)) {
- success = false;
- }
- if (success) {
- locMast = loc;
- break;
- }
- }
- sign = getCurRow(sign);
- }
- }
-
- //2023-4-13 ADD锛� 鎵惧埌鐨勫簱浣嶃�佷互鍙婂叾娴呭簱浣嶏紝濡傛灉鍦ㄥ伐浣滄。鏈夌Щ搴撲换鍔★紝鍒欒烦杩�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("io_type", 11));
- for (WrkMast wrkMast : wrkMasts){
- if (wrkMast.getSourceLocNo().equals(locMast.getLocNo())){
- locMast = null;
- break;
- }
- List<String> outerLocList = Utils.getGroupOuterLoc(locMast.getLocNo());
- for (String outerLocNo : outerLocList) {
- if (locMast.getLocNo().equals(outerLocNo)){
- locMast = null;
- break;
- }
- }
- }
-
- // 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- } else {
- times = 0;
- }
- // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+
// 杩斿洖dto
+ StartupDto startupDto = new StartupDto();
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6ea48e3..48cb33c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -112,7 +112,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -195,7 +195,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -258,7 +258,7 @@
}
// 妫�绱㈠簱浣�
List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
- return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e88f471..5ea709d 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -496,7 +496,7 @@
) dual on dual.loc_no = lm.loc_no
WHERE 1 = 1
AND ld.matnr = #{matnr}
- AND (lm.row1 >= #{start} AND lm.row1 <= #{end})
+ AND loc_type2 = 1
AND (lm.loc_sts = 'F')
AND dual.count = 1
ORDER BY lm.modi_time ASC
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 192e341..0135339 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,7 +33,6 @@
<result column="inv_wh" property="invWh" />
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
- <result column="Pdc_type" property="PdcType" />
<result column="ctn_no" property="ctnNo" />
</resultMap>
@@ -284,4 +283,47 @@
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
+ <select id="findOutMast" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_type1 = #{locType1}
+ and loc_type2 = 2
+ and crn_no in
+ <foreach item="item" collection="crnNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and loc_sts = 'O'
+ order by row1,bay1,lev1
+ </select>
+
+ <select id="findInEmptyLocMast" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_type2 = 1
+ and loc_type1 = #{locType1}
+ and row1 in
+ <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and loc_sts = 'O'
+ order by row1,bay1,lev1
+ </select>
+
+ <select id="findEmptyLocMastByLocNos" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_type2 = 1
+ and loc_type1 = #{locType1}
+ and loc_no in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and loc_sts = 'O'
+ order by row1,bay1,lev1
+ </select>
+
+ <select id="findEmptyLowFrequencyLocMast" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast
+ where loc_type2 = 3
+ and loc_type1 = #{locType1}
+ and loc_sts = 'O'
+ order by row1,bay1,lev1
+ </select>
</mapper>
--
Gitblit v1.9.1