From c8b2322c5c43b6e627ff724405281bc53c6c98f5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 11 十二月 2023 17:12:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 12 ---
src/main/java/com/zy/asrs/utils/Utils.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +-
src/main/resources/application-prod.yml | 8 ++
src/main/java/com/zy/asrs/controller/CrnController.java | 42 +++++++------
src/main/webapp/views/deviceOperate/crnOperate.html | 47 +++++++++------
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 13 ++++
8 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 403b11d..314a8fa 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -381,12 +381,13 @@
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
return crnControl(command)?R.ok():R.error();
}
@@ -398,12 +399,12 @@
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@@ -415,12 +416,13 @@
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
@@ -475,8 +477,8 @@
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞�
+ command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b9e762c..bd53665 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -166,17 +166,17 @@
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
- StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
+
ToWmsDTO toWmsDTO = new ToWmsDTO();
Map<String, Object> map = new HashMap<>();
map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
List<Integer> list = openServiceImpl.getInEnableRoadway();
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode).eq("crn_no",staDesc1.getCrnNo()));
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
if (Cools.isEmpty(taskWrk)){
continue;
}
-
+ //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() != workNo){
//鑾峰彇鍫嗗灈鏈虹珯鐐�
StaDesc staDesc = new StaDesc();
@@ -443,7 +443,7 @@
// }
}
- return;
+ // return;
}
}
@@ -873,7 +873,7 @@
} else if (taskWrk.getIoType() == 2) {
//鍑哄簱浠诲姟
taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
- taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 8b9a9f0..ffee264 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -330,7 +330,7 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
- String wcsLocNo = getWcsLocNo("02-01-01-02-01");
- System.out.println(wcsLocNo);
+ CrnSlave.CrnStn crnStnByStaNo = getCrnStnByStaNo(235, true);
+ System.out.println(crnStnByStaNo);
}
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index da02598..e2cdeec 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,7 +54,7 @@
*/
public Short status;
- public Short alarm;
+ public Short alarm = 0;
/**
* 鐘舵�佹灇涓�
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5f8e0cd..2a15883 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -43,6 +43,7 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+
@Value("${wms.url}")
private String wmsUrl;
public static final List<Short> rowOne = new ArrayList<Short>() {{
@@ -248,7 +249,7 @@
}
ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
- ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
+ ,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback"
,null
,"127.0.0.1"
,JSON.toJSONString(taskOverToWms)
@@ -383,22 +384,13 @@
}
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
-
array[3] = command.getSourcePosZ();
-
array[4] = command.getSourcePosX();
-
array[5] = command.getSourcePosY();
-
array[6] = command.getDestinationPosZ();
-
array[7] = command.getDestinationPosX();
-
array[8] = command.getDestinationPosY();
array[9] = command.getCommand();
-
-
-
// 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB100.0", array);
// 鏃ュ織璁板綍
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b13d8d1..508d4ff 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -335,6 +335,19 @@
staProtocol.setBarcodeErr(status[6]);
}
} else if (slave.getId() == 3) {
+
+ //鏉＄爜
+ //Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
+ if (result2.IsSuccess) {
+
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 7);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+
+ }
// 澶栧舰妫�娴� - 111
//Thread.sleep(50);
OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5ab5873..684d8ae 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -196,7 +196,7 @@
devpPlcId: ${wcs-slave.devp[1].id}
crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
staNo: 235
- row: 19
+ row: 21
bay: 22
lev: 2
devpPlcId: ${wcs-slave.devp[1].id}
@@ -321,7 +321,7 @@
inSta[0]: #鍏ュ簱鍙�1
scale: ${wcs-slave.scale[1].id}
staNo: 301
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 300
#slot: 0
outSta[0]: #鍑哄簱鍙�1
@@ -373,3 +373,7 @@
port: 51236
ip: 172.17.91.44
id: 6
+ barcode[6]:
+ port: 51236
+ ip: 172.17.8.203
+ id: 7
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index da33cc7..5e1daa1 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -234,27 +234,34 @@
},
requestOperate(method) {
let that = this
- $.ajax({
- url: baseUrl + "/crn/operator/" + method,
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: this.formParam,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/crn/operator/" + method,
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: this.formParam,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
- }
- });
+ });
+ })
+
},
updateEnableInOut(type) {
let that = this
--
Gitblit v1.9.1