diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index 2a21bdb2b..0431d395d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -39,14 +39,14 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { 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); String row_num = struct_jo.getString("row_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); if (ObjectUtil.isNotEmpty(task_jo)){ continue; - } + }*/ char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); AcsTaskDto dto = AcsTaskDto.builder() diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 46c58405e..39b0f1dea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -69,6 +69,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { private final RawAssistIStorService rawAssistIStorService; private final HandMoveStorService handMoveStorService; private final OutTask outTask; + private final HandMoveStorAcsTask moveStorAcsTask; @Override public Map pageQuery(Map whereJson, Pageable page) { @@ -3625,8 +3626,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { param2.put("sort_seq", i + 1); // 任务组顺序号 String move_task_id = outTask.createTask(param2); - new HandMoveStorAcsTask().immediateNotifyAcs(null); - // 回显移库明细任务id jsonMoveDtl.put("task_id", move_task_id); table.add(jsonMoveDtl); @@ -3641,6 +3640,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (ObjectUtil.isNotEmpty(jsonAllBlockPoint)) { handMoveStorService.insertDtl2(mapParam); } + + moveStorAcsTask.immediateNotifyAcs(null); } }