From 4736d5a88d1e9ad82d54adfa3d029974ee2be4f3 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 10 十月 2024 13:26:49 +0800
Subject: [PATCH] #gz
---
src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java | 4 ++--
src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 2 +-
src/main/webapp/views/wrkMastSta/wrkMastSta.html | 2 +-
src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 10 +++++-----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
index 39846f9..a63f144 100644
--- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
@@ -20,7 +20,7 @@
// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//鎷嗗灈淇℃伅涓婁紶
- int[] staNos =new int[]{118,119,120,121};
+ int[] staNos =new int[]{118,120,121};
for (int staNo : staNos){
try{
ReturnT<String> result = reportToDismantleTheStackHandler.start(staNo);
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index f80bb62..18521d3 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -64,7 +64,7 @@
}};
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_CU){
try{
@@ -139,7 +139,7 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
try{
for(Integer staNo : STA_WORK_CU){
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 5361160..d4bfc20 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -45,7 +45,7 @@
}};
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);
+ add(118);add(120);add(121);
}};
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
@@ -55,15 +55,15 @@
add(118);add(120);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(119);add(121);
+ add(121);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);add(122);add(123);
+ add(118);add(120);add(121);add(122);add(123);
}};
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_CU){
try{
@@ -143,7 +143,7 @@
}
}
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
try{
for(Integer staNo : STA_WORK_CU){
diff --git a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
index 3febe69..af3d97a 100644
--- a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
@@ -207,7 +207,7 @@
int sign = 0;
int staA=118;
- int staB=119;
+ int staB=118;
for (List<StockOutParam.LocDetl> locDetlList:lists){
sign++;
if (locDetlList.size()==0){
@@ -314,7 +314,7 @@
int sign = 0;
int staA=118;
- int staB=119;
+ int staB=118;
for (List<StockOutParam.LocDetl> locDetlList:lists){
sign++;
if (locDetlList.size()==0){
diff --git a/src/main/webapp/views/wrkMastSta/wrkMastSta.html b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
index ceed6e3..13b2555 100644
--- a/src/main/webapp/views/wrkMastSta/wrkMastSta.html
+++ b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
@@ -92,7 +92,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-add1" lay-event="addData1">118</button>
- <button class="layui-btn layui-btn-sm" id="btn-add2" lay-event="addData2">119</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add2" lay-event="addData2">119</button>-->
<button class="layui-btn layui-btn-sm" id="btn-add3" lay-event="addData3">120</button>
<button class="layui-btn layui-btn-sm" id="btn-add4" lay-event="addData4">121</button>
<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
--
Gitblit v1.9.1