root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-12-19 10:37:54 +08:00
parent 1c49eb87bb
commit 2b3b33e86f
1 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -1569,6 +1569,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0); jsonAllBlockPoint = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().getResultJSONArray(0);
} }
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
JSONObject mapParam = new JSONObject();// 生成移库单传入参数 JSONObject mapParam = new JSONObject();// 生成移库单传入参数
JSONArray table = new JSONArray(); // 明细参数 JSONArray table = new JSONArray(); // 明细参数
mapParam.put("bill_status", "10"); mapParam.put("bill_status", "10");
@@ -1580,9 +1583,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapParam.put("stor_name", "成品仓库"); mapParam.put("stor_name", "成品仓库");
mapParam.put("is_task", "1"); mapParam.put("is_task", "1");
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
// 查询移入货位 // 查询移入货位
JSONObject moveParam = new JSONObject(); JSONObject moveParam = new JSONObject();
moveParam.put("box_no", json.getString("storagevehicle_code")); moveParam.put("box_no", json.getString("storagevehicle_code"));
@@ -1636,13 +1636,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0); JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName()); jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
wo_Task.update(jsonTaskMove); wo_Task.update(jsonTaskMove);
}
mapParam.put("tableData", table); mapParam.put("tableData", table);
// 调用移库单新增方法 // 调用移库单新增方法
if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) { if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
handMoveStorService.insertDtl2(mapParam); handMoveStorService.insertDtl2(mapParam);
} }
} }
}
} else { } else {
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("struct_code", jsonAttr.getString("struct_code")); map.put("struct_code", jsonAttr.getString("struct_code"));
@@ -1686,6 +1688,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} }
} }
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
JSONObject mapParam = new JSONObject();// 生成移库单传入参数 JSONObject mapParam = new JSONObject();// 生成移库单传入参数
JSONArray table = new JSONArray(); // 明细参数 JSONArray table = new JSONArray(); // 明细参数
mapParam.put("bill_status", "10"); mapParam.put("bill_status", "10");
@@ -1697,9 +1702,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
mapParam.put("stor_name", "成品仓库"); mapParam.put("stor_name", "成品仓库");
mapParam.put("is_task", "1"); mapParam.put("is_task", "1");
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
// 查询移入货位 // 查询移入货位
JSONObject moveParam = new JSONObject(); JSONObject moveParam = new JSONObject();
moveParam.put("box_no", json.getString("storagevehicle_code")); moveParam.put("box_no", json.getString("storagevehicle_code"));
@@ -1753,13 +1755,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0); JSONObject jsonTaskMove = wo_Task.query("task_id = '" + move_task_id + "'").uniqueResult(0);
jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName()); jsonTaskMove.put("handle_class", HandMoveStorAcsTask.class.getName());
wo_Task.update(jsonTaskMove); wo_Task.update(jsonTaskMove);
}
mapParam.put("tableData", table); mapParam.put("tableData", table);
// 调用移库单新增方法 // 调用移库单新增方法
if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) { if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
handMoveStorService.insertDtl2(mapParam); handMoveStorService.insertDtl2(mapParam);
} }
} }
}
// 下发 // 下发
outTask.immediateNotifyAcs(null); outTask.immediateNotifyAcs(null);
} }