From d8cb845856064ff7d41fe92dda97249f7123c91b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 11:09:20 +0800
Subject: [PATCH] 增加出片直通模式

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 8d2912d..d0d4082 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -51,13 +51,14 @@
             albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, glasstype, 0);
             Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
             albaniaMapper.UpdateStorage(width,height,cage.getId());
-            albaniaMapper.UpdateQueueState(glassid);
+            
         }else{
             return(400);
         }
     }
     //澧炲姞浠诲姟璁板綍
     albaniaMapper.Inserttask(0, 0, 1001, cage.getId(), glassid,glasstype, flowcard,0,0);
+    albaniaMapper.UpdateQueueState(glassid);
     return(200);
 
 }
@@ -67,6 +68,7 @@
         GlassInfo glassmate=new GlassInfo();
         GlassInfo method=new GlassInfo();
         StorageCage glass=new StorageCage();
+        int glassend=0;
         method=albaniaMapper.SelectMethod(line);
         double width=0;
             for(int i=1;i<=7;i++){
@@ -76,6 +78,8 @@
                 }else{
                     //鐩撮�氭ā寮忔椂鎸夐『搴忕洿鍑�
                     glassmate= albaniaMapper.SelectOutGlass2(line);
+                    //鑾峰彇鐩撮�氭ā寮忔渶鍚庝竴鍧�
+                    glassend=albaniaMapper.SelectOutGlassend(line);
                 }
                 
                 if(glassmate==null){ 
@@ -97,11 +101,12 @@
                     Mestast(glass.getGlassId(), glass.getId(),40, 0,"MESID"+i,i);
                     albaniaMapper.AddFinishNumber(glassmate.getFlowcard(), glassmate.getMateid(), glassmate.getTier());
                     albaniaMapper.Inserttask(1, 0, glass.getId(), 2002, glassmate.getGlassid(), glassmate.getGlasstype(),glass.getFlowcard(),glassmate.getMateid(),glassmate.getTier());
-                      if(glassmate.getTier()==glassmate.getId()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
+                      if(glassmate.getTier()==glassmate.getId()||glassmate.getTier()==glassend){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
                         //鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
                         S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
                         return (200);//缁撴潫
                       }
+                     
                       
                     }else{
                         return (400);//缁撴潫

--
Gitblit v1.8.0