Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2024-04-23 d426473660914f321ba593cf7f2203d4bb2d3d7c

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

@@ -17,8 +17,6 @@
import com.example.springboot.mapper.SpianMapper;
import com.google.common.primitives.Bytes;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;

@Service
public class SpianService {
@@ -26,7 +24,7 @@
    private SpianMapper spianMapper;

    // @GetMapping("/all")
    public Short selectAll(String glassid) {
    public Short selectAll(north_glass_buffer1 glasslist) {

        int cage1 = 0;
        int cells;
@@ -36,8 +34,8 @@
        int prctier;
        double width;
        double minwidth = 0;

        north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 获取玻璃参数
        
        //north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 获取玻璃参数
        // 如果没有此id时
        if (glasslist == null) {
            return (300);
@@ -46,7 +44,7 @@
        double widths = glasslist.getglasslengthmm();
        String orderids = glasslist.getordernumber();
        String FrameBarcode = glasslist.getFrameBarcode();

        String glassid=glasslist.getbarcode();
        List<String> adddresslist = new ArrayList<>();
        adddresslist.add("DB105.0");// 进片车起始位置
        adddresslist.add("DB105.2");// 进片车目标位置
@@ -117,6 +115,11 @@
                    int qidong2 = 0;
                    if (qidong == true) {
                        qidong2 = 1;
                    }else{
                        while (qidong) {
                            S7control.getinstance().WriteWord("DB105.16", (short) 1);// 出片任务发送字改为1
                            qidong = listbool("DB105.16");
                        }
                    }
                    spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier,qidong2);// 新增任务
                    System.out.println("进片任务|" + datas);
@@ -193,6 +196,11 @@
            int qidong2 = 0;
            if (qidong == true) {
                qidong2 = 1;
            }else{
                while (qidong) {
                    S7control.getinstance().WriteWord("DB105.18", (short) 1);// 出片任务发送字改为1
                    qidong = listbool("DB105.18");
                }
            }
            spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state, qidong2);// 新增任务
            outmesid(glassid, "DB105.34");// 派发出片ID
@@ -221,6 +229,11 @@
                int qidong2 = 0;
                if (qidong == true) {
                    qidong2 = 1;
                }else{
                    while (qidong) {
                        S7control.getinstance().WriteWord("DB105.18", (short) 1);// 出片任务发送字改为1
                        qidong = listbool("DB105.18");
                    }
                }
                spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, 1, qidong2);// 新增任务
                return (200);// 结束
@@ -259,6 +272,11 @@
                    int qidong2 = 0;
                    if (qidong == true) {
                        qidong2 = 1;
                    }else{
                        while (qidong) {
                            S7control.getinstance().WriteWord("DB105.18", (short) 1);// 出片任务发送字改为1
                            qidong = listbool("DB105.18");
                        }
                    }
                    spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassids, 2, qidong2);// 新增调度任务

@@ -291,6 +309,11 @@
                    int qidong2 = 2;
                    if (qidong == true) {
                        qidong2 = 1;
                    }else{
                        while (qidong) {
                            S7control.getinstance().WriteWord("DB105.18", (short) 1);// 出片任务发送字改为1
                            qidong = listbool("DB105.18");
                        }
                    }
                    spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassids, 2, qidong2);// 新增调度任务
                    spianMapper.UpdateDBCage(ids, cage, cell, 2);// 将原格子数据更新到新格子里