diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java index 72b33a8c9..5929e8c14 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java @@ -55,4 +55,11 @@ public class FeedingController { public ResponseEntity handleConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.handleConfirm(whereJson), HttpStatus.OK); } + + @PostMapping("/vehicleReturn") + @Log("空轴送回") + @ApiOperation("空轴送回") + public ResponseEntity vehicleReturn(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(feedingService.vehicleReturn(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/FeedingService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/FeedingService.java index 0670e61f6..45a977498 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/FeedingService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/FeedingService.java @@ -37,4 +37,12 @@ public interface FeedingService { */ JSONObject handleConfirm(JSONObject whereJson); + /** + * 空轴送回 + * + * @param whereJson / + * @return JSONObject + */ + JSONObject vehicleReturn(JSONObject whereJson); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index 2bd4bb9c9..9629fbe20 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -333,4 +333,51 @@ public class FeedingServiceImpl implements FeedingService { result.put("message", "操作成功!"); return jo; } + + @Transactional(rollbackFor = Exception.class) + @Override + public JSONObject vehicleReturn(JSONObject form) { + String point_code = form.getString("point_code"); + if (StrUtil.isEmpty(point_code)) { + throw new BadRequestException("输入的点位不能为空！"); + } + + //查询对应的分切点位是否存在 + JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(cut_jo)) { + throw new BadRequestException("请输入或者扫码分切区域的空轴点位！"); + } + if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) { + throw new BadRequestException("该点位库存状态不存在空轴！"); + } + + // 2.找冷却区空货位 + JSONObject map = new JSONObject(); + map.put("flag", "2"); + map.put("product_area", cut_jo.getString("product_area")); + map.put("point_location", "0"); + + JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); + // 如果为空 + if (ObjectUtil.isEmpty(jsonCooIvt)) { + map.put("point_location", "1"); + jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); + } + if (ObjectUtil.isEmpty(jsonCooIvt)) { + throw new BadRequestException("冷却区空位不足"); + } + + // 3.创建任务 + JSONObject param = new JSONObject(); + param.put("point_code1", point_code); + param.put("point_code2", jsonCooIvt.getString("empty_point_code")); + param.put("product_area", cut_jo.getString("product_area")); + param.put("task_type", "010303"); + AbstractAcsTask task = new CoolCutTask(); + task.createTask(param); + + JSONObject result = new JSONObject(); + result.put("message", "操作成功!"); + return result; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql index 91fe4df50..bcb2cdc92 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql @@ -63,6 +63,9 @@ OPTION 输入.point_type <> "" point_type = 输入.point_type ENDOPTION + OPTION 输入.point_type = "5" + IFNULL(material_code,'') = '' + ENDOPTION order by point_code ASC diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql index 5602cb1f3..f2409b310 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql @@ -166,7 +166,7 @@ der.STATUS WHEN '01' THEN '开始' WHEN '02' THEN '空轴搬出' - WHEN '03' THEN '确认下卷' + WHEN '03' THEN '准备就绪' WHEN '04' THEN '下卷完成' WHEN '09' THEN '结束' END diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 284074ed4..8f92258b6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -234,7 +234,7 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); //更新冷却区空轴库存 - JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code2 + "'").uniqueResult(0); jsonCoolIvt2.put("empty_point_status", "02"); jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code")); jsonCoolIvt2.put("cool_ivt_status", "01"); diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue index 17ea8852a..90a5b47d6 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue @@ -91,30 +91,17 @@ - + - + + + + - - - - - diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 3b2b05fd6..2709eb906 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -313,6 +313,7 @@ --> +