From 709a5befe9d9f8d325fb0311e0fe2fb8984b5b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Thu, 17 Nov 2022 10:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/impl/XianGongAgvServiceImpl.java | 6 +++++- .../service/impl/InstructionServiceImpl.java | 19 ++++++++++--------- .../amb/service/impl/HFHandServiceImpl.java | 18 +++++++----------- .../org/nl/wms/pda/rest/PdaController.java | 8 ++++++-- .../wms/pda/service/impl/PdaServiceImpl.java | 18 ++++++++---------- 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 42830f3..2234d35 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -194,9 +194,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); - agvurl = agvurl + ":" + agvport + "/api/route/transportOrders/" + instCode + "/withdrawal"; + JSONObject param = new JSONObject(); + param.put("id", instCode); + param.put("disableVehicle", false); + agvurl = agvurl + ":" + agvport + "/terminate"; log.info("删除agv指令请求agvurl:{}", agvurl); HttpResponse result = HttpRequest.post(agvurl) + .body(param.toJSONString()) .timeout(20000)//超时，毫秒 .execute(); log.info("删除agv指令请求反馈:{}", result); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index dee7aaa..7380930 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -66,7 +66,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Autowired DeviceAppService deviceAppService; @Autowired - NDCAgvService ndcAgvService; + XianGongAgvService agvService; @Autowired ParamService paramService; @Autowired @@ -455,12 +455,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) { if (StrUtil.equals("1", dto.getInstruction_type())) { - ndcAgvService.sendAgvTwoInstToNDC(dto, dto2); + agvService.sendOrderSequencesToXZ(dto); + agvService.sendOrderSequencesToXZ(dto2); dto.setSend_status("1"); dto2.setSend_status("1"); } else if (StrUtil.equals("2", dto.getInstruction_type())) { dto.setSend_status("1"); - ndcAgvService.sendAgvTwoInstToNDC(dto, null); + agvService.sendOrderSequencesToXZ(dto); } else if (StrUtil.equals("3", dto.getInstruction_type())) { } else if (StrUtil.equals("4", dto.getInstruction_type())) { @@ -469,13 +470,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } else if (StrUtil.equals("6", dto.getInstruction_type())) { dto.setSend_status("1"); - ndcAgvService.sendAgvOneInstToNDC(dto); + agvService.sendOrderSequencesToXZ(dto); } else if (StrUtil.equals("7", dto.getInstruction_type())) { - ndcAgvService.sendAgvOneInstToNDC(dto); + agvService.sendOrderSequencesToXZ(dto); dto.setSend_status("1"); } else if (StrUtil.equals("8", dto.getInstruction_type())) { dto.setSend_status("1"); - ndcAgvService.sendAgvOneInstToNDC(dto); + agvService.sendOrderSequencesToXZ(dto); } } @@ -861,14 +862,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu // != 0 为agv任务 1=magic 2=NDC 3=XZ,4=ZHEDA if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "1") && !StrUtil.equals(entity.getSend_status(), "2")) { - MagicAgvService magicAgvService = SpringContextHolder.getBean(MagicAgvService.class); - magicAgvService.deleteAgvInst(entity.getInstruction_code()); + XianGongAgvService agvService = SpringContextHolder.getBean(XianGongAgvService.class); + agvService.deleteXZAgvInst(entity.getInstruction_code()); flag = true; } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) { //NDC agv指令不当场取消指令,需要等agv上报 if (!StrUtil.isEmpty(entity.getAgv_jobno())) { - ndcAgvService.deleteAgvInstToNDC(entity); + agvService.deleteXZAgvInst(entity.getInstruction_code()); } else { flag = true; } diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java index 7299687..1bec9a4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java @@ -11,8 +11,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.server.MagicAgvService; -import org.nl.acs.agv.server.impl.MagicAgvServiceImpl; +import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.dto.DeviceDto; import org.nl.acs.device.service.impl.DeviceServiceImpl; @@ -330,7 +329,7 @@ public class HFHandServiceImpl implements HFHandService { resultJson.put("result", ""); return resultJson; } - if(Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())){ + if (Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())) { resultJson.put("code", "0"); resultJson.put("desc", "起点或终点设备已被锁定"); resultJson.put("result", ""); @@ -542,7 +541,7 @@ public class HFHandServiceImpl implements HFHandService { } String task_id = instwo.getString("task_id"); Instruction instdto = (Instruction) instwo.toJavaObject(Instruction.class); - MagicAgvService agvService = SpringContextHolder.getBean(MagicAgvServiceImpl.class); + XianGongAgvService agvService = SpringContextHolder.getBean(XianGongAgvService.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); /* 1 指令撤销 @@ -553,11 +552,8 @@ public class HFHandServiceImpl implements HFHandService { try { //agvService.deleteAgvInst(instwo.getString("instruction_code")); - if (StrUtil.isEmpty(instdto.getAgv_jobno())) { - instructionService.cancelNOSendAgv(inst_uuid); - } else { - agvService.deleteAgvInst(instdto.getInstruction_code()); - } + instructionService.cancel(inst_uuid); + agvService.deleteXZAgvInst(instdto.getInstruction_code()); } catch (Exception e) { jo.put("code", "2"); @@ -568,7 +564,7 @@ public class HFHandServiceImpl implements HFHandService { } if (type.equals("2")) { try { - agvService.sendAgvInstToMagic(instdto); + agvService.sendOrderSequencesToXZ(instdto); } catch (Exception e) { jo.put("code", "2"); jo.put("desc", "下发agv失败"); @@ -677,7 +673,7 @@ public class HFHandServiceImpl implements HFHandService { TaskDto acsTask = taskjo.toJavaObject(TaskDto.class); InstructionService instructionservice = SpringContextHolder.getBean(InstructionServiceImpl.class); InstructionDto instdto = instructionservice.findByTaskid(acsTask.getTask_id(), "instruction_status <2 "); - if (instdto != null){ + if (instdto != null) { jo.put("code", "0"); jo.put("desc", "有指令未完成!"); jo.put("result", new JSONObject()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java index f01b97a..25b2d11 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java @@ -1,5 +1,7 @@ package org.nl.wms.pda.rest; +import cn.hutool.core.map.MapUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; @@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * @author 张江玮 * @date 2022/11/04 18:16 @@ -61,8 +65,8 @@ public class PdaController { @PostMapping("/vm") @Log("组盘") @ApiOperation("组盘") - public ResponseEntity vm(@RequestBody JSONObject param) { - pdaService.vm(param.getString("vehicle_code"), param.getJSONArray("material")); + public ResponseEntity vm(@RequestBody Map param) { + pdaService.vm(MapUtil.getStr(param, "vehicle_code"), JSON.parseArray(JSON.toJSONString(param.get("material")))); return this.success(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 979f91c..1a3fa98 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -149,12 +149,7 @@ public class PdaServiceImpl implements PdaService { WQLObject vehicleTable = WQLObject.getWQLObject("md_pb_vehicle"); JSONObject vehicle = vehicleTable.query("vehicle_code = '" + vehicleCode + "'").uniqueResult(0); if (ObjectUtil.isEmpty(vehicle)) { - vehicle = new JSONObject(); - vehicle.put("vehicle_id", IdUtil.getSnowflake(1L, 1L).nextId()); - vehicle.put("vehicle_code", vehicleCode); - vehicle.put("vehicle_status", VehicleStatus.EMPTY.getCode()); - CommonUtils.addCommonColum(vehicle); - vehicleTable.insert(vehicle); + throw new BadRequestException("该载具号不存在"); } String vehicleId = vehicle.getString("vehicle_id"); @@ -188,9 +183,12 @@ public class PdaServiceImpl implements PdaService { } vehicle.put("vehicle_status", VehicleStatus.HAS_MATERIAL.getCode()); - CommonUtils.addUpdateColum(vehicle); - vehicleTable.update(vehicle); + } else { + vehicle.put("vehicle_status", VehicleStatus.EMPTY.getCode()); } + + CommonUtils.addUpdateColum(vehicle); + vehicleTable.update(vehicle); } @Override @@ -347,7 +345,7 @@ public class PdaServiceImpl implements PdaService { String regionId = point.getString("region_id"); if (StrUtil.equals(regionId, RegionEnum.ZC.getId()) || (StrUtil.equals(regionId, RegionEnum.JJ.getId()) - && point.getString("point_code").startsWith("JJC"))) { + && !point.getString("point_code").startsWith("JJR"))) { throw new BadRequestException("只有交接区的入库位和接料区才能发起入库任务"); } @@ -406,7 +404,7 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("终点有载具"); } if (!StrUtil.equals(nextPoint.getString("region_id"), RegionEnum.JJ.getId()) - && nextPoint.getString("point_code").startsWith("JJC")) { + || !nextPoint.getString("point_code").startsWith("JJC")) { throw new BadRequestException("只有终点为交接区的出库位才能生成出库任务"); }