From 27b048e77b68752c7c3060b9e31ad46efb4101a5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 08:07:03 +0800
Subject: [PATCH] 1
---
version/db/cv.sql | 1 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java | 4 +++-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 4 +---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/version/db/cv.sql b/version/db/cv.sql
index f7fd3b8..889358e 100644
--- a/version/db/cv.sql
+++ b/version/db/cv.sql
@@ -136,5 +136,6 @@
-- Records of cv_work_lastno
-- ----------------------------
INSERT INTO `cv_work_lastno` VALUES (1, 1, 1, 1, 8999, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cv_work_lastno` (`id`, `type`, `wrk_no`, `s_no`, `e_no`, `status`, `deleted`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `memo`) VALUES (2, 2, 10000, 10000, 30000, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL);
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index 15345a8..add267f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -162,9 +162,7 @@
return job;
}
- private Integer getWorkNo() {
- return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
- }
+
private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
ApplyInDto applyInDto = new ApplyInDto();
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index 1e89ca8..e7b620f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -91,7 +91,7 @@
redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
- int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_OUT_TYPE.type);
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(putSta.getTargetSta());
job = new Job();
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index a25342a..e46767f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -127,6 +127,6 @@
}
private Integer getWorkNo() {
- return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_IN_TYPE.type);
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java
index b1c9562..31a3e15 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java
@@ -2,7 +2,9 @@
public enum WorkNoTypeType {
- WORK_NO_TYPE(1);
+ WORK_NO_IN_TYPE(1),
+ WORK_NO_OUT_TYPE(2);
+
public int type;
--
Gitblit v1.9.1