From 5110b6563db73a2869e0ac09e717928289cdfdde Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 09:45:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 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 cfd3d9e..d872d34 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -61,15 +61,32 @@
                     || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
                 return FAIL;
             }
+            BasDevp basDevp131 = basDevpService.selectById(131);
+            if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y") || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000)){
+                return FAIL;
+            }
             WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                     .eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
             if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
                 return FAIL;
             }
+            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+            if (Cools.isEmpty(wrkDetls) || wrkDetls.size()!=1){
+                return FAIL;
+            }
+            BasDevp basDevp118 = basDevpService.selectById(118);
+            if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
+                return FAIL;
+            }
+            BasDevp basDevp119 = basDevpService.selectById(119);
+            if (Cools.isEmpty(basDevp119) || basDevp119.getReportSign()!=0){
+                return FAIL;
+            }
 
+            if (basDevp118.getLoading().equals("Y")){
+                //鐢熸垚鏈烘鑷備换鍔�
 
-
-//            TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
+//                TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
 //            try{
 //                ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
 //                if (success.getCode()!=200){
@@ -78,6 +95,11 @@
 //            } catch (Exception e){
 //                throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
 //            }
+            }else {
+                //鐢熸垚鎷嗙洏浠诲姟
+            }
+
+//
         }catch (Exception e){
             log.error("寮傚父锛侊紒锛�"+e);
             return FAIL;

--
Gitblit v1.9.1