Albania_Mes.git

			@@ -1,6 +1,7 @@
			package com.example.springboot.controller;

			import java.sql.SQLException;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			@@ -16,6 +17,11 @@
			import com.example.springboot.service.OutSliceServive;
			import com.example.springboot.service.SpianService;
			import com.example.springboot.service.StorageCageService;
			import com.fasterxml.jackson.databind.ObjectMapper;
			import com.google.gson.JsonArray;
			import com.google.gson.JsonObject;

			import cn.hutool.core.lang.Console;

			import com.example.springboot.common.Result;
			import com.example.springboot.component.Plchome;
			@@ -473,8 +479,8 @@

			//领取/暂停任务
			@PostMapping("/ClaimTasks")
			public Result ClaimTasks(String flowcard,Integer state) {
			return storageCageService.ClaimTasks(flowcard,state);
			public Result ClaimTasks(String flowcard,Integer state, Integer line) {
			return storageCageService.ClaimTasks(flowcard,state,line);
			}

			//修改出片方式
			@@ -482,10 +488,25 @@
			public Result ModeChange(String flowcard,Integer method) {
			return storageCageService.ModeChange(flowcard,method);
			}


			//添加玻璃信息到测量信息
			@PostMapping("/UpdateQueue")
			public Result UpdateQueue(@RequestBody GlassInfo glassInfo) {
			return storageCageService.UpdateQueue(glassInfo);
			}
			//人工拿走
			@PostMapping("/ManualTake")
			public Result ManualTake(@RequestBody String glassInfo) {
			return storageCageService.ManualTake(glassInfo);
			}
			//重新测量
			@PostMapping("/AnewMeasure")
			public Result AnewMeasure(@RequestBody String glassInfo) {
			return storageCageService.AnewMeasure(glassInfo);
			}
			//导入数据：添加玻璃信息
			@PostMapping("/importData")
			public Result importData(@RequestBody List<Map> IportDataStr) {
			return storageCageService.AddGlassinfo(IportDataStr);
			}
			}