From f9d0b853c119db7ab1639fea8a7f41d7c6f75b2d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 03 四月 2024 16:09:24 +0800
Subject: [PATCH] 添加查询、清除架子上内容接口
---
UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java | 2
UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java | 2
UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java | 28 ++
UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java | 32 ++
UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java | 19 +
/dev/null | 13 -
UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java | 86 +++++++
UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java | 56 ++++
UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java | 4
UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java | 149 +++++++++----
UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java | 98 ++++----
UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java | 7
UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java | 42 +++
UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java | 64 +++++
UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java | 18 +
UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java | 13
16 files changed, 499 insertions(+), 134 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
index 085e400..01870af 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
@@ -15,7 +15,12 @@
@Autowired
private DownGlassInfoService downGlassInfoService;
- // 鑾峰彇鎸囧畾ID鐨凞ownGlassInfo淇℃伅
+ /**
+ * @param id
+ * @return
+ * // 鑾峰彇鎸囧畾ID鐨凞ownGlassInfo淇℃伅
+ */
+
@GetMapping("/{id}")
public DownGlassInfo getDownGlassInfoById(@PathVariable Integer id) {
return downGlassInfoService.getDownGlassInfoById(id);
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java
new file mode 100644
index 0000000..834317e
--- /dev/null
+++ b/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java
@@ -0,0 +1,64 @@
+package com.mes.controller;
+
+import com.mes.entity.DownWorkstation;
+import com.mes.service.DownWorkstationService;
+import com.mes.service.GlassInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/downWorkstation")
+public class DownWorkstationController {
+
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+
+ @GetMapping("/getone")
+ public List<DownWorkstation> getoneDownWorkstations() {
+ return downWorkstationService.getoneDownWorkstations();
+ }
+
+ @GetMapping("/gettwo")
+ public List<DownWorkstation> gettwoDownWorkstations() {
+ return downWorkstationService.gettwoDownWorkstations();
+ }
+ @GetMapping("/getflowCardId")
+ public List<Map<String, Object>> getflowCardId() {
+ return downWorkstationService.getflowCardId();
+ }
+
+
+ @PostMapping("/updateFlowCardId")
+ public String updateFlowCardId(@RequestBody Map<String, Object> requestData) {
+ // 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
+ String flowCardId = (String) requestData.get("flowCardId");
+
+ // 鏌ヨ瀵瑰簲 flowCardId 鐨勭幓鐠冧俊鎭�绘暟閲�
+ int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
+
+ // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
+ glassInfoService.updateFlowCardIdAndCount(flowCardId, glassInfoCount);
+
+ // 杩斿洖澶勭悊缁撴灉锛屾瘮濡傛垚鍔熸垨澶辫触淇℃伅
+ return "updated successfully";
+ }
+
+
+ @DeleteMapping("/clear/{workstationId}")
+ public String clearWorkstationInfo(@PathVariable("workstationId") int workstationId) {
+ // 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
+ downWorkstationService.clearFlowCardId(workstationId);
+ // 杩斿洖澶勭悊缁撴灉锛屾瘮濡傛垚鍔熸垨澶辫触淇℃伅
+ return "cleared successfully";
+ }
+
+
+
+
+
+}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/OrderTestController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/OrderTestController.java
deleted file mode 100644
index aecbd7f..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/OrderTestController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mes.controller;
-
-import com.mes.mapper.OrderTestMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-//@CrossOrigin //瑙ｅ喅鍗曚釜controller 璺ㄥ煙闂
-@RestController
-@RequestMapping("/order11111111")
-
-public class OrderTestController {
- @Autowired
- private OrderTestMapper orderMapper;
-
-// @GetMapping //鏌ヨorder琛ㄧ粨鏋滈泦
-// public Result index(){
-// return Result.seccess(orderMapper.findAll());
-//
-// }
-//
-// @PostMapping //鎻掑叆
-// public Integer save(@RequestBody Order order) {
-// return orderMapper.insert(order);
-// }
-//
-// @PostMapping("/update")
-// public Integer updateOrder(@RequestBody Order order) {
-// return orderMapper.update(order.getId(),order.getOrderid());
-// }
-//
-// @DeleteMapping("/{id}") //鍒犻櫎鏁版嵁
-// public Integer delete(@PathVariable Integer id) {
-// return orderMapper.deleteById(id);
-// }
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java
new file mode 100644
index 0000000..e8fa9ab
--- /dev/null
+++ b/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java
@@ -0,0 +1,86 @@
+package com.mes.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+/**
+ * 涓嬬墖鍓嶇悊鐗囩鏄庣粏瀹炰綋绫�
+ */
+/**
+ * 涓嬬墖鍓嶇悊鐗囩鏄庣粏瀹炰綋绫�
+ * @author SNG-012
+ */
+@Data
+public class DownStorageCageDetails {
+
+ @TableId(type = IdType.AUTO)
+ /**
+ * 涓嬬墖鍓嶇悊鐗囩鏄庣粏琛╥d
+ */
+ private int id;
+
+ /**
+ * 璁惧id
+ */
+ private int deviceId;
+
+ /**
+ * 鏍呮牸鍙�
+ */
+ private int slot;
+
+ /**
+ * 鐜荤拑id
+ */
+ private int glassId;
+
+ /**
+ * 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
+ */
+ private int sequence;
+
+ /**
+ * 娴佺▼鍗″彿
+ */
+ private String flowCardId;
+
+ /**
+ * 鐜荤拑绫诲瀷
+ */
+ private int glassType;
+
+ /**
+ * 瀹�
+ */
+ private double width;
+
+ /**
+ * 楂�
+ */
+ private double height;
+
+ /**
+ * 鍘氬害
+ */
+ private double thickness;
+
+ /**
+ * 閽㈠寲鐗堝浘id
+ */
+ private int temperingFeedSequence;
+
+ /**
+ * 閽㈠寲鐗堝浘鐗囧簭
+ */
+ private int temperingLayoutId;
+
+ /**
+ * 鐘舵��
+ */
+ private int state;
+
+ /**
+ * 鐜荤拑闂撮殭
+ */
+ private int gap;
+}
+
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
index c514d8f..3c15a9d 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
@@ -1,20 +1,56 @@
package com.mes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
- import com.baomidou.mybatisplus.annotation.TableId;
- import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
@Data
public class DownWorkstation {
+ /**
+ * // 涓嬬墖宸ヤ綅琛�
+ */
@TableId(type = IdType.AUTO)
- private int id; // 涓嬬墖宸ヤ綅琛╥d
- private Integer workstationId; // 宸ヤ綅id
- private String flowCardId; // 娴佺▼鍗″彿
- private Integer deviceId; // 璁惧id
- private Integer enableState; // 鍚敤鐘舵��
- private Integer workState; // 宸ヤ綔鐘舵��
- private int racksnumber; // 宸茶惤鏋舵暟閲�
- private Integer totalquantity; // 鎬绘暟閲�
+ private int id;
+
+ /**
+ * // 宸ヤ綅id
+ */
+ private Integer workstationId;
+
+ /**
+ * // 娴佺▼鍗″彿
+ */
+ private String flowCardId;
+
+ /**
+ * // 璁惧id
+ */
+ private Integer deviceId;
+
+ /**
+ * // 鍚敤鐘舵��
+ */
+ private Integer enableState;
+
+
+
+ /**
+ * // 宸ヤ綔鐘舵��
+ */
+ private Integer workState;
+
+ /**
+ * // 宸茶惤鏋舵暟閲�
+ */
+ @TableField(value = "racks_number")
+ private int racksnumber;
+
+ /**
+ * // 鎬绘暟閲�
+ */
+ @TableField(value = "total_quantity")
+ private Integer totalquantity;
}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/OrderTest.java b/UnLoadGlassModule/src/main/java/com/mes/entity/OrderTest.java
deleted file mode 100644
index e8ea030..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/OrderTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`order`")
-public class OrderTest {
- @TableId(type = IdType.AUTO)
- private Integer id;
- private String orderId;
- private String recipeNo;
- private String largeglassNo;
- private String largeglassCompleted;
- private String smallglassNo;
- private String smallglassCompleted;
- private String smallglassProcessing;
- private String smallglassWorn;
- private String orderStatus;
- private String orderMaker;
- private String makeTime;
- private String updateTime;
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
index dbd519c..0d213a7 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
@@ -16,10 +16,10 @@
public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> {
// 鏌ヨ涓嬬墖浠诲姟琛ㄤ腑鐘舵�佷负1鐨勪笅鐗囦俊鎭�
- @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE state = 1;")
+ @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
List<DownGlassInfo> selectunloadingtaskstate();
- @Update("UPDATE down_glass_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
+ @Update("UPDATE down_glass_task SET task_stauts = 0 WHERE flow_card_id = #{flowCardId}")
void updateTaskStateToZero(@Param("flowCardId") String flowCardId);
@Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1")
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
index 31f6a44..0f94766 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Component
@@ -66,4 +67,22 @@
@Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
+
+
+@Select(" SELECT * FROM down_workstation WHERE workstation_id >= 1 AND workstation_id <= 5")
+ List<DownWorkstation> getoneDownWorkstations();
+
+
+ @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 6 AND workstation_id <= 10")
+ List<DownWorkstation> gettwoDownWorkstations();
+
+
+
+ @Select("SELECT DISTINCT flowcard_id from glass_info")
+ @ResultType(Map.class)
+ List<Map<String, Object>> getflowCardId();
+
+ @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = NULL, racks_number = NULL WHERE workstation_id = #{workstationId}")
+ void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
+
}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java
new file mode 100644
index 0000000..b226112
--- /dev/null
+++ b/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java
@@ -0,0 +1,18 @@
+package com.mes.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+@Mapper
+public interface GlassInfoMapper {
+
+ @Select("SELECT COUNT(*) FROM glass_info WHERE flow_card_id = #{flowCardId}")
+ int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId);
+
+ @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount} WHERE flow_card_id = #{flowCardId}")
+ int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount);
+
+ // 杩欓噷鍙互娣诲姞鍏朵粬 SQL 璇彞
+}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/OrderTestMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/OrderTestMapper.java
deleted file mode 100644
index d12d4ce..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/OrderTestMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.OrderTest;
-import org.apache.ibatis.annotations.*;
-
-@Mapper
-public interface OrderTestMapper extends BaseMapper<OrderTest> {
-
-// @Select("select * from `order`")
-// List<Order> findAll();
-//
-// @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
-// Integer insert(Order order);
-//
-// @Delete("delete from `order` where id=#{id}")
-// Integer deleteById(@Param("id") Integer id);
-//
-// @Update("update `order` set order_id=#{order_id} where id=#{id}")
-// Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
index c631efc..e092020 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
@@ -16,7 +16,12 @@
public class DownGlassCacheLogic {
@Autowired
private SelectInfo selectInfo;
- //璇嗗埆閫昏緫 涓嶄氦浜�
+
+ /**
+ * @param Number
+ * //璇嗗埆閫昏緫 涓嶄氦浜�
+ */
+
public void identify(String Number){
//鏌ヨ浠诲姟
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -32,25 +37,44 @@
}
}
//涓嬬墖鍓嶇悊鐗�
- public void Process(){
- String Result=S7control.getinstance().ReadWord("DB14.0", 1).get(0)+"";
- String Number=S7control.getinstance().ReadWord("DB14.2", 1).get(0)+"";
- if(Result=="1"){//杩涚墖璇锋眰
- processInto(Number);
- }else if(Result=="2"){//鍑虹墖璇锋眰
+ public static final String RESULT_IN = "1";
+ public static final String RESULT_OUT = "2";
+ public static final String RESULT_IN_OUT = "3";
+
+ public void process() {
+ String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+ String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+
+ // 杩涚墖璇锋眰
+ if (RESULT_IN.equals(result)) {
+ processInto(number);
+ }
+ // 鍑虹墖璇锋眰
+ else if (RESULT_OUT.equals(result)) {
processOut();
- }else if(Result=="3"){//杩涘嚭鐗囪姹�
- if (!processOut()) { //鍏堝嚭鍚庤繘
- processInto(Number);
- }
+ }
+ // 杩涘嚭鐗囪姹�
+ else if (RESULT_IN_OUT.equals(result)) {
+ // 鍏堝嚭鍚庤繘
+ if (!processOut()) {
+ processInto(number);
+ }
}
}
- //涓嬬墖鍓嶇悊鐗� 杩�
+
+
+ /**
+ * @param Number
+ * @return
+ * //涓嬬墖鍓嶇悊鐗� 杩�
+ */
+
public boolean processInto(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
+ //瀛樺湪姝ょ幓鐠冪紪鍙�
+ if(GlassInfo!=null){
//鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
List<DownStorageCageDetails> list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
//绌烘爡鏍煎彿
@@ -80,41 +104,43 @@
//鐞嗙墖 鍑�
public boolean processOut(){
//鏌ヨ浠诲姟
- String G04=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
- String G05=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
+ String G06=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
+ String G11=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
+ String G13=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
List<DownStorageCageDetails> list=selectInfo.SelectCacheOut();
- boolean isOut=true;//鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
+ //鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
+ boolean isOut=true;
if (list.size()>0&&isOut) {
DownStorageCageDetails item=list.get(0);
- if(G04=="0"&&G05=="1"){
- //鍑哄埌 G04
- //selectInfo.insertCacheTask(item.getGlassId()+"","0","04","2");
- selectInfo.insertCacheTask(item.getGlassId()+"","0","04","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ if(G06=="0"&&G11=="1"){
+ //鍑哄埌 G06
+
+ selectInfo.insertCacheTask(item.getGlassId()+"","0","06","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
- }else if(G04=="1"&&G05=="0"){
- //鍑哄埌 G05
- //selectInfo.insertCacheTask(item.getGlassId()+"","0","05","2");
- selectInfo.insertCacheTask(item.getGlassId()+"","0","05","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
+ }else if(G06=="1"&&G11=="0"){
+ //鍑哄埌 G11
+
+ selectInfo.insertCacheTask(item.getGlassId()+"","0","11","2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
- }else if(G04=="0"&&G05=="0"){
+ }else if(G06=="0"&&G11=="0"){
//閮藉厑璁� G04/G05 涓婁竴鐗囨槸鍚﹀拰姝ょ墖鐜荤拑灏哄灏哄鐩稿悓
- String endcell="04";
+ String endcell="06";
String SendEndcell="1";
boolean If_=false;
- GlassInfo glassInfo04= selectInfo.SelectLastOutCacheInfo("04");
- GlassInfo glassInfo05= selectInfo.SelectLastOutCacheInfo("05");
+ GlassInfo glassInfo04= selectInfo.SelectLastOutCacheInfo("06");
+ GlassInfo glassInfo05= selectInfo.SelectLastOutCacheInfo("11");
if(glassInfo05!=null&&glassInfo05.getWidth()==item.getWidth()&&glassInfo05.getHeight()==item.getHeight()){
- endcell="05";
+ endcell="11";
SendEndcell="2";
}else if(glassInfo05!=null&&If_){
//鍏朵粬鏉′欢
}
- //selectInfo.insertCacheTask(item.getGlassId()+"","0",endcell,"2");
+
selectInfo.insertCacheTask(item.getGlassId()+"","0",endcell,"2",item.getWidth(),item.getHeight(),0,item.getThickness(),item.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
@@ -125,7 +151,11 @@
return false;
}
- //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
+ /**
+ * @param Number
+ * //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
+ */
+
public void processMb(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
@@ -142,33 +172,58 @@
//杩斿洖缁撴灉
}
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- public boolean SelectMessageId(String Number){
+
+ /**
+ * @param Number
+ * @return
+ * 鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
+ */
+ public boolean selectMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
+
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
+
}
- return true;//杩斿洖 瀛樺湪
- }
- //鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean DeleteMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
+ //杩斿洖 瀛樺湪
+ return true;
}
- //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
+ /**
+ * @param Number
+ * @return
+ * 鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
+ */
+
+ public boolean deleteMessageId(String Number){
+ //鏌ヨ鏄惁瀛樺湪
+ GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ if(GlassInfo==null){
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
+ }
+ //杩斿洖 瀛樺湪
+ return true;
+ }
+
+
+
+ /**
+ * @param Number
+ * @return
+ * //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
+ */
public boolean isExist(String Number){
//鏌ヨ鏄惁瀛樺湪
GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
+ //杩斿洖 涓嶅瓨鍦�
+ return false;
}
- return true;//杩斿洖 瀛樺湪
+ //杩斿洖 瀛樺湪
+ return true;
}
}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
index 1974256..a2f03a6 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
@@ -12,35 +12,48 @@
import org.springframework.stereotype.Service;
import java.util.List;
+
@Data
@Service
public class DownGlassLogic {
+ PlcParameterObject plcread = PLCAutoMes.PlcReadObject;
+ /**
+ * // 鏈烘鎵�1PLC璇锋眰瀛�
+ */
+ String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
+ /**
+ * // 鏈烘鎵�2PLC璇锋眰瀛�
+ */
+ String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
+ /**
+ * // 鐜荤拑id
+ */
+ String glassID = plcread.getPlcParameter("A01Position").getValue();
+ String glasswidth = plcread.getPlcParameter("A01Position").getValue();
+ String glassheight = plcread.getPlcParameter("A01Position").getValue();
+ //
+ String glassthickness = plcread.getPlcParameter("A01Position").getValue();
+ String pLcwancheng = plcread.getPlcParameter("A01Position").getValue();
@Autowired
private DownWorkstationMapper downWorkstationMapper;
private DownGlassInfo downGlassInfo;
private DownWorkstation downWorkstation;
private DownGlassInfoMapper downGlassInfoMapper;
-
private DownGlassInfoService downGlassInfoService;
+ /**
+ * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
+ */
+ private List<DownGlassInfo> glassList;
+ /**
+ * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
+ */
+ private List<DownStorageCageDetails> cageDetailsList;
+ /**
+ * //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
+ */
-
-
-
- private List<DownGlassInfo> glassList; // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
- private List<DownStorageCageDetails> cageDetailsList; // 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
- PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
- String Robot1PLCrequestword=plcread.getPlcParameter("A01Position").getValue();// 鏈烘鎵�1PLC璇锋眰瀛�
- String Robot2PLCrequestword=plcread.getPlcParameter("A01Position").getValue();// 鏈烘鎵�2PLC璇锋眰瀛�
- String GlassID=plcread.getPlcParameter("A01Position").getValue();// 鐜荤拑id
- String Glasswidth=plcread.getPlcParameter("A01Position").getValue();//鐜荤拑瀹藉害
- String Glassheight=plcread.getPlcParameter("A01Position").getValue();//鐜荤拑楂樺害
- String Glassthickness=plcread.getPlcParameter("A01Position").getValue();//鍘氬害
- String PLCwancheng = plcread.getPlcParameter("A01Position").getValue();// plc瀹屾垚瀛�
-
-
- //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
public void insertdownglassinfo() {
@@ -51,7 +64,7 @@
//
if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
-
+//
for (DownGlassInfo downGlassInfo : taskdownGlassInf) {
@@ -60,13 +73,15 @@
newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
Integer maxSequence = downGlassInfoMapper.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
- int sequence = maxSequence != null ? maxSequence + 1 : 1; // 鍒濆鍖栭『搴忓瓧娈靛��
+ // 鍒濆鍖栭『搴忓瓧娈靛��
+ int sequence = maxSequence != null ? maxSequence + 1 : 1;
newdownGlassInfo.setWidth(downGlassInfo.getWidth());
newdownGlassInfo.setHeight(downGlassInfo.getHeight());
newdownGlassInfo.setThickness(downGlassInfo.getThickness());
newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid());
- newdownGlassInfo.setSequence(sequence); // 璁剧疆椤哄簭瀛楁鍊�
+ // 璁剧疆椤哄簭瀛楁鍊�
+ newdownGlassInfo.setSequence(sequence);
// 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
downGlassInfoMapper.insert(newdownGlassInfo);
@@ -78,17 +93,18 @@
sequence++; // 閫掑椤哄簭瀛楁鍊�
-
}
}
}
- //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
- public void down_workstation(){
+ /**
+ * //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
+ */
- //downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
- //downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
+ public void downWorkstation() {
+
+
try {
//鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
@@ -97,7 +113,7 @@
for (DownWorkstation downWorkstation : taskdownWorkstation) {
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(),downWorkstation.getRacksnumber()+1 );
+ downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
downWorkstationMapper.update_task_state_to_zero(downWorkstation.getFlowCardId());
@@ -116,35 +132,23 @@
}
+ /**
+ * @param downWorkstation // 缁戝畾娴佺▼鍗″彿鏋跺瓙
+ */
-
- // 缁戝畾娴佺▼鍗″彿鏋跺瓙
- public void bindingshelf(DownWorkstation downWorkstation){
+ public void bindingshelf(DownWorkstation downWorkstation) {
downWorkstationMapper.updateFlowCardId(downWorkstation);
}
+ /**
+ * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
+ */
- // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- public void clearFlowCardId(DownWorkstation downWorkstation){
+ public void clearFlowCardId(DownWorkstation downWorkstation) {
- downWorkstationMapper.clearFlowCardId(downWorkstation);
+ downWorkstationMapper.clearFlowCardId(downWorkstation);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java
new file mode 100644
index 0000000..ed801d7
--- /dev/null
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java
@@ -0,0 +1,42 @@
+package com.mes.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.mes.entity.DownWorkstation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("hangzhoumes")
+public class DownWorkstationService {
+ @Autowired
+ private com.mes.mapper.DownWorkstationMapper DownWorkstationMapper;
+
+
+ public List<DownWorkstation> getoneDownWorkstations() {
+
+ return DownWorkstationMapper.getoneDownWorkstations();
+ }
+
+ public List<DownWorkstation> gettwoDownWorkstations() {
+
+ return DownWorkstationMapper.gettwoDownWorkstations();
+ }
+ public List<Map<String, Object>> getflowCardId() {
+
+ return DownWorkstationMapper.getflowCardId();
+ }
+
+
+
+ public void clearFlowCardId(int workstationId) {
+ // 鎵ц娓呴櫎鎸囧畾宸ヤ綅ID鐨勬祦绋嬪崱淇℃伅鐨勯�昏緫锛屽彲浠ユ槸鏁版嵁搴撴搷浣滄垨鍏朵粬涓氬姟閫昏緫
+ // 渚嬪锛�
+ DownWorkstationMapper.clearFlowCardInfoByWorkstationId(workstationId);
+ }
+
+
+
+}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java b/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java
new file mode 100644
index 0000000..bbe6ff8
--- /dev/null
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java
@@ -0,0 +1,28 @@
+package com.mes.service;
+
+import com.mes.mapper.GlassInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GlassInfoService {
+
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
+
+ public int getGlassInfoCountByFlowCardId(String flowCardId) {
+ return glassInfoMapper.getGlassInfoCountByFlowCardId(flowCardId);
+ }
+
+ public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount) {
+ // 璋冪敤 GlassInfoMapper 鐨� updateFlowCardIdAndCount 鏂规硶
+ int rowsAffected = glassInfoMapper.updateFlowCardIdAndCount(flowCardId, glassInfoCount);
+ if (rowsAffected > 0) {
+ System.out.println("鏇存柊娴佺▼鍗� ID 鍜屾暟閲忔垚鍔�");
+ } else {
+ System.out.println("鏇存柊娴佺▼鍗� ID 鍜屾暟閲忓け璐�");
+ }
+ }
+
+ // 杩欓噷鍙互娣诲姞鍏朵粬涓氬姟閫昏緫鏂规硶
+}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/IOrderService.java b/UnLoadGlassModule/src/main/java/com/mes/service/IOrderService.java
deleted file mode 100644
index 9e44ceb..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/IOrderService.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package com.mes.service;public interface IOrderService {
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
index 40af511..f33714f 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
@@ -8,7 +8,8 @@
public ModuleA(String QUEUENAME) {
QUEUE_NAME = QUEUENAME;
- receiver = new RabbitMQUtils(); // 瀹炰緥鍖� RabbitMQUtils 瀵硅薄
+ // 瀹炰緥鍖� RabbitMQUtils 瀵硅薄
+ receiver = new RabbitMQUtils();
}
public static void main(String[] argv) throws Exception {
@@ -16,11 +17,11 @@
// String message = "Your message to send666";
// String messageId = "5"; // 娑堟伅ID
// receiver.sendMessageWithId(QUEUE_NAME, message, messageId); // 璋冪敤 sendMessageWithId 鏂规硶鍙戦�佹秷鎭�
- receiver.sendMessageWithId("hangzhou2", "Hello RabbitMQ!", "1");
- receiver.sendMessageWithId("hangzhou2", "Another message", "2");
- receiver.sendMessageWithId("hangzhou2", "Another message", "3");
- receiver.sendMessageWithId("hangzhou2", "Another message", "4");
- receiver.sendMessageWithId("hangzhou2", "Another message", "5");
+ RabbitMQUtils.sendMessageWithId("hangzhou2", "Hello RabbitMQ!", "1");
+ RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "2");
+ RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "3");
+ RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "4");
+ RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "5");
// receiver.sendMessageWithId("hangzhou2", "Yet another message", "1"); // 杩欐潯娑堟伅浼氭墦鍗伴噸澶嶆秷鎭殑閿欒淇℃伅
}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
index 2cd57e4..6c0dfba 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
@@ -18,7 +18,7 @@
//receiver.consumeMessageById("5",QUEUE_NAME);
// String receivedMessage = receiver.consumeSelectedMessage(1,QUEUE_NAME);
- List<String> receivedMessage = receiver.browseMessages(QUEUE_NAME);
+ List<String> receivedMessage = RabbitMQUtils.browseMessages(QUEUE_NAME);
System.out.println("Received message: " + receivedMessage);
} catch (Exception e) {
e.printStackTrace();
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java b/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
index 110c5e3..d2dc1fa 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
@@ -32,7 +32,7 @@
//褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑閭ｆ潯璁板綍鍒犳帀 宸ヤ綅琛ㄦ祦绋嬪崱缁戝畾浜嗘灦瀛�
- plcService.down_workstation();
+ plcService.downWorkstation();
} catch (InterruptedException e) {
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/impl/OrderServiceImpl.java b/UnLoadGlassModule/src/main/java/com/mes/service/impl/OrderServiceImpl.java
deleted file mode 100644
index 5274aa6..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/impl/OrderServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mes.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.entity.OrderTest;
-import com.mes.mapper.OrderTestMapper;
-import com.mes.service.IOrderService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("erp_sd")
-public class OrderServiceImpl extends ServiceImpl<OrderTestMapper, OrderTest> implements IOrderService {
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java b/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
index 0b4ac1a..1f64390 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
@@ -5,11 +5,24 @@
import java.io.InputStream;
import java.util.Properties;
-// Configuration 绫荤敤浜庡姞杞介厤缃枃浠跺苟鎻愪緵璁块棶閰嶇疆椤圭殑鏂规硶銆�
+/**
+ * @author SNG-012
+ *
+ * Configuration 绫荤敤浜庡姞杞介厤缃枃浠跺苟鎻愪緵璁块棶閰嶇疆椤圭殑鏂规硶銆�
+ */
public class Configuration {
- private Properties properties; // Properties 瀵硅薄锛岀敤浜庡瓨鍌ㄩ厤缃枃浠朵腑鐨勯敭鍊煎銆�
- // 鏋勯�犲嚱鏁帮紝鏍规嵁浼犲叆鐨勬枃浠跺悕鍔犺浇閰嶇疆鏂囦欢銆�
+ /**
+ * // Properties 瀵硅薄锛岀敤浜庡瓨鍌ㄩ厤缃枃浠朵腑鐨勯敭鍊煎銆�
+ */
+ private Properties properties;
+
+ /**
+ * @param fileName
+ * @throws IOException
+ * // 鏋勯�犲嚱鏁帮紝鏍规嵁浼犲叆鐨勬枃浠跺悕鍔犺浇閰嶇疆鏂囦欢銆�
+ */
+
public Configuration(String fileName) throws IOException {
// 浣跨敤绫诲姞杞藉櫒鑾峰彇璧勬簮鏂囦欢鐨勮緭鍏ユ祦銆�
InputStream inputStream = getClass().getClassLoader().getResourceAsStream(fileName);
@@ -17,11 +30,18 @@
if (inputStream == null) {
throw new FileNotFoundException("Property file '" + fileName + "' not found in the classpath");
}
- properties = new Properties(); // 瀹炰緥鍖朠roperties瀵硅薄銆�
- properties.load(inputStream); // 浠庤緭鍏ユ祦鍔犺浇閰嶇疆椤广��
+ // 瀹炰緥鍖朠roperties瀵硅薄銆�
+ properties = new Properties();
+ // 浠庤緭鍏ユ祦鍔犺浇閰嶇疆椤广��
+ properties.load(inputStream);
}
- // 鏍规嵁閰嶇疆椤圭殑閿幏鍙栧叾瀵瑰簲鐨勫�笺��
+ /**
+ * @param key
+ * @return
+ * // 鏍规嵁閰嶇疆椤圭殑閿幏鍙栧叾瀵瑰簲鐨勫�笺��
+ */
+
public String getProperty(String key) {
return properties.getProperty(key);
}
--
Gitblit v1.8.0