From 211206994c4ec0e389c24cfc69e362e1968a75fc Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 14 Jan 2026 00:04:50 +0800 Subject: [PATCH] no message --- .../service/impl/AgvTaskServiceImpl.java | 1 + .../controller/ConveyorLineController.java | 21 ++++++++++++++++--- .../conveyorLine/request/ScanTrayRequest.java | 8 +++++++ .../service/IConveyorLineService.java | 2 ++ .../impl/IConveyorLineServiceImpl.java | 18 ++++++++++++++++ .../service/processor/ScanTrayProcessor.java | 2 +- 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java index 0b0787f..1e47a53 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java @@ -119,6 +119,7 @@ public class AgvTaskServiceImpl extends ServiceImpl impl public void processAgvTask(ScanTrayData data, Point dstPoint) { Asn asn = data.getAsn(); asn.setStatus(AsnStatusEnum.SCAN.getValue()); + asn.setResMessage("检测成功"); asnMapper.updateById(asn); //写入工作站和终点库位 diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/controller/ConveyorLineController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/controller/ConveyorLineController.java index 7f14fad..c450a2f 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/controller/ConveyorLineController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/controller/ConveyorLineController.java @@ -9,11 +9,14 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.cpte.modules.conveyorLine.request.ScanTrayRequest; import org.cpte.modules.conveyorLine.service.IConveyorLineService; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.api.vo.TesResult; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.config.shiro.IgnoreAuth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Tag(name = "输送线") @RestController @RequestMapping("/conveyorLine") @@ -32,9 +35,21 @@ public class ConveyorLineController { @Operation(summary = "输送线-扫描托盘") @PostMapping(value = "/scanTray") @IgnoreAuth - public Result scanTray(@RequestBody ScanTrayRequest scanTrayRequest) { - iConveyorLineService.scanTray(scanTrayRequest); - return Result.OK("扫描成功"); + public TesResult scanTray(@RequestBody ScanTrayRequest scanTrayRequest) { + try { + Long errorCode = scanTrayRequest.getContent().getSignal().getErrorCode(); + if (errorCode == 0) { + iConveyorLineService.scanTray(scanTrayRequest); + return TesResult.success(); + } else { + iConveyorLineService.updateResMessageAsn(scanTrayRequest); + List errorMsg = scanTrayRequest.getContent().getSignal().getErrorReason(); + return TesResult.error(errorMsg.toString()); + } + } catch (Exception e) { + iConveyorLineService.updateResMessageAsn(scanTrayRequest); + return TesResult.error(e.getMessage()); + } } @Operation(summary = "输送线-大屏显示") diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/request/ScanTrayRequest.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/request/ScanTrayRequest.java index 769e535..ac2a031 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/request/ScanTrayRequest.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/request/ScanTrayRequest.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import lombok.Data; +import java.util.List; + @Data public class ScanTrayRequest { @@ -29,5 +31,11 @@ public class ScanTrayRequest { public static class Signal{ @JsonProperty("barCode") private String barCode; + + @JsonProperty("errorCode") + private Long errorCode; + + @JsonProperty("errorReason") + private List errorReason; } } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/IConveyorLineService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/IConveyorLineService.java index eec9803..753355f 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/IConveyorLineService.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/IConveyorLineService.java @@ -15,6 +15,8 @@ public interface IConveyorLineService { */ void scanTray(ScanTrayRequest scanTrayRequest); + void updateResMessageAsn(ScanTrayRequest scanTrayRequest); + /** * 显示 输送线大屏显示 * diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/impl/IConveyorLineServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/impl/IConveyorLineServiceImpl.java index 9d5ff18..d6d001b 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/impl/IConveyorLineServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/impl/IConveyorLineServiceImpl.java @@ -12,12 +12,16 @@ import org.cpte.modules.constant.enums.*; import org.cpte.modules.conveyorLine.request.ScanTrayRequest; import org.cpte.modules.conveyorLine.service.IConveyorLineService; import org.cpte.modules.conveyorLine.service.processor.ScanTrayProcessor; +import org.cpte.modules.conveyorLine.vo.ScanTrayData; +import org.cpte.modules.receive.entity.Asn; +import org.cpte.modules.receive.mapper.AsnMapper; import org.cpte.modules.shipping.entity.Task; import org.cpte.modules.shipping.mapper.TaskMapper; import org.cpte.modules.utils.RedisDistributedLockUtil; import org.jeecg.common.util.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.util.HashMap; @@ -28,6 +32,9 @@ import java.util.Map; @Slf4j public class IConveyorLineServiceImpl implements IConveyorLineService { + @Autowired + private AsnMapper asnMapper; + @Autowired private AreaMapper areaMapper; @@ -66,6 +73,17 @@ public class IConveyorLineServiceImpl implements IConveyorLineService { } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateResMessageAsn(ScanTrayRequest scanTrayRequest) { + ScanTrayData data= scanTrayProcessor.prepareScanTrayData(scanTrayRequest); + Asn asn = data.getAsn(); + if (asn != null) { + asn.setResMessage(scanTrayRequest.getContent().getSignal().getErrorReason().toString()); + asnMapper.updateById(asn); + } + } + @Override public JSONObject showConveyorLine(String conveyorLine) { JSONObject jsonObject = initJsonObject(); diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/processor/ScanTrayProcessor.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/processor/ScanTrayProcessor.java index 5d7ac3a..bb56715 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/processor/ScanTrayProcessor.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/conveyorLine/service/processor/ScanTrayProcessor.java @@ -106,7 +106,7 @@ public class ScanTrayProcessor { * @param scanTrayRequest 扫描参数 * @return ScanTrayData */ - private ScanTrayData prepareScanTrayData(ScanTrayRequest scanTrayRequest) { + public ScanTrayData prepareScanTrayData(ScanTrayRequest scanTrayRequest) { ScanTrayData data = new ScanTrayData(); //工作站 Point station = pointMapper.queryByPointCode(scanTrayRequest.getContent().getStationCode());