From 9ca1d98ba57b5c9638cb43b65f6a6aa15344167d Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 4 Aug 2022 18:10:11 +0800 Subject: [PATCH] 1 --- ...nshPalletizingManipulatorDeviceDriver.java | 34 ++++++++++++++----- ...alletizingManipulatorSiteDeviceDriver.java | 6 ++-- .../wms/service/impl/WmsToAcsServiceImpl.java | 14 ++++++++ .../impl/ProduceshiftorderServiceImpl.java | 3 +- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index c5d1ebb..7bc7440 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -196,29 +196,47 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri case 3: break; case 4: - //获取托盘信息 + //人工排产确认 +// if (!requireSucess && !order_No.equals("0")) { +// JSONObject json = new JSONObject(); +// json.put("producetask_code",order_No); +// json.put("device_code",this.device_code); +// json.put("material_code",material); +// json.put("weight",weight); +// json.put("type","1"); +// enterProduction(json); +// } + break; + case 5: + //获取托盘信息（需提供抓取工位或放置工位） if (!requireSucess) { getVehicle(); } break; - case 5: - //码垛完成 - if (!requireSucess) { - palletizing(); - } - break; case 6: - //码垛强制完成 + //码垛完成 if (!requireSucess) { mandatoryPalletizing(); } break; case 7: + //码垛强制完成 + if (!requireSucess) { + applyEmpty(); + } + break; + case 8: //申请空盘 if (!requireSucess) { applyEmpty(); } break; + case 9: + //工单完成 + if (!requireSucess) { + applyEmpty(); + } + break; } switch (flag) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index ba0a76b..7639f78 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -314,9 +314,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { this.writing(1); + this.setRequireSucess(true); } } - this.setRequireSucess(true); return true; } } @@ -366,7 +366,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic JSONObject json = new JSONObject(); json.put("device_code",this.device_code); json.put("type","1"); - json.put("material",material); + json.put("material_code",material); json.put("vehicle_code",barcode); json.put("is_full","1"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); @@ -375,8 +375,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { this.writing(1); } + this.setRequireSucess(true); } - this.setRequireSucess(true); return true; } } 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 bce002c..b2ca84d 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 @@ -293,6 +293,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver; LnshPressDeviceDriver lnshPressDeviceDriver; LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; + LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) { lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver(); if (StrUtil.isEmpty(qty)) { @@ -319,6 +320,19 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { lnshPressDeviceDriver.writing("to_material_code",material_code); is_flag = true; } + if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); + 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_material_qty",qty); + lnshPalletizingManipulatorDeviceDriver.writing("to_material_code",material_code); + is_flag = true; + } if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); if (StrUtil.isEmpty(qty)) { 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 bff0711..25d5231 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 @@ -158,6 +158,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { FileUtil.downloadExcel(list, response); } + @Transactional(rollbackFor = Exception.class) @Override public void finish(String ids) { ProduceshiftorderDto dto = this.findById(ids); @@ -177,7 +178,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { json.put("device_code",dto.getDevice_code()); json.put("material_code",dto.getMaterial_code()); json.put("qty",dto.getQty()); - json.put("type","3"); + json.put("type","2"); acsToWmsService.enterOrder(json); } }