From ccc01ad78a663c888ae0fd514fde064f2aca6074 Mon Sep 17 00:00:00 2001 From: loujf Date: Mon, 13 Feb 2023 14:23:37 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E8=8B=B1=E8=8E=B1=E6=9C=BA=E6=A2=B0=E6=89=8B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 21 +++++++++++++++++++ .../impl/ProduceshiftorderServiceImpl.java | 7 ++++++- .../auto/run/NDCSocketConnectionAutoRun.java | 8 +++---- .../acs/service/impl/AcsToWmsServiceImpl.java | 9 ++++++++ .../org/nl/wms/ext/acs/wql/WMSTOJN_001.wql | 9 ++++---- .../service/impl/CheckOutServiceImpl.java | 13 ++++++++++-- .../wms/sch/manage/buss/CallMaterialTask.java | 2 +- .../sch/manage/buss/SendEmptyVehicleTask.java | 7 +++++++ .../wms/sch/manage/buss/SendMaterialTask.java | 2 +- 9 files changed, 65 insertions(+), 13 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 7a411be..4fc82a5 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -302,8 +302,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; //码垛机械手 LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; + //英莱码垛机械手 + LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; //分拣拆码垛机械手 RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; + if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); if (lnshPalletizingManipulatorSiteDeviceDriver.getIserror() @@ -324,6 +327,24 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { lnshPalletizingManipulatorSiteDeviceDriver.writing(3); is_flag = true; } + if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); + if (lnshPalletizingManipulatorDeviceDriver.getIserror() + && !device_code.equals("MDJXS601")) { + throw new BadRequestException("设备状态异常，下发失败！"); + } + if (StrUtil.isEmpty(qty)) { + throw new WDKException("数量不能为空"); + } + if (StrUtil.isEmpty(material_code)) { + throw new WDKException("物料编号不能为空！"); + } + lnshPalletizingManipulatorDeviceDriver.writing("to_order_No", producetask_code); + lnshPalletizingManipulatorDeviceDriver.writing("to_order_qty", qty); + lnshPalletizingManipulatorDeviceDriver.writing("to_material_code", material_code); + lnshPalletizingManipulatorDeviceDriver.writing(3); + is_flag = true; + } if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); if (lnshSplitManipulatorDeviceDriver.getIserror()) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 597e4e7..7193d6e 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; +import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver; @@ -31,7 +32,6 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.utils.SecurityUtils; -import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; import org.nl.utils.FileUtil; @@ -180,6 +180,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { Device device = deviceAppService.findDeviceByCode(dto.getDevice_code()); LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; + LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; @@ -187,6 +188,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver.writing(9); } + if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); + lnshPalletizingManipulatorDeviceDriver.writing(9); + } if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); lnshSplitManipulatorDeviceDriver.writing(9); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 2b293ec..a4718cf 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -200,7 +200,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -300,7 +300,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -422,7 +422,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } @@ -503,7 +503,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); break; } - if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) { + if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index a3f4ce8..ffafdbb 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.HashMap; import java.util.Map; @Service @@ -696,6 +697,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } taskObj.put("producetask_status", "04"); + if (StrUtil.equals("FJJXS1", device_code) || StrUtil.equals("FJJXS2", device_code) || StrUtil.equals("FJJXS3", device_code)) { + //调用mes接口 + HashMap map = new HashMap(); + map.put("producetask_code",producetask_code); + WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); + wmsToJnServiceImpl.feedBackPackWordShop(map); + } + } if (StrUtil.equals("2", type)) { taskObj.put("producetask_status", "05"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql index 6095942..6b906d7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql @@ -18,6 +18,7 @@ 输入.task_id TYPEAS s_string 输入.record_id TYPEAS s_string 输入.vehicle_code TYPEAS s_string + 输入.producetask_code TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -318,14 +319,14 @@ ENDIF IF 输入.flag = "15" QUERY SELECT DISTINCT - group.vehicle_code AS STOCKNO, - group.task_id AS ID + vehiclegroup.vehicle_code AS STOCKNO, + vehiclegroup.task_id AS ID FROM - st_buss_vehiclegroup group + st_buss_vehiclegroup vehiclegroup where 1=1 OPTION 输入.vehicle_code <> "" - group.vehicle_code = 输入.vehicle_code + vehiclegroup.vehicle_code = 输入.vehicle_code ENDOPTION ENDSELECT ENDQUERY diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java index f35c5b7..5af2cb9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.WorkProcedureEnum; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wms.pda.checkout.service.CheckOutService; import org.nl.wms.sch.manage.AreaEnum; import org.nl.wms.sch.manage.BillTypeEnum; @@ -21,6 +22,7 @@ import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.Map; @Service @@ -44,7 +46,7 @@ public class CheckOutServiceImpl implements CheckOutService { } @Override - public Map Confirm( JSONObject param) { + public Map Confirm(JSONObject param) { String point_id = param.getString("point_id"); String point_code = param.getString("point_code"); @@ -96,12 +98,19 @@ public class CheckOutServiceImpl implements CheckOutService { param.put("struct_id",point_id); ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT_AND_CAN_USE); // 删除阻盘信息 - groupTab.delete("vehicle_code = '" +ivtObj.getString("vehicle_code")+"'" ); + groupTab.delete("vehicle_code = '" + ivtObj.getString("vehicle_code")+"'" ); // 点位状态更新 JSONObject object = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); object.put("point_status", "00"); object.put("vehicle_code", ""); pointTab.update(object); + + //调用mes接口 + HashMap map = new HashMap(); + map.put("vehicle_code",ivtObj.getString("vehicle_code")); + WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); + wmsToJnServiceImpl.feedBackTrayBak(map); + JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); returnjo.put("desc", "操作成功！"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index f155e73..98ded5a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -147,7 +147,7 @@ public class CallMaterialTask extends AbstractAcsTask { if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) { wmsToJnServiceImpl.feedBackOutWait(jo); } - if (StrUtil.equals(point_type, AreaEnum.MTPQ.getCode())) { + if (StrUtil.equals(point_type, AreaEnum.BTHCQ.getCode())) { wmsToJnServiceImpl.feedBackOutPartStock(jo); } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java index fa65912..4a8f808 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java @@ -16,6 +16,7 @@ import org.nl.wms.BussConstant; import org.nl.wms.WorkProcedureEnum; import org.nl.wms.common.PointUpdateUtil; import org.nl.wms.common.StructFindUtil; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AreaEnum; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -85,6 +86,12 @@ public class SendEmptyVehicleTask extends AbstractAcsTask { pointTab.update(startPointObj); taskTab.update(jsonTask); + //调用mes接口 + HashMap hashMap = new HashMap(); + hashMap.put("vehicle_code",vehicle_code); + WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); + wmsToJnServiceImpl.feedBackTrayBak(hashMap); + //将组盘表删除 WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup"); JSONObject groupObj = group_Table.query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java index fb98cfe..e86b9f4 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java @@ -138,7 +138,7 @@ public class SendMaterialTask extends AbstractAcsTask { if (StrUtil.equals(area_type, AreaEnum.CYHCHJ.getCode())) { wmsToJnServiceImpl.feedBackInWait(jo); } - if (StrUtil.equals(area_type, AreaEnum.MTPQ.getCode())) { + if (StrUtil.equals(area_type, AreaEnum.BTHCQ.getCode())) { wmsToJnServiceImpl.feedBackInPartStock(jo); }