From 8ea75114778d247e302241b070958f708665b1f6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 23:23:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
/dev/null | 46 ----------------------------------------------
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 2 +-
2 files changed, 1 insertions(+), 47 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index c988d3a..662b714 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -48,7 +48,7 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- spianService.selectout2("X12345610102GV");
+ //spianService.selectout2("X12345610102GV");
// 鍑虹墖浠诲姟////////////////////////////////
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
deleted file mode 100644
index 0968120..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.example.springboot.controller;
-
-import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.service.SpianService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("/spian")
-
-
-public class SpianController {
-
- @Autowired
- SpianMapper spianMapper;
- @Autowired
- SpianService spianservice;
- //鍑虹墖浠诲姟
-@GetMapping("/all2")
- public void selectdd(String orderid){
- SpianService service=new SpianService();
- service.selectout2(orderid);
-
-}
-
- @GetMapping("/all")
- //杩涚墖浠诲姟,浼犺鍗昳d
- //鎸夎鍗曚紭鍏堣繘鐗�
- public void selectAll(Short glassid){
- SpianService service=new SpianService();
- service.selectAll(Short.toString(glassid));
-
- }
-
-
-
-
-
-
-
-}
--
Gitblit v1.8.0