|
|
@ -230,8 +230,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
public Integer insertApplicationOutRecord(Map<String, Object> map, UserByPort userToken, String userKey, String token) { |
|
|
public Integer insertApplicationOutRecord(Map<String, Object> map, UserByPort userToken, String userKey, String token) { |
|
|
String placeId = ""; |
|
|
String placeId = ""; |
|
|
Object temp = map.get("placeId"); |
|
|
Object temp = map.get("placeId"); |
|
|
String depositoryId = map.get("depositoryId").toString(); |
|
|
Object depositoryId = map.get("depositoryId"); |
|
|
if (depositoryId == null || "".equals(depositoryId)) { |
|
|
if (depositoryId == null || "".equals(depositoryId.toString())) { |
|
|
map.put("flagForOpenDepository", 1); |
|
|
map.put("flagForOpenDepository", 1); |
|
|
map.remove("depositoryId"); |
|
|
map.remove("depositoryId"); |
|
|
} else { |
|
|
} else { |
|
|
@ -919,16 +919,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
public Integer insertApplicationOutMin(Map<String, Object> map) { |
|
|
public Integer insertApplicationOutMin(Map<String, Object> map) { |
|
|
// 获取当前出库库存id
|
|
|
// 获取当前出库库存id
|
|
|
Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); |
|
|
Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); |
|
|
String depositoryId = map.get("depositoryId").toString(); |
|
|
Object depositoryId = map.get("depositoryId"); |
|
|
// 获取当前出库库存记录
|
|
|
// 获取当前出库库存记录
|
|
|
Inventory inventoryById = materialMapper.findInventoryById(mid); |
|
|
Inventory inventoryById = materialMapper.findInventoryById(mid); |
|
|
if (depositoryId == null || "".equals(depositoryId)) { |
|
|
if (depositoryId == null || "".equals(depositoryId.toString())) { |
|
|
map.put("depositoryId", inventoryById.getDepositoryId()); |
|
|
map.put("depositoryId", inventoryById.getDepositoryId()); |
|
|
} else { |
|
|
} else { |
|
|
// 如果选择了仓库
|
|
|
// 如果选择了仓库
|
|
|
Map<String, Object> paramForInventory = new HashMap<>(); |
|
|
Map<String, Object> paramForInventory = new HashMap<>(); |
|
|
paramForInventory.put("mid", inventoryById.getMid()); |
|
|
paramForInventory.put("mid", inventoryById.getMid()); |
|
|
paramForInventory.put("did", depositoryId); |
|
|
paramForInventory.put("did", depositoryId.toString()); |
|
|
inventoryById = materialMapper.findInventoryByMidAndDid(paramForInventory); |
|
|
inventoryById = materialMapper.findInventoryByMidAndDid(paramForInventory); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|