diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index d434825f7..09368c751 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -323,14 +323,14 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr this.require_apply_strangulation_time = date; // String vehicle_code = ""; // - Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task)); - if (StrUtil.isEmpty(inst.getVehicle_code())) { - message = LangProcess.msg("one_message8") + ": " + task + LangProcess.msg("one_message11"); - return; - } +// Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task)); +// if (StrUtil.isEmpty(inst.getVehicle_code())) { +// message = LangProcess.msg("one_message8") + ": " + task + LangProcess.msg("one_message11"); +// return; +// } JSONObject param = new JSONObject(); param.put("device_code", device_code); - param.put("vehicle_code", inst.getVehicle_code()); +// param.put("vehicle_code", inst.getVehicle_code()); param.put("type", AcsToLmsApplyTaskTypeEnum.LABEL_BIND.getType()); String response = acsToWmsService.deviceApplyTwo(param); JSONObject jo = JSON.parseObject(response); @@ -413,7 +413,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr JSONObject jo = JSON.parseObject(datas); String length = jo.get("length").toString(); - String weight = jo.get("weight").toString(); + String width = jo.get("width").toString(); String height = jo.get("height").toString(); String isBinding = jo.get("isBinding").toString(); String isLabeling = jo.get("isLabeling").toString(); @@ -433,7 +433,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr list.add(map); Map map2 = new HashMap(); map2.put("code", "to_weight"); - map2.put("value", weight); + map2.put("value", width); list.add(map2); Map map3 = new HashMap(); map3.put("code", "to_height"); @@ -483,7 +483,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr list.add(map); Map map2 = new HashMap(); map2.put("code", "to_weight"); - map2.put("value", weight); + map2.put("value", width); list.add(map2); Map map3 = new HashMap(); map3.put("code", "to_height"); @@ -540,7 +540,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr list.add(map); Map map2 = new HashMap(); map2.put("code", "to_weight"); - map2.put("value", weight); + map2.put("value", width); list.add(map2); Map map3 = new HashMap(); map3.put("code", "to_height"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index b5c2abf04..30262c27e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -557,7 +557,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); JSONObject jo = JSON.parseObject(response); - if (response == null || jo.getInteger("status") == 200) { + if (jo.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("申请空托盘出入库,参数,接口返回:" + jo) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 122520345..d3987abac 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -260,7 +260,6 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv requireSucess = false; } if (move != 0 && task > 0) { - update_instruction_status(); } @@ -403,7 +402,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); JSONObject jo = JSON.parseObject(response); - if (response == null || jo.getInteger("status") == 200) { + if (jo.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("申请空托盘出入库,参数,接口返回:" + jo) @@ -452,7 +451,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); JSONObject jo = JSON.parseObject(response); - if (response == null || jo.getInteger("status") == 200) { + if (jo.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("木箱、子卷入库申请入库任务,参数,接口返回:" + jo) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index f36bb192b..94698293b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -155,16 +155,17 @@ public class CreateDDJInst { } next_device_code = taskDto.getNext_device_code(); - nextDevice = appService.findDeviceByCode(next_device_code); - BeltConveyorDeviceDriver beltConveyorDeviceDriver; - if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); - if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) { - log.error("输送机,{}未联机或执行中", next_device_code); - ((BeltConveyorDeviceDriver) nextDevice.getDeviceDriver()).setNotCreateInstMessage("one_message7"); - return; - } - } + +// nextDevice = appService.findDeviceByCode(next_device_code); +// BeltConveyorDeviceDriver beltConveyorDeviceDriver; +// if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { +// beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); +// if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) { +// log.error("输送机,{}未联机或执行中", next_device_code); +// ((BeltConveyorDeviceDriver) nextDevice.getDeviceDriver()).setNotCreateInstMessage("one_message7"); +// return; +// } +// } /** * 开始平均分配 */