CanadaMes.git - Gitblit

			@@ -106,14 +106,15 @@

			// 根据玻璃id手动上片
			@GetMapping("/Addglassid")
			public Result Addglassid(String glassid) {
			public Result Addglassid(String glassid) throws SQLException {
			Map<String, Object> map = new HashMap<>();
			short taskno = homeMapper.SelectInTask();
			if (taskno > 0) {
			map.put("message2", "500");
			} else {
			// 调用伍上片函数
			short results = spianService.selectAll(glassid);
			north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
			short results = spianService.selectAll(north_glass_buffer1);
			if (results == 200) {
			map.put("message2", "200");
			} else if (results == 300) {
			@@ -177,7 +178,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 != "") {
			@@ -273,7 +274,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);

			}
			@@ -328,6 +329,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);