From 27f0c5253fb48dbf9635d31c62d3435407f326c1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 17:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzynasrs' into gzynasrs
---
src/main/resources/mapper/LocMastMapper.xml | 2
src/main/java/com/zy/common/web/WcsController.java | 3
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 +-
src/main/java/com/zy/common/service/CommonService.java | 184 +++++++++++++++++----------------------------
src/main/resources/application.yml | 2
5 files changed, 81 insertions(+), 122 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 683ff79..17c3248 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -590,12 +590,14 @@
java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(param.getPackName());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
+// Mat mat = matService.selectByMatnr(param.getPackName());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
+// waitPakin.sync(mat);
+ waitPakin.setMatnr(param.getPackName());
+ waitPakin.setMaktx(param.getPackName());
waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index dbbd384..bf10229 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -100,16 +100,6 @@
// whsType = getWhsType(sourceStaNo, times);
StartupDto startupDto = new StartupDto();
- if (sourceStaNo < 200){
- whsType = 1;
- } else if (sourceStaNo > 199 && sourceStaNo < 300){
- whsType = 2;
- } else if (sourceStaNo > 299 && sourceStaNo < 400){
- whsType = 3;
- } else if (sourceStaNo > 399){
- whsType = 4;
- }
-
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -126,49 +116,49 @@
// 鐩爣搴撲綅
LocMast locMast = null;
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+// if (!Cools.isEmpty(matNos)) {
+// List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
+// for (String locNo : locNos) {
+// if (Utils.isShallowLoc(slaveProperties, locNo)) {
+// continue;
+// }
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+// if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
+// }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (locMasts.size() > 0) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+// if (staDescId == 10) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+// if (locMasts.size() > 0) {
+// for (LocMast loc : locMasts) {
+// if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+// continue;
+// }
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
+// }
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
@@ -218,38 +208,38 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 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 (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)) {
locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
- }
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
- }
- }
+// if (!locMastService.checkEmptyCount(locMast)) {
+// locMast = null;
+// }
+// // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
+// if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+// LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
+// if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
+// locMast = null;
+// }
+// }
+// // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
+// if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+// LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
+// if (!shallowLoc.getLocSts().equals("O")) {
+// locMast = null;
+// }
+// }
}
- }
+// }
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
@@ -292,40 +282,6 @@
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
- }
- }
-
- /**
- * 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
- */
- private Integer getWhsType(Integer sourceStaNo, int times) {
- if (times >= 16) {
- return 4;
- }
- switch (sourceStaNo) {
- case 173:
- case 176:
- case 180:
- case 185:
- return 1;
- case 189:
- case 194:
- case 198:
- case 202:
- return 2;
- case 206:
-// case 211:
-// case 215:
-// case 219:
-// case 223:
- case 227:
- return 3;
- case 305:
- case 303:
- case 301:
- return 4;
- default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 19ab581..bf59f84 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -81,7 +81,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType1(param.getLocType1());
+// sourceStaNo.setLocType1(param.getLocType1());
+ sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e599c46..9e9020a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
# tomcat:
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 1ca68c2..243b9fa 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -48,7 +48,7 @@
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- order by loc_sts desc ,lev1 asc,bay1 asc
+ order by lev1 asc,bay1 asc
</select>
<select id="queryShallowLocFMast" resultMap="BaseResultMap">
--
Gitblit v1.9.1