|
|
@ -84,7 +84,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
@Override |
|
|
@Override |
|
|
public Integer insertMaterial(Map<String, Object> map) { |
|
|
public Integer insertMaterial(Map<String, Object> map) { |
|
|
if (map.containsKey("price")) { |
|
|
if (map.containsKey("price")) { |
|
|
int price = (int) (Double.parseDouble(map.get("price").toString()) * 100); |
|
|
int price = (int) (ObjectFormatUtil.toDouble(map.get("price").toString()) * 100); |
|
|
map.put("price", price); |
|
|
map.put("price", price); |
|
|
} |
|
|
} |
|
|
// 判断是否有保质期
|
|
|
// 判断是否有保质期
|
|
|
@ -121,7 +121,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
if (maxCode == null) { |
|
|
if (maxCode == null) { |
|
|
newCode = String.format("%04d", 1); |
|
|
newCode = String.format("%04d", 1); |
|
|
} else { |
|
|
} else { |
|
|
newCode = String.format("%04d", Long.parseLong(maxCode) + 1); |
|
|
newCode = String.format("%04d", ObjectFormatUtil.toLong(maxCode) + 1); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
map.put("code", newCode); |
|
|
map.put("code", newCode); |
|
|
@ -157,7 +157,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
@Override |
|
|
@Override |
|
|
public Integer updateMaterial(Map<String, Object> map) { |
|
|
public Integer updateMaterial(Map<String, Object> map) { |
|
|
if (map.containsKey("price")) { |
|
|
if (map.containsKey("price")) { |
|
|
Double price = Double.parseDouble((String) map.get("price")) * 100; |
|
|
Double price = ObjectFormatUtil.toDouble((String) map.get("price")) * 100; |
|
|
map.put("price", price); |
|
|
map.put("price", price); |
|
|
} |
|
|
} |
|
|
// 判断是否有保质期
|
|
|
// 判断是否有保质期
|
|
|
@ -623,7 +623,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
} |
|
|
} |
|
|
//1年2月3天，后面为数目
|
|
|
//1年2月3天，后面为数目
|
|
|
|
|
|
|
|
|
material.setShelfLife(Long.valueOf(shelfLife.substring(1))); |
|
|
material.setShelfLife(ObjectFormatUtil.toLong(shelfLife.substring(1))); |
|
|
} |
|
|
} |
|
|
return material; |
|
|
return material; |
|
|
} |
|
|
} |
|
|
@ -1052,7 +1052,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
} |
|
|
} |
|
|
material.setRemark(materialRemark + map.get("remark").toString()); |
|
|
material.setRemark(materialRemark + map.get("remark").toString()); |
|
|
} |
|
|
} |
|
|
double quantity = Double.parseDouble(map.get("quantity").toString()); |
|
|
double quantity = ObjectFormatUtil.toDouble(map.get("quantity").toString()); |
|
|
double quantity_residue = 0; |
|
|
double quantity_residue = 0; |
|
|
int splitInfoScaleQuantity = 0; |
|
|
int splitInfoScaleQuantity = 0; |
|
|
SplitInfo baseSplitInfoForMid = null; |
|
|
SplitInfo baseSplitInfoForMid = null; |
|
|
@ -1330,7 +1330,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public List<Object> AddInitTreeMenus(Map<String, Object> map) { |
|
|
public List<Object> AddInitTreeMenus(Map<String, Object> map) { |
|
|
Long mtId = Long.valueOf(map.get("mtId").toString()); |
|
|
Long mtId = ObjectFormatUtil.toLong(map.get("mtId").toString()); |
|
|
List<Object> result = new ArrayList<>(); |
|
|
List<Object> result = new ArrayList<>(); |
|
|
MaterialType mt = materialTypeMapper.findMaterialTypeByOldId(mtId); |
|
|
MaterialType mt = materialTypeMapper.findMaterialTypeByOldId(mtId); |
|
|
List<MaterialType> materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(mt.getOldId()); |
|
|
List<MaterialType> materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(mt.getOldId()); |
|
|
@ -1367,7 +1367,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
String s = objectList.get(i); |
|
|
String s = objectList.get(i); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
Long id = Long.valueOf(jsonObject.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); |
|
|
if (Long.compare(parentMt.getOldId(), id) == 0) { |
|
|
if (Long.compare(parentMt.getOldId(), id) == 0) { |
|
|
|
|
|
|
|
|
if (mtLevel == 1) { |
|
|
if (mtLevel == 1) { |
|
|
@ -1409,7 +1409,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
String s = objectList.get(i); |
|
|
String s = objectList.get(i); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
Long id = Long.valueOf(jsonObject.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
jsonObject = setTreeChildrenSpreadIsTrue(jsonObject, mt, mtLevel - 1, map); |
|
|
jsonObject = setTreeChildrenSpreadIsTrue(jsonObject, mt, mtLevel - 1, map); |
|
|
} |
|
|
} |
|
|
@ -1438,7 +1438,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
JSONArray children = jsonObject.getJSONArray("children"); |
|
|
JSONArray children = jsonObject.getJSONArray("children"); |
|
|
for (int i = 0; i < children.size(); i++) { |
|
|
for (int i = 0; i < children.size(); i++) { |
|
|
JSONObject object = children.getJSONObject(i); |
|
|
JSONObject object = children.getJSONObject(i); |
|
|
Long id = Long.valueOf(object.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(object.getString("id")); |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
JSONObject object1 = setTreeChildrenSpreadIsTrue(object, mt, level - 1, map); |
|
|
JSONObject object1 = setTreeChildrenSpreadIsTrue(object, mt, level - 1, map); |
|
|
children.set(i, object1); |
|
|
children.set(i, object1); |
|
|
@ -1544,7 +1544,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
for (int i = 0; i < objectList.size(); i++) { |
|
|
String s = objectList.get(i); |
|
|
String s = objectList.get(i); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
JSONObject jsonObject = JSONObject.parseObject(s); |
|
|
Long id = Long.valueOf(jsonObject.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); |
|
|
if (Long.compare(id, parentMt.getOldId()) == 0) { |
|
|
if (Long.compare(id, parentMt.getOldId()) == 0) { |
|
|
// 如果是打开的顶级
|
|
|
// 如果是打开的顶级
|
|
|
JSONArray children = closeTree(jsonObject.getJSONArray("children"), mtLevel - 1, mt); |
|
|
JSONArray children = closeTree(jsonObject.getJSONArray("children"), mtLevel - 1, mt); |
|
|
@ -1875,7 +1875,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
// 如果到当前等级
|
|
|
// 如果到当前等级
|
|
|
for (int i = 0; i < jsonArray.size(); i++) { |
|
|
for (int i = 0; i < jsonArray.size(); i++) { |
|
|
JSONObject object = jsonArray.getJSONObject(i); |
|
|
JSONObject object = jsonArray.getJSONObject(i); |
|
|
Long oId = Long.valueOf(object.getString("id")); |
|
|
Long oId = ObjectFormatUtil.toLong(object.getString("id")); |
|
|
if (Long.compare(oId, mt.getOldId()) == 0) { |
|
|
if (Long.compare(oId, mt.getOldId()) == 0) { |
|
|
// 如果是当前关闭类别
|
|
|
// 如果是当前关闭类别
|
|
|
object.remove("spread"); |
|
|
object.remove("spread"); |
|
|
@ -1888,7 +1888,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
} |
|
|
} |
|
|
for (int i = 0; i < jsonArray.size(); i++) { |
|
|
for (int i = 0; i < jsonArray.size(); i++) { |
|
|
JSONObject object = jsonArray.getJSONObject(i); |
|
|
JSONObject object = jsonArray.getJSONObject(i); |
|
|
Long oId = Long.valueOf(object.getString("id")); |
|
|
Long oId = ObjectFormatUtil.toLong(object.getString("id")); |
|
|
if (Long.compare(oId, parent.getOldId()) == 0) { |
|
|
if (Long.compare(oId, parent.getOldId()) == 0) { |
|
|
// 如果是当前要关闭的父类
|
|
|
// 如果是当前要关闭的父类
|
|
|
JSONArray children = object.getJSONArray("children"); |
|
|
JSONArray children = object.getJSONArray("children"); |
|
|
@ -1926,11 +1926,11 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
// 获取当前树形菜单数据
|
|
|
// 获取当前树形菜单数据
|
|
|
JSONObject jsonObject = (JSONObject) childrenList.get(i); |
|
|
JSONObject jsonObject = (JSONObject) childrenList.get(i); |
|
|
// 获取当前菜单id
|
|
|
// 获取当前菜单id
|
|
|
Long id = Long.valueOf(jsonObject.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); |
|
|
// 如果当前类型id与菜单id一致
|
|
|
// 如果当前类型id与菜单id一致
|
|
|
if (Long.compare(somId, id) == 0) { |
|
|
if (Long.compare(somId, id) == 0) { |
|
|
|
|
|
|
|
|
Long childrenId = Long.valueOf(stringObjectMap.get("id").toString()); |
|
|
Long childrenId = ObjectFormatUtil.toLong(stringObjectMap.get("id").toString()); |
|
|
if (Long.compare(childrenId, id) == 0) { |
|
|
if (Long.compare(childrenId, id) == 0) { |
|
|
list.add(stringObjectMap); |
|
|
list.add(stringObjectMap); |
|
|
} else { |
|
|
} else { |
|
|
@ -1961,14 +1961,14 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
*/ |
|
|
*/ |
|
|
public List<Object> updateTreeChildren(List<Object> childrenList, Map<String, Object> map, Integer level, Integer nowLevel) { |
|
|
public List<Object> updateTreeChildren(List<Object> childrenList, Map<String, Object> map, Integer level, Integer nowLevel) { |
|
|
// 获取数据中的id
|
|
|
// 获取数据中的id
|
|
|
Long somId = Long.valueOf(map.get("id").toString()); |
|
|
Long somId = ObjectFormatUtil.toLong(map.get("id").toString()); |
|
|
List<Object> children = new ArrayList<>(); |
|
|
List<Object> children = new ArrayList<>(); |
|
|
if (level - nowLevel == 0) { |
|
|
if (level - nowLevel == 0) { |
|
|
// 如果不需要递归
|
|
|
// 如果不需要递归
|
|
|
for (int i = 0; i < childrenList.size(); i++) { |
|
|
for (int i = 0; i < childrenList.size(); i++) { |
|
|
JSONObject o = (JSONObject) childrenList.get(i); |
|
|
JSONObject o = (JSONObject) childrenList.get(i); |
|
|
// 获取当前子列表中的数据id
|
|
|
// 获取当前子列表中的数据id
|
|
|
Long id = Long.valueOf(o.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(o.getString("id")); |
|
|
if (Long.compare(somId, id) == 0) { |
|
|
if (Long.compare(somId, id) == 0) { |
|
|
// 如果当前数据需要进行修改
|
|
|
// 如果当前数据需要进行修改
|
|
|
children.add(map); |
|
|
children.add(map); |
|
|
@ -1987,7 +1987,7 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
for (int i = 0; i < childrenList.size(); i++) { |
|
|
for (int i = 0; i < childrenList.size(); i++) { |
|
|
JSONObject o = (JSONObject) childrenList.get(i); |
|
|
JSONObject o = (JSONObject) childrenList.get(i); |
|
|
// 获取当前子列表中的数据id
|
|
|
// 获取当前子列表中的数据id
|
|
|
Long id = Long.valueOf(o.getString("id")); |
|
|
Long id = ObjectFormatUtil.toLong(o.getString("id")); |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
if (Long.compare(id, parent.getOldId()) == 0) { |
|
|
List<Object> objectList = updateTreeChildren(o.getJSONArray("children"), map, level, nowLevel + 1); |
|
|
List<Object> objectList = updateTreeChildren(o.getJSONArray("children"), map, level, nowLevel + 1); |
|
|
o.put("children", objectList); |
|
|
o.put("children", objectList); |
|
|
|
