From fed3f3bb2be54aefa5aa2aff255901249cd0d152 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 09:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index b5aca80..1343f7b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -7,13 +7,10 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSplitTwin;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.WrkMastSplitTwinService;
-import com.zy.asrs.service.impl.BasDevpServiceImpl;
-import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.asrs.task.handler.WrkMastSplitTwinInItHandler;
-import com.zy.asrs.utils.LocAndStaCodeUtil;
-import com.zy.asrs.utils.Utils;
import com.zy.common.model.enums.CrnStnType;
import com.zy.common.model.enums.WrkMastExecuteType;
import org.slf4j.Logger;
@@ -23,7 +20,6 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -42,22 +38,21 @@
@Autowired
private BasCrnpService basCrnpService;
@Autowired
- private BasDevpServiceImpl basDevpService;
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
public static final List<Integer> SplitTwin_CRN_NO = new ArrayList<Integer>() {{
add(3);
add(4);
add(5);
}};
- @Autowired
- private WrkMastServiceImpl wrkMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
for (Integer crnNo : SplitTwin_CRN_NO) {
try {
- List<Integer> integers = WrkMastExecuteType.get(crnNo);
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (!Cools.isEmpty(basCrnp)) {
if (basCrnp.getWrkNo() == 0 && basCrnp.getCrnSts() != 3) {
@@ -82,7 +77,7 @@
}
switch (wrkMastSplitTwin.getIoType()){
case 1:
- Integer count = basDevpService.selectWaitNecessary(integers,wrkMastSplitTwin.getWrkNo().intValue());
+ Integer count = basDevpService.selectWaitNecessary(WrkMastExecuteType.get(crnNo),wrkMastSplitTwin.getWrkNo().intValue());
if (basCrnp.getCrnStatusOne() != 20) {//鍫嗗灈鏈哄伐浣�1鏈夌墿寰呬綔涓�
break;
}
--
Gitblit v1.9.1