From bdc2389275719eedaa8eefd52aa86f1c18d8e234 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 一月 2024 10:38:32 +0800
Subject: [PATCH] #更改库位状态代码
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/LocMastController.java | 4 ++--
src/main/java/com/zy/asrs/entity/ViewLocMapDto.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/CrnController.java | 8 ++++----
src/main/java/com/zy/common/service/CommonService.java | 8 ++++----
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index a222dd3..80c78cf 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -921,17 +921,17 @@
LocMast locMast = locMastService.selectByLocNo(locNo);
if (type == 1){
locMast.setBarcode(barcode);
- locMast.setLocSts("F");
+ locMast.setLocSts("Z");
locMastService.updateById(locMast);
}else if (type == 2){
- originLoc.setLocSts("O");
+ originLoc.setLocSts("K");
originLoc.setBarcode("");
locMastService.updateById(originLoc);
}else if (type == 3){
- originLoc.setLocSts("O");
+ originLoc.setLocSts("K");
originLoc.setBarcode("");
locMast.setBarcode(barcode);
- locMast.setLocSts("F");
+ locMast.setLocSts("Z");
locMastService.updateById(originLoc);
locMastService.updateById(locMast);
}
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 84e79dd..c7ad697 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -154,7 +154,7 @@
return R.error("瀹瑰櫒缂栫爜鎴栧鍣ㄧ被鍨嬫湁璇�");
}
}
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("K")){
locMast.setBarcode(null);
}
locMast.setModiUser(getUserId());
@@ -186,7 +186,7 @@
Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
- locMast.setLocSts("O");
+ locMast.setLocSts("K");
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
diff --git a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
index 53fbbc4..5aceb1d 100644
--- a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
+++ b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
@@ -52,11 +52,11 @@
this.bgc = "#00B271";
this.color = "#fff";
break;
- case "F":
+ case "Z":
this.bgc = "#479AC7";
this.color = "#fff";
break;
- case "O":
+ case "K":
this.bgc = "#B45B3E";
this.color = "#fff";
break;
@@ -76,7 +76,7 @@
this.bgc = "#F0DAD2";
this.color = "#000";
break;
- case "X":
+ case "J":
this.bgc = "#bac296";
this.color = "#fff";
break;
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 556150a..5c58614 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -89,12 +89,12 @@
param.setWarehouseId("1688469798893297665");
param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
param.setEmptyContainer(locMast.getEmptyContainer$());
- if (locMast.getLocSts().equals("Z")){
+ if (locMast.getLocSts().equals("J")){
param.setStatus("JY");
}else {
param.setStatus("QY");
}
- if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
+ if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("K")){
param.setContainerCode("");
param.setContainerTypeCode("");
}else {
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 7f51136..bdc694d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1000,7 +1000,7 @@
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setLocSts("Z");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
locMast.setModiTime(now);
locMast.setModiUser(9999L);
@@ -1014,7 +1014,7 @@
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setLocSts("K");//O.绌哄簱浣�
locMast.setBarcode("");//鎵樼洏鐮�
locMast.setModiTime(now);
locMast.setModiUser(9999L);
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 151707c..c72255d 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -81,7 +81,7 @@
Date now = new Date();
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setLocSts("K");//O.绌哄簱浣�
locMast.setBarcode("");//鎵樼洏鐮�
locMast.setModiTime(now);
locMast.setModiUser(9999L);
@@ -89,7 +89,7 @@
//鏇存柊搴撲綅鐘舵��
LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast2.setLocSts("F");//F.鍦ㄥ簱
+ locMast2.setLocSts("Z");//F.鍦ㄥ簱
locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
locMast2.setModiTime(now);
locMast2.setModiUser(9999L);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ea237b8..2019ffb 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -146,7 +146,7 @@
String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("K")) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
locMast = shallowLoc;
@@ -169,7 +169,7 @@
String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("K")) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
crnNo = locMast.getCrnNo();
@@ -272,14 +272,14 @@
// 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 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")) {
+ if (!deepLoc.getLocSts().equals("Z") && !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")) {
+ if (!shallowLoc.getLocSts().equals("K")) {
locMast = null;
}
}
--
Gitblit v1.9.1