|
|
@ -244,8 +244,7 @@ public class DepositoryRecordController { |
|
|
recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); |
|
|
recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); |
|
|
mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); |
|
|
mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
else { |
|
|
|
|
|
// 获取库位id
|
|
|
// 获取库位id
|
|
|
Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); |
|
|
Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); |
|
|
if (placeId == 0) {// 如果插入到仓库
|
|
|
if (placeId == 0) {// 如果插入到仓库
|
|
|
@ -466,15 +465,21 @@ public class DepositoryRecordController { |
|
|
map.remove("id"); |
|
|
map.remove("id"); |
|
|
map.put("parentId", id); |
|
|
map.put("parentId", id); |
|
|
} |
|
|
} |
|
|
|
|
|
if (map.containsKey("constructionUnitId")) { |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
String adminorgId = map.get("adminorgId").toString(); |
|
|
if ("".equals(constructionUnitId)) { |
|
|
if("".equals(constructionUnitId)) |
|
|
|
|
|
{ |
|
|
|
|
|
map.remove("constructionUnitId"); |
|
|
map.remove("constructionUnitId"); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (map.containsKey("adminorgId")) { |
|
|
|
|
|
String adminorgId = map.get("adminorgId").toString(); |
|
|
if ("".equals(adminorgId)) { |
|
|
if ("".equals(adminorgId)) { |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
} |
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
integer += depositoryRecordService.insertApplicationOutMin(map); |
|
|
integer += depositoryRecordService.insertApplicationOutMin(map); |
|
|
|
|
|
|
|
|
// 开启一个线程执行发送信息操作
|
|
|
// 开启一个线程执行发送信息操作
|
|
|
@ -542,29 +547,41 @@ public class DepositoryRecordController { |
|
|
insert.put("unit", map.get("unit" + temp)); |
|
|
insert.put("unit", map.get("unit" + temp)); |
|
|
// 获取主订单编号
|
|
|
// 获取主订单编号
|
|
|
insert.put("parentId", id); |
|
|
insert.put("parentId", id); |
|
|
|
|
|
if (map.containsKey("constructionUnitId" + temp)) { |
|
|
String constructionUnitId = (String) map.get("constructionUnitId" + temp); |
|
|
String constructionUnitId = (String) map.get("constructionUnitId" + temp); |
|
|
String adminorgId = (String) map.get("adminorgId"+temp); |
|
|
if (!"".equals(constructionUnitId)) { |
|
|
if(!"".equals(constructionUnitId)) |
|
|
|
|
|
{ |
|
|
|
|
|
insert.put("constructionUnitId", constructionUnitId); |
|
|
insert.put("constructionUnitId", constructionUnitId); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (map.containsKey("adminorgId" + temp)) { |
|
|
|
|
|
String adminorgId = (String) map.get("adminorgId" + temp); |
|
|
|
|
|
|
|
|
if ("".equals(adminorgId)) { |
|
|
if ("".equals(adminorgId)) { |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
} else { |
|
|
} else { |
|
|
map.put("adminorgId", adminorgId); |
|
|
map.put("adminorgId", adminorgId); |
|
|
} |
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// 插入子订单
|
|
|
// 插入子订单
|
|
|
integer += depositoryRecordService.insertApplicationOutMin(insert); |
|
|
integer += depositoryRecordService.insertApplicationOutMin(insert); |
|
|
} |
|
|
} |
|
|
|
|
|
if (map.containsKey("constructionUnitId")) { |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
String adminorgId = map.get("adminorgId").toString(); |
|
|
if ("".equals(constructionUnitId)) { |
|
|
if("".equals(constructionUnitId)) |
|
|
|
|
|
{ |
|
|
|
|
|
map.remove("constructionUnitId"); |
|
|
map.remove("constructionUnitId"); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (map.containsKey("adminorgId")) { |
|
|
|
|
|
String adminorgId = map.get("adminorgId").toString(); |
|
|
if ("".equals(adminorgId)) { |
|
|
if ("".equals(adminorgId)) { |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
} |
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
|
|
|
} |
|
|
// 插入子订单
|
|
|
// 插入子订单
|
|
|
map.put("parentId", id); |
|
|
map.put("parentId", id); |
|
|
map.remove("id"); |
|
|
map.remove("id"); |
|
|
|