From 7bac1f6a6be795d36b94a6f77b23958e0590add4 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 03 四月 2025 10:20:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 3 +++
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java | 34 ----------------------------------
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 5e6ef92..6f0287a 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -73,6 +73,9 @@
if (basCrnp.getCrnNo() == 4 && !crn4){
iterator.remove();
}
+ if (basCrnp.getCrnNo() == 7){
+ iterator.remove();
+ }
}
if (basCrnps.isEmpty()){
return;
diff --git a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
index f65de1e..f76ba71 100644
--- a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
@@ -31,42 +31,8 @@
public ReturnT<String> start(LocMast locMastStart, LocMast locMastEnd, Integer crnNo) {
try {
LocMast locMastEndNew = null;
- Integer row1 = locMastStart.getRow1();
- Integer row2 = 0;
- Integer bay1 = locMastStart.getBay1();
- Integer lev1 = locMastStart.getLev1();
- if (row1==crnNo*4){
- row1 = crnNo*4-3;
- row2 = row1+1;
- }else {
- row1=crnNo*4;
- row2 = row1-1;
- }
- Integer signInt = 0;
- while (Cools.isEmpty(locMastEndNew) && lev1<9 && signInt<100){
- signInt++;
- bay1 = BAY+1-bay1;
- if ((bay1<BAY && bay1>0) || (bay1.equals(BAY) && lev1>3)){
- }else {
- bay1=1;
- lev1++;
- }
- locMastEndNew = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("row1",row1).eq("bay1",bay1).eq("lev1",lev1).ne("modi_user",66));
- LocMast locMastEndNew2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("row1",row2).eq("bay1",bay1).eq("lev1",lev1).ne("modi_user",66));
- if (!Cools.isEmpty(locMastEndNew) && !Cools.isEmpty(locMastEndNew2)){
- locMastEnd = locMastEndNew;
- }
- if ((bay1<BAY && bay1>0)){
- bay1++;
- }
- if (signInt==100){
- bay1=1;
- lev1++;
- signInt=0;
- }
- }
workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 66L);
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 84f17c0..e54c9e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=fyxcasrs
+ url: jdbc:sqlserver://192.168.10.201:1433;databasename=fyxcasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1