From 0dac23d40cf2755d4c164b65c59cd81a9f42deb1 Mon Sep 17 00:00:00 2001 From: loujf Date: Sat, 17 Sep 2022 14:54:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java | 6 ++---- .../LnshLaminatingMachineDeviceDriver.java | 3 +++ .../org/nl/hand/amb/service/impl/JnHandServiceImpl.java | 4 ++-- .../src/main/java/org/nl/wms/common/StructFindUtil.java | 5 ++++- .../src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql | 4 ++++ .../sendMaterial/service/impl/SendMaterialServiceImpl.java | 2 +- .../org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java | 3 +++ 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index c7021f7..0edeb83 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -462,6 +462,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { inst.setExecute_status("3"); // lnshStationDeviceDriver.setFlag(3); lnshStationDeviceDriver.writing(6); + lnshStationDeviceDriver.setInst(inst); is_feedback = true; } } else if ("NOP".equals(action)) { @@ -604,7 +605,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() > 0) { inst.setExecute_device_code(address); inst.setExecute_status("4"); - lnshStationDeviceDriver.setInst(inst); is_feedback = true; } } @@ -633,7 +633,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { is_feedback = true; } } else if ("NOP".equals(action)) { - if (lnshLaminatingMachineDeviceDriver.getMode() != 0) { + if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMode() != 6) { inst.setExecute_device_code(address); inst.setExecute_status("4"); lnshLaminatingMachineDeviceDriver.writing(1); @@ -817,8 +817,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { flag = true; lnshStationDeviceDriver.writing(3); // lnshStationDeviceDriver.setFlag(4); -// Instruction inst = instructionService.findByNextCode(address); -// lnshStationDeviceDriver.setInst(inst); } // } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index e7465fd..7fb0c77 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -134,6 +134,9 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } if (move != last_move) { + if (move == 0) { + this.writing(0); + } logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/JnHandServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/JnHandServiceImpl.java index 9ef4923..c4598a3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/JnHandServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/JnHandServiceImpl.java @@ -546,7 +546,7 @@ public class JnHandServiceImpl implements JnHandService { return jo; } String task_id = instwo.getString("task_id"); - Instruction instdto = (Instruction) JSONObject.toJSON(Instruction.class); + Instruction instdto = (Instruction) instwo.toJavaObject(Instruction.class); MagicAgvService agvService = SpringContextHolder.getBean(MagicAgvServiceImpl.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); @@ -678,7 +678,7 @@ public class JnHandServiceImpl implements JnHandService { if (type.equals("2")) { //手工完成 TaskService taskService = SpringContextHolder.getBean(TaskServiceImpl.class); - TaskDto acsTask = (TaskDto) JSONObject.toJSON(TaskDto.class); + TaskDto acsTask = taskjo.toJavaObject(TaskDto.class); InstructionService instructionservice = SpringContextHolder.getBean(InstructionServiceImpl.class); InstructionDto instdto = instructionservice.findByTaskid(acsTask.getTask_id(), "instruction_status <2 "); if (instdto != null){ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index d0aea7c..2770679 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -86,6 +86,7 @@ public class StructFindUtil { public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) { String area_type = jsonObject.getString("area_type"); String vehicle_type = jsonObject.getString("vehicle_type"); + String point_code = jsonObject.getString("point_code"); if (StrUtil.isEmpty(area_type)) { throw new BadRequestException("区域不能为空！"); } @@ -95,7 +96,9 @@ public class StructFindUtil { .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); } else { result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") - .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); + .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type) + .addParam("point_code",point_code). + process().uniqueResult(0); } return result; } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 22c5117..7bd293c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -25,6 +25,7 @@ 输入.next_point_code TYPEAS s_string 输入.point_code TYPEAS s_string 输入.group_device TYPEAS s_string + 输入.point_code TYPEAS s_string [临时表] @@ -190,6 +191,9 @@ IF 输入.flag = "5" OPTION 输入.area_type <> "" point.area_type = 输入.area_type ENDOPTION + OPTION 输入.point_code <> "" + point.point_code = 输入.point_code + ENDOPTION OPTION 输入.vehicle_type <> "" vehicle.vehicle_type = 输入.vehicle_type ENDOPTION diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java index 4bf1f27..cea0d18 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java @@ -111,7 +111,7 @@ public class SendMaterialServiceImpl implements SendMaterialService { String device_id = pointObj.getString("device_id"); //2 根据设备去找对应的生产任务 JSONObject productTaskObj = WQLObject.getWQLObject("PDM_MG_produceTask") - .query("device_id ='" + device_id + "' and producetask_status in ('03','02','04')", "seq_no") + .query("device_id ='" + device_id + "' and producetask_status in ('03','02','04')", "") .uniqueResult(0); if (ObjectUtil.isEmpty(productTaskObj)) { throw new BadRequestException("未找到点位为'" + code + "'的生产任务！"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java index 082241f..9050b08 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java @@ -210,6 +210,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { case YZGX: vehicle_type = VehicleTypeEnum.GTP.getCode(); start_area = AreaEnum.KTTDDQ.getCode(); + start_point_code="KTPDDW5"; break; //分拣工序 case FJGX: @@ -235,6 +236,8 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { param.put("vehicle_type", vehicle_type); } param.put("area_type", start_area); + param.put("point_code",start_point_code); + JSONObject outStructObj = StructFindUtil.getEmptyVehicleOutStruct(param); if (ObjectUtil.isEmpty(outStructObj)) { throw new BadRequestException("未找到合适的空托盘点位");