root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:优化固化室出库任务

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-21 22:50:33 +08:00
parent 56914e4936
commit 42e3fc1175
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
View File

@@ -289,9 +289,8 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + ItemProtocol.item_to_command;
//String opcservcerid = this.getDevice().getOpc_server_id();
//Server server = ReadUtil.getServer(opcservcerid);
//Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
this.control(itemMap);
@@ -406,7 +405,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
jsonObject.put("requestNo", IdUtil.simpleUUID());
if (type == 5) {
if (device_code.startsWith("ZCSSX")) {
log.error("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
//log.error("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
jsonObject.put("request_method_code", "KJQKTask");
}
}
@@ -415,9 +414,9 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
if (StrUtil.equals(res_jo.getString("code"), "200")) {
this.writing(type);
this.setRequireSucess(true);
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！");
//log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！");
} else {
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message"));
//log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message"));
}
return true;
}

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
IPage<InstructionMybatis> queryPage = PageUtil.toMybatisPage(page);
LambdaQueryWrapper<InstructionMybatis> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(InstructionMybatis::getIs_delete,0);
// wrapper.eq(InstructionMybatis::getIs_delete,0);
wrapper.and(StringUtils.isNotBlank(code), instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code, code).or().like(InstructionMybatis::getTask_code, code));
wrapper.like(StringUtils.isNotBlank(vehicle_code), InstructionMybatis::getVehicle_code, vehicle_code);
wrapper.eq(StringUtils.isNotBlank(material_type), InstructionMybatis::getMaterial, material_type);