diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index a3a22c488..5c363f8a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -157,6 +157,20 @@ public class ProductInstorServiceImpl implements ProductInstorService { if (StrUtil.isEmpty(box_length) || StrUtil.isEmpty(box_width) || StrUtil.isEmpty(box_high)){ throw new BadRequestException("该木箱没有长宽高信息，无法入库，请到子卷包装关系中维护!"); } + JSONObject point_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+point_code+"'").uniqueResult(0); + if (ObjectUtil.isEmpty(point_jo)){ + throw new BadRequestException("未查询到对应的点位！"); + }else { + if (point_jo.getString("is_used").equals("0")){ + throw new BadRequestException("该点位已经被禁用！"); + } + if (point_jo.getString("is_delete").equals("1")){ + throw new BadRequestException("该点位已经被删除！"); + } + if (!point_jo.getString("region_code").equals("NBJ01")){ + throw new BadRequestException("请扫描内包间入库点位！"); + } + } //创建二楼去一楼的任务 JSONObject form = new JSONObject(); form.put("point_code1", point_code); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 4242e9316..73af11d3d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -90,7 +90,7 @@ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_SN = dis.box_no AND sub.container_name = dis.pcsn - LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code + LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code AND task.task_status < '07' AND task.is_delete = '0' WHERE mst.bill_type = '0009' AND sub.STATUS = '1' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 889b35653..8a6be2653 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -231,6 +231,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { dis.put("material_id", row.get("material_id")); dis.put("pcsn", row.get("pcsn")); dis.put("box_no", row.get("box_no")); + dis.put("storagevehicle_code", row.get("box_no")); dis.put("quality_scode", row.get("quality_scode")); dis.put("work_status", "00"); dis.put("qty_unit_id", material.getString("base_unit_id")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index a5288db7d..374dfddbe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -176,6 +176,8 @@ OPTION 输入.open_flag = "2" dtl.bill_status IN ('30','40') ENDOPTION + ORDER BY + dtl.box_no ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 58cb6ad3c..27ed9bcac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -254,7 +254,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { task.put("task_id", task_id); task.put("task_code", task_code); task.put("task_type", "010505"); - task.put("task_status", "01"); + task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); task.put("point_code1", jo.getString("start_point_code")); task.put("point_code2", point.getString("point_code")); task.put("vehicle_code", jo.getString("storagevehicle_code")); 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 db1c60c54..044347c5b 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 @@ -86,7 +86,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { if(task==null){ throw new BadRequestException("查询不到操作的任务记录！"); } - if("1".equals(status)){ + if(TaskStatusEnum.EXECUTING.equals(status)){ map.put("work_status","02"); wo_dtl.update(map,"task_id='"+task_id+"'"); map.put("task_status","03"); @@ -94,7 +94,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { map.put("update_optname",nickName); map.put("update_time",now); wo_Task.update(map,"task_id='"+task_id+"'"); - }else if("2".equals(status)){ + }else if(TaskStatusEnum.FINISHED.equals(status)){ HandMoveStorServiceImpl handMoveStorServiceImpl = SpringContextHolder.getBean(HandMoveStorServiceImpl.class); handMoveStorServiceImpl.finishTask(task); }else if("0".equals(status)){