YiWuProject.git

			@@ -3,7 +3,7 @@
			import org.springframework.boot.autoconfigure.SpringBootApplication;
			import org.springframework.cache.annotation.EnableCaching;
			import org.springframework.transaction.annotation.EnableTransactionManagement;
			import org.springframework.transaction.annotation.Transactional;


			//springboot 启动入口
			@SpringBootApplication

			@@ -4,11 +4,8 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;
			import com.mes.common.Result;
			import com.mes.entity.Tempering;
			import com.mes.entity.UpWorkstation;
			import com.mes.service.LoadGlassService;
			import com.mes.service.TemperingOverService;
			import com.mes.service.TemperingService;


			@RestController

File was deleted

			@@ -1,21 +1,17 @@
			package com.mes.service;
			import java.nio.charset.StandardCharsets;
			import java.util.ArrayList;
			import java.util.List;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import com.mes.entity.device.PLCAutoMes;
			import com.mes.common.PlcTools.S7control;
			import com.mes.entity.device.PlcParameterObject;
			import com.google.common.primitives.Bytes;
			import com.mes.entity.GlassInfo;

			import com.mes.entity.UpWorkstation;
			import com.mes.mapper.LoadGlassMapper;

			@Service
			public class LoadGlassService {
			@Autowired
			private com.mes.common.PlcTools.S7control s7control;

			private S7control s7control;
			private LoadGlassMapper LoadGlassMapper;
			PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
			//显示工位上的玻璃信息
			@@ -25,7 +21,7 @@
			}
			//增加人工输入的工位玻璃信息
			public void insertGlass(UpWorkstation upwork) {
			LoadGlassMapper.insertGlass(upwork.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),upwork.getWorkstationid());
			LoadGlassMapper.insertGlass(upwork);
			}
			//删除人工搬走的玻璃信息
			public void deleteGlass(int id) {
			@@ -50,8 +46,8 @@
			s7control.WriteWord("DB100.10", (short)2);
			}else if(loadid1==loadid2){
			//当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子
			int glassnum1=plcmes.getPlcParameter("玻璃数").getValue();
			int glassnum2=plcmes.getPlcParameter("玻璃数").getValue();
			int glassnum1=Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
			int glassnum2=Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
			if(glassnum1>glassnum2){
			s7control.WriteWord("DB100.10", (short)2);
			}else{

	LoadGlassModule/src/main/java/com/mes/MesApplication.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/entity/Engineering.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/entity/GlassFilms.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史