From 80f5bd729e3147f3b62bb701c045e6183dff87e3 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 29 十月 2024 15:48:16 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 5630fe9..9e2a822 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -5333,11 +5333,11 @@ case 3: case 4: signExecute = jarWrkMastExecuteGenerateJar(signExecute,sign);//纭寲缃愪换鍔� -// case 5: -// signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉彇杈撻�佺嚎 - default: -// jarWrkMastExecuteGenerateSte(signExecute,sign);//灏忚溅绉诲姩 + case 5: signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉彇杈撻�佺嚎 + default: + jarWrkMastExecuteGenerateSte(signExecute,sign);//灏忚溅绉诲姩 +// signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉彇杈撻�佺嚎 } if (!signExecute[0] && !signExecute[1]){ @@ -8788,7 +8788,7 @@ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2); StaProtocol staProtocolEnt = devpThread.getStation().get(staNoEnt); if (staProtocolEnt == null || (staProtocolEnt.isLoading() && staProtocolEnt.getWorkNo()==0)){ - log.error("绔欑偣寮傚父,璁℃暟鍔犱竴锛岀珯鐐瑰彿锛�"+staNoEnt); +// log.error("绔欑偣寮傚父,璁℃暟鍔犱竴锛岀珯鐐瑰彿锛�"+staNoEnt); count++; } else if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){ if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){ -- Gitblit v1.9.1