From c25464b42dbba6a3625c6fd0a9992d79732cd5db Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 20 八月 2024 16:26:26 +0800
Subject: [PATCH] 桁架理货出库流程修改
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 51b1728..b97a3f1 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -9,7 +9,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -41,83 +40,88 @@
public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
- add(101);add(102);add(104);add(105);add(107);add(108);add(110);add(111);add(113);add(114);add(116);add(117);
+ add(101);add(102);add(104);add(105);add(107);add(108);
}};
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);
+ add(119);add(118);
}};
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
- add(120);add(121);
+
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
- add(118);add(120);
+ add(118);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(119);add(121);
+ add(119);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);add(122);add(123);
+ add(119);add(118);add(122);
}};
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_CU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ try{
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
continue;
}
- }
- if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
- continue;
- }
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
- continue;
- }
- boolean wrkTypeSign = fullKM(wrkMast);
- if (!Cools.isEmpty(wrkMast)){
- if (wrkTypeSign) {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
- if (result.getCode()==200){
+ if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
+ if (!wrkMast.getStaNo().equals(122)){
continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
}
- } else {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
+ }
+ if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
+ continue;
+ }
+ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
+ continue;
+ }
+ boolean wrkTypeSign = fullKM(wrkMast);
+ if (!Cools.isEmpty(wrkMast)){
+ if (wrkTypeSign) {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+ } else {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
+ }catch (Exception e){
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
for(Integer staNo : STA_WORK_RU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
- }
+ try{
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ continue;
+ }
- if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
- continue;
- }
+ if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
+ continue;
+ }
// boolean wrkTypeSign = fullKM(wrkMast);
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast)){
// if (wrkTypeSign){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
if (result.getCode()==200) {
@@ -125,12 +129,15 @@
} else {
System.out.println(staNo+"澶辫触锛�");
}
+ }
}
+ }catch (Exception e){
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
try{
for(Integer staNo : STA_WORK_CU){
--
Gitblit v1.9.1