取消计量单位

This commit is contained in:
张江玮
2022-12-17 09:45:45 +08:00
parent 4459fdf57a
commit 9065015d95
3 changed files with 27 additions and 29 deletions

View File

@@ -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);