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

更新

Browse Source
This commit is contained in:
gengby
2023-02-05 20:29:46 +08:00
parent 3ae3f0e409
commit b650280c14
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java
View File

@@ -117,15 +117,16 @@ public class AMHandServiceImpl implements AMHandService {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver();
int move = standardInspectSiteDeviceDriver.getMove(); int move = standardInspectSiteDeviceDriver.getMove();
TaskDto taskDto = taskService.findByStartAndNextCode(device_code); TaskDto taskDto = taskService.findByStartAndNextCode(device_code);
if (move != 0 && ObjectUtil.isNotEmpty(taskDto)) { if (ObjectUtil.isNotEmpty(taskDto)) {
status = "2"; status = "2";
status_name = "有任务"; status_name = "有任务";
material_type = "1"; material_type = "1";
} else if (move != 0) {
status = "1";
status_name = "有货";
material_type = "1";
} }
// } else if (move != 0) {
// status = "1";
// status_name = "有货";
// material_type = "1";
// }
} }
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("device_id", device_id); map.put("device_id", device_id);