From 8deaa50386a11d32ea390c7aa698eef9ac64d242 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 09 五月 2024 13:20:24 +0800
Subject: [PATCH] 增加engineering公共模块，增加上片json文件
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 20 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 26 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 21 ++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml | 0
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 86 ++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java | 20 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java | 0
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 12 +
/dev/null | 30 ----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json | 71 ++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java | 78 +++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java | 2
18 files changed, 318 insertions(+), 76 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
similarity index 89%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 6b2c34c..f80d3c0 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -2,9 +2,7 @@
import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.service.impl.EngineeringServiceImpl;
import com.mes.utils.Result;
-import com.mes.workstation.service.UpWorkstationService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
similarity index 97%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
index 4e68183..586a7b3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -89,7 +89,7 @@
/**
* 鑶滅郴id
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 澶囨敞
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
new file mode 100644
index 0000000..38b62f7
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
@@ -0,0 +1,78 @@
+package com.mes.engineering.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author SNG-010
+ */
+@Setter
+@Getter
+public class OptimizeEngineering {
+
+ // Getter methods
+ // Setter methods
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
+
+ /**
+ * 宸ョ▼鍚�
+ */
+ private String projectName;
+
+ /**
+ * 骞冲潎鍒╃敤鐜�
+ */
+ private Double avgCutPct;
+
+ /**
+ * 鏈夋晥鍒╃敤鐜�
+ */
+ private Double validCutPct;
+
+ /**
+ * 灏剧墖鍒╃敤鐜�
+ */
+ private Double lastCutPct;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
+
+ /**
+ * 灏忕墖鎬绘暟
+ */
+ private Integer glassTotal;
+ /**
+ * 灏忕墖鎬婚潰绉�
+ */
+ private Double glassTotalArea;
+ /**
+ * 璁″垝鍘熺墖鎬绘暟
+ */
+ private Integer rawStockQty;
+ /**
+ * 璁″垝鍘熺墖鎬婚潰绉�
+ */
+ private Double rawStockArea;
+ /**
+ * 瀹為檯鍘熺墖鎬绘暟
+ */
+ private Integer actualStockQty;
+ /**
+ * 瀹為檯鍘熺墖鎬婚潰绉�
+ */
+ private Double actualStockArea;
+ /**
+ * 鑶滅郴
+ */
+ private String glassType;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
similarity index 100%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml
similarity index 100%
rename from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml
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
new file mode 100644
index 0000000..79b3b8c
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -0,0 +1,26 @@
+package com.mes.engineering.service;
+
+import com.mes.engineering.entity.Engineering;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+public interface EngineeringService extends IService<Engineering> {
+
+
+
+ boolean changeTask(String projectId, Integer state);
+
+
+ List<Engineering> selectEngineering(String engineeringId);
+
+ void saveEngineering(List<Engineering> engineerings);
+}
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
new file mode 100644
index 0000000..4825296
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -0,0 +1,86 @@
+package com.mes.engineering.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.engineering.service.EngineeringService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.mapper.OptimizeProjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+@Service
+@Slf4j
+public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
+
+ @Autowired
+ OptimizeProjectMapper optimizeProjectMapper;
+ //寮�濮�/鏆傚仠浠诲姟
+ @Override
+ public boolean changeTask(String projectId, Integer state) {
+ //浣跨敤projectId浣滀负鏉′欢淇敼state瀛楁
+ LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+ wrapper.set(Engineering::getState,state);
+ wrapper.eq(Engineering::getEngineerId,projectId);
+ return wrapper.update();
+ }
+
+ @Override
+ @DS("pp")
+ public List<Engineering> selectEngineering(String engineeringId) {
+ //鏌ヨ閽㈠寲宸ョ▼淇℃伅
+ List<OptimizeProject> optimizeEngineerings = null;
+ if (engineeringId != null) {
+ QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+ wrapper.select("project_no,project_name,avg_cut_pct,valid_cut_pct,last_cut_pct,glass_total,glass_total_area,raw_stock_qty,raw_stock_area,glass_type,remark ")
+ .eq("project_no", engineeringId);
+ optimizeEngineerings = optimizeProjectMapper.selectList(wrapper);
+
+ }
+ List<Engineering> resultList=new ArrayList<>();
+// 閬嶅巻鏌ヨ缁撴灉璧嬪��
+ if (optimizeEngineerings != null) {
+ for (OptimizeProject map : optimizeEngineerings) {
+ // 鍒涘缓涓�涓柊鐨� OptimizeProject 瀵硅薄
+ Engineering engineering = new Engineering();
+ // 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeProject 瀵硅薄鐨勭浉搴斿瓧娈典笂
+ engineering.setEngineerId( map.getProjectNo());//宸ョ▼id
+ engineering.setEngineerName( map.getProjectName());//宸ョ▼鍚嶇О
+ engineering.setAvgAvailability( map.getAvgCutPct());//骞冲潎浼樺寲鐜�
+ engineering.setValidAvailability( map.getValidCutPct());//鏈夋晥浼樺寲鐜�
+ engineering.setLastAvailability( map.getLastCutPct());//灏剧墖浼樺寲鐜�
+ engineering.setState(0);//鐘舵��
+ engineering.setGlassTotal( map.getGlassTotal());//灏忕墖鐜荤拑鎬绘暟
+ engineering.setGlassTotalArea( map.getGlassTotalArea());//灏忕墖鎬婚潰绉�
+ engineering.setPlanPatternTotal( map.getRawStockQty());//璁″垝鍘熺墖鎬绘暟
+ engineering.setPlanPatternTotalArea( map.getRawStockArea());//璁″垝鍘熺墖鎬婚潰绉�
+ engineering.setFilmsId( map.getGlassType());//鑶滅郴
+ engineering.setNotes( map.getRemark());//澶囨敞
+ // 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
+ resultList.add(engineering);
+ }
+ }
+ log.info("鏌ヨ鍑洪挗鍖栧伐绋嬮泦鍚堜繚瀛樺埌瀹炰綋绫粄}",resultList);
+ return resultList;
+ }
+
+ @Override
+ public void saveEngineering(List<Engineering> engineerings) {
+ this.saveBatch(engineerings);
+ }
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index dfa7b6e..f1fa50d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -34,7 +34,7 @@
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
- private Integer glassType;
+ private String glassType;
/**
* 瀹�
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 8f50981..622197a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -15,7 +15,7 @@
/**
* 娴佺▼鍗″彿
*/
- private String projectId;
+ private String processId;
/**
* 宸ョ▼绉嶇被
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 746b5f4..9fad7a7 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
@@ -1,7 +1,6 @@
package com.mes.glassinfo.service;
import com.mes.glassinfo.entity.GlassInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import java.util.List;
@@ -16,4 +15,7 @@
public interface GlassInfoService extends MPJBaseService<GlassInfo> {
List<GlassInfo> selectGlassInfo(String engineeringId);
+
+ void saveGlassInfo(List<GlassInfo> glassinfo);
}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 88838b9..25fada5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -6,17 +6,14 @@
import com.mes.glassinfo.entity.OptimizeGlassinfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
-import com.mes.uppattenusage.entity.UpPattenUsage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.yulichang.base.MPJBaseServiceImpl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
@@ -34,14 +31,13 @@
OptimizeProjectMapper optimizeProjectMapper;
@Override
@DS("pp")
-
public List<GlassInfo> selectGlassInfo(String engineeringId) {
List<OptimizeGlassinfo> optimizeGlassinfos=null;
if (engineeringId != null) {
optimizeGlassinfos = optimizeProjectMapper.selectJoinList(OptimizeGlassinfo.class, new MPJQueryWrapper<OptimizeProject>()
.select("b.process_id,t.type,b.width,b.height,t.glass_thickness,t.glass_type,b.p_width,b.p_height,b.stock_id,b.heat_layout_id,b.heat_layout_sort,b.x_axis,b.y_axis,b.project_no,b.glass_id")
.leftJoin("optimize_detail b on t.project_no=b.project_no")
- .eq("t.state",200)
+ .eq("t.state",100)
.eq("t.project_no", engineeringId));
}
@@ -54,10 +50,13 @@
GlassInfo glassInfo = new GlassInfo();
// 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeGlassinfo 瀵硅薄鐨勭浉搴斿瓧娈典笂
glassInfo.setEngineerId(map.getProjectNo());
- glassInfo.setFlowCardId(map.getProjectId());
+ glassInfo.setFlowCardId(map.getProcessId());
glassInfo.setFilmsid(map.getGlassType());
+ glassInfo.setGlassType(map.getType());
glassInfo.setWidth(map.getWidth());
glassInfo.setHeight(map.getHeight());
+ glassInfo.setEdgWidth(map.getPWidth());
+ glassInfo.setEdgHeight(map.getPHeight());
glassInfo.setThickness(map.getGlassThickness());
glassInfo.setPatternSequence(map.getStockId());//
glassInfo.setTemperingLayoutId(map.getHeatLayoutId());//閽㈠寲鐗堝浘id
@@ -74,4 +73,9 @@
log.info("鏌ヨ鍑篻lassinfopro鐨勬暟鎹畕}:",optimizeGlassinfos);
return resultList;
}
+
+ @Override
+ public void saveGlassInfo(List<GlassInfo> glassinfo) {
+ this.saveBatch(glassinfo);
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
index beb015c..032b7c5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -87,7 +87,7 @@
/**
* 绗竴娆″钩鍧囧垏瑁佺巼
*/
- private String fristCutPct;
+ private Double fristCutPct;
/**
* 浣跨敤鐨勫師鏂欐暟
@@ -97,22 +97,22 @@
/**
* 浣跨敤鐨勫師鏂欓潰绉�
*/
- private String rawStockArea;
+ private Double rawStockArea;
/**
* 骞冲潎鍒囪鐜�
*/
- private String avgCutPct;
+ private Double avgCutPct;
/**
* 鏈夋晥鍒囪鐜�
*/
- private String validCutPct;
+ private Double validCutPct;
/**
* 灏剧墖鍒囪鐜�
*/
- private String lastCutPct;
+ private Double lastCutPct;
/**
* g娣锋帓绋嬪害
@@ -137,27 +137,27 @@
/**
* g涓婄墖瀹�
*/
- private Float loadWidth;
+ private Double loadWidth;
/**
* g涓婄墖闀�
*/
- private Float loadLength;
+ private Double loadLength;
/**
* x闂撮殧
*/
- private Float xSpace;
+ private Double xSpace;
/**
* y闂撮殧
*/
- private Float ySpace;
+ private Double ySpace;
/**
* g骞冲潎瑁呰浇鐜�
*/
- private Float loadRate;
+ private Double loadRate;
/**
* 娴佺▼鍗￠泦鍚�
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 6802de6..ab12655 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
@@ -1,8 +1,7 @@
package com.mes.uppattenusage.controller;
-
-
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.uppattenusage.service.UpPattenUsageService;
@@ -11,7 +10,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -34,6 +32,8 @@
private UpPattenUsageService upPattenUsageService;
@Autowired
private GlassInfoService glassInfoService;
+ @Autowired
+ private EngineeringService engineeringService;
@ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<List<UpPattenUsage>> prioritylist() {
@@ -50,6 +50,10 @@
upPattenUsageService.saveUpPattenUsage(upPattenUsages);
log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
+ glassInfoService.saveGlassInfo(glassinfo);
+ log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+ List<Engineering> engineerings= engineeringService.selectEngineering(engineeringId);
+ engineeringService.saveEngineering(engineerings);
return Result.build(200, "", 200);
}
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
index 7882159..d4aca93 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
@@ -40,7 +40,7 @@
/**
* 鍘熺墖鐗堝浘鐗囧簭
*/
- private Integer heatLayoutSort;
+ private Integer stockId;
/**
* 鐘舵��
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 59a06be..6b46236 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
@@ -46,7 +46,7 @@
List<OptimizeUpPattenUsage> upPattenUsageList = null;
if (engineeringId != null) {
upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
- .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
+ .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
.leftJoin("optimize_layout b on t.project_no=b.project_no")
.eq("b.project_no", engineeringId));
}
@@ -59,12 +59,12 @@
// 鍒涘缓涓�涓柊鐨� OptimizeProject 瀵硅薄
UpPattenUsage optimizeProject = new UpPattenUsage();
// 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeProject 瀵硅薄鐨勭浉搴斿瓧娈典笂
- optimizeProject.setEngineeringId((String) map.getProjectNo());
- optimizeProject.setFilmsId((String) map.getGlassType());
- optimizeProject.setWidth((Double) map.getWidth());
- optimizeProject.setHeight((Double) map.getHeight());
- optimizeProject.setThickness((Double)map.getHeight());
- optimizeProject.setLayoutSequence((Integer) map.getHeatLayoutSort());
+ optimizeProject.setEngineeringId(map.getProjectNo());
+ optimizeProject.setFilmsId( map.getGlassType());
+ optimizeProject.setWidth(map.getWidth());
+ optimizeProject.setHeight( map.getHeight());
+ optimizeProject.setThickness(map.getHeight());
+ optimizeProject.setLayoutSequence( map.getStockId());
optimizeProject.setState(0);
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(optimizeProject);
@@ -80,11 +80,7 @@
//淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
}
- //@Override
- public void selectSaveGlassinfo(String engineeringId) {
- //淇濆瓨鐜荤拑淇℃伅琛�
- //optimizeProjectMapper.selectJoinList();
- }
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
deleted file mode 100644
index ebca48c..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.engineering.service;
-
-import com.mes.engineering.entity.Engineering;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wu
- * @since 2024-04-22
- */
-public interface EngineeringService extends IService<Engineering> {
-
- boolean changeTask(String projectId,Integer state);
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
deleted file mode 100644
index fa3ec49..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.engineering.service.impl;
-
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.mapper.EngineeringMapper;
-import com.mes.engineering.service.EngineeringService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wu
- * @since 2024-04-22
- */
-@Service
-public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
- //寮�濮�/鏆傚仠浠诲姟
- @Override
- public boolean changeTask(String projectId, Integer state) {
- //浣跨敤projectId浣滀负鏉′欢淇敼state瀛楁
- LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- wrapper.set(Engineering::getState,state);
- wrapper.eq(Engineering::getEngineerId,projectId);
- return wrapper.update();
- }
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json
new file mode 100644
index 0000000..d2804e1
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json
@@ -0,0 +1,71 @@
+{
+ "plcAddressBegin":"DB14.0",
+ "plcAddressLenght":"98",
+ "dataType":"word",
+ "parameteInfor":[
+ {
+ "codeId": "PlcToMes",
+ "addressIndex":"0",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "PlcStatus",
+ "addressIndex":"10",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesToPlc",
+ "addressIndex":"20",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "WorkId",
+ "addressIndex":"24",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "GlassWidth",
+ "addressIndex":"26",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "GlassHeight",
+ "addressIndex":"28",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ,
+ {
+ "codeId": "MesToPlcStatus",
+ "addressIndex":"40",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesToPlcStatusId",
+ "addressIndex":"42",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesTaskStatus",
+ "addressIndex":"56",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ]
+}
\ 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 afb83c3..d148295 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -1,9 +1,10 @@
package com.mes;
+import com.mes.engineering.entity.Engineering;
+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.uppattenusage.entity.OptimizeUpPattenUsage;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -16,24 +17,23 @@
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
- * @Author : zhoush
- * @Date: 2024/3/27 16:37
- * @Description:
+
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = LoadGlassModuleApplication.class)
public class LoadGlassModuleApplicationTest {
- @Resource
- private OptimizeProjectMapper optimizeProjectMapper;
+// @Resource
+// private OptimizeProjectMapper optimizeProjectMapper;
@Autowired
private UpPattenUsageServiceImpl upPattenUsageService;
@Autowired
private GlassInfoService glassInfoService;
+ @Autowired
+ private EngineeringService engineeringService;
@Test
public void test() {
// List<OptimizeProject> list = optimizeProjectMapper.saveProject("P24032204");
@@ -55,5 +55,12 @@
public void textglassinfo(){
List<GlassInfo> glass= glassInfoService.selectGlassInfo("P24032204");
log.info("glassinfo锛歿}", Arrays.asList(glass));
+ glassInfoService.saveGlassInfo(glass);
+ }
+ @Test
+ public void textengineering(){
+ List<Engineering> glass= engineeringService.selectEngineering("P24032204");
+ engineeringService.saveEngineering(glass);
+ log.info("glassinfo锛歿}", Arrays.asList(glass));
}
}
--
Gitblit v1.8.0