From 96b63f125687d8ef610745fd9041da2cc77a24af Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 10 四月 2024 08:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
index 363b7a2..cfcb251 100644
--- a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
+++ b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
@@ -9,11 +9,11 @@
     @Select("SELECT * FROM up_workstation")
     List<UpWorkstation> selectALL();
     //鍒犻櫎宸ヤ綅鐨勭幓鐠冧俊鎭�
-    @Delete("DELETE FROM up_workstation where  workstation_id=#{id}")
+    @Update("UPDATE `hangzhoumes`.`up_workstation` SET   `pattern_width` =NULL, `pattern_heigth` = NULL, `pattern_thickness` = NULL, `films_id` = NULL, `number` = NULL WHERE `workstation_id`=#{id}")
     void deleteGlass(int id );
     //澧炲姞涓婄墖淇℃伅
-    @Insert ("INSERT INTO up_workstation (pattern_width,pattern_heigth,pattern_thickness)value(#{patternwidth},#{patternheigth},#{patternthickness}where workstation_id=#{workstationid) ")
-    void insertGlass(Double patternwidth,Double patternheigth,Double patternthickness,int workstationid);
+    @Update ("UPDATE `hangzhoumes`.`up_workstation` SET   `pattern_width` = #{upwork.patternwidth}, `pattern_heigth` = #{upwork.patternheigth}, `pattern_thickness` =#{upwork.patternthickness}, `films_id` =#{upwork.filmsid}, `number` = #{upwork.number} WHERE `id` = #{upwork.workstationid}; ")
+    void insertGlass(UpWorkstation upwork);
     //鏄惁鍙戣捣鍚哥墖
     @Select("SELECT * FROM up_workstation where  workstation_id=#{id}")
     UpWorkstation selectAdd(int id);

--
Gitblit v1.8.0