From 56930aa574a738f918750aaea3efd790e2c789fc Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期五, 26 一月 2024 16:29:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java index 2d7f723..eeebaa6 100644 --- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java @@ -115,10 +115,15 @@ return FAIL; } }else if (!basDevp118.getLoading().equals("Y") ){ - WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNo + 19999L)); + Thread.sleep(1000); + basDevp118 = basDevpService.selectById(118); + if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 || !basDevp118.getLoading().equals("Y") ){ + return FAIL; + } + WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",118 + 19999L)); if (Cools.isEmpty(wrkMastSta)){ //鐢熸垚鎷嗙洏浠诲姟 - WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNo); + WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118); wrkMastSta1.setType(2); //绫诲瀷 1:闈炵┖ 2:绌烘澘 wrkMastSta1.setWrkType(2); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀� wrkMastStaService.insert(wrkMastSta1); -- Gitblit v1.9.1