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

机械手任务完成更新组盘为已完成

Browse Source
This commit is contained in:
psh
2023-08-20 14:15:54 +08:00
parent 4e2c8e50e0
commit 36540bf169
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_manipulator/HfKilnManipulatorDeviceDriver.java
View File

@@ -225,6 +225,15 @@ public class HfKilnManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
if (inst2 != null) {
if (StrUtil.equals(inst2.getInstruction_status(), "1")) {
this.finish_instruction(inst2);
JSONObject json = new JSONObject();
// Device device = appService.findDeviceByAddress(String.valueOf(this.locate));
//点位
// json.put("device",device.getDevice_code());
//条码
json.put("barcode",this.barcode);
//2-更新托盘状态为已拆垛
json.put("state",2);
JSONObject resp = acsToWmsService.updateKiln(json);
logServer.deviceInfo("反馈电气信号", this.getDevice_code(), "机械手任务完成,开始反馈电气信号");
this.writing("to_onset", "0");
this.writing("to_target", "0");

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -598,7 +598,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
case 2:{
JSONObject json = wo.query("vehicle_code ='" + vehicle_code + "' AND is_delete = 0").uniqueResult(0);
// 将托盘置为已拆垛并删除，供后续重复使用
json.put("kiln_code", kiln_code);
// json.put("kiln_code", kiln_code);
json.put("region_code", 3);
json.put("is_delete", 1);
wo.update(json);