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

更新

Browse Source
This commit is contained in:
张江玮
2023-03-28 20:55:10 +08:00
parent 83e0f0b80c
commit 129e1a510f
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@@ -130,7 +130,6 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
if (mode != last_mode) { if (mode != last_mode) {
this.setRequireSucess(false); this.setRequireSucess(false);
this.setResult(false);
logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
} }

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
View File

@@ -861,7 +861,13 @@ public class WmsToJnServiceImpl implements WmsToJnService {
} }
String method = "/TrayBak"; String method = "/TrayBak";
String vehicle_code = (String) whereJson.get("vehicle_code"); String vehicle_code = (String) whereJson.get("vehicle_code");
if (StrUtil.isBlank(vehicle_code) || "0".equals(vehicle_code) || "0000".equals(vehicle_code) || "999".equals(vehicle_code)) {
return null;
}
JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "15").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "15").addParam("vehicle_code", vehicle_code).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonObject)) {
return null;
}
jsonObject.put("outdate",DateUtil.now()); jsonObject.put("outdate",DateUtil.now());
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("ticker", "WLXT"); obj.put("ticker", "WLXT");

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -82,7 +82,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
//调用mes接口 //调用mes接口
HashMap hashMap = new HashMap(); HashMap hashMap = new HashMap();
hashMap.put("vehicle_code",startPointObj.getString("vehicle_code")); hashMap.put("vehicle_code", startPointObj.getString("vehicle_code"));
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackTrayBak(hashMap); wmsToJnServiceImpl.feedBackTrayBak(hashMap);