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

wuyouming666

2023-09-13 a21582607b88104e66f7dc91a5038b3f59ed9f1a

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

# Conflicts:
#	CanadaMes-ui/src/views/Electrical/Sign.vue
#	CanadaMes-ui/src/views/Electrical/State.vue
#	CanadaMes-ui/src/views/Electrical/alarm.vue

 CanadaMes-ui/src/img/dipan.png

 CanadaMes-ui/src/img/taimian.png

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -172,16 +172,16 @@
  "Alarm": "Alarm",

  "Distribute": "Distribute",

  "Search": "Search",

 
 
  "dvstate": {

    "自动": "automatic",

    "手动": "manual"

  },

  "langUsernameLabel": "Username",



  "langPasswordLabel": "Password",

  "langPasswordPlaceholder": "Please enter your password",

  "langConfirmPasswordLabel": "Confirm Password",

  "langConfirmPasswordPlaceholder": "Please confirm your password",

  "langEmailLabel": "Email",



  "langQQLabel": "QQ",

  "langQQPlaceholder": "Please enter your QQ number",

  "langPhoneNumberLabel": "Phone Number",

@@ -196,10 +196,19 @@
  "langResetButton": "Reset",

  "langCancelButton": "Cancel",

  "langRegisterSuccessMessage": "Registration successful",

  "today": "today",

  "yesterday": "yesterday",

  "week": "week",

  "shijian": "date",

  "Pick a day": "Pick a day",

  "alarmid": "id",

  "alacontent": "content",

  "time-on": "time-on",

  "End-Time": "End-Time",

  "langRegisterSuccessMessage": "Registration successful",



  "添加用户成功":"Successfully add user ",

  "confirmResetPassword": "Are you sure you want to reset the password to the default value?",



  "confirm": "Confirm",

  "cancel": "Cancel",

  "passwordResetSuccess": "Password has been reset to the default value",

@@ -252,6 +261,19 @@
  "glassid":"glassid",

  "order number":"order number",

  "delete":"delete",

  "out":"out"

  "out":"out",



  "Operation successful":"Operation successful",

  "Operation canceled":"Operation canceled",

  "There is no glass for this order":"There is no glass for this order",

  "There are currently tasks":"There are currently tasks",

  "There is no such glass":"There is no such glass",

  "There is no such grid":"There is no such grid",

  "No delete allowed":"No delete allowed",

  "No out allowed":"No out allowed",

  "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",

  "prompt":"prompt",

  "Yes":"Yes",

  "No":"No"



}

 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -168,17 +168,20 @@
  "Parameter": "参数下发",

  "Action": "开关控制",

  "Sign": "IO状态",

  "State": "State",

  "State": "设备状态",

  "Alarm": "报警信息",

  "Distribute": "下发",

  "Search": "搜索",

  "dvstate": {

    "automatic": "自动",

    "manual": "手动"

  },

  "langUsernameLabel": "用户名",

  "langPasswordLabel": "密码",

  "langPasswordPlaceholder": "请输入密码",

  "langConfirmPasswordLabel": "确认密码",

  "langConfirmPasswordPlaceholder": "请确认密码",

  "langEmailLabel": "邮箱",

  
  "langQQLabel": "QQ",

  "langQQPlaceholder": "请输入QQ号码",

  "langPhoneNumberLabel": "手机号码",

@@ -253,6 +256,27 @@
  "glassid":"玻璃id",

  "order number":"订单",

  "delete":"删除",

  "out":"出片"

  "out":"出片",



  "Operation successful":"操作成功",

  "Operation canceled":"操作取消",

  "There is no such order":"没有此订单的玻璃",

  "There are currently tasks":"当前有任务",

  "There is no such glass":"没有此玻璃",

  "There is no such grid":"没有空闲格子",

  "No delete allowed":"不能删除",

  "No out allowed":"不能出片",

  "Are you sure to perform this operation ?":"确定执行此操作?",

  "prompt":"提示",

  "Yes":"是",

  "No":"否",

  "today": "今天",

  "yesterday": "昨天",

  "week": "一周前",

  "shijian": "日期",

  "Pick a day": "选择日期",

  "alarmid": "id",

  "alacontent": "报警内容",

  "time-on": "开始时间",

  "End-Time": "结束时间"

}

 CanadaMes-ui/src/views/Electrical/Sign.vue

@@ -2,13 +2,16 @@
  <div class="app">

    <!--面包屑导航区域-->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">



      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>

      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>

      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>

      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>

    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>



 
    </el-breadcrumb>

    <div>Sign</div>

    <div>{{ $t('Sign') }}</div>

    <div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">

      <div class="kuai_sb" v-for="item in record.xyData" :key="item.name">

        <el-col class="deng" :class="getStatusClass(item.value)">

@@ -147,7 +150,7 @@
    this.init();

  },

  methods: {

    onButtonClick() {

    onButtonClick () {

      this.isButtonClicked = true; // 将按钮颜色设置为蓝色

      setTimeout(() => {

        this.isButtonClicked = false; // 重置按钮颜色

@@ -294,6 +297,7 @@
.yellow {

  background-color: yellow;

}



.blue-button {

  background-color: skyblue;

}


 CanadaMes-ui/src/views/Electrical/State.vue

@@ -2,20 +2,22 @@
  <div class="app">

    <!--面包屑导航区域-->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">



      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>

      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>

      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>

      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>

    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>



    </el-breadcrumb>

    <div>State</div>

    <div>{{ $t('State') }}</div>





    <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">



      <div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">

        <el-input style="width: 280px;" class="in_mc" v-model="item.name"></el-input>

        <el-input v-model="item.value" readonly="readonly" style="width: 80px;"></el-input>

        <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>

      </div>





@@ -55,7 +57,7 @@


      },





      localizedRoles: [],

      messagepack: {

        data: { taskname: "" }

      },

@@ -68,9 +70,10 @@
  },

  created () {

    this.init();

    this.replaceChineseWithEnglish();

  },

  methods: {

    onButtonClick() {

    onButtonClick () {

      this.isButtonClicked = true; // 将按钮颜色设置为蓝色

      setTimeout(() => {

        this.isButtonClicked = false; // 重置按钮颜色

@@ -101,7 +104,6 @@
          //console.log("收到数据====" + msg.data);

          let obj = JSON.parse(msg.data);

          this.record.params[0] = obj.sta[0];

          console.log(this.record.params[0]);

          //将读取到的PLC的数据，与定义的xyData，组合成新的数组

          for (let a = 0; a < this.record.params[0].length; a++) {

            if (!this.record.xyData[a]) {

@@ -111,6 +113,13 @@
            }



          }

          const language = this.$i18n.locale;

          if (language === 'en-US') {

            this.replaceChineseWithEnglish();

          } else {

            this.localizedRoles = [...this.record.xyData];

          }

          //console.log(this.localizedRoles);

          this.$forceUpdate();



        }.bind(this);

@@ -124,19 +133,12 @@
        }

      }

    },

    send () {

      this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value)); // 转换为整数数组

      console.log(this.messagepack);

      socket?.send(JSON.stringify(this.messagepack));

    //语言转换

    replaceChineseWithEnglish () {

      const translation = this.$t('dvstate');

      this.record.xyData = this.record.xyData.map(item => { return { name: item.name, value: translation[item.value] || item.value }; });

      console.log(translation);

    },

    valuezhi (zhi) {

      if (zhi == 1) {

        return "自动";

      }

      else {

        return "手动";

      }

    }





  }

@@ -150,6 +152,11 @@
</script>



<style>

* {

  margin: 0px;

  padding: 0px;

}



.kuai_div {

  width: 30%;

  margin-bottom: 15px;

@@ -160,7 +167,9 @@




  .el-input__inner {

    text-align: center;

    border: 1 solid black;

    padding: 0 10px;

  }





@@ -180,6 +189,7 @@
#btn_div .el-button {

  float: right;

}



.blue-button {

  background-color: skyblue;

}


 CanadaMes-ui/src/views/Electrical/alarm.vue

@@ -2,20 +2,22 @@
  <div class="app">
    <!--面包屑导航区域-->
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>

    </el-breadcrumb>
    <div>Alarm</div>
    <div>{{ $t('Alarm') }}</div>
    <div class="block">
      <span class="demonstration">时间：</span>
      <el-date-picker v-model="shijian1" type="datetime" placeholder="选择日期时间" align="right"
      <span class="demonstration">{{ $t('shijian') }}：</span>
      <el-date-picker v-model="shijian1" type="datetime" :placeholder="$t('Pick a day')" align="right"
        :picker-options="pickerOptions">
      </el-date-picker>
      ~
      <el-date-picker v-model="shijian2" type="datetime" placeholder="选择日期时间" align="right"
      <el-date-picker v-model="shijian2" type="datetime" :placeholder="$t('Pick a day')" align="right"
        :picker-options="pickerOptions">
      </el-date-picker>
      &nbsp;&nbsp;
@@ -23,13 +25,13 @@
    </div>

    <el-table :data="localizedRoles" style="width: 100%;" height="550">
      <el-table-column prop="id" label="id" width="80">
      <el-table-column prop="id" :label="$t('alarmid')" width="80">
      </el-table-column>
      <el-table-column prop="content" label="content">
      <el-table-column prop="content" :label="$t('alacontent')">
      </el-table-column>
      <el-table-column prop="timeon" label="time-on">
      <el-table-column prop="timeon" :label="$t('time-on')">
      </el-table-column>
      <el-table-column prop="endTime" label="End Time">
      <el-table-column prop="endTime" :label="$t('End-Time')">
      </el-table-column>
    </el-table>
  </div>
@@ -47,7 +49,6 @@
  mixins: [LanguageMixin],
  data () {
    return {
      activeButton: '',
      record: {
        params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],

@@ -66,27 +67,33 @@
        pageSize: 10
      },
      pickerOptions: {

        disabledDate (time) {
          return time.getTime() > Date.now();
        },
        shortcuts: [{
          text: '今天',

          text: this.$t('today'),
          onClick (picker) {
            picker.$emit('pick', new Date());
          }
        }, {
          text: '昨天',
        },
        {
          text: this.$t('yesterday'),
          onClick (picker) {
            const date = new Date();
            date.setTime(date.getTime() - 3600 * 1000 * 24);
            picker.$emit('pick', date);
          }
        }, {
          text: '一周前',
        },
        {
          text: this.$t('week'),
          onClick (picker) {
            const date = new Date();
            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
            picker.$emit('pick', date);
          }
        }],

        }]
      },
      shijian1: "",
      shijian2: "",
@@ -109,12 +116,6 @@

  },
  methods: {
    onButtonClick() {
      this.isButtonClicked = true; // 将按钮颜色设置为蓝色
      setTimeout(() => {
        this.isButtonClicked = false; // 重置按钮颜色
      }, 500); // 这里的500毫秒是根据您希望按钮颜色持续多长时间来定的，可以根据需求进行调整
    },

    load () {
      setAll().then(res => {
@@ -236,8 +237,5 @@
td div,
th div {
  text-align: center;
}
.blue-button {
  background-color: skyblue;
}
</style>

 CanadaMes-ui/src/views/home/index.vue

@@ -91,11 +91,36 @@
    background-size: 46px 94px;

    background-attachment: local;

    width: 32px;



    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/bigcar01.png');

}



.blocks-img2 {

    height: 100px;

    max-width: 100vw;

    background-repeat: no-repeat;

    background-size: 85px 100px;

    background-attachment: local;

    width: 100px;

    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/dipan.png');

}



.blocks-img3 {

    height: 90px;

    max-width: 100vw;

    background-repeat: no-repeat;

    background-size: 160px 40px;

    background-attachment: local;

    width: 160px;

    position: absolute;

    /* left: 116px; */

    /* left:1060px;18.88px */

    background-image: url('../../img/taimian.png');

}



.el-table td,

@@ -167,7 +192,7 @@
                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{$t('end task')}}</el-button>

                                @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -181,7 +206,7 @@
                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{$t('end task')}}</el-button>

                                @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>

                        </template>

                    </el-table-column>

                </el-table>

@@ -219,6 +244,8 @@
                </div>

                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>

                <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }"></div>

                <div class="blocks-img2" :style="{ left: '912px', top: '366px' }"></div>

                <div class="blocks-img3" :style="{ left: '875px', top: '455px' }"></div>

            </div>

        </el-footer>

        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

@@ -280,6 +307,8 @@
                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>

                        <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')

                        }}</el-button> -->

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>

                    </template>

@@ -441,11 +470,11 @@
            if (this.form1.order != "") {

                InsertOrder(this.order).then(res => {

                    if (res.data.message == 200) {

                        this.dialogFormVisible1=false;

                        this.$message.success("Operation successful");

                        this.dialogFormVisible1 = false;

                        this.$message.success(this.$t('Operation successful'));



                    } else {

                        this.$message.success("There is no such order");

                        this.$message.success(this.$t('There is no glass for this order'));

                    }

                    this.load();

                });

@@ -457,16 +486,16 @@
            if (this.form.order != "") {

                Addglassid(this.glassid).then(res => {

                    if (res.data.message2 == 200) {

                        this.$message.success("Operation successful");

                        this.$message.success(this.$t('Operation successful'));

                        this.cancal();

                    } else if(res.data.message2 == 500) {

                        this.$message.success("There are currently tasks");

                    } else if (res.data.message2 == 500) {

                        this.$message.success(this.$t('There are currently tasks'));

                    }

                    else if(res.data.message2 == 300) {

                        this.$message.success("There is no such glass");

                    else if (res.data.message2 == 300) {

                        this.$message.success(this.$t('There is no such glass'));

                    }

                    else if(res.data.message2 == 400) {

                        this.$message.success("There is no such grid");

                    else if (res.data.message2 == 400) {

                        this.$message.success(this.$t('There is no such grid'));

                    }

                });

            }

@@ -504,11 +533,23 @@
            this.form1 = {};

        },

        endtask(type, glassid, cell) {

            UpdateTask(type, glassid, cell).then(res => {

                if (res.data.message3 == 200) {

                    this.$message.success("Operation successful");

                }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                UpdateTask(type, glassid, cell).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success(this.$t('Operation successful'));

                    }

                });

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });



        },

        showcageinfo(cage) {

            this.cage = cage;

@@ -518,31 +559,52 @@
            });

        },

        deleteglass(glassid, state) {

            if (state == 1) {

                DeleteByGlassID(glassid).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    DeleteByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

                } else {

                    this.$message.success(this.$t('No delete allowed'));

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            } else {

                this.$message.success("No out allowed");

            }

            });

        },

        outglass(glassid, state) {

            if (state == 1) {

                OutByGlassID(glassid).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    OutByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

                } else {

                    this.$message.success(this.$t('No out allowed'));

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            } else {

                this.$message.success("No out allowed");

            }

            });



        }



    }



}







</script>

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

@@ -17,7 +17,7 @@
    public void run() {
        while (this != null) {
            try {
                Thread.sleep(5000);
                Thread.sleep(1000);
            } catch (InterruptedException e) {
                e.printStackTrace();
            }

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

@@ -16,10 +16,10 @@
        e.printStackTrace();
      }

      List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
      // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
      // 1, 0, };
      // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
      // List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
      Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
          1, 0, };
      List<Short> plclist = new ArrayList<>(Arrays.asList(values));
      if (plclist != null) {

        List<String> Intlist = new ArrayList<>();

 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -25,19 +25,15 @@
    //
    System.out.println("启动完成");


  new PlcHold().start();


    new PlcHold().start();

    new Plcaction().start();


    new Plchome().start();

    new PlcParameter().start();

 new Plcalarm().start();
    new Plcalarm().start();

    new Plcsign().start();


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

@@ -14,323 +14,323 @@

@Service
public class SpianService {
    @Autowired
    private SpianMapper spianMapper;
  @Autowired
  private SpianMapper spianMapper;

    // @GetMapping("/all2")
    public Result selectout(String orderid) {
        // 定义PRC数据传送数组
        List<String> adddresslist = new ArrayList<>();
        adddresslist.add("DB105.6");// 出片车起始位置
        adddresslist.add("DB105.8");// 出片车目标位置
        adddresslist.add("DB105.10");// 出片笼玻璃数
        adddresslist.add("DB105.14");// 出片车启动 1为启动
        List<Short> datas = new ArrayList<>();
        // 获取优先出片的位置
        StorageCage cageout = spianMapper.selectOut(orderid);
        int cage = cageout.getCage(); // 储存出片位置，笼子格子几号玻璃
        int cell = cageout.getCell();// 出片格号
        int tier = cageout.getTier();// 出片内外片
        int prcid = cageout.getPrcId();// prcid
        int prcid2;
        int ids;
        int cages;
        int cells;
        double glasswidth = cageout.getGlassWidth();
        // 判断玻璃内外片
        if (tier == 2) {
            // 判断玻璃可直接出片时
            // 修改数据库笼子表(出片)
            spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
           
            datas.add((short) prcid);
            datas.add((short) 1000);
            datas.add((short) 1);
            datas.add((short) 1);
            S7control.getinstance().WriteWord(adddresslist, datas);
            return Result.success(datas);
        } else {
            // 获取格子的玻璃数量
            int state = spianMapper.selectGlassState(cage, cell);
            // 判断内片是否需要调拨
            if (state == 0) {
                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
                datas.add((short) prcid);
                datas.add((short) 1000);
                datas.add((short) 1);
                datas.add((short) 1);
                S7control.getinstance().WriteWord(adddresslist, datas);
                return Result.success("状态为0,直接出片");
            } else {
                // 玻璃需要调拨时，判断属于哪个半区的笼子
                if (cage < 6) {
                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
                    if (cagecell == null) {
                        return Result.success(cagecell);
                    }
                    // 获取调拨位置进行调拨
                    prcid2 = cagecell.getPrcId();// 调拨目标位PRCID
                    ids = cagecell.getId();// 调拨目标位ID
                    cages=cagecell.getCage();//调拨目标位笼子
                    cells=cagecell.getCell();//调拨目标位格子
                    // 更换玻璃的笼子
                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
                    spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
                    // 填入调拨数据
                    datas.add((short) prcid);// 调拨外片起始位置
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    // 传输mes数据,坐标，数据
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    datas.clear(); // 清空整个列表
                    // 判断调拨结束后再次出片,填入出片数据
                    datas.add((short) prcid);
                    datas.add((short) 1000);
                    datas.add((short) 1);
                    datas.add((short) 1);
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    // 修改数据库笼子表(出片)
  // @GetMapping("/all2")
  public Result selectout(String orderid) {
    // 定义PRC数据传送数组
    List<String> adddresslist = new ArrayList<>();
    adddresslist.add("DB105.6");// 出片车起始位置
    adddresslist.add("DB105.8");// 出片车目标位置
    adddresslist.add("DB105.10");// 出片笼玻璃数
    adddresslist.add("DB105.14");// 出片车启动 1为启动
    List<Short> datas = new ArrayList<>();
    // 获取优先出片的位置
    StorageCage cageout = spianMapper.selectOut(orderid);
    int cage = cageout.getCage(); // 储存出片位置，笼子格子几号玻璃
    int cell = cageout.getCell();// 出片格号
    int tier = cageout.getTier();// 出片内外片
    int prcid = cageout.getPrcId();// prcid
    int prcid2;
    int ids;
    int cages;
    int cells;
    double glasswidth = cageout.getGlassWidth();
    // 判断玻璃内外片
    if (tier == 2) {
      // 判断玻璃可直接出片时
      // 修改数据库笼子表(出片)
      spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
      spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);

                    return Result.success(cagecell); // 调拨位置的参数内容
      datas.add((short) prcid);
      datas.add((short) 1000);
      datas.add((short) 1);
      datas.add((short) 1);
      S7control.getinstance().WriteWord(adddresslist, datas);
      return Result.success(datas);
    } else {
      // 获取格子的玻璃数量
      int state = spianMapper.selectGlassState(cage, cell);
      // 判断内片是否需要调拨
      if (state == 0) {
        spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
        datas.add((short) prcid);
        datas.add((short) 1000);
        datas.add((short) 1);
        datas.add((short) 1);
        S7control.getinstance().WriteWord(adddresslist, datas);
        return Result.success("状态为0,直接出片");
      } else {
        // 玻璃需要调拨时，判断属于哪个半区的笼子
        if (cage < 6) {
          StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
          if (cagecell == null) {
            return Result.success(cagecell);
          }
          // 获取调拨位置进行调拨
          prcid2 = cagecell.getPrcId();// 调拨目标位PRCID
          ids = cagecell.getId();// 调拨目标位ID
          cages = cagecell.getCage();// 调拨目标位笼子
          cells = cagecell.getCell();// 调拨目标位格子
          // 更换玻璃的笼子
          spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 减少新格子宽度
          spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
          spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
          spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
          // 填入调拨数据
          datas.add((short) prcid);// 调拨外片起始位置
          datas.add((short) prcid2);
          datas.add((short) 2);
          datas.add((short) 1);
          // 传输mes数据,坐标，数据
          S7control.getinstance().WriteWord(adddresslist, datas);
          datas.clear(); // 清空整个列表
          // 判断调拨结束后再次出片,填入出片数据
          datas.add((short) prcid);
          datas.add((short) 1000);
          datas.add((short) 1);
          datas.add((short) 1);
          S7control.getinstance().WriteWord(adddresslist, datas);
          // 修改数据库笼子表(出片)

                } else {// 笼子号大于5时
                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
                    if (cagecell == null) {
                        return Result.success(cagecell);
                    }
                    // 获取调拨位置进行调拨
                    prcid2 = cagecell.getPrcId();// 调拨目标位prcID
                    ids = cagecell.getId();// 调拨目标位ID
                    cages=cagecell.getCage();//调拨目标位笼子
                    cells=cagecell.getCell();//调拨目标位格子
                    // 填入调拨数据
                    datas.add((short) prcid);
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    // 转移原调拨格子数据
                    spianMapper.UpdataAddCage(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
                    spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
                    // 传输mes数据,坐标，数据
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    datas.clear(); // 清空整个列表
                    // 判断调拨结束后再次出片
                    // 填入出片数据
                    datas.add((short) prcid);
                    datas.add((short) 1000);
                    datas.add((short) 1);
                    datas.add((short) 1);
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    return Result.success(cagecell); // 调拨位置的参数内容
          return Result.success(cagecell); // 调拨位置的参数内容

                }
        } else {// 笼子号大于5时
          StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
          if (cagecell == null) {
            return Result.success(cagecell);
          }
          // 获取调拨位置进行调拨
          prcid2 = cagecell.getPrcId();// 调拨目标位prcID
          ids = cagecell.getId();// 调拨目标位ID
          cages = cagecell.getCage();// 调拨目标位笼子
          cells = cagecell.getCell();// 调拨目标位格子
          // 填入调拨数据
          datas.add((short) prcid);
          datas.add((short) prcid2);
          datas.add((short) 2);
          datas.add((short) 1);
          // 转移原调拨格子数据
          spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 减少新格子宽度
          spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
          spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
          spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
          // 传输mes数据,坐标，数据
          S7control.getinstance().WriteWord(adddresslist, datas);
          datas.clear(); // 清空整个列表
          // 判断调拨结束后再次出片
          // 填入出片数据
          datas.add((short) prcid);
          datas.add((short) 1000);
          datas.add((short) 1);
          datas.add((short) 1);
          S7control.getinstance().WriteWord(adddresslist, datas);
          return Result.success(cagecell); // 调拨位置的参数内容

            }
        }

      }
    }

    // @GetMapping("/all")
    // 进片任务,传订单id
    // 按订单优先进片
    public Short selectAll(Short glassid) {
  }

        int cage1;
        int cells;
        int ids;
        int prcid;
        int tiers;
        int prctier;
  // @GetMapping("/all")
  // 进片任务,传订单id
  // 按订单优先进片
  public Short selectAll(Short glassid) {

        Glass glasslist = spianMapper.selectGlass(glassid);
        if (glasslist == null) {
            return (300);
    int cage1;
    int cells;
    int ids;
    int prcid;
    int tiers;
    int prctier;

    Glass glasslist = spianMapper.selectGlass(glassid);
    if (glasslist == null) {
      return (300);
    }
    double widths = glasslist.getWidth();
    Short orderids = glasslist.getOrderId();

    List<String> adddresslist = new ArrayList<>();
    adddresslist.add("DB105.0");// 进片车起始位置
    adddresslist.add("DB105.2");// 进片车目标位置
    adddresslist.add("DB105.4");// 进片笼玻璃数
    adddresslist.add("DB105.12");// 进片车启动 1为启动
    List<Short> datas = new ArrayList<>();

    // String orderid="A001";
    // 获取订单相关度最高的笼子排序
    List<StorageCage> storageCage = spianMapper.selectAll(orderids);
    if (storageCage == null) {
      return (400);
    }
    for (StorageCage storageCage2 : storageCage) {
      // 保存订单优先顺序笼子号
      cage1 = storageCage2.getCage();
      // 判断该笼子号相邻最大的空格数
      int cages = spianMapper.selectCage(cage1);
      // 判断选中笼子是否有合适宽度空格
      StorageCage cages1 = spianMapper.selectCage1(cage1, widths);
      if (cages1 != null) {
        ids = cages1.getId();// 数据库ID
        tiers = cages1.getTier();// 内外片
        cells = cages1.getCell();// 格子号
        prcid = cages1.getPrcId();// 传给prc的目标地id
        prctier = spianMapper.selectsum(cage1, cells);// 传给prc的格子内玻璃数
        // 有合适空格时进片
        if (cages > 1 && cages1.getTier() != null) {
          // 执行进片
          datas.add((short) 1000);
          datas.add((short) prcid);
          datas.add((short) prctier);
          datas.add((short) 1);
          // 数据库修改笼子表新增一条玻璃
          spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
          spianMapper.UpdataAddCage1(widths, cage1, cells);// 减少格子宽度
          S7control.getinstance().WriteWord(adddresslist, datas);

          return (200);
        }
        double widths = glasslist.getWidth();
        Short orderids = glasslist.getOrderId();

        List<String> adddresslist = new ArrayList<>();
        adddresslist.add("DB105.0");// 进片车起始位置
        adddresslist.add("DB105.2");// 进片车目标位置
        adddresslist.add("DB105.4");// 进片笼玻璃数
        adddresslist.add("DB105.12");// 进片车启动 1为启动
        List<Short> datas = new ArrayList<>();

        // String orderid="A001";
        // 获取订单相关度最高的笼子排序
        List<StorageCage> storageCage = spianMapper.selectAll(orderids);
        if (storageCage == null) {
            return (400);
        }
        for (StorageCage storageCage2 : storageCage) {
            // 保存订单优先顺序笼子号
            cage1 = storageCage2.getCage();
            // 判断该笼子号相邻最大的空格数
            int cages = spianMapper.selectCage(cage1);
            // 判断选中笼子是否有合适宽度空格
            StorageCage cages1 = spianMapper.selectCage1(cage1, widths);
            if (cages1 != null) {
                ids = cages1.getId();// 数据库ID
                tiers = cages1.getTier();// 内外片
                cells = cages1.getCell();// 格子号
                prcid = cages1.getPrcId();// 传给prc的目标地id
                prctier = spianMapper.selectsum(cage1, cells);// 传给prc的格子内玻璃数
                // 有合适空格时进片
                if (cages > 1 && cages1.getTier() != null) {
                    // 执行进片
                    datas.add((short) 1000);
                    datas.add((short) prcid);
                    datas.add((short) prctier);
                    datas.add((short) 1);
                    // 数据库修改笼子表新增一条玻璃
                    spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
                    spianMapper.UpdataAddCage1(widths, cage1, cells);//减少格子宽度
                    S7control.getinstance().WriteWord(adddresslist, datas);

                    return (200);
                }
            }

        }
        return (400);
      }

    }
    return (400);

    // @GetMapping("/all2")
    public Result selectout2(String glassid) {
        // 定义PRC数据传送数组
        List<String> adddresslist = new ArrayList<>();
        adddresslist.add("DB105.6");// 出片车起始位置
        adddresslist.add("DB105.8");// 出片车目标位置
        adddresslist.add("DB105.10");// 出片笼玻璃数
        adddresslist.add("DB105.14");// 出片车启动 1为启动
        List<Short> datas = new ArrayList<>();
        // 获取优先出片的位置
        StorageCage cageout = spianMapper.selectOut2(glassid);
        int cage = cageout.getCage(); // 储存出片位置，笼子格子几号玻璃
        int cell = cageout.getCell();// 出片格号
        int tier = cageout.getTier();// 出片内外片
        int prcid = cageout.getPrcId();// prcid
        int prcid2;
        int ids;
        int cages;
        int cells;
        double glasswidth = cageout.getGlassWidth();
        // 判断玻璃内外片
        if (tier == 2) {
            // 判断玻璃可直接出片时
            // 修改数据库笼子表(出片)
            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
            spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
            datas.add((short) prcid);
            datas.add((short) 1000);
            datas.add((short) 1);
            datas.add((short) 1);
            S7control.getinstance().WriteWord(adddresslist, datas);
            return Result.success(datas);
        } else {
            // 获取格子的玻璃数量
            int state = spianMapper.selectGlassState(cage, cell);
            // 判断内片是否需要调拨
            if (state == 0) {
                return Result.success("状态为0,直接出片");
            } else {
                // 玻璃需要调拨时，判断属于哪个半区的笼子
                if (cage < 6) {
                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
                    if (cagecell == null) {
                        return Result.success(cagecell);
                    }
                    // 获取调拨位置进行调拨
                    prcid2 = cagecell.getPrcId();// 调拨目标位PRCID
                    ids = cagecell.getId();// 调拨目标位ID
                    cages=cagecell.getCage();//调拨目标位笼子
                    cells=cagecell.getCell();//调拨目标位格子
                    // 更换玻璃的笼子
                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
                    spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
                    // 填入调拨数据
                    datas.add((short) prcid);// 调拨外片起始位置
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    // 传输mes数据,坐标，数据
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    datas.clear(); // 清空整个列表
                    // 判断调拨结束后再次出片,填入出片数据
                    datas.add((short) prcid);
                    datas.add((short) 1000);
                    datas.add((short) 1);
                    datas.add((short) 1);
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    // 修改数据库笼子表(出片)
  }

                    return Result.success(cagecell); // 调拨位置的参数内容
  // @GetMapping("/all2")
  public Result selectout2(String glassid) {
    // 定义PRC数据传送数组
    List<String> adddresslist = new ArrayList<>();
    adddresslist.add("DB105.6");// 出片车起始位置
    adddresslist.add("DB105.8");// 出片车目标位置
    adddresslist.add("DB105.10");// 出片笼玻璃数
    adddresslist.add("DB105.14");// 出片车启动 1为启动
    List<Short> datas = new ArrayList<>();
    // 获取优先出片的位置
    StorageCage cageout = spianMapper.selectOut2(glassid);
    int cage = cageout.getCage(); // 储存出片位置，笼子格子几号玻璃
    int cell = cageout.getCell();// 出片格号
    int tier = cageout.getTier();// 出片内外片
    int prcid = cageout.getPrcId();// prcid
    int prcid2;
    int ids;
    int cages;
    int cells;
    double glasswidth = cageout.getGlassWidth();
    // 判断玻璃内外片
    if (tier == 2) {
      // 判断玻璃可直接出片时
      // 修改数据库笼子表(出片)
      spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
      spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
      datas.add((short) prcid);
      datas.add((short) 1000);
      datas.add((short) 1);
      datas.add((short) 1);
      S7control.getinstance().WriteWord(adddresslist, datas);
      return Result.success(datas);
    } else {
      // 获取格子的玻璃数量
      int state = spianMapper.selectGlassState(cage, cell);
      // 判断内片是否需要调拨
      if (state == 0) {
        return Result.success("状态为0,直接出片");
      } else {
        // 玻璃需要调拨时，判断属于哪个半区的笼子
        if (cage < 6) {
          StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
          if (cagecell == null) {
            return Result.success(cagecell);
          }
          // 获取调拨位置进行调拨
          prcid2 = cagecell.getPrcId();// 调拨目标位PRCID
          ids = cagecell.getId();// 调拨目标位ID
          cages = cagecell.getCage();// 调拨目标位笼子
          cells = cagecell.getCell();// 调拨目标位格子
          // 更换玻璃的笼子
          spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 减少新格子宽度
          spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
          spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
          spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
          // 填入调拨数据
          datas.add((short) prcid);// 调拨外片起始位置
          datas.add((short) prcid2);
          datas.add((short) 2);
          datas.add((short) 1);
          // 传输mes数据,坐标，数据
          S7control.getinstance().WriteWord(adddresslist, datas);
          datas.clear(); // 清空整个列表
          // 判断调拨结束后再次出片,填入出片数据
          datas.add((short) prcid);
          datas.add((short) 1000);
          datas.add((short) 1);
          datas.add((short) 1);
          S7control.getinstance().WriteWord(adddresslist, datas);
          // 修改数据库笼子表(出片)

                } else {// 笼子号大于5时
                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
                    if (cagecell == null) {
                        return Result.success(cagecell);
                    }
                    // 获取调拨位置进行调拨
                    prcid2 = cagecell.getPrcId();// 调拨目标位prcID
                    ids = cagecell.getId();// 调拨目标位ID
                    cages=cagecell.getCage();//调拨目标位笼子
                    cells=cagecell.getCell();//调拨目标位格子
                   
                    // 填入调拨数据
                    datas.add((short) prcid);
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    // 转移原调拨格子数据
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataAddCage(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
                    spianMapper.UpdataOutCage(glasswidth, cage, cell);//增加原格子宽度
                    // 传输mes数据,坐标，数据
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    datas.clear(); // 清空整个列表
                    // 判断调拨结束后再次出片
                    // 填入出片数据
                    datas.add((short) prcid);
                    datas.add((short) 1000);
                    datas.add((short) 1);
                    datas.add((short) 1);
                    S7control.getinstance().WriteWord(adddresslist, datas);
                    return Result.success(cagecell); // 调拨位置的参数内容
          return Result.success(cagecell); // 调拨位置的参数内容

                }
        } else {// 笼子号大于5时
          StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
          if (cagecell == null) {
            return Result.success(cagecell);
          }
          // 获取调拨位置进行调拨
          prcid2 = cagecell.getPrcId();// 调拨目标位prcID
          ids = cagecell.getId();// 调拨目标位ID
          cages = cagecell.getCage();// 调拨目标位笼子
          cells = cagecell.getCell();// 调拨目标位格子

            }
          // 填入调拨数据
          datas.add((short) prcid);
          datas.add((short) prcid2);
          datas.add((short) 2);
          datas.add((short) 1);
          // 转移原调拨格子数据
          spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
          spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 减少新格子宽度
          spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除原格子数据
          spianMapper.UpdataOutCage(glasswidth, cage, cell);// 增加原格子宽度
          // 传输mes数据,坐标，数据
          S7control.getinstance().WriteWord(adddresslist, datas);
          datas.clear(); // 清空整个列表
          // 判断调拨结束后再次出片
          // 填入出片数据
          datas.add((short) prcid);
          datas.add((short) 1000);
          datas.add((short) 1);
          datas.add((short) 1);
          S7control.getinstance().WriteWord(adddresslist, datas);
          return Result.success(cagecell); // 调拨位置的参数内容

        }

      }
    }

    /*** 修改用户* @throws SQLException */
    // public static int updateUser(Glass user) throws SQLException {conn =
    // getConn();
    // String sql = "update t_user set name=?,gender=?,age=?,score=?"+ " where
    // id=?";ps = conn.prepareStatement(sql);
    // ps.setString(1, user.getName());ps.setString(2, user.getGender());
    // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());ps.setInt(5,
    // user.getId());return ps.executeUpdate();}
    // /*** 增加用户* @throws SQLException */
    // public static int insertUser(User user) throws SQLException {
    // conn = getConn();
    // String sql = "insert into t_user(name,gender,age,score)"+ " values(?,?,?,?)";
    // ps = conn.prepareStatement(sql);ps.setString(1,
    // user.getName());ps.setString(2, user.getGender());
    // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());return
    // ps.executeUpdate();
    // }
  }

  /*** 修改用户* @throws SQLException */
  // public static int updateUser(Glass user) throws SQLException {conn =
  // getConn();
  // String sql = "update t_user set name=?,gender=?,age=?,score=?"+ " where
  // id=?";ps = conn.prepareStatement(sql);
  // ps.setString(1, user.getName());ps.setString(2, user.getGender());
  // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());ps.setInt(5,
  // user.getId());return ps.executeUpdate();}
  // /*** 增加用户* @throws SQLException */
  // public static int insertUser(User user) throws SQLException {
  // conn = getConn();
  // String sql = "insert into t_user(name,gender,age,score)"+ " values(?,?,?,?)";
  // ps = conn.prepareStatement(sql);ps.setString(1,
  // user.getName());ps.setString(2, user.getGender());
  // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());return
  // ps.executeUpdate();
  // }

}

 springboot-vue3/src/main/resources/sql/canadames.sql

@@ -11,7 +11,7 @@
 Target Server Version : 80019

 File Encoding         : 65001



 Date: 13/09/2023 09:22:22

 Date: 13/09/2023 09:48:14

*/



SET NAMES utf8mb4;