Albania_Mes.git

			@@ -21,6 +21,7 @@
			import com.example.springboot.entity.StorageTask;
			import com.example.springboot.entity.device.PlcParameterObject;
			import com.example.springboot.mapper.HomeMapper;
			import com.example.springboot.mapper.QueueMapper;
			import com.fasterxml.jackson.databind.ObjectMapper;

			@Service
			@@ -30,6 +31,9 @@

			@Autowired
			private OutSliceServive outSliceServive;

			@Autowired
			private QueueMapper QueueMapper;

			@Autowired
			private SpianService spianService;
			@@ -280,9 +284,9 @@
			// 查询订单任务
			public List<FlowCard> SelectOrderTask() {
			List<FlowCard> OrderTask = homeMapper.SelectOrderTask();
			for (FlowCard flowcard : OrderTask) {
			flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
			}
			// for (FlowCard flowcard : OrderTask) {
			// flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
			// }
			return OrderTask;
			}

			@@ -328,8 +332,10 @@
			// 读取DB105区文件
			PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
			// 移除
			// S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
			// (short) 3);
			S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 3);
			//删除数据
			QueueMapper.DeleteErrorQueue();

			// plcmes.getPlcParameter("GaToMES").setValue("3");
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			@@ -341,8 +347,9 @@
			// 读取DB105区文件
			PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
			// 重新测量
			// S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
			// (short) 2);
			S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
			//删除数据
			QueueMapper.DeleteErrorQueue();
			// plcmes.getPlcParameter("GaToMES").setValue("2");
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			@@ -394,7 +401,7 @@
			glasstype = Integer.valueOf(value);
			}
			homeMapper.AddGlassinfo(map.get("order").toString(), glasstype,
			Integer.parseInt(map.get("glasstype").toString()) // 需要计算配片ID
			Integer.parseInt(map.get("matching").toString()) // 需要计算配片ID
			, glasstype+"" // 需要计算玻璃ID
			, Integer.parseInt(map.get("tier").toString()), map.get("films").toString(),
			Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),