From d029518fd1ce9170fcf276b28d76d8d7b4f3a948 Mon Sep 17 00:00:00 2001
From: gtctu <3272660260@qq.com>
Date: 星期六, 10 一月 2026 09:36:36 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 4 ++--
src/main/webapp/static/js/mergeStore/mergeStore.js | 2 +-
src/main/webapp/static/js/order/out.js | 6 +++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 ++
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 4 ++--
src/main/webapp/static/js/common.js | 2 +-
pom.xml | 2 +-
8 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/license.lic b/license.lic
index 50da63e..6f8fdd2 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/pom.xml b/pom.xml
index aa3af82..119fc4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
</dependencies>
<build>
- <finalName>gtSxkWms</finalName>
+ <finalName>gtCtuWms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
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 6b14391..4610cb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1185,6 +1185,8 @@
// 鍑哄簱
} else if (wrkMast.getIoType() >100 && wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
+ }else if (wrkMast.getIoType() == 200) {
+ wrkMast.setWrkSts(5L);
}
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index d69ef4f..b6688ae 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -109,7 +109,7 @@
//
// }
- @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
+// @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
private void ShuttleOutTaskSend(){
List<WrkMast> wrkMastsMove = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
if (!wrkMastsMove.isEmpty()) {
@@ -158,7 +158,7 @@
}
- @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
+// @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
private void ShuttleMoveTaskSend(){
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
if (wrkMasts.isEmpty()) {
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7ddded5..c3e6c4e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/gtSxkWms";
+var baseUrl = "/gtCtuWms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index 3e3faaf..e0d2dc7 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -194,7 +194,7 @@
function pakoutPreview(ids) {
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl + "/out/pakout/preview/auth/sxk",
+ url: baseUrl + "/out/pakout/preview/auth/ctu",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(ids),
@@ -349,7 +349,7 @@
// let loadIndex = layer.load(2);
notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
$.ajax({
- url: baseUrl + "/out/pakout/auth/sxk",
+ url: baseUrl + "/out/pakout/auth",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(tableCache),
diff --git a/src/main/webapp/static/js/mergeStore/mergeStore.js b/src/main/webapp/static/js/mergeStore/mergeStore.js
index 8775f38..c60d61e 100644
--- a/src/main/webapp/static/js/mergeStore/mergeStore.js
+++ b/src/main/webapp/static/js/mergeStore/mergeStore.js
@@ -52,7 +52,7 @@
locDetls: locDetlData
}
$.ajax({
- url: baseUrl+"/locMerge/out/start/sxk",
+ url: baseUrl+"/locMerge/out/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 8214bf4..7f6d2b8 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -164,7 +164,7 @@
function pakoutPreview(ids,amount) {
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl + "/out/pakout/preview/auth/sxk",
+ url: baseUrl + "/out/pakout/preview/auth/ctu",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(ids),
@@ -324,7 +324,7 @@
json.ids = ids
json.amount = amount
$.ajax({
- url: baseUrl + "/out/pakout/previewCustomQuantity/auth/sxk",
+ url: baseUrl + "/out/pakout/previewCustomQuantity/auth/ctu",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(json),
@@ -479,7 +479,7 @@
// let loadIndex = layer.load(2);
notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
$.ajax({
- url: baseUrl + "/out/pakout/auth/sxk",
+ url: baseUrl + "/out/pakout/auth",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(tableCache),
--
Gitblit v1.9.1