From 6ae0650e0e4ad19b189cba35026b80abdefd39b8 Mon Sep 17 00:00:00 2001 From: loujf Date: Sun, 25 Sep 2022 16:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=8B=A3=E6=9C=BA=E6=A2=B0=E6=89=8B?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hPackagePalletManipulatorDeviceDriver.java | 2 +- .../LnshSplitManipulatorDeviceDriver.java | 2 +- .../lnsh_station/LnshStationDeviceDriver.java | 32 ++++++++++++++++++- .../acs/service/impl/WmsToAcsServiceImpl.java | 2 +- .../service/impl/ProducetaskServiceImpl.java | 14 ++++++-- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index efd5cee..7a5b8a0 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -867,7 +867,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { - dto.setOrder_status("0"); + dto.setOrder_status("1"); } else if (this.mode == 9) { dto.setOrder_status("2"); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 0053955..534bf95 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -857,7 +857,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { - dto.setOrder_status("0"); + dto.setOrder_status("1"); } else if (this.mode == 9) { dto.setOrder_status("2"); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index c903a84..dbfd123 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -236,7 +236,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements case 4: //叫料 if (!requireSucess && this.move == 0) { - applyIn(); + applyMaterialOut(); } break; case 5: @@ -540,6 +540,36 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements } } + /** + * 申请物料出库 + * + * @param + */ + public synchronized boolean applyMaterialOut() { + Date date = new Date(); + if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); + return false; + } else { + this.instruction_require_time = date; + JSONObject json = new JSONObject(); + + json.put("device_code",device_code); + json.put("type","2"); + json.put("is_full","1"); + + HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + this.writing(this.mode); + this.setRequireSucess(true); + } + } + return true; + } + } + /** * 申请入库 * diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 9b9b466..3a9c220 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -36,7 +36,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map action(JSONArray arr) { - String api = "api/wms/updateDeviceGoods"; + String api = "api/wms/action"; return AcsUtil.notifyAcs(api, arr); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java index 5038fbb..0e3e42d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java @@ -15,10 +15,13 @@ import org.nl.utils.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; +import org.nl.wms.pdm.service.DeviceService; import org.nl.wms.pdm.service.ProducetaskService; +import org.nl.wms.pdm.service.dto.DeviceDto; import org.nl.wms.pdm.service.dto.ProducetaskDto; import org.nl.wms.sch.AcsUtil; import org.nl.wql.WQL; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,6 +58,9 @@ import javax.servlet.http.HttpServletRequest; @Slf4j public class ProducetaskServiceImpl implements ProducetaskService { + @Autowired + DeviceService deviceService; + @Override public Map queryAll(Map whereJson, Pageable page) { String search = MapUtil.getStr(whereJson, "search"); @@ -283,13 +289,15 @@ public class ProducetaskServiceImpl implements ProducetaskService { if (ObjectUtil.isNotEmpty(jo)) { throw new BadRequestException("该设备存在未完成的工单，不能下发！"); } + + DeviceDto dto = deviceService.findById(Long.valueOf(device_id)); JSONObject taskObj = new JSONObject(); //假如是包装的三台机械手，是将设备当作工单设备 //假如是压机下料的机械手，则是将对接为当作工单设备 - if (StrUtil.equals(device_id, "1518136519804719104") || StrUtil.equals("1518136611341209600", device_id) || StrUtil.equals("1544608176471674880", device_id)) { - taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0); - } else { + if (StrUtil.equals(dto.getDevice_code(), "FJJXS1") || StrUtil.equals("FJJXS2", dto.getDevice_code()) || StrUtil.equals("FJJXS3", dto.getDevice_code())) { taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "3").addParam("producetask_id", producetask_id).process().uniqueResult(0); + } else { + taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0); } taskObj.put("product_code", "wms");