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

嘉耐更新

Browse Source
This commit is contained in:
loujf
2022-08-16 14:14:24 +08:00
parent 7961205167
commit a4e6f58b87
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -815,7 +815,6 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
this.writing(this.mode);
ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No);
if (this.mode == 4) {
dto.setOrder_status("0");
@@ -823,10 +822,11 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
dto.setOrder_status("2");
}
produceshiftorderService.update(dto);
this.writing(this.mode);
this.setRequireSucess(true);
}
}
this.setRequireSucess(true);
return true;
}
}

7
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@@ -853,7 +853,6 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
this.writing(this.mode);
ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No);
if (this.mode == 4) {
dto.setOrder_status("0");
@@ -861,10 +860,10 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
dto.setOrder_status("2");
}
produceshiftorderService.update(dto);
this.writing(this.mode);
this.setRequireSucess(true);
}
}
this.setRequireSucess(true);
return true;
}
}
@@ -926,8 +925,8 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
this.writing(this.mode);
this.writing("to_material",material_code);
this.setRequireSucess(true);
}
requireSucess = true;
return true;
}
}