From 7428921a405f685e879911ee1d04c143d6079658 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期一, 12 五月 2025 17:24:44 +0800
Subject: [PATCH] 数据库名称和服务器ip修改
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 254ae97..b0824a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -78,14 +78,14 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
+// try {
+// if (param.getIoType() > 1) {
+// if (Utils.locNoRowBoolean(locMast.getRow1())) {
+// param.setTaskPriority(11);
+// }
+// }
+// } catch (Exception e) {
+// }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -99,11 +99,11 @@
} else if (param.getIoType() == 2) {
taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
+// if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(param.getTargetPoint());
- }
- taskWrk.setTargetPoint(param.getTargetPoint());
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint())-1));
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
} else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
@@ -216,7 +216,7 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("stn_desc", param.getWharfCode()));
+ .eq("stn_desc", param.getStartPoint()));
if (Cools.isEmpty(staDesc)) {
throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
}
@@ -229,7 +229,7 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (wharfCode1.contains(param.getWharfCode())) {
+ if (wharfCode1.contains(param.getStartPoint())) {
if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() > 0) {
//AGV鍑哄簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 0);
@@ -266,11 +266,15 @@
@Override
public R getAgvPickAndPlaceV1(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
+ }
+ if (Cools.isEmpty(param.getHeight())) {
+ return R.error("楂樺害涓嶈兘涓虹┖" + param.getStartPoint());
}
if (param.getType() == 0 && basDevp.getAgvStartPick() == 1) {
+ basDevp.setInreq2(param.getHeight().toString());
return R.ok();
} else if (param.getType() == 1 && basDevp.getAgvStartPlace() == 1) {
return R.ok();
@@ -281,9 +285,9 @@
@Override
public R getAgvPickAndPlaceV2(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
}
if (param.getType() == 0) {
basDevp.setAgvTargetPick(1);
--
Gitblit v1.9.1