From f9dd569895f007d09c3b568b4a4755d7ae8add45 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 二月 2023 17:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 9 +-
src/main/resources/mapper/LocMastMapper.xml | 4 +
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4
src/main/java/com/zy/asrs/service/LocMastService.java | 4
src/main/java/com/zy/common/service/CommonService.java | 110 +++++++++---------------------------
src/main/resources/application.yml | 7 ++
6 files changed, 46 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index dcea667..c495423 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -15,9 +15,9 @@
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
- LocMast queryFreeLocMast1(@Param("row") Integer row, @Param("locType1") Short locType1);
+ LocMast queryFreeLocMast1(@Param("row") Integer row, @Param("locType1") Short locType1 ,@Param("channelMax") int channelMax);
- LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("bay") Integer bay);
+ LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index a7f45fb..e137a2c 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -16,12 +16,12 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast1(Integer row, Short locType1);
+ LocMast queryFreeLocMast1(Integer row, Short locType1 ,int channelMax);
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast2(Integer row, Short locType1, Integer bay);
+ LocMast queryFreeLocMast2(Integer row, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
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 962ac2f..163de40 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -24,15 +24,16 @@
}
@Override
- public LocMast queryFreeLocMast1(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast1(row, locType1);
+ public LocMast queryFreeLocMast1(Integer row, Short locType1 ,int channelMax) {
+ return this.baseMapper.queryFreeLocMast1(row, locType1 ,channelMax);
}
@Override
- public LocMast queryFreeLocMast2(Integer row, Short locType1, Integer bay) {
- return this.baseMapper.queryFreeLocMast2(row, locType1, bay);
+ public LocMast queryFreeLocMast2(Integer row, Short locType1) {
+ return this.baseMapper.queryFreeLocMast2(row, locType1);
}
+
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
if (Cools.isEmpty(sourceLocNo)) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 496755b..0ca81d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -17,6 +17,7 @@
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,8 @@
private LocDetlService locDetlService;
@Autowired
private SlaveProperties slaveProperties;
+ @Value("${channel.channelMax}")
+ private Integer channelMax;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -98,9 +101,13 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
-// whsType = getWhsType(sourceStaNo, times);
- StartupDto startupDto = new StartupDto();
+ if (sourceStaNo.equals(100)){
+ whsType=1;
+ }else if (sourceStaNo.equals(200)){
+ whsType=2;
+ }
+ StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -111,52 +118,18 @@
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
+ int rowCount = eRow - sRow;
// 鐩爣鍫嗗灈鏈哄彿
int crnNo = crn_qty;
// 鐩爣搴撲綅
LocMast locMast = null;
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- switch (curRow){
- case 2:
- curRow = 4;
- break;
- case 4:
- curRow = 6;
- break;
- case 6:
- curRow = 8;
- break;
- case 8:
- curRow = 11;
- break;
- case 11:
- curRow = 13;
- break;
- case 13:
- curRow = 3;
- break;
- case 3:
- curRow = 5;
- break;
- case 5:
- curRow = 7;
- break;
- case 7:
- curRow = 9;
- break;
- case 9:
- curRow = 12;
- break;
- case 12:
- curRow = 14;
- break;
- case 14:
- curRow = 2;
- break;
- }
+ if (curRow==3){
+ curRow=4;
+ }else if (curRow==4){
+ curRow=3;
+ }else {
+ rowCount=0;
}
if (crnNo == 0) {
@@ -182,33 +155,19 @@
rowLastnoService.updateById(rowLastno);
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ if (Cools.isEmpty(locMast)) {
+ Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
+ if (whsType!=1){
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ } else if (ruleId == 1){ //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
+ locMast = locMastService.queryFreeLocMast1(curRow, locTypeDto.getLocType1() ,channelMax+1);
+ } else if (ruleId == 2){ //鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
-// if (locMast == null) {
-// if (Utils.isShallowLoc(slaveProperties, curRow)) {
-// Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
-// locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
-// // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
-// // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-// if (!locMastService.checkEmptyCount(locMast)) {
-// locMast = null;
-// }
-// }
- if (Cools.isEmpty(locMast)) {
-
- Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
- if (ruleId == 0){//榛樿瑙勫垯
- locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
- } else if (ruleId == 1){ //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
- locMast = locMastService.queryFreeLocMast1(2, locTypeDto.getLocType1());
- } else if (ruleId == 2){//鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
- locMast = locMastService.queryFreeLocMast2(2, locTypeDto.getLocType1(), curRow);
- } else {
- locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
- }
-
+ locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1() );
+ } else { //榛樿瑙勫垯
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
}
-// }
+ }
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
@@ -232,21 +191,6 @@
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
- }
-
-
- public static String zerofill(String msg, Integer count) {
- if (msg.length() == count) {
- return msg;
- } else if (msg.length() > count) {
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
- msgBuilder.insert(0, "0");
- }
- return msgBuilder.toString();
- }
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b80d24c..6a87a9f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,6 +52,12 @@
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
+# 鍏呮斁鐢垫祴璇曢�氶亾
+channel:
+ # 鏈�澶ч�氶亾鏁�
+ channelMax: 48
+
+# MES绯荤粺
mes:
url: 172.28.15.251:7899
# 鍏ュ簱涓婃姤
@@ -59,6 +65,7 @@
# 鍑哄簱涓婃姤
outPath: mes-pm/in/stock/condition/exWarehouse
+# 鍏呮斁鐢垫祴璇曠郴缁�
ren:
# 1~8閫氶亾
url1: 172.28.15.196:12784
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index fd66425..9c463e0 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -57,10 +57,12 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
+ and channel > 0
+ and channel < #{channelMax}
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- order by loc_type2 asc,lev1 asc,bay1 asc
+ order by channel asc
</select>
<select id="queryFreeLocMast2" resultMap="BaseResultMap">
--
Gitblit v1.9.1