diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index b2e28788e..964655186 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -1289,11 +1289,16 @@ public class MesToLmsServiceImpl implements MesToLmsService { //查询库内是否存在相同的子卷号 JSONObject container_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '" + ContainerName + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(container_jo)) { - if (container_jo.getString("need_delete").equals("99")) { + if (StrUtil.isNotEmpty(container_jo.getString("need_delete")) && container_jo.getString("need_delete").equals("99")) { WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation"); HashMap map = new HashMap<>(); map.put("need_delete", ""); tab.update(map, "package_box_sn = '" + PackageBoxSN + "'"); + result.put("RTYPE", "S"); + result.put("RTMSG", "操作成功!"); + result.put("RTOAL", 1); + result.put("RTDAT", null); + return result; } else { throw new BadRequestException("LMS系统中已存在子卷号:" + ContainerName + ",请检查!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java index da45ed1e8..dd2fa72cb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java @@ -32,7 +32,7 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { JSONObject json = new JSONObject(); for (URLEnum url : URLEnum.values()) { String product_area = url.getProduct_area(); - if (product_area.equals("BLK") || product_area.equals("B2")) { + if (product_area.startsWith("B")) { continue; } JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND product_area = '" + product_area + "'").getResultJSONArray(0);