代码测试更新

ZengTao

2024-01-26 49ba681f1478c522c375525146e0ac79b1fbf88b

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -7,7 +7,9 @@
import java.sql.SQLException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import com.example.springboot.service.*;

import org.springframework.beans.factory.annotation.Autowired;

@@ -123,7 +125,7 @@
                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));

                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));



                if (S7control.getinstance().CheckConnected() == true) {

                // if (S7control.getinstance().CheckConnected() == true) {



                    // 铝框线交互

                    if (S7controlLK.getinstance().CheckConnected() == true) {

@@ -268,17 +270,24 @@
                    boolean D01ResponseState = D01respnse.contains((short) 1);

                    // jsonObject.append("D01RequestState", D01RequestState);

                    // 自动进片

                isConfirm=true;

                if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {

                    if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810

                            || form3.getglasswidth() > 2760)

                            || (form3.getglassheight() < 390 || form3.getglasswidth() < 380

                                    || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {



                        if (isConfirm == true && D01RequestState == true && D01ResponseState == false) {

                        FeedState = true;

                        jsonObject.append("FeedState", FeedState);

                        FeedState = false;

                    } else {

                        if (D01RequestState == true && D01ResponseState != true) {

                            storageCageService.InsertQueueGlassId((short) 1, form3);

                        }

                    }

                }



                // }



            } catch (InterruptedException e) {

                e.printStackTrace();

            }