diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java index 0585461..6337576 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Data; @@ -118,7 +117,7 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); if (mode != last_mode) { - if (mode == 2){ + if (mode == 2) { this.setRequireSucess(false); } logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); @@ -156,8 +155,8 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); - map.put("task_id",taskDto.getExt_task_id()); - map.put("task_status","1"); + map.put("task_id", taskDto.getExt_task_id()); + map.put("task_status", "1"); array.add(map); acsToWmsService.feedbackTaskStatusToWms(array); } @@ -167,13 +166,13 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp //申请取货 判断取货位是否有货 有货就下发允许取货命令 if (mode == 3 && action == 1 && move == 0 && task > 0) { Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task)); - if (ObjectUtil.isNotEmpty(inst2)){ + if (ObjectUtil.isNotEmpty(inst2)) { String start_device_code = inst2.getStart_device_code(); Device device = appService.findDeviceByCode(start_device_code); HfStationDeviceDriver hfStationDeviceDriver; - if (device.getDeviceDriver() instanceof HfStationDeviceDriver){ + if (device.getDeviceDriver() instanceof HfStationDeviceDriver) { hfStationDeviceDriver = (HfStationDeviceDriver) device.getDeviceDriver(); - if (hfStationDeviceDriver.getMove() == 1){ + if (hfStationDeviceDriver.getMove() == 1) { this.writing("to_command", "2"); } } @@ -182,23 +181,8 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp //行架机械手取货时校验条码 校验失败,取消任务 if (mode == 4 && action == 1 && move == 0 && task > 0) { - try { - Instruction instructionDto = instructionService.findByCode(String.valueOf(task)); - if (ObjectUtil.isNotEmpty(instructionDto)) { - // TODO 校验失败我是取消指令还是完成指令 - instructionService.cancel(instructionDto.getInstruction_id()); - //taskserver.cancel(instructionDto.getTask_id()); -// TaskDto taskDto = taskserver.findByCode(instructionDto.getTask_code()); -// JSONArray array = new JSONArray(); -// JSONObject map = new JSONObject(); -// map.put("task_id",taskDto.getExt_task_id()); -// map.put("task_status","3"); -// array.add(map); -// acsToWmsService.feedbackTaskStatusToWms(array); - } - } catch (Exception e) { - e.printStackTrace(); - } + Instruction instructionDto = instructionService.findByCode(String.valueOf(task)); + instructionService.cancel(instructionDto.getInstruction_id()); this.writing("to_command", "4"); this.writing("to_onset", "0"); this.writing("to_target", "0"); @@ -236,15 +220,15 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp Device device = appService.findDeviceByCode(next_device_code); HfStationDeviceDriver hfStationDeviceDriver; String current_num = ""; - if (device.getDeviceDriver() instanceof HfStationDeviceDriver){ + if (device.getDeviceDriver() instanceof HfStationDeviceDriver) { hfStationDeviceDriver = (HfStationDeviceDriver) device.getDeviceDriver(); current_num = String.valueOf(hfStationDeviceDriver.getCurrent_order_num()); } JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); - map.put("task_id",taskDto.getExt_task_id()); - map.put("task_status","2"); - map.put("material_num",current_num); + map.put("task_id", taskDto.getExt_task_id()); + map.put("task_status", "2"); + map.put("material_num", current_num); array.add(map); acsToWmsService.feedbackTaskStatusToWms(array); this.writing("to_command2", "0"); @@ -316,11 +300,28 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp TaskDto task = null; for (int i = 0; i < getDeviceCodeList.size(); i++) { String startDeviceCode = getDeviceCodeList.get(i); - List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); - if (ObjectUtil.isNotEmpty(taskDtoList)) { - task = taskDtoList.get(0); + List taskDtos = taskserver.queryTaskByDeviceCodeAndStatus(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtos)){ + TaskDto taskDto = taskDtos.get(0); + Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code()); + instruction.setInstruction_status("1"); + instruction.setUpdate_time(DateUtil.now()); + instructionService.update(instruction); + int start_addrIndex = getDeviceCodeList.indexOf(instruction.getStart_device_code()); + int next_addrIndex = putDeviceCodeList.indexOf(instruction.getNext_device_code()); + writing("to_onset", String.valueOf(start_addrIndex)); + writing("to_target", String.valueOf(next_addrIndex)); + writing("to_task", instruction.getInstruction_code()); + writing("to_command", "1"); + this.setRequireSucess(true); + return true; + }else { + List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtoList)) { + task = taskDtoList.get(0); + } + if (ObjectUtil.isNotEmpty(task)) break; } - if (ObjectUtil.isNotEmpty(task)) break; } if (!ObjectUtil.isEmpty(task)) { String taskid = task.getTask_id(); @@ -350,7 +351,7 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp instdto.setStart_point_code(start_point_code); instdto.setNext_point_code(next_point_code); instdto.setPriority(priority); - instdto.setInstruction_status("0"); + instdto.setInstruction_status("1"); instdto.setExecute_device_code(start_point_code); try { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java index 4381e50..6dd27ab 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/ItemProtocol.java @@ -99,22 +99,22 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1")); - list.add(new ItemDto(item_move, "光电信号", "DB1.B2")); - list.add(new ItemDto(item_action, "动作信号", "DB1.B3")); - list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); - list.add(new ItemDto(item_task, "任务号", "DB1.D6")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB2.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB2.B1")); + list.add(new ItemDto(item_move, "光电信号", "DB2.B2")); + list.add(new ItemDto(item_action, "动作信号", "DB2.B3")); + list.add(new ItemDto(item_walk_y, "行走列", "DB2.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB2.B5")); + list.add(new ItemDto(item_task, "任务号", "DB2.D6")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_onset, "下发起始站", "DB2.W2")); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D6")); + list.add(new ItemDto(item_to_command, "下发命令", "DB3.W0")); + list.add(new ItemDto(item_to_onset, "下发起始站", "DB3.W2")); + list.add(new ItemDto(item_to_target, "下发目标站", "DB3.W4")); + list.add(new ItemDto(item_to_task, "下发任务号", "DB3.D6")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index 06d4572..a54538e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -95,6 +95,9 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De //条码 String barcode = "0"; String last_barcode = "0"; + //重量 + int weight = 0; + int last_weight = 0; Boolean isonline = true; @@ -178,6 +181,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De status = this.itemProtocol.getStatus(); current_order_num = this.itemProtocol.getCurrent_order_num(); barcode = this.itemProtocol.getBarcode(); + weight = this.itemProtocol.getWeight(); material_code = this.itemProtocol.getMaterial_code(); order = this.itemProtocol.getOrder(); @@ -220,6 +224,10 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De logServer.deviceItemValue(this.device_code, "current_order_num", String.valueOf(current_order_num)); logServer.deviceExecuteLog(this.device_code, "", "", "信号current_order_num: " + last_current_order_num + "->" + current_order_num); } + if (weight != last_weight) { + logServer.deviceItemValue(this.device_code, "weight", String.valueOf(weight)); + logServer.deviceExecuteLog(this.device_code, "", "", "信号weight: " + last_weight + "->" + weight); + } if (!order.equals(last_order)) { logServer.deviceItemValue(this.device_code, "order", order); logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order); @@ -324,7 +332,8 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De last_current_order_num = current_order_num; last_order = order; last_barcode = barcode; - last_material_code = material_code; + last_weight = weight; +// last_material_code = material_code; } @@ -343,7 +352,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De ProduceshiftorderDto dto = produceshiftorderService.findByCode(order); JSONObject json = new JSONObject(); json.put("device_code", device_code); - json.put("material_code", material_code); + json.put("material_code", dto.getMaterial_code()); json.put("ext_order_id", dto.getExt_order_id()); json.put("order_code", order); HttpResponse result = acsToWmsService.orderConfirm(json); @@ -438,7 +447,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De JSONObject json = new JSONObject(); json.put("device_code", device_code); json.put("barcode", barcode); - json.put("material_code", material_code); + json.put("weight", weight); json.put("create_mode", "2"); json.put("is_auto_issue", "0"); json.put("type", "2"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java index 1d1b094..daf5602 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/ItemProtocol.java @@ -36,6 +36,8 @@ public class ItemProtocol { public static String item_material_code = "material_code"; //条码 public static String item_barcode = "barcode"; + //重量 + public static String item_weight = "weight"; //下发命令 @@ -106,6 +108,10 @@ public class ItemProtocol { return this.getOpcStringValue(item_barcode); } + public int getWeight() { + return this.getOpcIntegerValue(item_weight); + } + public String getMaterial_code() { return this.getOpcStringValue(item_material_code); } @@ -140,30 +146,31 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB4.B1")); - list.add(new ItemDto(item_move, "光电信号", "DB4.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB4.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB4.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB4.B5")); - list.add(new ItemDto(item_task, "任务号", "DB4.D6")); - list.add(new ItemDto(item_status, "设备状态", "DB4.D7")); - list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB4.D8")); - list.add(new ItemDto(item_material_code, "产品编号", "DB4.S6")); - list.add(new ItemDto(item_barcode, "条码", "DB4.S7")); - list.add(new ItemDto(item_order, "工单号", "DB4.S8")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB2.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB2.B1")); + list.add(new ItemDto(item_move, "光电信号", "DB2.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB2.B3")); + list.add(new ItemDto(item_ioaction, "进出信号", "DB2.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB2.B5")); + list.add(new ItemDto(item_task, "任务号", "DB2.D6")); + list.add(new ItemDto(item_status, "设备状态", "DB2.B10")); + list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB2.D12")); + list.add(new ItemDto(item_order, "工单号", "DB2.S16")); + list.add(new ItemDto(item_weight, "重量", "DB2.D272")); + list.add(new ItemDto(item_barcode, "条码", "DB2.W276")); + list.add(new ItemDto(item_material_code, "产品编号", "DB2.S278")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB5.W0")); - list.add(new ItemDto(item_to_target, "目标站", "DB5.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB5.D4")); - list.add(new ItemDto(item_to_error, "故障代码", "DB5.W6")); - list.add(new ItemDto(item_to_order_num, "工单数量", "DB5.W8")); - list.add(new ItemDto(item_to_product_number, "产品编号", "DB5.S10")); - list.add(new ItemDto(item_to_order, "工单号", "DB5.S12")); + list.add(new ItemDto(item_to_command, "作业命令", "DB3.W0")); + list.add(new ItemDto(item_to_target, "目标站", "DB3.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB3.D4")); + list.add(new ItemDto(item_to_error, "故障代码", "DB3.B8")); + list.add(new ItemDto(item_to_order_num, "工单数量", "DB3.D10")); + list.add(new ItemDto(item_to_product_number, "产品编号", "DB3.S14")); + list.add(new ItemDto(item_to_order, "工单号", "DB3.S270")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index 486e725..1b66d59 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -409,11 +409,28 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev TaskDto task = null; for (int i = 0; i < getDeviceCodeList.size(); i++) { String startDeviceCode = getDeviceCodeList.get(i); - List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); - if (ObjectUtil.isNotEmpty(taskDtoList)) { - task = taskDtoList.get(0); + List taskDtos = taskserver.queryTaskByDeviceCodeAndStatus(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtos)){ + TaskDto taskDto = taskDtos.get(0); + Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code()); + instruction.setInstruction_status("1"); + instruction.setUpdate_time(DateUtil.now()); + instructionService.update(instruction); + int start_addrIndex = getDeviceCodeList.indexOf(instruction.getStart_device_code()); + int next_addrIndex = putDeviceCodeList.indexOf(instruction.getNext_device_code()); + this.writing("to_onset1", String.valueOf(start_addrIndex)); + this.writing("to_target1", String.valueOf(next_addrIndex)); + this.writing("to_task1", instruction.getInstruction_code()); + this.writing("to_command1", "1"); + requireHeadSucess = true; + return true; + }else { + List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtoList)) { + task = taskDtoList.get(0); + } + if (ObjectUtil.isNotEmpty(task)) break; } - if (ObjectUtil.isNotEmpty(task)) break; } if (!ObjectUtil.isEmpty(task)) { @@ -444,7 +461,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev instdto.setStart_point_code(start_point_code); instdto.setNext_point_code(next_point_code); instdto.setPriority(priority); - instdto.setInstruction_status("0"); + instdto.setInstruction_status("1"); instdto.setExecute_device_code(start_point_code); try { @@ -488,11 +505,28 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev TaskDto task = null; for (int i = 0; i < getDeviceCodeList.size(); i++) { String startDeviceCode = getDeviceCodeList.get(i); - List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); - if (ObjectUtil.isNotEmpty(taskDtoList)) { - task = taskDtoList.get(0); + List taskDtos = taskserver.queryTaskByDeviceCodeAndStatus(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtos)){ + TaskDto taskDto = taskDtos.get(0); + Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code()); + instruction.setInstruction_status("1"); + instruction.setUpdate_time(DateUtil.now()); + instructionService.update(instruction); + int start_addrIndex = getDeviceCodeList.indexOf(instruction.getStart_device_code()); + int next_addrIndex = putDeviceCodeList.indexOf(instruction.getNext_device_code()); + this.writing("to_onset1", String.valueOf(start_addrIndex)); + this.writing("to_target1", String.valueOf(next_addrIndex)); + this.writing("to_task1", instruction.getInstruction_code()); + this.writing("to_command1", "1"); + requireHeadSucess = true; + return true; + }else { + List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); + if (ObjectUtil.isNotEmpty(taskDtoList)) { + task = taskDtoList.get(0); + } + if (ObjectUtil.isNotEmpty(task)) break; } - if (ObjectUtil.isNotEmpty(task)) break; } if (!ObjectUtil.isEmpty(task)) { @@ -523,7 +557,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev instdto.setStart_point_code(start_point_code); instdto.setNext_point_code(next_point_code); instdto.setPriority(priority); - instdto.setInstruction_status("0"); + instdto.setInstruction_status("1"); instdto.setExecute_device_code(start_point_code); try { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/ItemProtocol.java index 976adbd..b6d9651 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/ItemProtocol.java @@ -137,30 +137,30 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1")); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_move1, "前工位光电信号", "DB1.B3")); - list.add(new ItemDto(item_move2, "后工位光电信号", "DB1.B4")); - list.add(new ItemDto(item_action1, "前工位动作信号", "DB1.B5")); - list.add(new ItemDto(item_action2, "后工位动作信号", "DB1.B6")); - list.add(new ItemDto(item_walk_y, "行走列", "DB1.B7")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B8")); - list.add(new ItemDto(item_task1, "前工位任务号", "DB1.D10")); - list.add(new ItemDto(item_task2, "后工位任务号", "DB1.D14")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB2.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB2.B1")); + list.add(new ItemDto(item_status, "设备状态", "DB2.B2")); + list.add(new ItemDto(item_move1, "前工位光电信号", "DB2.B3")); + list.add(new ItemDto(item_move2, "后工位光电信号", "DB2.B4")); + list.add(new ItemDto(item_action1, "前工位动作信号", "DB2.B5")); + list.add(new ItemDto(item_action2, "后工位动作信号", "DB2.B6")); + list.add(new ItemDto(item_walk_y, "行走列", "DB2.B7")); + list.add(new ItemDto(item_error, "报警信号", "DB2.B8")); + list.add(new ItemDto(item_task1, "前工位任务号", "DB2.D10")); + list.add(new ItemDto(item_task2, "后工位任务号", "DB2.D14")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_onset1, "前工位下发起始站", "DB2.W2")); - list.add(new ItemDto(item_to_target1, "前工位下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task1, "前工位下发任务号", "DB2.D6")); - list.add(new ItemDto(item_to_command2, "后工位下发命令", "DB2.W10")); - list.add(new ItemDto(item_to_onset2, "后工位下发起始站", "DB2.W12")); - list.add(new ItemDto(item_to_target2, "后工位下发目标站", "DB2.W14")); - list.add(new ItemDto(item_to_task2, "后工位下发任务号", "DB2.D16")); + list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB3.W0")); + list.add(new ItemDto(item_to_onset1, "前工位下发起始站", "DB3.W2")); + list.add(new ItemDto(item_to_target1, "前工位下发目标站", "DB3.W4")); + list.add(new ItemDto(item_to_task1, "前工位下发任务号", "DB3.D6")); + list.add(new ItemDto(item_to_command2, "后工位下发命令", "DB3.W10")); + list.add(new ItemDto(item_to_onset2, "后工位下发起始站", "DB3.W12")); + list.add(new ItemDto(item_to_target2, "后工位下发目标站", "DB3.W14")); + list.add(new ItemDto(item_to_task2, "后工位下发任务号", "DB3.D16")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java index fa8a5fd..b198ace 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -86,6 +86,8 @@ public interface InstructionService { */ Instruction findByTaskcode(String code); + Instruction findByTaskcodeAndStatus(String code); + /** * 根据任务id查询 * diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 33a1416..645bad5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -228,6 +228,17 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu return null; } + @Override + public Instruction findByTaskcodeAndStatus(String code) { + WQLObject wo = WQLObject.getWQLObject("acs_instruction"); + JSONObject json = wo.query("task_code ='" + code + "' and instruction_status = '0'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + final Instruction obj = json.toJavaObject(Instruction.class); + return obj; + } + return null; + } + @Override public Instruction findByTaskid(String id, String wherecaluse) { if (!StrUtil.isEmpty(wherecaluse)) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/TaskService.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/TaskService.java index 10400b9..ad5c3b9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/TaskService.java @@ -104,6 +104,13 @@ public interface TaskService { */ List queryTaskByDeviceCode(String device_code); + /** + * 根据设备号和任务状态查询 + * @param device_code + * @return + */ + List queryTaskByDeviceCodeAndStatus(String device_code); + /** * 根据关联编号查询非立刻下发的关联任务 */ diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index bd8bc30..a2fc0e9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -277,6 +277,22 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { return list; } + @Override + public List queryTaskByDeviceCodeAndStatus(String device_code) { + List list = new ArrayList<>(); + Iterator iterator = tasks.iterator(); + while (iterator.hasNext()) { + TaskDto task = iterator.next(); + if (task.getStart_device_code().equals(device_code) && StrUtil.equals(task.getTask_status(), "1")) { + Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); + if (ObjectUtil.isNotEmpty(instruction)){ + list.add(task); + } + } + } + return list; + } + @Override public TaskDto queryTaskByLinkNum(String link_num) { return null; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/test/service/impl/TestServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/test/service/impl/TestServiceImpl.java index 76a9248..fc99e61 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/test/service/impl/TestServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/test/service/impl/TestServiceImpl.java @@ -34,63 +34,101 @@ public class TestServiceImpl implements TestService String now = DateUtil.now(); String currentUsername = SecurityUtils.getCurrentUsername(); -// for (int i = 1; i <= 12; i++) { -// String device_code = "KLZHC"; -// if (i < 10){ -// device_code = device_code + "0" + i; -// } else { -// device_code = device_code + i; -// } -// DeviceDto dto = new DeviceDto(); -// dto.setDevice_id(IdUtil.simpleUUID()); -// dto.setDevice_code(device_code); -// dto.setDevice_name(device_code); -// dto.setDevice_type("conveyor"); -// dto.setCreate_by(currentUsername); -// dto.setUpdate_by(currentUsername); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); -// wo.insert(json); -// } -// for (int i = 1; i <= 25; i++) { -// String device_code = "KLZC"; -// if (i < 10){ -// device_code = device_code + "0" + i; -// } else { -// device_code = device_code + i; -// } -// DeviceDto dto = new DeviceDto(); -// dto.setDevice_id(IdUtil.simpleUUID()); -// dto.setDevice_code(device_code); -// dto.setDevice_name(device_code); -// dto.setDevice_type("conveyor"); -// dto.setCreate_by(currentUsername); -// dto.setUpdate_by(currentUsername); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); -// wo.insert(json); -// } -// for (int i = 1; i <= 25; i++) { -// String device_code = "MLZHC"; -// if (i < 10){ -// device_code = device_code + "0" + i; -// } else { -// device_code = device_code + i; -// } -// DeviceDto dto = new DeviceDto(); -// dto.setDevice_id(IdUtil.simpleUUID()); -// dto.setDevice_code(device_code); -// dto.setDevice_name(device_code); -// dto.setDevice_type("conveyor"); -// dto.setCreate_by(currentUsername); -// dto.setUpdate_by(currentUsername); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); -// wo.insert(json); -// } + for (int i = 1; i <= 12; i++) { + String device_code = "KLZHC"; + if (i < 10){ + device_code = device_code + "0" + i; + } else { + device_code = device_code + i; + } + DeviceDto dto = new DeviceDto(); + dto.setDevice_id(IdUtil.simpleUUID()); + dto.setDevice_code(device_code); + dto.setDevice_name(device_code); + dto.setDevice_type("conveyor"); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + wo.insert(json); + } + for (int i = 1; i <= 8; i++) { + String device_code = "YLJ"; + if (i < 10){ + device_code = device_code + "0" + i; + } else { + device_code = device_code + i; + } + DeviceDto dto = new DeviceDto(); + dto.setDevice_id(IdUtil.simpleUUID()); + dto.setDevice_code(device_code); + dto.setDevice_name(device_code); + dto.setDevice_type("conveyor"); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + wo.insert(json); + } + for (int i = 1; i <= 2; i++) { + String device_code = "HNJ"; + if (i < 10){ + device_code = device_code + "0" + i; + } else { + device_code = device_code + i; + } + DeviceDto dto = new DeviceDto(); + dto.setDevice_id(IdUtil.simpleUUID()); + dto.setDevice_code(device_code); + dto.setDevice_name(device_code); + dto.setDevice_type("conveyor"); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + wo.insert(json); + } + for (int i = 1; i <= 26; i++) { + String device_code = "KLZC"; + if (i < 10){ + device_code = device_code + "0" + i; + } else { + device_code = device_code + i; + } + DeviceDto dto = new DeviceDto(); + dto.setDevice_id(IdUtil.simpleUUID()); + dto.setDevice_code(device_code); + dto.setDevice_name(device_code); + dto.setDevice_type("conveyor"); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + wo.insert(json); + } + for (int i = 1; i <= 26; i++) { + String device_code = "MLZHC"; + if (i < 10){ + device_code = device_code + "0" + i; + } else { + device_code = device_code + i; + } + DeviceDto dto = new DeviceDto(); + dto.setDevice_id(IdUtil.simpleUUID()); + dto.setDevice_code(device_code); + dto.setDevice_name(device_code); + dto.setDevice_type("conveyor"); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + wo.insert(json); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/amb/rest/HFHandController.java b/acs/nladmin-system/src/main/java/org/nl/hand/amb/rest/HFHandController.java index e14d738..070b8af 100644 --- a/acs/nladmin-system/src/main/java/org/nl/hand/amb/rest/HFHandController.java +++ b/acs/nladmin-system/src/main/java/org/nl/hand/amb/rest/HFHandController.java @@ -2,6 +2,7 @@ package org.nl.hand.amb.rest; +import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -32,6 +33,7 @@ public class HFHandController { @PostMapping("/area") @Log("查询区域") @ApiOperation("查询区域") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity query() { return new ResponseEntity<>(HandService.queryArea(null), HttpStatus.OK); @@ -40,6 +42,7 @@ public class HFHandController { @PostMapping("/point") @Log("查询设备编号及状态") @ApiOperation("查询设备编号及状态") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") //@RequestBody JSONObject json public ResponseEntity queryPoint(@RequestBody Map whereJson) { @@ -50,6 +53,7 @@ public class HFHandController { @PostMapping("/point/storage") @Log("查询设备扩展属性") @ApiOperation("查询设备扩展属性") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") //@RequestBody JSONObject json public ResponseEntity queryDeviceAugmentabilityByCode(@RequestBody Map whereJson) { @@ -59,6 +63,7 @@ public class HFHandController { @PostMapping("/task_type") @Log("查询任务类型") @ApiOperation("查询任务类型") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") //@RequestBody JSONObject json public ResponseEntity queryTaskType() { @@ -68,15 +73,16 @@ public class HFHandController { @PostMapping("/tasks") @Log("查询任务") @ApiOperation("查询任务") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity queryTask(@RequestBody Map whereJson) { - return new ResponseEntity<>(HandService.queryTask(whereJson), HttpStatus.OK); } @PostMapping("/insts") @Log("查询指令") @ApiOperation("查询指令") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity queryInst(@RequestBody Map whereJson) { @@ -86,6 +92,7 @@ public class HFHandController { @PostMapping("/routeplan_type") @Log("查询路由类型") @ApiOperation("查询路由类型") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity queryRouteplanType() { return new ResponseEntity<>(HandService.queryRouteplanType(), HttpStatus.OK); @@ -94,6 +101,7 @@ public class HFHandController { @PostMapping("/task") @Log("创建任务") @ApiOperation("创建任务") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity createTask(@RequestBody Map whereJson) { return new ResponseEntity<>(HandService.createTask(whereJson), HttpStatus.OK); @@ -102,6 +110,7 @@ public class HFHandController { @PostMapping("/inst") @Log("指令操作") @ApiOperation("指令操作") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity Instoperation(@RequestBody Map whereJson) { return new ResponseEntity<>(HandService.Instoperation(whereJson), HttpStatus.OK); @@ -110,6 +119,7 @@ public class HFHandController { @PostMapping("/taskoperation") @Log("任务操作") @ApiOperation("任务操作") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity Taskoperation(@RequestBody Map whereJson) throws Exception { return new ResponseEntity<>(HandService.Taskoperation(whereJson), HttpStatus.OK); @@ -118,6 +128,7 @@ public class HFHandController { @PostMapping("/deviceStatus") @Log("修改设备状态") @ApiOperation("修改设备状态") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity updateDeviceStatus(@RequestBody Map whereJson) { @@ -127,6 +138,7 @@ public class HFHandController { @PostMapping("/handlogin") @Log("手持登陆验证") @ApiOperation("手持登陆验证") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity handlogin(@RequestBody Map whereJson) { @@ -136,6 +148,7 @@ public class HFHandController { @PostMapping("/matrial") @Log("查询物料信息") @ApiOperation("查询物料信息") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity queryMaterial() { return new ResponseEntity<>(HandService.queryMaterial(), HttpStatus.OK); @@ -144,6 +157,7 @@ public class HFHandController { @PostMapping("/task2") @Log("创建任务") @ApiOperation("创建任务") + @SaIgnore //@PreAuthorize("@el.check('sect:list')") public ResponseEntity createTask2(@RequestBody Map whereJson) { return new ResponseEntity<>(HandService.createTask2(whereJson), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java index 6f6e9c3..79b6f1e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java @@ -641,7 +641,7 @@ public class HFHandServiceImpl implements HFHandService { instdto.setInstruction_status("0"); InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); WQLObject instwo = WQLObject.getWQLObject("acs_instruction"); - JSONObject instcheckjson = instwo.query(" instruction_status <2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'").uniqueResult(0); + JSONObject instcheckjson = instwo.query(" instruction_status < 2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'").uniqueResult(0); if (instcheckjson != null) { jo.put("code", "2"); jo.put("desc", "操作失败"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index e576ba7..30a73b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.math.BigDecimal; import java.util.LinkedList; import java.util.Map; @@ -302,9 +303,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (StrUtil.equals(is_first, "true")) { JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0); redisUtils.set(barcode,ivtJson.getString("material_id")); + redisUtils.set(barcode+"-ivt_qty",ivtJson.getString("ivt_qty")); materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id")); } String material_id = String.valueOf(redisUtils.get(barcode)); + String ivt_qty = String.valueOf(redisUtils.get(barcode+"-ivt_qty")); Long materialId = null; String point_status = "2"; if (StrUtil.equals("0",barcode)){ @@ -319,6 +322,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { StructivtDto structivtDto = structivtService.findByCode(device_code); structivtDto.setMaterial_id(materialId); structivtDto.setVehicle_code(barcode); + structivtDto.setIvt_qty(new BigDecimal(ivt_qty)); VehicleDto vehicleDto = vehicleService.findByCode(barcode); if (ObjectUtil.isNotEmpty(vehicleDto)) { structivtDto.setVehicle_type(vehicleDto.getVehicle_type()); @@ -348,12 +352,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } if (ll.size() == (HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) && isHasGoods) { ll.removeFirst(); + materialbaseDto = materialbaseService.findById(ivtJsonObject.getLong("material_id")); JSONObject map = new JSONObject(); map.put("vehicle_type", ivtJsonObject.getString("vehicle_type")); map.put("vehicle_code", ivtJsonObject.getString("vehicle_code")); if (ObjectUtil.isNotEmpty(materialbaseDto)) { map.put("material_code", materialbaseDto.getMaterial_code()); } + map.put("ivt_qty",ivtJsonObject.getString("ivt_qty")); boolean flag = klzhcwUtil.judge(ll, map); if (flag) { jsonObject.put("lock_type", "1"); @@ -365,6 +371,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { ivtJson.put("vehicle_type", ""); ivtJson.put("vehicle_code", ""); ivtJson.put("material_id", ""); + ivtJson.put("ivt_qty", "0"); wo_ivt.update(ivtJson); } } else if (ll.size() == (HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) && !isHasGoods) { @@ -374,6 +381,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jsonGT2.put("vehicle_code", ""); jsonGT2.put("vehicle_type", ""); jsonGT2.put("material_id", ""); + jsonGT2.put("ivt_qty", "0"); wo_ivt.update(jsonGT2); JSONObject jsonObject2 = wo.query("point_code = '" + jsonGT2.getString("point_code") + "'").uniqueResult(0); jsonObject2.put("point_status", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/inStruct/wql/PDA_InStruct_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/inStruct/wql/PDA_InStruct_01.wql index 3290e40..a79f961 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/inStruct/wql/PDA_InStruct_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/inStruct/wql/PDA_InStruct_01.wql @@ -47,7 +47,7 @@ FROM sch_base_region WHERE - region_code = 'GT01' + region_code = 'GT1' ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java index d137687..3694ffb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java @@ -4,15 +4,15 @@ package org.nl.wms.pda.scanGroup; * 区域枚举 */ public enum HcwNumEnum { - KLZHCQ(1, "KLZHCQ", 12), - KLZCQ(2, "KLZCQ", 25), + KLZHCQ(1, "KLZHCQ", 10), + KLZCQ(2, "KLZCQ", 26), MLZZCQ(3, "MLZZCQ", 26), - YLJQ(4, "YLJQ", 0), - HNJQ(5, "HNJQ", 0), + YLJQ(4, "YLJQ", 8), + HNJQ(5, "HNJQ", 2), GT1(6, "GT1", 1), GT2(7, "GT2", 1), - GT3(8, "GT3", 0), - GT4(9, "GT4", 0); + GT3(8, "GT3", 1), + GT4(9, "GT4", 1); private int index; private String code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/KlzhcwUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/KlzhcwUtil.java index a824165..1502857 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/KlzhcwUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/KlzhcwUtil.java @@ -36,6 +36,10 @@ public class KlzhcwUtil { if (ll.size() == 0) ll = structivtService.reload(); String vehicle_code = param.getString("vehicle_code"); String material_code = param.getString("material_code"); + String ivt_qty = param.getString("ivt_qty"); + if (StrUtil.isEmpty(ivt_qty)){ + ivt_qty = "0"; + } VehicleDto vehicle = vehicleService.findByCode(vehicle_code); String vehicle_type = vehicle.getVehicle_type(); //判断原先缓存个数 如果小于缓存区的个数 就将当前入库的托盘信息添加到缓存中 @@ -47,6 +51,7 @@ public class KlzhcwUtil { map.put("vehicle_code", vehicle_code); map.put("vehicle_type", vehicle_type); map.put("material_code", material_code); + map.put("ivt_qty",ivt_qty); ll.addLast(map); //添加以后仍然小于或等于困料缓存区的个数 所以执行小于困料缓存区个数更新库存的逻辑-直接更新库存 flag = this.lessThan25(ll); @@ -58,6 +63,7 @@ public class KlzhcwUtil { map.put("vehicle_code", vehicle_code); map.put("vehicle_type", vehicle_type); map.put("material_code", material_code); + map.put("ivt_qty",ivt_qty); ll.addLast(map); //如果说有手工出库的缓存信息 //将入库的信息添加到缓存中 此时缓存中的个数还是等于困料缓存区个数 所以执行直接更新库存 @@ -75,6 +81,7 @@ public class KlzhcwUtil { map.put("vehicle_code", vehicle_code); map.put("vehicle_type", vehicle_type); map.put("material_code", material_code); + map.put("ivt_qty",ivt_qty); ll.addLast(map); flag = this.equle25(ll); } else if (ll.size() == HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) { @@ -111,9 +118,12 @@ public class KlzhcwUtil { MaterialbaseDto materialbaseDto = materialbaseService.findByCode(ll.get(ll.size() - i - 1).getString("material_code")); jsonObject.put("vehicle_code", ll.get(ll.size() - i - 1).getString("vehicle_code")); jsonObject.put("vehicle_type", ll.get(ll.size() - i - 1).getString("vehicle_type")); + jsonObject.put("ivt_qty", ll.get(ll.size() - i - 1).getString("ivt_qty")); if (ObjectUtil.isNotEmpty(materialbaseDto)) { jsonObject.put("material_id", materialbaseDto.getMaterial_id()); point_status = "3"; + }else { + jsonObject.put("material_id", ""); } jsonObject.put("instorage_time", DateUtil.now()); wo.update(jsonObject); @@ -137,9 +147,12 @@ public class KlzhcwUtil { MaterialbaseDto materialbaseDto = materialbaseService.findByCode(ll.get(0).getString("material_code")); jsonObject.put("vehicle_code", ll.get(0).getString("vehicle_code")); jsonObject.put("vehicle_type", ll.get(0).getString("vehicle_type")); + jsonObject.put("ivt_qty", ll.get(0).getString("ivt_qty")); if (ObjectUtil.isNotEmpty(materialbaseDto)) { jsonObject.put("material_id", materialbaseDto.getMaterial_id()); point_status = "3"; + }else { + jsonObject.put("material_id", ""); } jsonObject.put("instorage_time", DateUtil.now()); wo.update(jsonObject); @@ -154,12 +167,16 @@ public class KlzhcwUtil { jsonObject = jsonArray.getJSONObject(i); String vehicleCode = ll.get(ll.size() - i - 1).getString("vehicle_code"); String vehicleType = ll.get(ll.size() - i - 1).getString("vehicle_type"); + String ivt_qty = ll.get(ll.size() - i - 1).getString("ivt_qty"); //修改库存信息 jsonObject.put("vehicle_code", vehicleCode); jsonObject.put("vehicle_type", vehicleType); + jsonObject.put("ivt_qty", ivt_qty); if (ObjectUtil.isNotEmpty(materialbaseDto)) { jsonObject.put("material_id", materialbaseDto.getMaterial_id()); point_status = "3"; + }else { + jsonObject.put("material_id", ""); } jsonObject.put("instorage_time", DateUtil.now()); wo.update(jsonObject); @@ -175,18 +192,28 @@ public class KlzhcwUtil { public Boolean equles26(LinkedList ll, JSONObject param) { String vehicle_code = param.getString("vehicle_code"); String material_code = param.getString("material_code"); + String ivt_qty = param.getString("ivt_qty"); + if (StrUtil.isEmpty(ivt_qty)){ + ivt_qty = "0"; + } VehicleDto vehicle = vehicleService.findByCode(vehicle_code); - String vehicle_type = vehicle.getVehicle_type(); + String vehicle_type = ""; + if (ObjectUtil.isNotEmpty(vehicle)){ + vehicle_type = vehicle.getVehicle_type(); + } WQLObject wo = WQLObject.getWQLObject("ST_IVT_StructIvt"); WQLObject wo_point = WQLObject.getWQLObject("sch_base_point"); String point_status = "2"; JSONObject jsonObject = wo.query("region_code = '" + HcwNumEnum.GT1.getCode() + "'").uniqueResult(0); jsonObject.put("vehicle_code", vehicle_code); jsonObject.put("vehicle_type", vehicle_type); + jsonObject.put("ivt_qty", ivt_qty); MaterialbaseDto materialbaseDto = materialbaseService.findByCode(material_code); if (ObjectUtil.isNotEmpty(materialbaseDto)) { jsonObject.put("material_id", materialbaseDto.getMaterial_id()); point_status = "3"; + }else { + jsonObject.put("material_id", ""); } jsonObject.put("instorage_time", DateUtil.now()); wo.update(jsonObject); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java index dfe0abb..0d8fb7e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java @@ -4,15 +4,15 @@ package org.nl.wms.sch.tasks; * 区域枚举 */ public enum RegionTypeEnum { - KLZHCQ(1, "KLZHCQ", "空料盅缓存区","1586240366032588800"), - KLZCQ(2, "KLZCQ", "困料暂存区","1586240455950077952"), - MLZZCQ(3, "MLZHCQ", "满料盅缓存区","1586240614075338752"), - YLJQ(4, "YLJQ", "压力机区","1586887408316715008"), - HNJQ(5, "HNJQ", "混碾机区","1586887462549065728"), - GT1(6, "GT1", "1号接驳滚筒机区","1586888185684824064"), - GT2(7, "GT2", "2号接驳滚筒机区","1586888795951861760"), - GT3(8, "GT3", "3号接驳滚筒机区","1586888837689380864"), - GT4(9, "GT4", "4号接驳滚筒机区","1586888946166665216"); + KLZHCQ(1, "KLZHCQ", "空料盅缓存区", "1586240366032588800"), + KLZCQ(2, "KLZCQ", "困料暂存区", "1586240455950077952"), + MLZZCQ(3, "MLZHCQ", "满料盅缓存区", "1586240614075338752"), + YLJQ(4, "YLJQ", "压力机区", "1586887408316715008"), + HNJQ(5, "HNJQ", "混碾机区", "1586887462549065728"), + GT1(6, "GT1", "1号接驳滚筒机区", "1586888185684824064"), + GT2(7, "GT2", "2号接驳滚筒机区", "1586888795951861760"), + GT3(8, "GT3", "3号接驳滚筒机区", "1586888837689380864"), + GT4(9, "GT4", "4号接驳滚筒机区", "1586888946166665216"); private int index; private String code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java index fd621d2..0f231f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java @@ -201,7 +201,7 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_name("混碾机呼叫空料盅") - .task_type("task_type") + .task_type("hnjcallempty") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .priority("1") @@ -227,18 +227,22 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } - } else { throw new BadRequestException("任务已删除或者已完成!"); } @@ -250,18 +254,23 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } - }else { + } else { throw new BadRequestException("任务已删除或者已完成!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java index 2d251c2..edc099e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java @@ -233,7 +233,7 @@ public class YljCallMaterialTask extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_name("压力机叫料") - .task_type("task_type") + .task_type("yljcallm") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .priority("1") @@ -261,16 +261,21 @@ public class YljCallMaterialTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } } else { @@ -285,16 +290,21 @@ public class YljCallMaterialTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } }else { throw new BadRequestException("任务已删除或者已完成!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java index e2a7c88..53f90a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java @@ -307,7 +307,7 @@ public class HandlingTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder().task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") + .task_type("sc") .task_name("手持创建搬运任务") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(start_point_code) @@ -362,16 +362,21 @@ public class HandlingTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } } else { @@ -385,18 +390,23 @@ public class HandlingTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } - }else { + } else { throw new BadRequestException("任务已删除或者已完成!"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/KzdjwSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/KzdjwSendEmpVehicleTask.java index 229e1be..4169e7e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/KzdjwSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/KzdjwSendEmpVehicleTask.java @@ -190,7 +190,7 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder() .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") + .task_type("klzdjwsendempty") .task_name("空料盅对接位呼叫送空盅") .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) @@ -217,16 +217,21 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } } else { @@ -240,16 +245,21 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } }else { throw new BadRequestException("任务已删除或者已完成!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java index b0d7ccf..197989c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java @@ -172,6 +172,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(materialbaseDto)) { param.put("material_code", materialbaseDto.getMaterial_code()); } + param.put("ivt_qty",taskObj.getString("qty")); boolean flag = klzhcwUtil.judge(ll, param); if (flag) { jsonEnd.put("lock_type", "1"); @@ -189,6 +190,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { jsonObject.put("vehicle_type", taskObj.getString("vehicle_type")); jsonObject.put("vehicle_code", taskObj.getString("vehicle_code")); jsonObject.put("material_id", taskObj.getString("material_id")); + jsonObject.put("ivt_qty", taskObj.getString("qty")); jsonObject.put("instorage_time", DateUtil.now()); ivtTab.update(jsonObject); //解锁终点 @@ -335,6 +337,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { String point_code1 = whereJson.getString("point_code1"); String create_mode = whereJson.getString("create_mode"); String is_auto_issue = whereJson.getString("is_auto_issue"); + String qty = whereJson.getString("weight"); //生产工单表【PDM_BD_WorkOrder】 WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); @@ -362,7 +365,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_name("混碾机满盅入库之取空") - .task_type("task_type") + .task_type("hnjsendm") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code1) .priority("1") @@ -381,7 +384,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_name("混碾机满盅入库之取满") - .task_type("task_type") + .task_type("hnjsendm") .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) .priority("1") @@ -389,6 +392,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { .is_auto_issue(is_auto_issue) .task_group_id(task_group_id) .sort_seq(2) + .material_qty(qty) .acs_task_type("1") .create_mode(create_mode) .material_info_id(workOrderObj.getLong("workorder_id")) @@ -413,16 +417,21 @@ public class HnjSendMaterialTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } } else { @@ -438,16 +447,21 @@ public class HnjSendMaterialTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } } else { throw new BadRequestException("任务已删除或者已完成!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java index 18d0838..1c6959a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java @@ -181,7 +181,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_name("定时任务生成空料盅区有料到困料区的任务") - .task_type("task_type") + .task_type("timing") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code1(point_code1) .point_code2(point_code2) @@ -226,18 +226,22 @@ public class TimingSendMaterialTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.forceFinishToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.forceFinishToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } } else { - throw new BadRequestException(String.valueOf(resp.get("message"))); + this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); } - } else { throw new BadRequestException("任务已删除或者已完成!"); } @@ -249,18 +253,23 @@ public class TimingSendMaterialTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", task_id); - map.put("task_code", taskObj.getString("task_code")); - array.add(map); - Map resp = wmsToAcsService.cancelToAcs(array); - if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){ + Integer task_status = taskObj.getInteger("task_status"); + if (task_status >= 5) { + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", task_id); + map.put("task_code", taskObj.getString("task_code")); + array.add(map); + Map resp = wmsToAcsService.cancelToAcs(array); + if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException(String.valueOf(resp.get("message"))); + } + } else { this.updateTaskStatus(taskObj, "0"); - }else { - throw new BadRequestException(String.valueOf(resp.get("message"))); } - }else { + } else { throw new BadRequestException("任务已删除或者已完成!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java index 8cb77e8..d2da6c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java @@ -325,6 +325,7 @@ public class StructivtServiceImpl implements StructivtService { // ll.clear(); JSONObject jsonObject = wo.query("region_code = '" + HcwNumEnum.GT2.getCode() + "'").uniqueResult(0); String material_id_gt = jsonObject.getString("material_id"); + String ivt_qty = jsonObject.getString("ivt_qty"); JSONObject jsonMa_gt = new JSONObject(); String material_code_gt2 = ""; if (StrUtil.isNotEmpty(material_id_gt)) { @@ -336,6 +337,7 @@ public class StructivtServiceImpl implements StructivtService { map.put("vehicle_code", jsonObject.getString("vehicle_code")); map.put("vehicle_type", jsonObject.getString("vehicle_type")); map.put("material_code", material_code_gt2); + map.put("ivt_qty", ivt_qty); ll.addLast(map); } JSONArray jsonArray = wo.query("region_code = '" + HcwNumEnum.KLZCQ.getCode() + "'", "point_code").getResultJSONArray(0); @@ -363,6 +365,7 @@ public class StructivtServiceImpl implements StructivtService { map.put("vehicle_code", jsonObject1.getString("vehicle_code")); map.put("vehicle_type", jsonObject1.getString("vehicle_type")); map.put("material_code", material_code); + map.put("ivt_qty", jsonObject1.getString("ivt_qty")); ll.addLast(map); } } else { @@ -370,11 +373,10 @@ public class StructivtServiceImpl implements StructivtService { map.put("vehicle_code", jsonObject1.getString("vehicle_code")); map.put("vehicle_type", jsonObject1.getString("vehicle_type")); map.put("material_code", material_code); + map.put("ivt_qty", jsonObject1.getString("ivt_qty")); ll.addLast(map); } } - redisUtils.set("ll", ll); - System.out.println(ll.size()); return ll; }