From 5dc4d422e67455e4dc444b9daab45aab077c1885 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 13:29:16 +0800
Subject: [PATCH] 代码更新,部门逻辑提交
---
LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
index f827088..c990244 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,30 +1,39 @@
-package com.example.springboot.service;
-
-
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import com.example.springboot.component.PLCAutoMes;
import com.example.springboot.component.S7control;
-import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.SpianMapper;
import com.google.common.primitives.Bytes;
-
+import com.mes.entity.GlassInfo;
+import com.mes.entity.UpWorkstation;
+import com.mes.mapper.LoadGlassMapper;
+import com.mes.mapper.TemperingMapper;
@Service
public class LoadGlassService {
@Autowired
-
-
- public Short selectAll(String glassid) {
-
-
-
+ private com.mes.common.PlcTools.S7control s7control;
+ private LoadGlassMapper LoadGlassMapper;
+ //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
+ public GlassInfo selectAll() {
+ GlassInfo glassInfo = LoadGlassMapper.SelectALL();
+ return glassInfo;
+ }
+ //澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
+ public void insertGlass(UpWorkstation upwork) {
+ LoadGlassMapper.insertGlass(upwork.Getpatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),1);
+ }
+ //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
+ public void deleteGlass(String id) {
+ LoadGlassMapper.deleteGlass(id);
+ }
+ //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+ public boolean isCanLoadGlass() {
+ boolean result=s7control.WriteWord("100.10", 1);
+ return result;
}
--
Gitblit v1.8.0