From 7ef9a2e673617e598fb12903dd1bf83f7ce93547 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 13 五月 2024 08:47:47 +0800
Subject: [PATCH] 增加代码备注
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 10 --
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 25 +++---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 7 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 11 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 22 ++++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 31 ++++++-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml | 4
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 12 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 6
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 84 +++++++++------------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 9 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 13 ---
13 files changed, 125 insertions(+), 113 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
index 7c01553..77bd557 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -16,13 +16,23 @@
public interface EngineeringService extends IService<Engineering> {
-
+ /**
+ * 寮�濮�/鏆傚仠浠诲姟
+ * @return boolean
+ */
boolean changeTask(String projectId, Integer state);
-
-
+ /**
+ * 鏌ヨ閽㈠寲淇℃伅
+ * @return List<Engineering>
+ */
List<Engineering> selectEngineering(String engineeringId);
-
- void saveEngineering(List<Engineering> engineerings);
-
+ /**
+ * 淇濆瓨閽㈠寲淇℃伅
+ */
+ void saveEngineering(List<Engineering> engineering);
+ /**
+ * 鏌ヨ鏄惁鏈変笂鐗囦换鍔�
+ * @return Engineering
+ */
Engineering selectInitiate(Integer state);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 968cd59..32c52a8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -79,8 +79,8 @@
}
@Override
- public void saveEngineering(List<Engineering> engineerings) {
- this.saveBatch(engineerings);
+ public void saveEngineering(List<Engineering> engineering) {
+ this.saveBatch(engineering);
//淇濆瓨閽㈠寲宸ョ▼淇℃伅
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index 9fad7a7..f85f7f8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -13,9 +13,14 @@
* @since 2024-04-29
*/
public interface GlassInfoService extends MPJBaseService<GlassInfo> {
-
+ /**
+ * 鏌ヨ灏忕墖琛�
+ * @return List<GlassInfo>
+ */
List<GlassInfo> selectGlassInfo(String engineeringId);
-
+ /**
+ * 淇濆瓨灏忕墖琛�
+ */
void saveGlassInfo(List<GlassInfo> glassinfo);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index e12e67f..94fe110 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -1,6 +1,5 @@
package com.mes.pp.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
@@ -19,17 +18,12 @@
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- * @return
+ * @return List<OptimizeProject>
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
- /**
- * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
- * @return
- */
- void insetupPattenUsage(List<OptimizeProject> glass);
+
/**
* 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙�
- * @return
*/
void changeTask(String engineeringId, int i);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 20a4b32..76aa79e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -9,7 +9,6 @@
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
-import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -44,18 +43,6 @@
return this.list(wrapper);
}
-
- @Override
- public void insetupPattenUsage(List<OptimizeProject> glass) {
- log.info("寰幆鏌ヨ缁撴灉淇濆瓨鍒癠pPattenUsage琛ㄤ腑");
- for (OptimizeProject project : glass) {
- UpPattenUsage upPattenUsage = new UpPattenUsage();
- upPattenUsage.setEngineeringId(project.getProjectNo());
- upPattenUsage.setFilmsId(project.getGlassType());
- upPattenUsage.setState(project.getState());
- upPattenUsageMapper.insert(upPattenUsage);
- }
- }
@Override
public void changeTask(String engineeringId, int state) {
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index a8a3edf..04c3279 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -53,7 +53,7 @@
UpPattenUsage upPattenUsage= upPattenUsageService.selectedEngineering(engineeringId);
if (upPattenUsage!=null){
log.info("宸蹭繚瀛樿繃");
- return Result.build(200, "宸蹭繚瀛樿繃", 200);
+ return Result.build(200, "宸蹭繚瀛樼殑宸ョ▼", 200);
}else {
List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
@@ -62,8 +62,8 @@
List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
glassInfoService.saveGlassInfo(glassinfo);
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<Engineering> engineerings= engineeringService.selectEngineering(engineeringId);
- engineeringService.saveEngineering(engineerings);
+ List<Engineering> engineering= engineeringService.selectEngineering(engineeringId);
+ engineeringService.saveEngineering(engineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
optimizeProjectService.changeTask(engineeringId, 200);
return Result.build(200, "", 200);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 7bc799b..bcbd926 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -3,7 +3,6 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -14,15 +13,33 @@
* @since 2024-04-18
*/
public interface UpPattenUsageService extends MPJBaseService<UpPattenUsage> {
+ /**
+ * 鏌ヨ宸ヤ綅涓婄殑鐜荤拑淇℃伅
+ * @return List<UpPattenUsage>
+ */
List<UpPattenUsage> prioritylist(int state);
-
+ /**
+ * 鏌ヨ涓婄墖椤哄簭淇℃伅
+ * @return List<UpPattenUsage>
+ */
List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId);
-
+ /**
+ * 淇濆瓨涓婄墖椤哄簭淇℃伅
+ */
void saveUpPattenUsage(List<UpPattenUsage> upPattenUsages);
-
- void updateupPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
-
+ /**
+ * 鏇存柊涓婄墖琛ㄧ姸鎬�
+ */
+ void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
+ /**
+ * 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩�
+ * @return UpPattenUsage
+ */
UpPattenUsage selectedEngineering(String engineeringId);
-
+ /**
+ * 鏌ヨ姝ｅ湪鎵ц鐨勪笂鐗囦换鍔�
+ * @return UpPattenUsage
+ */
+ UpPattenUsage selectOverTask();
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index ecff14b..afb470a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -82,7 +82,7 @@
}
@Override
- public void updateupPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
+ public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
upPattenUsage.setState(state);
boolean updateSuccess=this.updateById(upPattenUsage);
log.info("鏇存柊鐘舵�亄}",updateSuccess);
@@ -97,5 +97,14 @@
return this.getOne(wrapper);
}
+ @Override
+ public UpPattenUsage selectOverTask() {
+ QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
+ wrapper.gt("state",0)
+ .lt("state",99)
+ .last("limit 1");
+ return this.getOne(wrapper);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 4d3f240..4110f80 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -1,6 +1,5 @@
package com.mes.job;
-import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
@@ -24,11 +23,12 @@
@Autowired
private UpWorkstationService upWorkstationService;
@Autowired
- private EngineeringService engineeringService;
+ private EngineeringService engineeringService;
@Autowired
private UpPattenUsageService upPattenUsageService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
@@ -37,47 +37,47 @@
@Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
- log.info("寮�濮嬩笂鐗�");
//鑾峰彇鏄惁鏈変笂鐗囪姹�
String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
//鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
- Engineering engineering=engineeringService.selectInitiate(1);
- if("1".equals(loadRequest)&&engineering!=null){
- UpPattenUsage upPattenUsage=upWorkstationService.selectPriority(engineering);
- log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}",upPattenUsage);
- UpWorkstation upwork=upWorkstationService.selectworkstation(upPattenUsage);
- log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}",upwork);
- if(upwork!=null){
- int workId=upwork.getWorkstationId();//宸ヤ綅id
- double width=upwork.getPatternWidth();//瀹藉害
- double height=upwork.getPatternHeight();//楂樺害
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(),workId);
+ Engineering engineering = engineeringService.selectInitiate(1);
+ if ("1".equals(loadRequest) && engineering != null) {
+ log.info("寮�濮嬩笂鐗囦换鍔�");
+ UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
+ log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
+ UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
+ log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}", upwork);
+ if (upwork != null) {
+ int workId = upwork.getWorkstationId();//宸ヤ綅id
+ double width = upwork.getPatternWidth();//瀹藉害
+ double height = upwork.getPatternHeight();//楂樺害
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(),1);
- //鍑忓皯宸ヤ綅鏁伴噺
- upWorkstationService.reduceWorkstationNumber(upwork);
- //瀹屾垚涓婄墖琛ㄧ姸鎬�
- upPattenUsageService.updateupPattenUsageState(upPattenUsage,1);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+ //鏇存敼涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
}
}
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
- if (loadStatus!=null) {
+ if (loadStatus != null) {
log.info(loadStatus);
if ("1".equals(loadStatus)) {
log.info("鏀跺埌姹囨姤浠诲姟瀹屾垚");
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
} else if ("2".equals(loadStatus)) {
log.info("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
+ //鍑忓皯宸ヤ綅鏁伴噺,鎭㈠浠诲姟鐘舵��
+ overTask(loadStatus,0);
} else if ("3".equals(loadStatus)) {
log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
- } else {
- log.info("鏀跺埌姹囨姤娓�0鐘舵��");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ overTask(loadStatus,0);
+ } else if("0".equals(loadStatus)){
+ log.info("鏀跺埌姹囨姤娓�0鐘舵��");
+ //鍑忓皯宸ヤ綅鏁伴噺,瀹屾垚浠诲姟鐘舵��
+ overTask(loadStatus,1);
}
}
//鎵ц鍚庝紤鐪�300姣
@@ -86,28 +86,16 @@
e.printStackTrace();
}
}
-// @Scheduled(fixedDelay = 300)
-// public void plcLoadGlassOver() throws InterruptedException {
-// try {
-// //鑾峰彇鏄惁鏈夋眹鎶�
-// String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
-// if ("1".equals(loadStatus)){
-// log.info("鏀跺埌姹囨姤浠诲姟瀹屾垚");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else if ("2".equals(loadStatus)) {
-// log.info("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else if("3".equals(loadStatus)){
-// log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else {
-// log.info("鏀跺埌姹囨姤娓�0鐘舵��");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),0);
-// }
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
+ public void overTask(String loadStatus,int state) throws InterruptedException {
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
+ if (upPattenUsage != null) {
+ log.info("鏀跺埌姹囨姤娓厈}鐘舵��",loadStatus);
+ //鍑忓皯宸ヤ綅鏁伴噺
+ upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
+ //瀹屾垚涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, 100);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ }
+ }
}
\ No newline at end of file
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
index ca6f827..28547f4 100644
--- 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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
/**
@@ -15,24 +14,26 @@
* @since 2024-04-07
*/
public interface UpWorkstationService extends IService<UpWorkstation> {
- //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-
-
//鍒ゆ柇浼樺厛鍚哥墖鐜荤拑
+ /**
+ * 鍒ゆ柇浼樺厛鍚哥墖浣嶇疆
+ * @return UpPattenUsage
+ */
UpPattenUsage selectPriority(Engineering engineering);
- //鏌ヨ姝ｅ湪杩涜鐨勫崟鐗囦俊鎭�
- UpWorkstation selectworkstation(UpPattenUsage upPattenUsage);
- //鍑忓皯宸ヤ綅鏁伴噺
- void reduceWorkstationNumber(UpWorkstation upwork);
-
-
+ /**
+ * 鏌ヨ姝ｅ湪杩涜鐨勫崟鐗囦俊鎭�
+ * @return UpWorkstation
+ */
+ UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage);
+ /**
+ * 鍑忓皯宸ヤ綅鏁伴噺
+ */
+ void reduceWorkstationNumber(Integer upworkId);
/**
* 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
- *
* @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
index 1e24d13..3b8a57a 100644
--- 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
@@ -46,7 +46,7 @@
//鍒ゆ柇宸ヤ綅鏄惁鏈夌鍚堟潯浠剁殑鐜荤拑
@Override
- public UpWorkstation selectworkstation(UpPattenUsage upPattenUsage) {
+ public UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage) {
QueryWrapper<UpWorkstation> wrapper = new QueryWrapper<>();
wrapper.eq("pattern_width", upPattenUsage.getWidth())
.eq("pattern_height", upPattenUsage.getHeight())
@@ -59,9 +59,9 @@
}
@Override
- public void reduceWorkstationNumber(UpWorkstation upwork) {
+ public void reduceWorkstationNumber(Integer upworkId) {
UpdateWrapper<UpWorkstation> wrapper = new UpdateWrapper<>();
- wrapper.eq("id", upwork.getWorkstationId())
+ wrapper.eq("id", upworkId)
.setSql("number = number - 1");
boolean updateResult = upWorkstationMapper.update(null, wrapper) > 0;
log.info("鍑忓皯宸ヤ綅鏁伴噺{}",updateResult);
@@ -79,4 +79,5 @@
}
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
index 94840e1..625cc04 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -7,5 +7,5 @@
name: loadGlass
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 鎵撳嵃sql璇彞
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
index c4d40db..c92e6e9 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -4,7 +4,6 @@
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
@@ -17,7 +16,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
@@ -59,11 +57,11 @@
log.info("寮�濮嬩笂鐗囩殑宸ョ▼锛歿}", Arrays.asList(engineering));
UpPattenUsage upPattenUsage = workstationService.selectPriority(engineering);
log.info("涓婄墖椤哄簭锛歿}", Arrays.asList(upPattenUsage));
- UpWorkstation glass2=workstationService.selectworkstation(upPattenUsage);
+ UpWorkstation glass2=workstationService.selectWorkstation(upPattenUsage);
log.info("绗﹀悎鐨勫伐浣嶇幓鐠儃}",glass2);
- workstationService.reduceWorkstationNumber(glass2);
+ workstationService.reduceWorkstationNumber(glass2.getWorkstationId());
//鍑忓皯鏁伴噺
- upPattenUsageService.updateupPattenUsageState(upPattenUsage,1);
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage,1);
//鏇存柊鐘舵��
}
@@ -87,6 +85,8 @@
@Test
public void textengineering3(){
//鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛�
- upPattenUsageService.selectedEngineering("P24050801");
+ UpPattenUsage upPattenUsage=upPattenUsageService.selectOverTask();
+ log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",upPattenUsage);
}
+
}
--
Gitblit v1.8.0