From fddf1c716af76c2968e08ce11895eaa1c26319a5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 十一月 2024 14:43:21 +0800
Subject: [PATCH] 增加翻译文件和bug解决
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 288 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 247 insertions(+), 41 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 5c78fef..c2a2672 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -16,10 +16,13 @@
import com.example.springboot.component.S7control;
import com.example.springboot.entity.Flowcard;
import com.example.springboot.entity.GlassInfo;
+import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.entity.device.PlcParameterObject;
+import com.example.springboot.mapper.AlbaniaMapper;
+import com.example.springboot.mapper.GlassInfoMapper;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.QueueMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,6 +40,10 @@
@Autowired
private SpianService spianService;
+ @Autowired
+ private AlbaniaMapper albaniaMapper;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
public void EndTask(int types) {
String A01glassid1 = spianService.queGlassid("DB103.128", 14).toString();
@@ -200,6 +207,7 @@
} else {
if (id == 1) {
// 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ System.out.println("璋冪敤涓婄墖鍑芥暟");
zhi = spianService.selectAll(queue.getglassId());
if (zhi == 200) {
homeMapper.InsertQueueGlassId(queue, id);
@@ -230,10 +238,27 @@
return Result.success(map);
}
+ // 鎸囧畾鏍煎瓙鍑虹墖
+ public Result AddOutGlass(Integer cell, Integer glasstype) {
+ GlassInfo glass = albaniaMapper.SelectGlassInfo(glasstype);
+ Map<String, Object> map = new HashMap<>();
+ if (glass != null) {
+ albaniaMapper.AddFinishNumber(glass.getFlowcard(), glass.getMateid(), glass.getTier());
+ UpdateStroageCageByCell(cell, -1);// 鐜荤拑鏁伴噺-1
+ // 澧炲姞鍑虹墖闃熷垪鐨勪换鍔�
+ albaniaMapper.InsertOutTask(1, 0, cell, 2001, glass.getGlassid(),
+ glass.getGlasstype(), glass.getFlowcard(), glass.getMateid(), glass.getTier());
+ map.put("message", "200");
+ } else {
+ map.put("message", "300");
+ }
+ return Result.success(map);
+ }
+
// 鏌ヨ杩�/鍑虹墖浠诲姟
public List<StorageTask> SelectStorageTask(int task_type) {
List<StorageTask> storageTasks = new ArrayList<>();
- String loadrack="0";
+ String loadrack = "0";
if (task_type == 0) {
storageTasks = homeMapper.SelectStorageTask(task_type);
} else {
@@ -241,30 +266,128 @@
}
for (StorageTask storageTask : storageTasks) {
if (task_type == 0) {
- loadrack=storageTask.getLoadrack();
- }else{
- loadrack=storageTask.getShelfRack();
+ loadrack = storageTask.getLoadrack();
+ } else {
+ loadrack = storageTask.getShelfRack();
}
- storageTask.setstorageCage(homeMapper.SelectStorageByCell(loadrack));
+ // storageTask.setstorageCage(homeMapper.SelectStorageByCell(loadrack));
+ storageTask.setstorageCage(homeMapper.SelectStorageByCellGlass(storageTask.getId()));
+
}
return storageTasks;
}
- // 鎵嬪姩瀹屾垚浠诲姟
- public Result FinishTask(Integer id) {
- StorageTask storageTask = homeMapper.SelectStorageTaskById(id);// 鑾峰彇浠诲姟淇℃伅
- homeMapper.FinishTask(storageTask.getId());// 瀹屾垚浠诲姟
- if (storageTask.getTaskType().equals("0")) {
- UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()), 1);// 鐜荤拑鏁伴噺+1
- homeMapper.DeletequeueByGlassid(storageTask.getGlassId());
- } else {
- StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
- if (storageCage.getNumber() > 1) {
- UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), -1);// 鐜荤拑鏁伴噺-1
- } else {
- UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), 0);// 娓呴櫎鏍煎唴淇℃伅
+ // 鏌ヨ鍑虹墖闃熷垪
+ public List<Map> SelectOutTask() {
+ return homeMapper.SelectOutTask();
+ }
+
+ // 鏌ヨ鍑虹墖闃熷垪
+ public List<Map> SelectOutLog() {
+ return homeMapper.SelectOutLog();
+ }
+
+ // 鏌ヨ杩�/鍑虹墖浠诲姟
+ public List<GlassInfo> SelectMeasure() {
+ return homeMapper.SelectMeasure();
+ }
+
+ // 鏌ヨ褰撳墠鑶滅郴鍘氬害
+ public MeasureSetting SelectSetting() {
+ return homeMapper.SelectMeasureSetting();
+ }
+
+ // 鏌ヨ娴嬮噺瀹介珮鍘氳啘绯�
+ public Map StorageCageForm() {
+ return homeMapper.SelectMeasureWidthHeight();
+ }
+
+ // 鎵嬪姩缁撴潫浠诲姟
+ public Result TerminateTask(int id) {
+ for (int i = 1; i < 7; i++) {
+ int taskcont = albaniaMapper.SelectTaskcount(); // 姝ｅ湪杩涜鐨勪换鍔℃暟閲�
+ System.out.println("浠诲姟鏁伴噺:" + taskcont);
+ if (taskcont == 0) {
+ break;
}
- homeMapper.AddGlassNo(storageTask.getFlowcard(), storageTask.getMateid(), storageTask.geTier());// 娣诲姞鍑虹墖瀹屾垚鏁伴噺
+ StorageTask storageTask = homeMapper.SelectStorageTaskById();// 鑾峰彇浠诲姟淇℃伅
+ if (storageTask.getTaskType().equals("0")) {
+ System.out.println("缁撴潫杩涚墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 2);// 瀹屾垚浠诲姟
+ homeMapper.DeletequeueByGlassid(storageTask.getGlasstype().toString());
+ glassInfoMapper.updateGlassNumber(storageTask.getGlasstype());// 鍑忓皯鎵弿娆℃暟
+ StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getLoadrack());
+ if (storageCage.getNumber() == null || storageCage.getNumber() == 0) {
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), 0);// 娓呴櫎鏍煎唴淇℃伅
+ }
+ } else {
+ System.out.println("缁撴潫鍑虹墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 2);// 瀹屾垚浠诲姟
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.OutGlassNo(storageTask.getGlasstype());// 杩樺師鍑虹墖瀹屾垚鏁伴噺
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩瀹屾垚浠诲姟
+ public Result FinishTask() {
+ for (int i = 1; i < 7; i++) {
+ int taskcont = albaniaMapper.SelectTaskcount(); // 姝ｅ湪杩涜鐨勪换鍔℃暟閲�
+ System.out.println("浠诲姟鏁伴噺:" + taskcont);
+ if (taskcont == 0) {
+ break;
+ }
+ StorageTask storageTask = homeMapper.SelectStorageTaskById();// 鑾峰彇浠诲姟淇℃伅
+ if (storageTask.getTaskType().equals("0")) {
+ System.out.println("瀹屾垚杩涚墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 1);// 瀹屾垚浠诲姟
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()), 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.DeletequeueByGlassid(storageTask.getGlasstype().toString());
+ } else {
+ System.out.println("瀹屾垚鍑虹墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 1);// 瀹屾垚浠诲姟
+ StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
+ if (storageCage.getNumber() == null || storageCage.getNumber() == 0) {
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), 0);// 娓呴櫎鏍煎唴淇℃伅
+ }
+ // homeMapper.AddGlassNo(storageTask.getFlowcard(), storageTask.getMateid(),
+ // storageTask.geTier());// 娣诲姞鍑虹墖瀹屾垚鏁伴噺
+
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鑷姩瀹屾垚浠诲姟
+ public Result LoseTask() {
+ for (int i = 1; i < 7; i++) {
+ int taskcont = albaniaMapper.SelectTaskcount(); // 姝ｅ湪杩涜鐨勪换鍔℃暟閲�
+ System.out.println("浠诲姟鏁伴噺:" + taskcont);
+ if (taskcont == 0) {
+ break;
+ }
+ StorageTask storageTask = homeMapper.SelectStorageTaskById();// 鑾峰彇浠诲姟淇℃伅
+ if (storageTask.getTaskType().equals("0")) {
+ System.out.println("瀹屾垚杩涚墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 1);// 瀹屾垚浠诲姟
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()), 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.DeletequeueByGlassid(storageTask.getGlasstype().toString());
+ } else {
+ System.out.println("瀹屾垚鍑虹墖浠诲姟:" + storageTask.getId());
+ homeMapper.FinishTask(storageTask.getId(), 1);// 瀹屾垚浠诲姟
+ StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
+ if (storageCage.getNumber() > 1) {
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), -1);// 鐜荤拑鏁伴噺-1
+ } else {
+ UpdateStroageCageByCell(Integer.parseInt(storageTask.getShelfRack()), 0);// 娓呴櫎鏍煎唴淇℃伅
+ }
+ homeMapper.AddGlassNo(storageTask.getFlowcard(), storageTask.getMateid(), storageTask.geTier());// 娣诲姞鍑虹墖瀹屾垚鏁伴噺
+
+ }
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -272,8 +395,8 @@
}
// 鏌ヨ鐜荤拑淇℃伅
- public Result SelectGlassInfo(String width, String height, String thickness, String films) {
- List<GlassInfo> glassInfoList = homeMapper.SelectGlassInfo(width, height, thickness, films);
+ public Result SelectGlassInfo(String width, String height, String thickness, String films,String tier) {
+ List<GlassInfo> glassInfoList = homeMapper.SelectGlassInfo(width, height, thickness, films,tier);
Map<String, Object> map = new HashMap<>();
map.put("StorageCageAddInfo", glassInfoList);
return Result.success(map);
@@ -297,21 +420,21 @@
return OrderTask;
}
- // 寮�濮嬩换鍔�
+ // 寮�濮嬪嚭鐗�
public Result ClaimTasks(String flowcard, Integer state, Integer line) {
- int count=homeMapper.SelectTaskCount(flowcard,line);
+ int count = homeMapper.SelectTaskCount(flowcard, line);
Map<String, Object> map = new HashMap<>();
- if(count==0){
+ if (count == 0) {
if (state == 1) {
homeMapper.ClaimTasks(flowcard, 0, line);
} else {
homeMapper.ClaimTasks(flowcard, 1, line);
}
map.put("message", "200");
- }else{
+ } else {
map.put("message", "300");
}
-
+
return Result.success(map);
}
@@ -326,15 +449,49 @@
map.put("message", "200");
return Result.success(map);
}
+ //鎵爜鍖归厤鎴愬姛
+ public int ScanMatch(String Order, Integer Mateid,Integer tier) {
+
+ GlassInfo glass=homeMapper.SelectCodeGlass(Order,Mateid,tier);
+ System.out.println("glass:"+glass);
+ System.out.println("order"+Order+"mateid"+Mateid+"tier"+tier);
+ if(glass==null){
+ return 0;
+ }else{
+ int cont= QueueMapper.insertQueueCode(glass.getFlowcard(),glass.getGlassid(),glass.getMateid(),glass.getGlasstype(),glass.getWidth(),glass.getHeight(),glass.getThickness());
+ glassInfoMapper.updatemeasurenumber(glass.getId());
+ return cont;
+ }
+ }
- // 淇敼娴嬮噺淇℃伅
+ // 浜哄伐鍖归厤淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
- homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
- glassInfo.getGlasstype(), glassInfo.getThickness(), glassInfo.getTier());
- Map<String, Object> map = new HashMap<>();
+ // 鍒犻櫎鏁版嵁
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
- map.put("message", "200");
+ Map<String, Object> map = new HashMap<>();
+ QueueMapper.DeleteQueue();
+ String mestoplc=plcmes.getPlcParameter("MESToGaStatus").getValue();
+ String A02Plc=plcmes.getPlcParameter("GaToMES").getValue();
+ System.out.println("浜哄伐鍖归厤mestoplc:"+mestoplc);
+ // int count = homeMapper.SelectQueue();
+ if (("0".equals(mestoplc)&&"0".equals(A02Plc))||("1".equals(A02Plc)&&"4".equals(mestoplc))) {
+ // homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
+ // glassInfo.getGlasstype(), glassInfo.getThickness(), glassInfo.getTier(), glassInfo.getMateid());
+ homeMapper.AddQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
+ glassInfo.getGlasstype(), glassInfo.getThickness(), glassInfo.getTier(), glassInfo.getMateid());
+ glassInfoMapper.updatemeasurenumber(glassInfo.getId());
+ if("0".equals(mestoplc)){
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(), (short) 1);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+ System.out.println("鎻愬墠鍖归厤");
+ }else{
+ System.out.println("娴嬮噺鍖归厤");
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+ }
+ map.put("message", "200");
+ } else {
+ map.put("message", "300");
+ }
return Result.success(map);
}
@@ -357,11 +514,50 @@
return Result.success(map);
}
- // 寮�濮嬪伐绋�
- public Result StartChange(String flowcard) {
- homeMapper.StartChange(flowcard, 1);
+ // 寮�濮嬩笂鐗�
+ public Result StartChange(String flowcard, int orderstate) {
+ homeMapper.StartChange(flowcard, orderstate);
+ Map<String, Object> map = new HashMap<>();
+ int state = homeMapper.selectStartChange(flowcard);
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 寮�濮�/鏆傚仠鍑虹墖闃熷垪
+ public Result UpdateOutTask(Integer id, Integer state) {
+ homeMapper.UpdateOutTask(id, state);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鍒犻櫎鍑虹墖闃熷垪
+ public Result DeleteOutTask(Integer id) {
+
+ int cell=homeMapper.SelectOutTaskId(id);
+ UpdateStroageCageByCell(cell, 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.DeleteOutTask(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鍒犻櫎宸ョ▼
+ public Result deleteTasks(Map num) {
+ String flowcard = (String) num.get("num");
+ int aa = homeMapper.deleteFlowcard(flowcard.trim());
+ homeMapper.deleteGlassinfo(flowcard.trim());
+ System.out.println(flowcard);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", flowcard.trim());
+ return Result.success(map);
+ }
+
+ // 淇濆瓨娴嬮噺璁剧疆
+ public Result SaveMeasure(String films, Integer thickness) {
+ int Measure = homeMapper.SaveMeasure(films, thickness);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", Measure);
return Result.success(map);
}
@@ -370,7 +566,10 @@
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
// 閲嶆柊娴嬮噺
+ String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// plc璇锋眰瀛�
+ if("1".equals(PlcRequest)){
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 2);
+ }
// 鍒犻櫎鏁版嵁
QueueMapper.DeleteErrorQueue();
// plcmes.getPlcParameter("GaToMES").setValue("2");
@@ -389,7 +588,7 @@
Map<String, Integer> OrderFinishedProduct = new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗璁㈠崟鎴愬搧鎬绘暟閲�;
// "order zong 0 1 10 2 10"
List<Map> RemoveErrorData = IportDataStr.stream()
- .filter(item -> (item.get("order") != null && item.get("glasstype") != null && item.get("tier") != null
+ .filter(item -> (item.get("order") != null && item.get("tier") != null
&&
item.get("films") != null && item.get("base") != null && item.get("height") != null
&& item.get("thickness") != null && item.get("quantity") != null
@@ -428,14 +627,19 @@
int count = 1;
for (Map map : RemoveErrorData) {
String key = map.get("base").toString() + "_" + map.get("height").toString() + "_"
- + map.get("thickness").toString() + "_" + map.get("films").toString();
-
+ + map.get("thickness").toString() + "_" + map.get("films").toString() + "_"
+ + map.get("order").toString() + "_" + map.get("matching").toString()+ map.get("tier").toString();
String tierkey = map.get("order").toString() + "_" + map.get("matching").toString();
String value = TypeData.get(key);
Integer glasstype;
+ System.out.println(key + ":" + TypeData.get(key));
if (TypeData.get(key) == null) {
- glasstype = homeMapper.SelectMaxType();
+
+ glasstype = homeMapper.SelectMaxTypes(key);
+ if (glasstype == null) {
+ glasstype = homeMapper.SelectMaxType();
+ }
if (glasstype == null) {
glasstype = 1;
}
@@ -449,9 +653,11 @@
, Integer.parseInt(map.get("tier").toString()), map.get("films").toString(),
Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),
Double.parseDouble(map.get("thickness").toString()),
- Integer.parseInt(map.get("quantity").toString()), groupby.get(tierkey));// 闇�瑕佽绠楁�诲眰鏁�
+ Integer.parseInt(map.get("quantity").toString()), groupby.get(tierkey),
+ map.get("Customer").toString());// 闇�瑕佽绠楁�诲眰鏁�
// 璁㈠崟鍐呮�诲眰鏁�
- homeMapper.InsertFlowcard(map.get("order").toString(), OrderFinishedProduct.get(tierkey + "_Sum"));
+ homeMapper.InsertFlowcard(map.get("order").toString(), OrderFinishedProduct.get(tierkey + "_Sum"),
+ map.get("Customer").toString());
count++;
}
Map<String, Object> ResultCode = new HashMap<>();
--
Gitblit v1.8.0