From ca22218b8ae87ab58742af20cd41043a6aabcb4e Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 14 Jan 2026 16:29:11 +0800 Subject: [PATCH] no message --- .../constant/enums/AsnOrderTypeEnum.java | 32 ------------------- .../modules/constant/enums/AsnTypeEnum.java | 6 ++++ .../controller/ConveyorLineController.java | 6 ++-- .../impl/IConveyorLineServiceImpl.java | 11 ++++--- .../receive/mapper/ReceiveRecordMapper.java | 14 +++++++- .../service/impl/AsnDetailServiceImpl.java | 6 ++-- .../service/processor/CallAgvProcessor.java | 5 --- .../processor/InBoundCancelProcessor.java | 19 +---------- .../processor/InBoundTaskProcessor.java | 2 +- .../processor/OutBoundTaskProcessor.java | 8 ++--- .../service/impl/ITesAgvServiceImpl.java | 20 +++++++++--- 11 files changed, 52 insertions(+), 77 deletions(-) delete mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnOrderTypeEnum.java diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnOrderTypeEnum.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnOrderTypeEnum.java deleted file mode 100644 index 1b75ce7..0000000 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnOrderTypeEnum.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.cpte.modules.constant.enums; - -import lombok.Getter; - -@Getter -public enum AsnOrderTypeEnum { - PRODUCT(0, "成品入库"), - - ACCESSORY(1, "配件入库"), - - PRODUCT_UNPALLETIZE(2, "成品拆托入库"), - - ACCESSORY_UNPALLETIZE(3, "配件拆托入库"), - - - ; - - AsnOrderTypeEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - /** - * 值 - */ - final Integer value; - - /** - * 描述 - */ - final String desc; -} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java index c3abbe0..bd53ff2 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/constant/enums/AsnTypeEnum.java @@ -22,6 +22,12 @@ public enum AsnTypeEnum { PJC(3, "配件拆托入库"), + SC(4, "生产入库"), + + WX(5, "维修入库"), + + QC(6, "期初入库"), + ; 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 c450a2f..c4be604 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 @@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.cpte.modules.conveyorLine.request.ScanTrayRequest; import org.cpte.modules.conveyorLine.service.IConveyorLineService; @@ -37,13 +38,12 @@ public class ConveyorLineController { @IgnoreAuth public TesResult scanTray(@RequestBody ScanTrayRequest scanTrayRequest) { try { - Long errorCode = scanTrayRequest.getContent().getSignal().getErrorCode(); - if (errorCode == 0) { + List errorMsg = scanTrayRequest.getContent().getSignal().getErrorReason(); + if (CollectionUtils.isEmpty(errorMsg)) { iConveyorLineService.scanTray(scanTrayRequest); return TesResult.success(); } else { iConveyorLineService.updateResMessageAsn(scanTrayRequest); - List errorMsg = scanTrayRequest.getContent().getSignal().getErrorReason(); return TesResult.error(errorMsg.toString()); } } catch (Exception e) { 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 d6d001b..b51f2bd 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 @@ -76,9 +76,12 @@ public class IConveyorLineServiceImpl implements IConveyorLineService { @Override @Transactional(rollbackFor = Exception.class) public void updateResMessageAsn(ScanTrayRequest scanTrayRequest) { - ScanTrayData data= scanTrayProcessor.prepareScanTrayData(scanTrayRequest); + ScanTrayData data = scanTrayProcessor.prepareScanTrayData(scanTrayRequest); Asn asn = data.getAsn(); if (asn != null) { + if (asn.getResMessage().equals("检测成功")) { + return; + } asn.setResMessage(scanTrayRequest.getContent().getSignal().getErrorReason().toString()); asnMapper.updateById(asn); } @@ -121,8 +124,8 @@ public class IConveyorLineServiceImpl implements IConveyorLineService { if (AgvStatusEnum.COMPLETED.getValue().equals(agvTask.getStatus())) { Object dateObj = redisUtil.get(CONVEYOR_LINE_KEY); if (dateObj != null) { - String description = "工作站无入库任务"; - return cleanJsonObject(conveyorLine,description); + String description = "工作站无入库任务"; + return cleanJsonObject(conveyorLine, description); } else { redisUtil.set(CONVEYOR_LINE_KEY, agvTask.getId()); } @@ -147,7 +150,7 @@ public class IConveyorLineServiceImpl implements IConveyorLineService { return jsonObject; } - private JSONObject cleanJsonObject(String conveyorLine, String description) { + private JSONObject cleanJsonObject(String conveyorLine, String description) { JSONObject jsonObject = new JSONObject(); jsonObject.put("stockCode", ""); jsonObject.put("taskType", ""); diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/mapper/ReceiveRecordMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/mapper/ReceiveRecordMapper.java index 689234d..96a91cf 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/mapper/ReceiveRecordMapper.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/mapper/ReceiveRecordMapper.java @@ -1,8 +1,20 @@ package org.cpte.modules.receive.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.cpte.modules.receive.entity.Asn; import org.cpte.modules.receive.entity.ReceiveRecord; -public interface ReceiveRecordMapper extends BaseMapper { +import java.util.List; +public interface ReceiveRecordMapper extends BaseMapper { + /** + * 根据任务号查询入库单 + * + * @param asnId 入库ID + * @return List + */ + @Select("select * from data_receive_record where asn_id = #{asnId} ") + List queryByAsnId(@Param("asnId") Long asnId); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/service/impl/AsnDetailServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/service/impl/AsnDetailServiceImpl.java index a920c1c..1e988a0 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/service/impl/AsnDetailServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/service/impl/AsnDetailServiceImpl.java @@ -95,7 +95,7 @@ public class AsnDetailServiceImpl extends ServiceImpl itemMap, Point srcPoint, Stock stock) { //1.获取工作站 Point station = null; - if (AsnOrderTypeEnum.PRODUCT.getValue().equals(inboundRequest.getType()) && srcPoint != null) { + if (AsnTypeEnum.CP.getValue().equals(inboundRequest.getType()) && srcPoint != null) { station = getStationPoint(inboundRequest.getType()); } @@ -108,7 +108,7 @@ public class AsnDetailServiceImpl extends ServiceImpl asnDetails= asnDetailMapper.selectByMainId(agvTask.getBusinessDetailId()); + for (AsnDetail asnDetail : asnDetails){ + asnDetail.setToPointId(point.getId()); + } + if(CollectionUtils.isNotEmpty(asnDetails)){ + asnDetailMapper.updateById(asnDetails); + } + } private void outBoundAgvTask(AgvTask newAgvTask, AgvTask agvTask) {