CanadaMes.git - Gitblit

			@@ -23,6 +23,7 @@
			import com.example.springboot.entity.CarPosition;
			import com.example.springboot.entity.StorageCage;
			import com.example.springboot.entity.alarmmg;
			import com.example.springboot.entity.north_frame_buffer1_frames;
			import com.example.springboot.entity.north_glass_buffer1;
			import com.example.springboot.entity.Out_slice;
			import com.example.springboot.entity.Queue;
			@@ -178,7 +179,7 @@
			Map<String, Object> map = new HashMap<>();
			Out_slice result = homeMapper.SelectQueueByglassid(glassid);
			if (result == null) {
			north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
			north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdout(glassid, "", "");
			String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());

			if (flip != null&&flip != "") {
			@@ -274,7 +275,7 @@

			// 手动添加扫码位玻璃
			@PostMapping("/InsertQueueGlassId")
			public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
			public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) throws SQLException {
			return storageCageService.InsertQueueGlassId(id, queue);

			}
			@@ -311,6 +312,7 @@
			public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
			String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
			List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
			Plchome.AluminumFrameInfo=jdbcConnections.SelectFrameBarcode(FrameBarcode);
			Map<String, Object> map = new HashMap<>();
			map.put("AluminumFrame", AluminumFrame);
			map.put("flip", flip);
			@@ -329,6 +331,7 @@
			// public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
			// SQLException {
			north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
			Plchome.AluminumFrame = null;
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);
			@@ -404,6 +407,7 @@
			@PostMapping("/CloseForm7")
			public Result CloseForm7() {
			Plchome.AluminumFrame = null;
			Plchome.AluminumFrameInfo = new north_frame_buffer1_frames();
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);