From 66d23ee8325e6506b1a1149d0b4feb3996d76bf5 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 31 Jul 2024 12:34:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99AGV?= =?UTF-8?q?=E4=B9=9F=E6=B7=BB=E5=8A=A0=E5=85=81=E8=AE=B8=E6=94=BE=E8=B4=A7?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/InBoxManageServiceImpl.java | 2 +- .../wms/pda/mps/rest/FeedingController.java | 7 ++++ .../wms/pda/mps/service/FeedingService.java | 3 ++ .../mps/service/impl/FeedingServiceImpl.java | 35 +++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 9b63fa7ba..7f82a9790 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -202,7 +202,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { BstIvtBoxinfo boxinfo = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda() .eq(BstIvtBoxinfo::getBox_no, boxNo)); - if (ObjectUtil.isEmpty(boxinfo.getBox_weight()) || Integer.parseInt(boxinfo.getBox_weight()) == 0) { + if (ObjectUtil.isEmpty(boxinfo.getBox_weight()) || Double.parseDouble(boxinfo.getBox_weight()) == 0) { throw new BadRequestException("请先维护木箱重量后进行入库！"); } if (StrUtil.isEmpty(boxType)) { 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 e41816631..fb27ff03a 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 @@ -59,4 +59,11 @@ public class FeedingController { public ResponseEntity vehicleReturn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.vehicleReturn(whereJson), HttpStatus.OK); } + + @PostMapping("/AGVPass") + @Log("AGV放行") + + public ResponseEntity AGVPass(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(feedingService.AGVPass(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 abb154cbe..ea279aeef 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 @@ -45,4 +45,7 @@ public interface FeedingService { */ JSONObject vehicleReturn(JSONObject whereJson); + JSONObject AGVPass(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 86346118b..bc066afe0 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 @@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.content.HttpContext; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; +import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.pda.mps.service.FeedingService; @@ -565,4 +566,38 @@ public class FeedingServiceImpl implements FeedingService { result.put("message", "操作成功!"); return result; } + + @Override + public JSONObject AGVPass(JSONObject whereJson) { + String point_code = whereJson.getString("point_code"); + if (ObjectUtil.isEmpty(point_code)) { + throw new BadRequestException("输入设备点位编码不能为空！"); + } + JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0); + + //查询该母卷号对应的任务 + JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("(point_code2 = '" + point_code + "' OR point_code1 = '" + point_code + "') and task_status <> '07' AND is_delete = '0'").uniqueResult(0); + if (ObjectUtil.isEmpty(task_jo)) { + throw new BadRequestException("输入设备点位编码不能为空！"); + } + //下发ACS，执行取满放空的AGV动作 + JSONArray paramArr = new JSONArray(); + JSONObject param = new JSONObject(); + param.put("device_code", cut_jo.getString("point_code")); + param.put("task_code", task_jo.getString("task_code")); + param.put("product_area", cut_jo.getString("product_area")); + param.put("option", "1"); + paramArr.add(param); + + WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl(); + JSONObject result = wmsToAcsService.updateTask(paramArr); + + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException("操作失败：" + result.getString("message ")); + } + + JSONObject jo = new JSONObject(); + jo.put("message", "操作成功!"); + return jo; + } }