From 3ee0d6d5ae1747481e359b68c0c56d219726aa0b Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Sun, 10 Jul 2022 15:57:19 +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 --- .../service/impl/DeviceServiceImpl.java | 1 + .../java/org/nl/acs/device/wql/task_inst.xls | Bin 189440 -> 189952 bytes .../HailiangEngravingCacheDeviceDriver.java | 17 +- .../HailiangEngravingMachineDeviceDriver.java | 5 + .../HailiangPackerStationDeviceDriver.java | 207 +++++++++--------- ...ailiangSpecialFullStationDeviceDriver.java | 82 ++++++- ...ailiangSpecialPourStationDeviceDriver.java | 74 +++++++ .../acs/ext/wms/rest/AcsToWmsController.java | 15 ++ .../acs/ext/wms/service/AcsToWmsService.java | 16 ++ .../wms/service/impl/AcsToWmsServiceImpl.java | 69 +++++- .../service/impl/InstructionServiceImpl.java | 11 +- .../org/nl/acs/task/service/dto/TaskDto.java | 5 + .../modules/quartz/task/AutoCleanUpLogs.java | 4 +- 13 files changed, 376 insertions(+), 130 deletions(-) diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 0ce84a6f..22fbec58 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -937,6 +937,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial obj.setHasgoods(hasGoodStatus); obj.setMaterial_type(material_type); obj.setBatch(batch); + obj.setIslock(islock); hailiangEngravingCacheDeviceDriver.setMaterial(material_type); if (hailiangEngravingCacheDeviceDriver.getMove() != Integer.parseInt(hasGoodStatus)){ hailiangEngravingCacheDeviceDriver.writing("to_cache_write",hasGoodStatus); diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls index aebc15e620a56f5da4a9ab7fa97624a3af1870fe..50a6b4406253df7851dc0b68b678f0037c881c84 100644 GIT binary patch delta 13076 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 delta 13075 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 G@c#f0?}H2g diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java index 222d754b..64c97340 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java @@ -250,31 +250,22 @@ public class HailiangEngravingCacheDeviceDriver extends AbstractOpcDeviceDriver instructionService.update(inst); // TODO 指令中根据起始点位驱动类型判断空满 String start_device_code = inst.getStart_device_code(); + log.warn("起点设备为:{}",start_device_code); String next_device_code = inst.getNext_device_code(); + log.warn("终点设备为:{}",next_device_code); Device start_device = deviceAppservice.findDeviceByCode(start_device_code); Device next_device = deviceAppservice.findDeviceByCode(next_device_code); - WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint"); if (start_device.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver){ writing("to_cache_write", "2"); this.setMaterial(inst.getMaterial()); next_device.setMaterial_type(inst.getMaterial()); - JSONObject updatejson = new JSONObject(); - updatejson.put("hasgoods","2"); - updatejson.put("islock","0"); - updatejson.put("material_type",inst.getMaterial()); - runpointwo.update(updatejson, "device_code = '" + device_code + "'"); - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "起点位置刻字机，缓存位锁定成功"); + logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "起点位置刻字机，缓存位解锁成功"); } if (start_device.getDeviceDriver() instanceof HailiangPackerStationDeviceDriver){ writing("to_cache_write", "1"); this.setMaterial(""); next_device.setMaterial_type(""); - JSONObject updatejson = new JSONObject(); - updatejson.put("hasgoods","1"); - updatejson.put("islock","0"); - updatejson.put("material_type",""); - runpointwo.update(updatejson, "device_code = '" + device_code + "'"); - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "起点位置包装机，缓存位锁定成功"); + logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "起点位置包装机，缓存位解锁成功"); } byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); OneNDCSocketConnectionAutoRun.write(data); diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java index acaa89f6..b7b6b67d 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java @@ -364,6 +364,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive if ( move == 1 && mode == 1 && full_req == 1 ) { // if ( full_req == 1 ) { logServer.deviceLogToacs(this.device_code,"","",device_code+":,move:"+move+",requireSucess:" + requireSucess + "开始申请任务"); + apply_task(); } else { logServer.deviceLogToacs(this.device_code,"","","不满足下发满框请求任务条件，mode:"+mode+"move:"+move+"full_req:"+full_req); @@ -589,6 +590,10 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "未找到对应设备工单"); throw new BadRequestException(this.device_code + ":关联设备" + link_device + "未找到对应设备工单"); } + if (order.getIs_needmove().equals("0")){ + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "工单，不需要agv搬运"); + return false; + } //查找当前工单对应的物料编号 String cpbh = order.getMaterial_code(); diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java index 991d4194..9949577e 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java @@ -179,69 +179,69 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i await_time = this.itemProtocol.getItem_await_time(); //待机时间（S) order = this.itemProtocol.getItem_order(); //工单号 if (mode != last_mode) { - logServer.deviceLog(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceLogToacs(this.device_code,"","","信号mode:" + last_mode + "->" + mode); + logServer.deviceLog(this.device_code, "mode", String.valueOf(mode)); + logServer.deviceLogToacs(this.device_code, "", "", "信号mode:" + last_mode + "->" + mode); } if (move != last_move) { - logServer.deviceLog(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceLogToacs(this.device_code,"","","信号move(取反):" + last_move + "->" + move); + logServer.deviceLog(this.device_code, "move", String.valueOf(move)); + logServer.deviceLogToacs(this.device_code, "", "", "信号move(取反):" + last_move + "->" + move); } if (packer_ready != last_packer_ready) { - logServer.deviceLog(this.device_code,"packer_ready" ,String.valueOf(packer_ready)); - logServer.deviceLogToacs(this.device_code,"","","信号packer_ready:" + last_packer_ready + "->" + packer_ready); + logServer.deviceLog(this.device_code, "packer_ready", String.valueOf(packer_ready)); + logServer.deviceLogToacs(this.device_code, "", "", "信号packer_ready:" + last_packer_ready + "->" + packer_ready); } if (lack_req != last_lack_req) { - if(lack_req == 0){ + if (lack_req == 0) { this.setRequireSucess(false); } - logServer.deviceLog(this.device_code,"lack_req" ,String.valueOf(lack_req)); - logServer.deviceLogToacs(this.device_code,"","","信号lack_req:" + last_lack_req + "->" + lack_req); + logServer.deviceLog(this.device_code, "lack_req", String.valueOf(lack_req)); + logServer.deviceLogToacs(this.device_code, "", "", "信号lack_req:" + last_lack_req + "->" + lack_req); } if (hopper_already != last_hopper_already) { - logServer.deviceLog(this.device_code,"hopper_already" ,String.valueOf(hopper_already)); - logServer.deviceLogToacs(this.device_code,"","","信号hopper_already:" + last_hopper_already + "->" + hopper_already); + logServer.deviceLog(this.device_code, "hopper_already", String.valueOf(hopper_already)); + logServer.deviceLogToacs(this.device_code, "", "", "信号hopper_already:" + last_hopper_already + "->" + hopper_already); } if (req_task_empty != last_req_task_empty) { - if(req_task_empty==0){ + if (req_task_empty == 0) { this.setRequireSucess(false); } - logServer.deviceLog(this.device_code,"req_task_empty" ,String.valueOf(req_task_empty)); - logServer.deviceLogToacs(this.device_code,"","","信号req_task_empty:" + last_req_task_empty + "->" + req_task_empty); + logServer.deviceLog(this.device_code, "req_task_empty", String.valueOf(req_task_empty)); + logServer.deviceLogToacs(this.device_code, "", "", "信号req_task_empty:" + last_req_task_empty + "->" + req_task_empty); } if (hopper_removed != last_hopper_removed) { - logServer.deviceLog(this.device_code,"hopper_removed" ,String.valueOf(hopper_removed)); - logServer.deviceLogToacs(this.device_code,"","","信号hopper_removed:" + last_hopper_removed + "->" + hopper_removed); + logServer.deviceLog(this.device_code, "hopper_removed", String.valueOf(hopper_removed)); + logServer.deviceLogToacs(this.device_code, "", "", "信号hopper_removed:" + last_hopper_removed + "->" + hopper_removed); } if (order_finish != last_order_finish) { - logServer.deviceLog(this.device_code,"order_finish" ,String.valueOf(order_finish)); - logServer.deviceLogToacs(this.device_code,"","","信号order_finish:" + last_order_finish + "->" + order_finish); + logServer.deviceLog(this.device_code, "order_finish", String.valueOf(order_finish)); + logServer.deviceLogToacs(this.device_code, "", "", "信号order_finish:" + last_order_finish + "->" + order_finish); } if (error != last_error) { - logServer.deviceLog(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceLogToacs(this.device_code,"","","信号error:" + last_error + "->" + error); + logServer.deviceLog(this.device_code, "error", String.valueOf(error)); + logServer.deviceLogToacs(this.device_code, "", "", "信号error:" + last_error + "->" + error); } if (order_now != last_order_now) { - logServer.deviceLog(this.device_code,"order_now" ,String.valueOf(order_now)); - logServer.deviceLogToacs(this.device_code,"","","信号order_now:" + last_order_now + "->" + order_now); + logServer.deviceLog(this.device_code, "order_now", String.valueOf(order_now)); + logServer.deviceLogToacs(this.device_code, "", "", "信号order_now:" + last_order_now + "->" + order_now); } if (open_ready_time != last_open_ready_time) { - logServer.deviceLog(this.device_code,"open_ready_time" ,String.valueOf(open_ready_time)); - logServer.deviceLogToacs(this.device_code,"","","信号open_ready_time:" + last_open_ready_time + "->" + open_ready_time); + logServer.deviceLog(this.device_code, "open_ready_time", String.valueOf(open_ready_time)); + logServer.deviceLogToacs(this.device_code, "", "", "信号open_ready_time:" + last_open_ready_time + "->" + open_ready_time); } if (device_running_time != last_device_running_time) { - logServer.deviceLog(this.device_code,"device_running_time" ,String.valueOf(device_running_time)); - logServer.deviceLogToacs(this.device_code,"","","信号device_running_time:" + last_device_running_time + "->" + device_running_time); + logServer.deviceLog(this.device_code, "device_running_time", String.valueOf(device_running_time)); + logServer.deviceLogToacs(this.device_code, "", "", "信号device_running_time:" + last_device_running_time + "->" + device_running_time); } if (await_time != last_await_time) { - logServer.deviceLog(this.device_code,"await_time" ,String.valueOf(await_time)); - logServer.deviceLogToacs(this.device_code,"","","信号await_time:" + last_await_time + "->" + await_time); + logServer.deviceLog(this.device_code, "await_time", String.valueOf(await_time)); + logServer.deviceLogToacs(this.device_code, "", "", "信号await_time:" + last_await_time + "->" + await_time); } if (order != last_order) { - logServer.deviceLog(this.device_code,"order" ,String.valueOf(order)); - logServer.deviceLogToacs(this.device_code,"","","信号order:" + last_order + "->" + order); + logServer.deviceLog(this.device_code, "order", String.valueOf(order)); + logServer.deviceLogToacs(this.device_code, "", "", "信号order:" + last_order + "->" + order); } /* if (mode == 2 && move != 0 && task > 0) { @@ -273,90 +273,89 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i Instruction instruction = null; List toInstructions; - if ( mode == 1 && order_finish != last_order_finish && order_finish == 1 && order > 0){ + if (mode == 1 && order_finish != last_order_finish && order_finish == 1 && order > 0) { ProduceshiftorderDto dto = new ProduceshiftorderDto(); dto.setOrder_code(order + ""); dto.setOrder_status("2"); ProduceshiftorderDto deviceInfo = produceshiftorderService.findOrderByDeviceCode(this.device_code); - if(deviceInfo != null){ + if (deviceInfo != null) { if (StrUtil.isNotEmpty(deviceInfo.getExt_order_id())) { String ext_order_id = deviceInfo.getExt_order_id(); JSONObject param = new JSONObject(); - param.put("ext_order_id",ext_order_id); + param.put("ext_order_id", ext_order_id); acsToWmsService.feedbackOrderStatus(param); - logServer.deviceLogToacs(this.device_code,"","",device_code+":,对应的工单的外部标识："+ext_order_id); - }else { - logServer.deviceLogToacs(this.device_code,"","",device_code+":,对应的工单的没有外部标识"); + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,对应的工单的外部标识：" + ext_order_id); + } else { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,对应的工单的没有外部标识"); } - }else { - logServer.deviceLogToacs(this.device_code,"","",device_code+":,对应的工单信息为空"); + } else { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,对应的工单信息为空"); } produceshiftorderService.updateByOrderCode(dto); - this.writing("to_confirm_finished","1"); - this.writing("to_clear","1"); - this.writing("to_pause","1"); - logServer.deviceLogToacs(this.device_code,"","",device_code+":,任务确认完成，电器信号写入成功"); + this.writing("to_confirm_finished", "1"); + this.writing("to_clear", "1"); + this.writing("to_pause", "1"); + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,任务确认完成，电器信号写入成功"); } else { - logServer.deviceLogToacs(this.device_code,"","",device_code+":,move:"+move + ",order_finish>"+ order_finish +",last_order_finish>"+last_order_finish); + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,move:" + move + ",order_finish>" + order_finish + ",last_order_finish>" + last_order_finish); } - if(ObjectUtil.isEmpty(inst)){ - if(!requireSucess){ - if (lack_req == 1 && move == 0) { - logServer.deviceLogToacs(this.device_code,"","",device_code+":,move:"+move+",requireSucess:" + requireSucess + "开始申请缺料请求任务"); + if (ObjectUtil.isEmpty(inst)) { + if (!requireSucess) { + if (mode == 1 && lack_req == 1 && move == 0) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,move:" + move + ",mode:" + mode + ",requireSucess:" + requireSucess + "开始申请缺料请求任务"); apply_task(); } - if (req_task_empty == 1 && move == 1){ - logServer.deviceLogToacs(this.device_code,"","",device_code+":,move:"+move+",requireSucess:" + requireSucess + "开始申请请求取走空料斗任务"); + if (mode == 1 && req_task_empty == 1 && move == 1) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,move:" + move + ",mode:" + mode + ",requireSucess:" + requireSucess + "开始申请请求取走空料斗任务"); apply_take_empty_task(); } - logServer.deviceLogToacs(this.device_code,"","","lack_req:"+lack_req+"move:"+move+"req_task_empty:"+req_task_empty); + logServer.deviceLogToacs(this.device_code, "", "", "lack_req:" + lack_req + "move:" + move + "req_task_empty:" + req_task_empty); } else { - logServer.deviceLogToacs(this.device_code,"","","是否请求成功：requireSucess:"+requireSucess); + logServer.deviceLogToacs(this.device_code, "", "", "是否请求成功：requireSucess:" + requireSucess); } } - if(agvphase == 0x03) - { + if (agvphase == 0x03) { //&& lack_req =1 缺料请求 先不判断 /*if( move == 1 && error == 0 && ObjectUtil.isNotEmpty(inst)){*/ - inst.setExecute_status("1"); - instructionService.update(inst); - //writing("to_agv_ready", "1"); - byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); - OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "反馈成功"); + inst.setExecute_status("1"); + instructionService.update(inst); + //writing("to_agv_ready", "1"); + byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); + OneNDCSocketConnectionAutoRun.write(data); + agvphase = 0; + index = 0; + inst = null; + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); /* } else { logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "等待反馈,原因move:"+move+",error:"+error+",inst"+inst); }*/ } - if(agvphase == 0x05){ - if(move ==0 && error == 0 && ObjectUtil.isNotEmpty(inst)){ + if (agvphase == 0x05) { + if (move == 0 && error == 0 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status("2"); instructionService.update(inst); //writing("to_agv_ready", "1"); byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); - writing("to_agv_take_finish","1"); + writing("to_agv_take_finish", "1"); OneNDCSocketConnectionAutoRun.write(data); agvphase = 0; index = 0; inst = null; - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "反馈成功"); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); } else { - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "等待反馈,原因move:"+move+",error:"+error+",inst"+inst); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈,原因move:" + move + ",error:" + error + ",inst" + inst); } } - if(agvphase == 0x07){ - if(move ==0 && error == 0 && ObjectUtil.isNotEmpty(inst)){ + if (agvphase == 0x07) { + if (move == 0 && error == 0 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status("5"); instructionService.update(inst); //writing("to_agv_ready", "1"); @@ -365,15 +364,15 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i agvphase = 0; index = 0; inst = null; - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "反馈成功"); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); } else { - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "等待反馈,原因move:"+move+",error:"+error+",inst"+inst); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈,原因move:" + move + ",error:" + error + ",inst" + inst); } } - if(agvphase == 0x09){ - if(move ==1 && error == 0 && ObjectUtil.isNotEmpty(inst)){ + if (agvphase == 0x09) { + if (move == 1 && error == 0 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status("6"); instructionService.update(inst); writing("to_agv_release_finish", "1"); @@ -385,27 +384,27 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i agvphase = 0; index = 0; inst = null; - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "反馈成功"); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); } else { - logServer.deviceLogToacs(this.device_code,"","","agvphase:" + agvphase + "等待反馈,move:"+move+",error:"+error+",inst:"+inst); + logServer.deviceLogToacs(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈,move:" + move + ",error:" + error + ",inst:" + inst); } } } - last_packer_ready = packer_ready;//包装机就绪 - last_lack_req = lack_req;//缺料请求 - last_hopper_already = hopper_already;//料斗已就位 - last_req_task_empty = req_task_empty;//请求取空料斗 - last_hopper_removed = hopper_removed;//料斗已取走 - last_move = move;//有货 - last_order_finish = order_finish;//订单完成 - last_mode = mode;//模式 所有设备就绪 - last_error = error; //报警信号 - last_order_now = order_now; //订单实时 - last_open_ready_time = open_ready_time; //开机准备时间（S) - last_device_running_time = device_running_time; //设备运转时间（S) - last_await_time = await_time; //待机时间（S) - last_order = order; //工单号 + last_packer_ready = packer_ready;//包装机就绪 + last_lack_req = lack_req;//缺料请求 + last_hopper_already = hopper_already;//料斗已就位 + last_req_task_empty = req_task_empty;//请求取空料斗 + last_hopper_removed = hopper_removed;//料斗已取走 + last_move = move;//有货 + last_order_finish = order_finish;//订单完成 + last_mode = mode;//模式 所有设备就绪 + last_error = error; //报警信号 + last_order_now = order_now; //订单实时 + last_open_ready_time = open_ready_time; //开机准备时间（S) + last_device_running_time = device_running_time; //设备运转时间（S) + last_await_time = await_time; //待机时间（S) + last_order = order; //工单号 } public boolean exe_error() { @@ -435,6 +434,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i public void set_last_container_type_desc(String type) { } + public synchronized boolean apply_take_empty_task() throws Exception { WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint"); @@ -466,13 +466,13 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i continue; } int num = taskserver.querySameDestinationTask(next_device_code); - if(num != 0){ + if (num != 0) { continue; } //判断缓存位是否锁定 JSONObject jsonObject = runpointwo.query("device_code = '" + next_device_code + "' and islock = '1'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)){ - logServer.deviceLogToacs(this.device_code, "", "", "对应路由设备，"+next_device_code+"已锁定"); + if (ObjectUtil.isNotEmpty(jsonObject)) { + logServer.deviceLogToacs(this.device_code, "", "", "对应路由设备，" + next_device_code + "已锁定"); continue; } TaskDto onedto = new TaskDto(); @@ -497,10 +497,10 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i taskserver.create(onedto); //任务创建成功 锁定 JSONObject map = new JSONObject(); - map.put("islock","1"); - map.put("update_by","auto"); + map.put("islock", "1"); + map.put("update_by", "auto"); map.put("update_time", DateUtil.now()); - runpointwo.update(map,"device_code = '" + next_device_code + "'"); + runpointwo.update(map, "device_code = '" + next_device_code + "'"); flag = true; break; } catch (Exception e) { @@ -522,6 +522,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i } return true; } + public synchronized boolean apply_task() throws Exception { Date date = new Date(); if (date.getTime() - this.instruction_apply_time.getTime() < (long) this.instruction_require_time_out) { @@ -540,6 +541,10 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "未找到对应设备工单"); throw new BadRequestException(this.device_code + ":关联设备" + link_device + "未找到对应设备工单"); } + if (order.getIs_needmove().equals("0")) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "工单，不需要agv搬运"); + return false; + } //查找当前工单对应的物料编号 String cpbh = order.getMaterial_code(); @@ -550,18 +555,18 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i Device route_link_device = deviceAppservice.findDeviceByCode(start_device_code); if (route_link_device.getDeviceDriver() instanceof HailiangEngravingCacheDeviceDriver) { hailiangEngravingCacheDeviceDriver = (HailiangEngravingCacheDeviceDriver) route_link_device.getDeviceDriver(); - if (hailiangEngravingCacheDeviceDriver.getMove() == 0 || hailiangEngravingCacheDeviceDriver.getMove() == 1 ) { + if (hailiangEngravingCacheDeviceDriver.getMove() == 0 || hailiangEngravingCacheDeviceDriver.getMove() == 1) { continue; } int num = taskserver.querySameOriginTask(start_device_code); - if(num != 0){ + if (num != 0) { continue; } String material = hailiangEngravingCacheDeviceDriver.getMaterial(); - if(StrUtil.isEmpty(material)){ + if (StrUtil.isEmpty(material)) { continue; } - if (material.equals(cpbh)){ + if (material.equals(cpbh)) { TaskDto onedto = new TaskDto(); String now = DateUtil.now(); onedto.setTask_id(IdUtil.simpleUUID()); @@ -659,7 +664,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); itemMap.put(to_command, value); - logServer.deviceLogToacs(this.device_code,"","","下发信号:" + key + ",value:"+value); + logServer.deviceLogToacs(this.device_code, "", "", "下发信号:" + key + ",value:" + value); ReadUtil.write(itemMap, server); } @@ -707,7 +712,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i dto.setCreate_time(now); WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.insert(json); requireSucess = false; diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java index 84c784f2..0f177bb8 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java @@ -4,16 +4,19 @@ 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; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.sf.json.JSONObject; import org.nl.acs.agv.server.AgvService; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_auto_cache_line.HailiangAutoCacheLineDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_cleaning_feeding_line.HailiangCleaningFeedingLineDefination; import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_cleaning_machine_storage_station.HailiangCleaningMachineStorageStationDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_special_pour_station.HailiangSpecialPourStationDeviceDriver; @@ -394,27 +397,27 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri String empty_device = this.getDevice().getExtraValue().get("empty_device_code").toString(); //通过满料位设备关联的设备tw查找订单 ProduceshiftorderDto order = produceshiftorderService.findOrderByDeviceCode(link_device); - //判断是否需要agv搬运 - if (order.getIs_needmove().equals("0")){ - requireSucess = true; - logServer.deviceLogToacs(this.device_code,"","","不需要agv搬运，工单号:"+order.getOrder_code()); - return true; - } if (ObjectUtil.isEmpty(order)) { logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "未找到对应设备工单"); throw new BadRequestException(this.device_code + ":关联设备" + link_device + "未找到对应设备工单"); } + //判断是否需要agv搬运 + if (order.getIs_needmove().equals("0")){ + requireSucess = true; + logServer.deviceLogToacs(this.device_code,"","","不需要agv搬运，工单号:"+order.getOrder_code()); + return true; + } //查找当前工单对应的物料编号 String cpbh = order.getMaterial_code(); HailiangSpecialPourStationDeviceDriver hailiangSpecialPourStationDeviceDriver; HailiangCleaningMachineStorageStationDeviceDriver hailiangCleaningMachineStorageStationDeviceDriver; + HailiangAutoCacheLineDeviceDriver hailiangAutoCacheLineDeviceDriver; String clear_storage_device =null; //遍历路由，找到对应所有的物料进行匹配 for (int i = 0; i < list.size(); i++) { RouteLineDto dto = list.get(i); //找到路由对应工位 清洗机设备编号 String route_device_code = dto.getNext_device_code(); - //根据清洗机设备编号获取清洗剂设备信息 Device route_link_device = deviceAppservice.findDeviceByCode(route_device_code); //找到路由工位对应设备 String route_link_device_code = (String)route_link_device.getExtraValue().get("link_device_code"); @@ -480,6 +483,51 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri } } + else if (route_link_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver){ + JSONObject json = new JSONObject(); + json.put("device_code",device_code); + json.put("type","1"); + HttpResponse httpResponse = acsToWmsService.applyInCacheLineTask(json); + JSONObject jsonObject = JSONObject.parseObject(httpResponse.body()); + String ext_task_id = jsonObject.getString("ext_task_id"); + String task_code = jsonObject.getString("task_code"); + String start_device_code = jsonObject.getString("start_device_code"); + String put_device_code = jsonObject.getString("put_device_code"); + String next_device_code = jsonObject.getString("next_device_code"); + String task_type = jsonObject.getString("task_type"); + String barcodeArr = jsonObject.getString("barcodeArr"); + String[] barcodeArrs = barcodeArr.split("\\,"); + TaskDto onedto = new TaskDto(); + String now = DateUtil.now(); + onedto.setTask_id(IdUtil.simpleUUID()); + onedto.setQuantity(String.valueOf(full_number)); + onedto.setCreate_by(this.getDevice().getDevice_code()); + onedto.setUpdate_by(this.getDevice().getDevice_code()); + onedto.setExt_task_id(ext_task_id); + onedto.setRoute_plan_code("normal"); + String taskcode = CodeUtil.getNewCode("TASK_NO"); + onedto.setTask_code("-" + taskcode); + onedto.setTask_status("0"); + onedto.setPriority("101"); + onedto.setAgv_system_type("1"); + onedto.setTask_type(task_type); + onedto.setTask_id(IdUtil.simpleUUID()); + onedto.setTask_code(task_code); + onedto.setStart_device_code(start_device_code); + onedto.setStart_point_code(start_device_code); + onedto.setPut_device_code(put_device_code); + onedto.setPut_point_code(put_device_code); + onedto.setNext_point_code(next_device_code); + onedto.setNext_device_code(next_device_code); + onedto.setUpdate_time(now); + onedto.setCreate_time(now); + try { + taskserver.create(onedto); + flag = true; + } catch (Exception e) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务失败," + String.valueOf(e.getMessage())); + } + } } else { //清洗倒料位是没有工单的 if (route_link_device.getDeviceDriver() instanceof HailiangCleaningMachineStorageStationDeviceDriver) { @@ -580,7 +628,6 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri hailiangCleaningMachineStorageStationDeviceDriver.setMaterial(""); logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务失败," + String.valueOf(e.getMessage())); } - logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务成功"); break; } } @@ -601,6 +648,23 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri return true; } + public synchronized boolean applyInCacheLineTask() throws Exception { + Boolean flag = false; + + //生成任务成功 + if (flag) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":专机生成任务成功"); + requireSucess = true; + } else { + //如果都没有则调用mes接口申请入缓存线 + //生成任务 + //前往缓存线 + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":分配任务缓存线"); + } + + return true; + } + public synchronized boolean finish_instruction() throws Exception { diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java index 9223956f..570a2a08 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java @@ -4,6 +4,7 @@ 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.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -243,6 +244,21 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri Instruction instruction = null; List toInstructions; + if(!requireSucess){ + Device device = deviceAppservice.findDeviceByCode(device_code); + Integer min_num = Integer.parseInt(device.getExtraValue().get("min_num")+""); + // TODO 是否需要手自动状态开启判断条件 + if ( mode == 1 && storage_stock_num < min_num ) { + logServer.deviceLogToacs(this.device_code,"","",device_code+":requireSucess:" + requireSucess + "开始申请任务"); + applyOutCacheLineTask(); + } else { + logServer.deviceLogToacs(this.device_code,"","",device_code+":requireSucess:" + requireSucess + "倒料位数量:"+storage_stock_num+"最小数量:"+min_num+ "申请任务失败，不符合条件"); + } + } else { + logServer.deviceLogToacs(this.device_code,"","","是否请求成功：requireSucess:"+requireSucess); + + } + if(agvphase == 0x0B || agvphase == 0x0F ) { if(error == 0 && ObjectUtil.isNotEmpty(inst)){ @@ -295,6 +311,64 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri } } + public synchronized boolean applyOutCacheLineTask() throws Exception { + Boolean flag = false; + JSONObject json = new JSONObject(); + json.put("device_code",device_code); + json.put("type","2"); + HttpResponse httpResponse = acsToWmsService.applyOutCacheLineTask(json); + String body = httpResponse.body(); + JSONObject jsonObject = JSONObject.parseObject(body); + String ext_task_id = jsonObject.getString("ext_task_id"); + String task_code = jsonObject.getString("task_code"); + String start_device_code = jsonObject.getString("start_device_code"); + String put_device_code = jsonObject.getString("put_device_code"); + String next_device_code = jsonObject.getString("next_device_code"); + String task_type = jsonObject.getString("task_type"); + TaskDto onedto = new TaskDto(); + String now = DateUtil.now(); + onedto.setTask_id(IdUtil.simpleUUID()); + onedto.setQuantity(String.valueOf(full_number)); + onedto.setCreate_by(this.getDevice().getDevice_code()); + onedto.setUpdate_by(this.getDevice().getDevice_code()); + onedto.setRoute_plan_code("normal"); + String taskcode = CodeUtil.getNewCode("TASK_NO"); + onedto.setTask_code("-" + taskcode); + onedto.setTask_status("0"); + onedto.setPriority("101"); + onedto.setAgv_system_type("1"); + onedto.setTask_type(task_type); + onedto.setExt_task_id(ext_task_id); + onedto.setTask_id(IdUtil.simpleUUID()); + onedto.setTask_code(task_code); + onedto.setStart_device_code(start_device_code); + onedto.setStart_point_code(start_device_code); + onedto.setPut_device_code(put_device_code); + onedto.setPut_point_code(put_device_code); + onedto.setNext_point_code(next_device_code); + onedto.setNext_device_code(next_device_code); + onedto.setUpdate_time(now); + onedto.setCreate_time(now); + + try { + taskserver.create(onedto); + flag = true; + } catch (Exception e) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务失败," + String.valueOf(e.getMessage())); + } + //生成任务成功 + if (flag) { + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":专机生成任务成功"); + requireSucess = true; + } else { + //如果都没有则调用mes接口申请入缓存线 + //生成任务 + //前往缓存线 + logServer.deviceLogToacs(this.device_code, "", "", device_code + ":分配任务缓存线"); + } + return true; + } + protected void thingToNothing() { log.debug("从有货到无货 清理数据"); this.setRequireSucess(false); diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java index 2beec905..635dda4e 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java @@ -80,4 +80,19 @@ public class AcsToWmsController { public ResponseEntity feedbackOrderStatus(@RequestBody JSONObject param) { return new ResponseEntity<>(acstowmsService.feedbackOrderStatus(param), HttpStatus.OK); } + + + @PostMapping("/applyInCacheLineTask") + @Log("ACS申请缓存线入库任务") + @ApiOperation("ACS申请缓存线入库任务") + public ResponseEntity applyInCacheLineTask(@RequestBody JSONObject param) { + return new ResponseEntity<>(acstowmsService.applyInCacheLineTask(param), HttpStatus.OK); + } + + @PostMapping("/applyOutCacheLineTask") + @Log("ACS系统申请出库任务") + @ApiOperation("ACS系统申请出库任务") + public ResponseEntity applyOutCacheLineTask(@RequestBody JSONObject param) { + return new ResponseEntity<>(acstowmsService.applyOutCacheLineTask(param), HttpStatus.OK); + } } diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 28f57cb0..0f6361c7 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -100,4 +100,20 @@ public interface AcsToWmsService { * @return */ HttpResponse feedbackOrderStatus(JSONObject param); + + /** + * ACS申请缓存线入库任务 + * + * @param param + * @return + */ + HttpResponse applyInCacheLineTask(JSONObject param); + + /** + * ACS系统申请出库任务 + * + * @param param + * @return + */ + HttpResponse applyOutCacheLineTask(JSONObject param); } diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 67f5ed5d..4ffa2ec2 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -439,7 +439,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - @Transactional(rollbackFor = Exception.class) public HttpResponse feedbackOrderStatus(JSONObject param) { if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS).toString(), "1")) { String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); @@ -466,7 +465,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } - logServer.log(ext_order_id, "feedbackOrderStatus", type, param.toString(), result.body(), String.valueOf(result.getStatus()), url, status); + logServer.log(ext_order_id, "feedbackOrderStatus", type, param.toString(), result.body(), String.valueOf(result.getStatus()), url, ""); log.info("feedbackOrderStatus----返回参数{}", result); } catch (Exception e) { String msg = e.getMessage(); @@ -479,4 +478,70 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return null; } + @Override + public HttpResponse applyInCacheLineTask(JSONObject param) { + if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS).toString(), "1")) { + String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + // TODO 还没向地址表中添加 applyInCacheLineTask地址 + AddressDto addressDto = addressService.findByCode("applyInCacheLineTask"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + log.info("feedbackOrderStatus----请求参数{}", param); + try { + result = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute(); + String type = ""; + if (result.getStatus() == 200) { + type = "info"; + } else { + type = "error"; + } + + logServer.log("", "applyInCacheLineTask", type, param.toString(), result.body(), String.valueOf(result.getStatus()), url, ""); + log.info("applyInCacheLineTask----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } + return null; + } + + @Override + public HttpResponse applyOutCacheLineTask(JSONObject param) { + if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS).toString(), "1")) { + String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + // TODO 还没向地址表中添加 applyOutCacheLineTask + AddressDto addressDto = addressService.findByCode("applyOutCacheLineTask"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + log.info("feedbackOrderStatus----请求参数{}", param); + try { + result = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute(); + String type = ""; + if (result.getStatus() == 200) { + type = "info"; + } else { + type = "error"; + } + + logServer.log("", "applyOutCacheLineTask", type, param.toString(), result.body(), String.valueOf(result.getStatus()), url, ""); + log.info("applyOutCacheLineTask----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } + return null; + } + } diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 2fd92034..370a92a3 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_engraving_machine.HailiangEngravingMachineDeviceDriver; +import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_packer_station.HailiangPackerStationDeviceDriver; import org.nl.acs.device_driver.basedriver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; @@ -753,15 +754,19 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } if(deviceByCode.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver){ jo1.put("hasGoodStatus", "2"); + jo1.put("material_type",startdevice.getMaterial_type()); + } else if (deviceByCode.getDeviceDriver() instanceof HailiangPackerStationDeviceDriver){ + jo1.put("hasGoodStatus", "1"); + jo1.put("material_type", ""); } else { jo1.put("hasGoodStatus", "1"); + jo1.put("material_type",startdevice.getMaterial_type()); } - jo1.put("material_type", startdevice.getMaterial_type()); jo1.put("quantity", startdevice.getQuantity()); jo1.put("remark", startdevice.getRemark()); jo1.put("batch", startdevice.getBatch()); jo1.put("vehicle_code", entity.getVehicle_code()); - jo1.put("islock", "false"); + jo1.put("islock", "0"); jo1.put("barrels_code", startdevice.getBarrels_code()); jo1.put("cooperate_code", startdevice.getCooperate_code()); jo1.put("powder_name", startdevice.getPowder_name()); @@ -775,7 +780,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo.put("quantity", ""); jo.put("remark", ""); jo.put("batch", ""); - jo.put("islock", "false"); + jo.put("islock", "0"); deviceService.changeDeviceStatus(jo); JSONObject json = (JSONObject) JSONObject.toJSON(entity); diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java index 2d15efb1..4e538394 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java @@ -18,6 +18,11 @@ public class TaskDto implements Serializable { */ private String task_id; + /** + * 任务外部标识 + */ + private String ext_task_id; + /** * 任务号 */ diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java index 0a1aa279..aabf37ea 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java @@ -29,7 +29,7 @@ public class AutoCleanUpLogs { public void run() throws Exception { try { WQLObject wo = WQLObject.getWQLObject("acs_device"); - JSONArray array = wo.query().getResultJSONArray(0); + JSONArray array = wo.query("1=1","device_code").getResultJSONArray(0); Date now = DateUtil.parse(DateUtil.now()); DateTime dateTime = DateUtil.offsetDay(now, -15); String formatDateTime = DateUtil.formatDateTime(dateTime); @@ -39,8 +39,8 @@ public class AutoCleanUpLogs { JSONObject jsonObject = array.getJSONObject(i); String device_code = jsonObject.getString("device_code"); mongoTemplate.remove(query,device_code); + System.out.println(device_code+"设备日志清除成功---------------------"); } - System.out.println("设备日志清除成功---------------------"); } } catch (Exception e) { e.printStackTrace();