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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-03-09 18:34:57 +08:00
parent a8c881b58a
commit a3ad778fbd
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -81,7 +81,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
} }
if(this.getClose() == 0){ if(this.getClose() == 0){
open = "未知"; open = "未知";
} else if(this.getOpen() == 1){ } else if(this.getClose() == 1){
open = "关到位"; open = "关到位";
} }
jo.put("device_name", this.getDevice().getDevice_name()); jo.put("device_name", this.getDevice().getDevice_name());

1
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -774,7 +774,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
public Map<String, Object> updateTask(String whereJson) { public Map<String, Object> updateTask(String whereJson) {
JSONArray datas = JSONArray.parseArray(whereJson); JSONArray datas = JSONArray.parseArray(whereJson);
log.info("updateTask--------------:输入参数" + datas.toString()); log.info("updateTask--------------:输入参数" + datas.toString());
JSONObject map = new JSONObject();
JSONArray errArr = new JSONArray(); JSONArray errArr = new JSONArray();
if (datas.size() > 0) { if (datas.size() > 0) {
for (int i = 0; i < datas.size(); i++) { for (int i = 0; i < datas.size(); i++) {

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

@@ -782,6 +782,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
public void finish(Instruction dto) { public void finish(Instruction dto) {
String now = DateUtil.now(); String now = DateUtil.now();
dto.setInstruction_status("2"); dto.setInstruction_status("2");
dto.setUpdate_time(now);
WQLObject wo = WQLObject.getWQLObject("acs_instruction"); WQLObject wo = WQLObject.getWQLObject("acs_instruction");
JSONObject json = (JSONObject) JSONObject.toJSON(dto); JSONObject json = (JSONObject) JSONObject.toJSON(dto);