liuxy/HuaDongYiYaoACS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-02-07 18:23:57 +08:00
parent 632a306046
commit d0d7dac83a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/robot_arm/RobotArmDeviceDriver.java
View File

@@ -158,6 +158,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev
*/ */
public void executeTask() { public void executeTask() {
String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
String hasHk = paramService.findByCode(AcsConfig.HAS_HK).getValue();
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
// 申请叫料任务 // 申请叫料任务
@@ -168,7 +169,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev
.eq(Task::getIs_delete, "0") .eq(Task::getIs_delete, "0")
.in(Task::getTask_status, "0", "1") .in(Task::getTask_status, "0", "1")
); );
if (ObjectUtil.isEmpty(list) && "1".equals(hasWms)) { if (ObjectUtil.isEmpty(list) && "1".equals(hasWms) && "1".equals(hasHk)) {
// 调用上位接口 // 调用上位接口
param.put("device_code", devicecode); param.put("device_code", devicecode);
param.put("type", "2"); param.put("type", "2");
@@ -190,7 +191,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev
.eq(Task::getIs_delete, "0") .eq(Task::getIs_delete, "0")
.in(Task::getTask_status, "0", "1") .in(Task::getTask_status, "0", "1")
); );
if (ObjectUtil.isEmpty(list) && "1".equals(hasWms)) { if (ObjectUtil.isEmpty(list) && "1".equals(hasWms) && "1".equals(hasHk)) {
// 调用上位接口 // 调用上位接口
param.put("device_code", devicecode); param.put("device_code", devicecode);
param.put("type", "2"); param.put("type", "2");