From 6b3b7d9c3434f3ae8cb12ef8431b16c185f14628 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 08 二月 2023 09:44:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 78 +++++++---
src/main/java/com/zy/asrs/utils/Utils.java | 11 +
src/main/resources/mapper/LocMastMapper.xml | 50 +++++++
src/main/java/com/zy/asrs/controller/DocTypeController.java | 2
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6
src/main/java/com/zy/asrs/service/LocMastService.java | 5
src/main/java/com/zy/common/service/CommonService.java | 213 ++++++++++++++++-------------
src/main/resources/application.yml | 6
8 files changed, 246 insertions(+), 125 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index ee3ff8f..1edaeec 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -105,7 +105,7 @@
public R query(String condition) {
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
wrapper.like("doc_name", condition);
- Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper);
+ Page<DocType> page = docTypeService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (DocType docType : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index e0722fe..a01a798 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -19,9 +19,15 @@
, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday
, @Param("rowBeg") Integer rowBeg, @Param("rowEnd") Integer rowEnd, @Param("bayBeg") Integer bayBeg
, @Param("bayEnd") Integer bayEnd, @Param("levBeg") Integer levBeg, @Param("levEnd") Integer levEnd);
+ List<LocMast> queryFreeLocMast2(@Param("locType1") Short locType1
+ , @Param("rowBeg") Integer rowBeg, @Param("rowEnd") Integer rowEnd, @Param("bayBeg") Integer bayBeg
+ , @Param("bayEnd") Integer bayEnd, @Param("levBeg") Integer levBeg, @Param("levEnd") Integer levEnd);
+
List<LocMast> queryFreeLocMastEnd(@Param("row") Integer row, @Param("locType1") Short locType1);
List<LocMast> queryFreeLocMastEnd0(@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("row1") Integer row, @Param("locType1") Short locType1);
+ List<LocMast> queryFreeLocMastEnd1(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday);
+
@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 7e6e34e..1356a23 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -17,6 +17,9 @@
, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1);
List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1);
+ List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday);
+
+ List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -30,7 +33,7 @@
* @param locMast
* @return
*/
- Boolean checkEmptyCount(LocMast locMast);
+ Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
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 c19181d..9ad0930 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,6 +19,7 @@
import java.util.List;
import java.util.stream.Collectors;
+@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -50,6 +52,17 @@
}
@Override
+ public List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday){
+ return this.baseMapper.queryFreeLocMastEnd1(row, locType1,inoutEveryday);
+ }
+
+ @Override
+ 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<String> queryGroupEmptyStock(String sourceLocNo) {
if (Cools.isEmpty(sourceLocNo)) {
return null;
@@ -62,11 +75,15 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ boolean res = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
+ if (!res) {
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank);
+ }
+ return res;
}
@Override
@@ -118,33 +135,46 @@
rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
}
-// if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})
-// ) {
-// locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
-// } else if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})
-// ) {
-// locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ // plan first
+// for (int i = 0; i<locNos.size(); i++) {
+// LocMast locMast = this.selectById(locNos.get(i));
+// if (locMast.getLocSts().equals("O")) {
+// if (i == 0) {
+// return locMast;
+// } else {
+// LocMast lastLoc = this.selectById(locNos.get(i - 1));
+// if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
+// return locMast;
+// } else {
+// break;
+// }
+// }
+// }
// }
- for (int i = 0; i<locNos.size(); i++) {
- LocMast locMast = this.selectById(locNos.get(i));
+// return null;
+
+ // plan second
+ LocMast finalRes = null;
+ for (String locNo : locNos) {
+ LocMast locMast = this.selectById(locNo);
if (locMast.getLocSts().equals("O")) {
- if (i == 0) {
- return locMast;
- } else {
- LocMast lastLoc = this.selectById(locNos.get(i - 1));
- if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
- return locMast;
- } else {
- break;
- }
+ if (finalRes == null) {
+ finalRes = locMast;
}
+ } else {
+ if (finalRes != null) {
+ log.error("{}搴撲綅寮傚父锛歿}搴撲綅鐘舵�佷负O.绌哄簱浣嶏紝浣唟}搴撲綅鐘舵�佷负{}", finalRes.getLocNo(), finalRes.getLocNo(), locMast.getLocNo(), locMast.getLocSts());
+ finalRes = null;
+ break;
+ }
+ if (locMast.getLocSts().equals("R") || locMast.getLocSts().equals("P")) {
+ finalRes = null;
+ break;
+ }
+ finalRes = null;
}
}
- return null;
+ return finalRes;
}
@Override
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 89cef79..12cdfb4 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -6,7 +6,9 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2020/8/27
@@ -531,4 +533,13 @@
}
}
+
+ public Map<Integer, List<Integer>> getRowSeqHasSortOfPakin(int start, int end) {
+ Map<Integer, List<Integer>> result = new HashMap<>();
+ for (int i = start ; i <= end; i++) {
+
+ }
+ return result;
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ca077cf..3d48739 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -178,9 +178,12 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
}
}
}
@@ -200,9 +203,39 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // 搴撳尯閿佸畾
+ 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;
+ }
}
}
}
@@ -211,7 +244,6 @@
}
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
-
int currentRow = 1;
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
@@ -311,78 +343,57 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
+ // 楂樹綆棰戠鎺с�佸簱浣嶇粍鍏ㄩ儴涓篛
if (locMast == null) {
-
- // 搴撳尯閿佸畾
- LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
- if (!Cools.isEmpty(locRule)) {
- List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
- List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
- , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast one : locMasts) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- crnNo = locMast.getCrnNo();
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- // 妫�娴嬬洰鏍囩珯
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- }
- break;
- }
+ 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 (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;
- }
- }
- }
- }
-// LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
-// if (!Cools.isEmpty(locMast0)) {
-// locMast = locMast0;
-// }
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
-// if (!locMastService.checkEmptyCount(locMast)) {
-// locMast = null;
-// }
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(locMast, 10)) { locMast = null; }
}
- // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
-
-
+ // 2.1 楂樹綆棰戠鎺с�佸簱浣嶇粍鏃犻渶鍏ㄩ儴涓篛锛屾壘鍒板簱浣嶅搴旀繁搴撲綅涓嶈兘涓篜 R
if (Cools.isEmpty(locMast)) {
int sign = curRow;
while (sign != 0 && Cools.isEmpty(locMast)) {
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
+ List<LocMast> locMasts = locMastService.queryFreeLocMastEnd1(sign, locTypeDto.getLocType1(), inoutEveryday);
for (LocMast loc : locMasts) {
// 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
boolean success = true;
- List<String> outerLoc = Utils.getGroupOuterLoc(loc.getLocNo());
- for (String outerLocNo : outerLoc) {
- if (!locMastService.selectById(outerLocNo).getLocSts().equals("O")) {
+ // 娴呭簱浣�
+ 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")) {
+ success = false; break;
+ }
+ }
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(loc, 10)) {
+ success = false;
}
if (success) {
locMast = loc;
@@ -393,38 +404,48 @@
}
}
-
-// if (Cools.isEmpty(locMast)){
-// List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
-// int sign=curRow;
-// while (true){
-// if (locMasts.size()==0){
-// sign = getCurRow(sign);
-// if (sign != 0){
-// locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
-// }else {
-// break;
-// }
-// }else {
-// break;
-// }
-// }
-// for (LocMast locMast1 : locMasts){
-// List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
-// Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
-// for (LocMast locMast2:locMasts1){
-// if (locMast2.getLocSts().equals("O")){
-// locMast = locMast2;
-// break;
-// }else if (!locMast2.getLocSts().equals("F")){
-// break;
-// }
-// }
-// if (!Cools.isEmpty(locMast)){
-// break;
-// }
-// }
-// }
+ // 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")) {
+ success = false; break;
+ }
+ }
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(loc, 10)) {
+ success = false;
+ }
+ if (success) {
+ locMast = loc;
+ break;
+ }
+ }
+ sign = getCurRow(sign);
+ }
+ }
// 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8b324a5..d3ee19b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
-# url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+# url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 006bb7d..192e341 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -198,6 +198,25 @@
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
+ <select id="queryFreeLocMastEnd1" resultMap="BaseResultMap">
+ select *
+ from asr_loc_mast
+ where row1=#{row}
+ and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ <choose>
+ <when test="inoutEveryday != null and inoutEveryday">
+ AND bay1 < 11 </when>
+ <otherwise>
+ AND bay1 >= 11
+ </otherwise>
+ </choose>
+ and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+ order by loc_sts desc ,lev1 asc,bay1 asc
+ </select>
+
<select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
select *
from asr_loc_mast
@@ -234,4 +253,35 @@
</if>
</select>
+ <select id="queryFreeLocMast2" resultMap="BaseResultMap">
+ select *
+ from asr_loc_mast
+ where 1=1
+ and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+
+ <if test="rowBeg != null">
+ and row1 >= #{rowBeg}
+ </if>
+ <if test="rowEnd != null">
+ and row1 <= #{rowEnd}
+ </if>
+ <if test="bayBeg != null">
+ and bay1 >= #{bayBeg}
+ </if>
+ <if test="bayEnd != null">
+ and bay1 <= #{bayEnd}
+ </if>
+ <if test="levBeg != null">
+ and lev1 >= #{levBeg}
+ </if>
+ <if test="levEnd != null">
+ and lev1 <= #{levEnd}
+ </if>
+ and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+ order by loc_sts desc ,lev1 asc,bay1 asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1