From 12a87a3bc544e3e5ffe1589a4975de642ab038c4 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 29 十一月 2024 00:59:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 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 56fd550..209b3a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.LedErrorAreaType;
 import com.zy.asrs.domain.enums.WorkNoType;
@@ -57,13 +58,9 @@
 public class MainServiceImpl {
 
     public static final long COMMAND_TIMEOUT = 5 * 1000;
-//    private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
     private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
 
-//    private static final Integer jarMaxLoc1 = 7;
     private static  Integer jarMaxLoc = 0;
-//    private static  Integer signBigTurn = 0;
-//    private static  Integer signSmallTurn = 0;
     private static final Float jarTemperature = 50F;
     @Autowired
     private CommonService commonService;
@@ -2273,7 +2270,7 @@
                     staProtocolOther1 = staProtocolOther1.clone();
                 }
 
-                if (staProtocolOther1.isAutoing() || staProtocolOther1.getWorkNo()!=0){
+                if (staProtocolOther1.isLoading() || !staProtocolOther1.getWorkNo().equals(0)){
                     return;
                 }
 
@@ -2284,7 +2281,7 @@
                 } else {
                     staProtocolOther2 = staProtocolOther2.clone();
                 }
-                if (staProtocolOther2.isAutoing() || staProtocolOther2.getWorkNo()!=0){
+                if (staProtocolOther2.isLoading() || !staProtocolOther2.getWorkNo().equals(0)){
                     return;
                 }
             }
@@ -3098,12 +3095,20 @@
                 continue;
             }
 
+            Integer turnBigInt = 0;
             if (wrkMast.booleanStaNoSign()){
                 RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
                 if (Cools.isEmpty(rgvOneSign)){
                     continue;
                 }
-                if (rgvOneSign.getRgvOneSign()>=2){
+                RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig");
+                if (Cools.isEmpty(trunBig)){
+                    continue;
+                }
+                turnBigInt = trunBig.getRgvOneSign();
+                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
+
+                if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
                     continue;
                 }
 //                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
@@ -3266,6 +3271,9 @@
                     crnCommand.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
                     crnCommand.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
                     crnCommand.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
+                    if (!Cools.isEmpty(wrkMast.getStaNo()) && (wrkMast.getStaNo().equals(312) || wrkMast.getStaNo().equals(310))){
+                        updateRgvOneSign("TrunBig",turnBigInt+1);
+                    }
                     if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(crnStation==1? 2:5, crnCommand))) {
                         log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSONString(crnCommand));
                     } else {
@@ -3347,6 +3355,24 @@
 //            signBigTurn = 0;
 //        }
 
+    }
+
+    public void updateRgvOneSign(String signType,Integer oneSign){
+        RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+        try{
+            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+            if (!Cools.isEmpty(rgvOneSign)){
+                rgvOneSign.setRgvOneSign(oneSign);
+                rgvOneSignMapper.updateById(rgvOneSign);
+            }
+        } catch (Exception e){
+            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+            if (!Cools.isEmpty(rgvOneSign)){
+                rgvOneSign.setRgvOneSign(999);
+                rgvOneSignMapper.updateById(rgvOneSign);
+            }
+        }
     }
 
     /**
@@ -4022,7 +4048,7 @@
                 } else {
                     staProtocol = staProtocol.clone();
                 }
-                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
+                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo().equals(0)
                         && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
                     String barcode = staProtocol.getBarcode();
                     if (!Cools.isEmpty(barcode)) {
@@ -8420,6 +8446,10 @@
     /**
      *  ste鍏呯數浠诲姟鍒涘缓   //瀹屾垚
      */
+    public synchronized void signTrunBig() {
+        updateRgvOneSign("TrunBig",0);
+    }
+
     public synchronized boolean jarChargeGenerate() {
         try{
             //80%鐢甸噺 鏃犱换鍔�  鍏呯數  >50鐢甸噺  鏈変换鍔�  鏂數

--
Gitblit v1.9.1