|
|
@ -110,7 +110,10 @@ public class DepositoryServiceImpl implements DepositoryService { |
|
|
code = parentCode + String.format("%02d", sonDepositoryNum + 1); |
|
|
code = parentCode + String.format("%02d", sonDepositoryNum + 1); |
|
|
} |
|
|
} |
|
|
map.put("code", code); |
|
|
map.put("code", code); |
|
|
map.put("maxNumber",(int)(ObjectFormatUtil.toDouble(map.get("maxNumber")) * 100)); |
|
|
Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); |
|
|
|
|
|
if ((int) (maxNumber * 100) > 999999999) { |
|
|
|
|
|
map.put("maxNumber", 999999999); |
|
|
|
|
|
} |
|
|
return depositoryMapper.insertDepository(map); |
|
|
return depositoryMapper.insertDepository(map); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -215,7 +218,10 @@ public class DepositoryServiceImpl implements DepositoryService { |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public Integer updateDepository(Map<String, Object> map) { |
|
|
public Integer updateDepository(Map<String, Object> map) { |
|
|
map.put("maxNumber",(int)(ObjectFormatUtil.toDouble(map.get("maxNumber")) * 100)); |
|
|
Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); |
|
|
|
|
|
if ((int) (maxNumber * 100) > 999999999) { |
|
|
|
|
|
map.put("maxNumber", 999999999); |
|
|
|
|
|
} |
|
|
return depositoryMapper.updateDepository(map); |
|
|
return depositoryMapper.updateDepository(map); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -554,7 +560,7 @@ public class DepositoryServiceImpl implements DepositoryService { |
|
|
// 定义树结构
|
|
|
// 定义树结构
|
|
|
List<Object> result = new ArrayList<>(); |
|
|
List<Object> result = new ArrayList<>(); |
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
if(list.get(i) == null){ |
|
|
if (list.get(i) == null) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
// 构造为jsonObject类
|
|
|
// 构造为jsonObject类
|
|
|
@ -737,8 +743,8 @@ public class DepositoryServiceImpl implements DepositoryService { |
|
|
@Override |
|
|
@Override |
|
|
public List<InventoryByDname> getToDayInventoryByDNameTest() { |
|
|
public List<InventoryByDname> getToDayInventoryByDNameTest() { |
|
|
List<InventoryByDname> toDayInventoryByDNameTest = depositoryMapper.getToDayInventoryByDNameTest(); |
|
|
List<InventoryByDname> toDayInventoryByDNameTest = depositoryMapper.getToDayInventoryByDNameTest(); |
|
|
for (InventoryByDname inventoryByDName:toDayInventoryByDNameTest |
|
|
for (InventoryByDname inventoryByDName : toDayInventoryByDNameTest |
|
|
) { |
|
|
) { |
|
|
inventoryByDName.setInventory(inventoryByDName.getInventory() / 100); |
|
|
inventoryByDName.setInventory(inventoryByDName.getInventory() / 100); |
|
|
} |
|
|
} |
|
|
return toDayInventoryByDNameTest; |
|
|
return toDayInventoryByDNameTest; |
|
|
|