CanadaMes.git - Gitblit

			@@ -13,7 +13,7 @@
			import com.example.springboot.mapper.HomeMapper;
			import com.example.springboot.mapper.SpianMapper;
			import com.example.springboot.service.HomeService;
			import com.example.springboot.service.MultiFieldComparator;
			// import com.example.springboot.service.MultiFieldComparator;
			import com.example.springboot.service.SpianService;
			import com.example.springboot.common.Result;
			import com.example.springboot.component.S7control;
			@@ -24,7 +24,6 @@
			import com.example.springboot.entity.Out_slice;

			import org.springframework.web.bind.annotation.*;


			@RestController
			@RequestMapping("/home")
			@@ -227,8 +226,9 @@
			if (result > 0) {
			map.put("message", "300");
			} else {
			homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
			spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
			// homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
			// spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage,
			// cell);
			}
			return Result.success(map);
			}
			@@ -291,16 +291,14 @@
			List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
			String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
			for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
			north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
			north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
			// north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
			// north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
			}
			Map<String, Object> map = new HashMap<>();
			map.put("listAluminumFrame", listAluminumFrame);
			map.put("flip", flip);
			return Result.success(map);
			}



			// 查询出片队列数据
			@PostMapping("/SelectProductionqueue")