CanadaMes.git - Gitblit

			@@ -18,7 +18,7 @@
			while (this != null) {
			try {

			Thread.sleep(10000);
			Thread.sleep(500);
			} catch (InterruptedException e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
			@@ -26,7 +26,10 @@
			List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);

			List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);


			//判断进片请求
			List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);

			// 查询数据库
			// 推送到前端

			@@ -1,6 +1,7 @@
			package com.example.springboot.controller;

			import com.example.springboot.common.Result;
			import com.example.springboot.component.S7control;
			import com.example.springboot.entity.StorageCage;
			import com.example.springboot.mapper.SpianMapper;
			import com.example.springboot.service.SpianService;
			@@ -13,6 +14,7 @@
			import org.springframework.web.bind.annotation.RestController;

			import java.util.List;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.Map;
			@RestController
			@@ -30,6 +32,9 @@
			//出片任务
			@GetMapping("/all2")
			public Result selectdd(String orderid){



			//获取优先出片的位置
			StorageCage cageout=spianMapper.selectOut(orderid);
			int cage =cageout.getCage(); //储存出片位置，笼子格子几号玻璃
			@@ -52,6 +57,17 @@
			if(cage<6){
			StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
			//获取调拨位置进行调拨
			List<String> adddresslist=new ArrayList<>();
			adddresslist.add("DB105.6");
			adddresslist.add("DB105.8");
			adddresslist.add("DB105.10");
			adddresslist.add("DB105.14");
			List<Short> datas=new ArrayList<>();
			datas.add((short)0);
			datas.add((short)0);
			datas.add((short)0);
			datas.add((short)0);
			S7control.getinstance().WriteWord(adddresslist, datas);
			return Result.success(cagecell); //调拨位置的参数内容
			//判断调拨结束后再次出片
			}else{

			@@ -40,7 +40,9 @@
			//判断该调拨的笼子
			@Select("select cage,cell,max(state)as shu from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
			StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);

			//修改笼子信息(进片)
			@Update("update storage_cage set state=1,width=width #{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{glasswidth} where cage=#{cage} and cell=#{cell} and tier=#{tier}");

			// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
			// void insert (Spian spian);

	springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史