CanadaMes.git - Gitblit

			@@ -274,19 +274,8 @@
			// 手动添加扫码位玻璃
			@PostMapping("/InsertQueueGlassId")
			public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
			Map<String, Object> map = new HashMap<>();
			short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
			if (result > 0) {
			map.put("message", "300");
			} else {
			homeMapper.InsertQueueGlassId(queue, id);
			if (id == 1) {
			// 调用伍存储过程
			spianService.selectAll(queue.getglassId());
			}
			map.put("message", "200");
			}
			return Result.success(map);
			return storageCageService.InsertQueueGlassId(id, queue);

			}

			// 确认扫码位玻璃信息
			@@ -330,11 +319,7 @@
			// 根据铝框id删除出片队列玻璃
			@PostMapping("/DeleteProductionQueueGlass")
			public Result DeleteProductionQueueGlass(String FrameNo) {
			homeMapper.CompleteQueueByFrameNo(FrameNo);

			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);
			return outSliceServive.CompleteQueueByFrameNo(FrameNo);
			}

			// 添加铝框id对应玻璃到出片队列
			@@ -402,7 +387,7 @@
			@PostMapping("/WriteGlassID")
			public Result WriteGlassID(String glassid) {
			// 扫码位写入玻璃id
			spianService.outmesid(glassid, "DB103.256");
			spianService.outmesid(glassid, "DB103.286");
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);
			@@ -454,8 +439,8 @@

			// 切换PLC获取二维码方式
			@PostMapping("/SwitchScanMethod")
			public Result SwitchScanMethod(Short scansmethod) {
			S7control.getinstance().WriteWord("DB103.255", scansmethod);
			public Result SwitchScanMethod(Boolean scansmethod) {
			S7control.getinstance().WriteBit("DB101.11.4", scansmethod);
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);