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 bb8730fde..c547db8f7 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 @@ -400,7 +400,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { log.info("母卷:" + ContainerName + "被决策入烘箱,请求烘烤标识改为1"); String point_code = ""; - JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04' AND point_type = '1'").uniqueResult(0); + JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' AND point_type = '1'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonCoolIvt)) { JSONObject jsonPoint = pointTab.query("material_code ='" + containerName + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonPoint)) { @@ -527,7 +527,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { String SplitBreadth = param.getString("SplitBreadth"); // 子卷幅宽 String SplitHeight = param.getString("SplitHeight"); // 子卷理论长度 String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量 -// String Attribute2 = param.getString("Attribute2"); // 销售订单及行号 String Attribute2 = param.getString("Attribute2"); // 上下轴 String Attribute3 = param.getString("Attribute3"); // 位置左右 @@ -668,14 +667,13 @@ public class MesToLmsServiceImpl implements MesToLmsService { json.put("split_breadth", SplitBreadth); json.put("split_height", SplitHeight); json.put("split_weight", SplitWeight); - json.put("up_or_down", Attribute2); +// json.put("up_or_down", Attribute2); json.put("left_or_right", Attribute3); json.put("qzz_size", qzz_size); if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) { json.put("is_paper_ok", "1"); } -// json.put("sale_order_name", Attribute2); - + json.put("sale_order_name", ""); json.put("start_time", DateUtil.now()); json.put("status", "01"); json.put("qzz_generation", qzz_generation); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index c4ab1ecb9..ddfeb1f7a 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ