From 1b26f269e3f35ff487e3b582250ef01061f0856d Mon Sep 17 00:00:00 2001 From: zhangjiangwei Date: Wed, 22 Mar 2023 08:41:42 +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 --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 4 ++++ .../nl/wms/st/basedata/service/impl/KilnServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) 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 3f1a3dc..a09e636 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 @@ -339,6 +339,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isNotEmpty(jsonObject.get("vehicle_code")) && !StrUtil.equals(jsonObject.get("vehicle_code").toString(), "0000") && !"0".equals(jsonObject.get("vehicle_code").toString())) { vehicle_code = jsonObject.get("vehicle_code").toString(); } + if (device_code.startsWith("FJJXSXLW") && StrUtil.isNotBlank(vehicle_code)) { + WQLObject.getWQLObject("st_buss_vehiclegroup").delete("vehicle_code = '" + vehicle_code + "'"); + } String qty = String.valueOf(jsonObject.get("qty")); //产品编码 String product_code = String.valueOf(jsonObject.get("product_code")); @@ -442,6 +445,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jsonObject.put("type", "1"); jsonObject.put("group_id", group_id); jsonObject.put("producetask_id", producetask_id); + jsonObject.put("material_code", materialObj.getString("material_code")); this.receiveTaskFromAcs(jsonObject); JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java index 2206ad0..219810b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java @@ -78,11 +78,11 @@ public class KilnServiceImpl implements KilnService { // 删除仓位库存 if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'"); // 组盘不为空则删除组盘信息以及设置载具编码为空 - if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); +// if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); vehicle_code = null; } else if (point_status.equals("01")) { // 空载具 // 删除组盘 - if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); + if (ObjectUtil.isNotEmpty(vehicle_code)) vehicleGroupTab.delete("vehicle_code = '" + vehicle_code + "'"); // 删除仓位库存 if (ObjectUtil.isNotEmpty(struct_id)) structIvtTab.delete("struct_id = '" + struct_id + "'"); } else { // 有箱有料 @@ -141,7 +141,7 @@ public class KilnServiceImpl implements KilnService { } // 组盘表 // 存在相应载具的话删掉在存 - if (ObjectUtil.isNotEmpty(vehicleGroupObj)) vehicleGroupTab.delete(vehicleGroupObj); + if (ObjectUtil.isNotEmpty(vehicle_code)) vehicleGroupTab.delete("vehicle_code = '" + vehicle_code + "'"); JSONObject vehicleGroup = new JSONObject(); vehicleGroup.put("group_id", IdUtil.getSnowflake(1, 1).nextId()); vehicleGroup.put("vehicle_code", vehicle_code);