From c9e80c3ed157dd2549b669ae3d1510918a99a3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Mon, 28 Aug 2023 14:53:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20querydevice=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index a218bb740..a09fc5544 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -246,11 +246,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONObject jo = new JSONObject(); JSONObject data = datas.getJSONObject(i); String parent_device_code = data.getString("device_code"); - String device_code = ""; JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + parent_device_code + "'").uniqueResult(0); - if (!ObjectUtil.isEmpty(device_json)) { - device_code = (String) device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); - } + String device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); Device device = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { throw new Exception("未找到对应设备:" + parent_device_code); From 39c4a2a0d2a23d6120e34288df8eeedeca8cf485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Mon, 28 Aug 2023 14:56:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20querydevice=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index a09fc5544..3ee15e51e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -246,8 +246,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONObject jo = new JSONObject(); JSONObject data = datas.getJSONObject(i); String parent_device_code = data.getString("device_code"); + String device_code = ""; JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + parent_device_code + "'").uniqueResult(0); - String device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); + if (!ObjectUtil.isEmpty(device_json)) { + device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); + } else { + device_code = parent_device_code; + } Device device = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { throw new Exception("未找到对应设备:" + parent_device_code); From 81fd26cba77fe2f6c3d7619d318f0ef151d7d8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Mon, 28 Aug 2023 15:27:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20querydevice=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 3ee15e51e..18fc1e0c0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -324,6 +324,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("power", driver.getElectric_qty()); jo.put("error", driver.getError()); jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); + } else if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + AgvNdcTwoDeviceDriver driver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", driver.getStatus()); + jo.put("power", driver.getElectric_qty()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); } else if (device.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { OvenGantryManipulatorDeviceDriver driver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", driver.getDevice().getDevice_code()); From f4ad461c853ebaa419f03d03f995c2c97c4a6af7 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 28 Aug 2023 17:27:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?rev=EF=BC=9A1.=E7=94=B3=E8=AF=B7=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=962.=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E5=87=BA=E5=BA=93=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 16 ++++++++++++++++ .../service/impl/ProductionOutServiceImpl.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index b7d3c9f63..bef4d4f1f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -399,6 +399,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } if (type.equals("4")) { + CutConveyorTask cutConveyorTask = new CutConveyorTask(); + //查询该木箱对应的包装关系 JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(sub_jo)) { @@ -480,6 +482,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' and is_used = '1' order by out_order_seq ASC").getResultJSONArray(0); if (pointArr.size() == flag) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); + + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; + } + point_code = jsonNewRow.getString("point_code"); break; } @@ -499,6 +506,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 堵住则判断下一个 continue; } else { + if (cutConveyorTask.isSingleTask(json.getString("point_code"))) { + continue; + } + // 未堵住: 跳出循环 point_code = json.getString("point_code"); break; @@ -527,6 +538,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' and is_used = '1' order by out_order_seq ASC").getResultJSONArray(0); if (pointArr.size() == flag) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); + + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; + } + point_code = jsonNewRow.getString("point_code"); break; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java index 49acf6c2b..7bb342171 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java @@ -53,7 +53,7 @@ public class ProductionOutServiceImpl implements ProductionOutService { String box_no = whereJson.getString("box_no"); if (ObjectUtil.isEmpty(box_no)) throw new BadRequestException("木箱不能为空"); - JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); + JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("请输入正确的木箱或查看点位是否存在");