diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index beda90d..d1f4ea1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -208,7 +208,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { // 进行计量单位与物料的更新 JSONArray data = response_body.getJSONArray("data"); - WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit"); +// WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit"); WQLObject material_table = WQLObject.getWQLObject("md_me_materialbase"); Long user_id = SecurityUtils.getCurrentUserId(); String nick_name = SecurityUtils.getCurrentNickName(); @@ -216,27 +216,28 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { for (Object o : data) { JSONObject material = (JSONObject) o; + // 计量单位不管 // 查询是否存在这个计量单位 - String unit_code = material.getString("unit_code"); - JSONObject unit = unit_table - .query("unit_code = '" + unit_code + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(unit)) { +// String unit_code = material.getString("unit_code"); +// JSONObject unit = unit_table +// .query("unit_code = '" + unit_code + "'") +// .uniqueResult(0); +// if (ObjectUtil.isEmpty(unit)) { // 如果不存在则添加 - material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L)); - material.put("is_used", "1"); - material.put("create_id", user_id); - material.put("create_name", nick_name); - material.put("create_time", now); - unit_table.insert(material); - } else { +// material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L)); +// material.put("is_used", "1"); +// material.put("create_id", user_id); +// material.put("create_name", nick_name); +// material.put("create_time", now); +// unit_table.insert(material); +// } else { // 如果存在则修改 - unit.put("unit_name", material.getString("unit_name")); - unit.put("update_optid", user_id); - unit.put("update_optname", nick_name); - unit.put("update_time", now); - unit_table.update(unit); - } +// unit.put("unit_name", material.getString("unit_name")); +// unit.put("update_optid", user_id); +// unit.put("update_optname", nick_name); +// unit.put("update_time", now); +// unit_table.update(unit); +// } // 查询是否存在这个物料 String material_code = material.getString("material_code"); @@ -254,7 +255,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { } else { // 如果存在则修改 existMaterial.put("material_name", material.getString("material_name")); - existMaterial.put("unit_code", unit_code); +// existMaterial.put("unit_code", unit_code); existMaterial.put("update_optid", user_id); existMaterial.put("update_optname", nick_name); existMaterial.put("update_time", now); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 4a1f5c4..9638c68 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue index 8a28248..81f1c28 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -58,14 +58,14 @@ > - + - + @@ -79,7 +79,7 @@ - + - - + + - + @@ -326,9 +326,6 @@ export default { ], material_height_type: [ { required: true, message: '不能为空', trigger: 'blur' } - ], - unit_code: [ - { required: true, message: '计量单位不能为空', trigger: 'blur' } ] } }