优化出片逻辑，更换DB区读取方式

wu

2024-02-01 18dfd899e47fd2c0876251389941891388a2ebb6

 springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java

@@ -9,7 +9,9 @@
import org.springframework.stereotype.Service;

import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.mapper.HomeMapper;
@@ -30,19 +32,22 @@
        String A01glassid2 = spianService.queGlassid("DB103.142", 14).toString();
        String A02glassid1 = spianService.queGlassid("DB103.156", 14).toString();
        String B01glassid = spianService.queGlassid("DB103.184", 14).toString();
        String B02glassid = spianService.queGlassid("DB103.198", 14).toString();
        String B02glassid = spianService.queGlassid("DB103.212", 14).toString();
        List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
        if (types == 0) {// 终止进片任务
            List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
            for (StorageTask storageTask : cageList) {
                // 判断出片任务位置并清除对应玻璃id
                if ((storageTask.getGlassId() == A01glassid1 || storageTask.getGlassId() == A01glassid2)&&DeviceList.get(4)==0) {
                if ((storageTask.getGlassId().equals(A01glassid1) || storageTask.getGlassId().equals(A01glassid2))
                        && DeviceList.get(4) == 0) {
                    outSliceServive.StopTask(storageTask.getGlassId(), types);
                    ClearGlassId("DB101.10.0");
                } else if (storageTask.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
                }
                if (storageTask.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
                    outSliceServive.StopTask(storageTask.getGlassId(), types);
                    ClearGlassId("DB101.10.2");
                } else if (storageTask.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
                }
                if (storageTask.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
                    ClearGlassId("DB101.10.3");
                    outSliceServive.StopTask(storageTask.getGlassId(), types);
                }
@@ -51,35 +56,34 @@
        } else {// 终止出片任务
            List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
            List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
            if (cageList2.size()>0) {
            if (cageList2.size() > 0) {
                cageLists.add(cageList2.get(0));
            }
            for (StorageTask cageList : cageLists) {
                if (cageList.getTaskType().equals("1")) {

                    System.out.println(DeviceList.get(5));
                    if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
                    if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), types);
                        ClearGlassId("DB101.10.1");
                    }
                    if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
                    if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), types);
                        ClearGlassId("DB101.10.2");
                    }
                    if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
                    if (cageList.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), types);
                        ClearGlassId("DB101.10.3");
                    }
                }else if (cageList.getTaskType().equals("2")) {
                    if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
                } else if (cageList.getTaskType().equals("2")) {
                    if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), 2);
                        ClearGlassId("DB101.10.1");
                    }
                    if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
                    if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), 2);
                        ClearGlassId("DB101.10.2");
                    }
                    if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
                    if (cageList.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
                        outSliceServive.StopTask(cageList.getGlassId(), 2);
                        ClearGlassId("DB101.10.3");
                    }
@@ -88,28 +92,29 @@

            // List<StorageCage> storageCages = homeMapper.selectinout(3);
            // for (StorageCage storageCage : storageCages) {
            //     List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
            // List<StorageCage> storageCagess =
            // homeMapper.SelectStoragesGlassById(storageCage.getGlassId());

            //     for (StorageCage storageCagez : storageCagess) {
            // for (StorageCage storageCagez : storageCagess) {

            //         if (storageCagez.getState().equals("2")) {// 调拨进片
            //             outSliceServive.StopTask(storageCagez.getGlassId(), 0);
            //         } else {// 出片
            //             outSliceServive.StopTask(storageCagez.getGlassId(), types);
            //         }
            // if (storageCagez.getState().equals("2")) {// 调拨进片
            // outSliceServive.StopTask(storageCagez.getGlassId(), 0);
            // } else {// 出片
            // outSliceServive.StopTask(storageCagez.getGlassId(), types);
            // }

            //         // 判断出片任务位置并清除对应玻璃id
            //         if (storageCagez.getGlassId() == A02glassid1&&DeviceList.get(5)==0) {
            //             outSliceServive.StopTask(storageCagez.getGlassId(), types);
            //             ClearGlassId("DB101.10.1");
            //         } else if (storageCagez.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
            //             outSliceServive.StopTask(storageCagez.getGlassId(), types);
            //             ClearGlassId("DB101.10.2");
            //         } else if (storageCagez.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
            //             ClearGlassId("DB101.10.3");
            //             outSliceServive.StopTask(storageCagez.getGlassId(), types);
            //         }
            //     }
            // // 判断出片任务位置并清除对应玻璃id
            // if (storageCagez.getGlassId() == A02glassid1&&DeviceList.get(5)==0) {
            // outSliceServive.StopTask(storageCagez.getGlassId(), types);
            // ClearGlassId("DB101.10.1");
            // } else if (storageCagez.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
            // outSliceServive.StopTask(storageCagez.getGlassId(), types);
            // ClearGlassId("DB101.10.2");
            // } else if (storageCagez.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
            // ClearGlassId("DB101.10.3");
            // outSliceServive.StopTask(storageCagez.getGlassId(), types);
            // }
            // }
            // }
        }
    }
@@ -174,4 +179,29 @@
        return Result.success(map);
    }

    public Result InsertQueueGlassId(Short id, Queue queue) {
        Map<String, Object> map = new HashMap<>();
        if (Plchome.FeedState == false) {
            Plchome.FeedState = true;
            Short zhi = 200;
            short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
            if (result > 0) {
                map.put("message", "300");
            } else {
                if (id == 1) {
                    // 调用伍存储过程
                    zhi = spianService.selectAll(queue.getglassId());
                    if (zhi == 200) {
                        homeMapper.InsertQueueGlassId(queue, id);
                    }
                }
                map.put("message", zhi);
            }
            Plchome.FeedState = false;
        } else {
            map.put("message", 200);
        }
        return Result.success(map);
    }

}