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

rev:移库下发

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-12 17:30:22 +08:00
parent 2746ffdd08
commit 3231445e61
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -39,14 +39,14 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
//判断该任务所在的块、排存在其他任务 //判断该任务所在的块、排存在其他任务
String point_code2 = json.getString("point_code2"); /*String point_code2 = json.getString("point_code2");
JSONObject struct_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("struct_code = '"+point_code2+"'").uniqueResult(0); JSONObject struct_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("struct_code = '"+point_code2+"'").uniqueResult(0);
String row_num = struct_jo.getString("row_num"); String row_num = struct_jo.getString("row_num");
String block_num = struct_jo.getString("block_num"); String block_num = struct_jo.getString("block_num");
JSONObject task_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("block_num = '"+block_num+"' AND row_num = '"+row_num+"' AND lock_type in ('3','6')").uniqueResult(0); JSONObject task_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("block_num = '"+block_num+"' AND row_num = '"+row_num+"' AND lock_type in ('3','6')").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)){ if (ObjectUtil.isNotEmpty(task_jo)){
continue; continue;
} }*/
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()

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

@@ -69,6 +69,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
private final RawAssistIStorService rawAssistIStorService; private final RawAssistIStorService rawAssistIStorService;
private final HandMoveStorService handMoveStorService; private final HandMoveStorService handMoveStorService;
private final OutTask outTask; private final OutTask outTask;
private final HandMoveStorAcsTask moveStorAcsTask;
@Override @Override
public Map<String, Object> pageQuery(Map whereJson, Pageable page) { public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
@@ -3625,8 +3626,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
param2.put("sort_seq", i + 1); // 任务组顺序号 param2.put("sort_seq", i + 1); // 任务组顺序号
String move_task_id = outTask.createTask(param2); String move_task_id = outTask.createTask(param2);
new HandMoveStorAcsTask().immediateNotifyAcs(null);
// 回显移库明细任务id // 回显移库明细任务id
jsonMoveDtl.put("task_id", move_task_id); jsonMoveDtl.put("task_id", move_task_id);
table.add(jsonMoveDtl); table.add(jsonMoveDtl);
@@ -3641,6 +3640,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) { if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) {
handMoveStorService.insertDtl2(mapParam); handMoveStorService.insertDtl2(mapParam);
} }
moveStorAcsTask.immediateNotifyAcs(null);
} }
} }