From 680e87428606128d625fc1c60f3f02a05e2e4b0f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 四月 2024 10:42:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
index 20df2ae..94397d5 100644
--- a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
+++ b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
@@ -4,11 +4,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.mes.common.Result;
-import com.mes.entity.Tempering;
 import com.mes.entity.UpWorkstation;
 import com.mes.service.LoadGlassService;
-import com.mes.service.TemperingOverService;
-import com.mes.service.TemperingService;
 
 
 @RestController
@@ -28,14 +25,14 @@
         return Result.seccess(glass);
     }
 
-    @PostMapping("/insertGlass") //鏂板涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
+    @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
     @ResponseBody
     public void insertGlassinfo(@RequestBody UpWorkstation upwork) {
         loadGlassService.insertGlass(upwork);
       
     }
 
-    @PostMapping("/deleteGlass") //鍒犻櫎涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d鍒犻櫎
+    @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
     @ResponseBody
     public void SelectCutTerritory(int upworkid) {
         loadGlassService.deleteGlass(upworkid);

--
Gitblit v1.8.0