From 570d13db62381963bdd560fd2136013aed24c9bb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 12 四月 2024 17:02:06 +0800
Subject: [PATCH] 代码迁移更改,重构
---
/dev/null | 20 -----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 30 +++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 68 +++++++++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 56 ++++++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java | 16 ++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java | 8 -
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java | 21 +++++
8 files changed, 193 insertions(+), 28 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java
index 441fe8d..2634690 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java
@@ -19,12 +19,6 @@
@MapperScan(basePackages = "com.mes.*.mapper")
public class LoadGlassModuleApplication {
public static void main(String[] args) {
- try {
- SpringApplication.run(LoadGlassModuleApplication.class, args);
- } catch (Exception e) {
- log.error(e.getMessage());
-
- }
-
+ SpringApplication.run(LoadGlassModuleApplication.class, args);
}
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
deleted file mode 100644
index 3988b80..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mes.upworkstation.controller;
-import java.util.List;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.mes.upworkstation.entity.UpWorkstation;
-import com.mes.upworkstation.service.LoadGlassService;
-import com.mes.utils.Result;
-
-@RestController
-@RequestMapping("/LoadGlass")
-
-// TidyUpGlassModule 閽㈠寲妯″潡
-public class LoadGlassController {
-
- @Autowired
- private LoadGlassService loadGlassService;
-
- @PostMapping("/SelectAll") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- @ResponseBody
- public Result SelectGlassInfo() {
- List<UpWorkstation> glass = loadGlassService.selectAll();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
- @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
- @ResponseBody
- public void insertGlassinfo(@RequestBody UpWorkstation upwork) {
- loadGlassService.insertGlass(upwork);
-
- }
-
- @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
- @ResponseBody
- public void SelectCutTerritory(int upworkid) {
- loadGlassService.deleteGlass(upworkid);
- }
-
- @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
- @ResponseBody
- public void selectPriority() {
- boolean result = loadGlassService.isCanLoadGlass();
- if(result==true){
- loadGlassService.selectPriority();
- }
- }
-
-
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/UpWorkstationController.java
deleted file mode 100644
index 5162736..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/UpWorkstationController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mes.upworkstation.controller;
-
-
-import com.mes.upworkstation.entity.UpWorkstation;
-import com.mes.upworkstation.service.LoadGlassService;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@RestController
-@RequestMapping("/upWorkstation")
-public class UpWorkstationController {
- @Autowired
- private LoadGlassService loadGlassService;
-
- @PostMapping("/SelectAll") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- @ResponseBody
- public Result selectGlassInfo() {
- List<UpWorkstation> glass = loadGlassService.selectAll();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
- @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
- @ResponseBody
- public void insertGlassinfo(@RequestBody UpWorkstation upwork) {
- loadGlassService.insertGlass(upwork);
-
- }
-
- @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
- @ResponseBody
- public void selectCutTerritory(int upworkid) {
- loadGlassService.deleteGlass(upworkid);
- }
-
- @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
- @ResponseBody
- public void selectPriority() {
- boolean result = loadGlassService.isCanLoadGlass();
- if(result){
- loadGlassService.selectPriority();
- }
- }
-}
-
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
deleted file mode 100644
index 8a47dfa..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes.upworkstation.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.*;
-import com.mes.upworkstation.entity.UpWorkstation;
-@Mapper
-public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
- //鏄剧ず鐩墠宸ヤ綅鐜荤拑淇℃伅
- @Select("SELECT * FROM up_workstation")
- List<UpWorkstation> selectALL();
- //鍒犻櫎宸ヤ綅鐨勭幓鐠冧俊鎭�
- @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 );
- //澧炲姞涓婄墖淇℃伅
- @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);
- //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
- @Select("select b.layout_sequence from up_workstation a left join up_patten_usage b on a.pattern_width=b.width and a.pattern_heigth=b.width and a.pattern_thickness=b.thickness where a.workstation_id=#{id}")
- int selectPriority(int id);
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/UpWorkstationMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/UpWorkstationMapper.java
deleted file mode 100644
index 333d195..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/UpWorkstationMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.upworkstation.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.upworkstation.entity.UpWorkstation;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpWorkstationMapper extends BaseMapper<UpWorkstation> {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
deleted file mode 100644
index 2c9b60c..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mes.upworkstation.service;
-import java.util.List;
-import org.springframework.stereotype.Service;
-import com.mes.common.PLCAutoMes;
-import com.mes.common.PlcParameterObject;
-import com.mes.upworkstation.entity.UpWorkstation;
-import com.mes.upworkstation.mapper.LoadGlassMapper;
-import com.mes.common.S7object;
-/**
- * @author SNG-010
- */
-@Service
-public class LoadGlassService {
-
-
- private LoadGlassMapper loadGlassMapper;
-//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
- public List<UpWorkstation> selectAll() {
- return loadGlassMapper.selectALL();
- }
- //澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
- public void insertGlass(UpWorkstation upwork) {
- loadGlassMapper.insertGlass(upwork);
- }
- //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
- public void deleteGlass(int id) {
- loadGlassMapper.deleteGlass(id);
- }
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
- public boolean isCanLoadGlass() {
- String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- return "1".equals(loadstart);
-
- }
- //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority() {
- int loadid1=loadGlassMapper.selectPriority(1);
- int loadid2=loadGlassMapper.selectPriority(2);
- //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
- if(loadid1>loadid2) {
- S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)2);
- }else if(loadid1==loadid2){
- //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=1;//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- int glassnum2=2;//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- if(glassnum1>glassnum2){
- S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)2);
- }else{
- S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)1);
- }
- }else{
- S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)1);
- }
- }
-
-
-
-
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/UpWorkstationService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/UpWorkstationService.java
deleted file mode 100644
index 7f6f858..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/UpWorkstationService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.upworkstation.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.upworkstation.entity.UpWorkstation;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpWorkstationService extends IService<UpWorkstation> {
-
-
-
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/impl/UpWorkstationServiceImpl.java
deleted file mode 100644
index 22ed61b..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/impl/UpWorkstationServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.upworkstation.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.upworkstation.entity.UpWorkstation;
-import com.mes.upworkstation.mapper.UpWorkstationMapper;
-import com.mes.upworkstation.service.UpWorkstationService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
new file mode 100644
index 0000000..34ea858
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -0,0 +1,56 @@
+package com.mes.workstation.controller;
+
+
+import com.mes.workstation.entity.UpWorkstation;
+import com.mes.workstation.service.UpWorkstationService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("/LoadGlass")
+@Slf4j
+public class UpWorkstationController {
+ @Autowired
+ private UpWorkstationService upWorkstationService;
+
+ @ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅")
+ @GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ public Result<List<UpWorkstation>> list() {
+ List<UpWorkstation> glass = upWorkstationService.list();
+ log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
+ return Result.build(200, "", glass);
+ }
+
+ @PostMapping("/updateGlassMessage") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
+ @ResponseBody
+ public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
+ upWorkstationService.updateGlassMessage(upwork);
+ }
+
+ //todo: 鍜寀pdateGlassMessage绫讳技
+// @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
+// @ResponseBody
+// public void selectCutTerritory(int upworkid) {
+// loadGlassService.deleteGlass(upworkid);
+// }
+
+ @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
+ @ResponseBody
+ public void selectPriority() {
+ upWorkstationService.selectPriority();
+ }
+}
+
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/entity/UpWorkstation.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
similarity index 96%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/entity/UpWorkstation.java
rename to hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
index 88e5523..66a5c48 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/entity/UpWorkstation.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
@@ -1,4 +1,4 @@
-package com.mes.upworkstation.entity;
+package com.mes.workstation.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
new file mode 100644
index 0000000..83bc50b
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
@@ -0,0 +1,16 @@
+package com.mes.workstation.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Map;
+
+import org.apache.ibatis.annotations.*;
+import com.mes.workstation.entity.UpWorkstation;
+@Mapper
+public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
+ //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
+ @Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " +
+ "on a.pattern_width=b.width and a.pattern_heigth=b.width " +
+ "and a.pattern_thickness=b.thickness where a.workstation_id=#{id}")
+ Map<String,Object> selectPriority(int id);
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
new file mode 100644
index 0000000..5731173
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
@@ -0,0 +1,21 @@
+package com.mes.workstation.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.workstation.entity.UpWorkSequence;
+import com.mes.workstation.entity.UpWorkstation;
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+public interface UpWorkstationMapper extends BaseMapper<UpWorkstation> {
+
+ List<UpWorkSequence> selectPriority(@Param("id") int id);
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
new file mode 100644
index 0000000..7a03568
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
@@ -0,0 +1,30 @@
+package com.mes.workstation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.workstation.entity.UpWorkstation;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+public interface UpWorkstationService extends IService<UpWorkstation> {
+ //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+
+ //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+// public void deleteGlass(int id);
+ //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+
+ //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+ public void selectPriority() ;
+
+
+ /**
+ * 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
+ * @param upwork
+ */
+ void updateGlassMessage(UpWorkstation upwork);
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
new file mode 100644
index 0000000..7e891f6
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -0,0 +1,68 @@
+package com.mes.workstation.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.common.S7object;
+import com.mes.workstation.entity.UpWorkSequence;
+import com.mes.workstation.entity.UpWorkstation;
+import com.mes.workstation.mapper.UpWorkstationMapper;
+import com.mes.workstation.service.UpWorkstationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+@Service
+public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
+
+ public static final String DB_100_10 = "DB_100_10";
+
+ //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+ public boolean isCanLoadGlass() {
+ String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+ return "1".equals(loadstart);
+
+ }
+ //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+ public void selectPriority() {
+ //todo:鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+// String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+// if (!"1".equals(loadstart)) {
+// return;
+// }
+ UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0);
+ UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0);
+ //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
+ if(loadid1.getSequence()>loadid2.getSequence()) {
+ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
+ }else if(loadid1.getSequence()==loadid2.getSequence()){
+ //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
+ int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ if(glassnum1>glassnum2){
+ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
+ }else{
+ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
+ }
+ }else{
+ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
+ }
+ }
+
+ /**
+ * 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�/鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+ * @param upwork
+ */
+ @Override
+ public void updateGlassMessage(UpWorkstation upwork) {
+ UpdateWrapper<UpWorkstation> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("workstation_id", upwork.getWorkstationId());
+ int update = this.baseMapper.update(upwork, updateWrapper);
+ }
+
+}
--
Gitblit v1.8.0