From 6a91d8ce9408f76e98e69415cd4dca62d003776e Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 26 Jun 2026 18:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=AE=A3=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdvertisementController.java | 3 ++- .../common/pojo/qo/AdvertisementRequst.java | 10 +++++----- .../pojo/qo/AdvertisementVersionRequest.java | 20 +++++++++++++++++++ .../vo/QmsReturnInspectionTaskRecordVO.java | 16 +++++++++++++++ .../entity/QmsReturnInspectionTaskRecord.java | 6 ++++++ .../mapper/AdvertisementMapper.java | 2 +- .../service/IAdvertisementService.java | 2 +- .../impl/AdvertisementServiceImpl.java | 2 +- .../resources/mapper/AdvertisementMapper.xml | 6 ++++-- 9 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementVersionRequest.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java index 181eed2b..f015d29b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java @@ -5,6 +5,7 @@ import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.AdvertisementRequst; import com.nflg.wms.common.pojo.qo.AdvertisementSaveRequest; +import com.nflg.wms.common.pojo.qo.AdvertisementVersionRequest; import com.nflg.wms.common.pojo.qo.EnableBatchQO; import com.nflg.wms.common.pojo.qo.PageQO; import com.nflg.wms.common.pojo.vo.AdvertisementListVO; @@ -106,7 +107,7 @@ public class AdvertisementController extends BaseController { * @return 质量宣传图版本列表 */ @PostMapping("versions") - public ApiResult> getAdvertisementVersions(@Valid @RequestBody @NotNull AdvertisementRequst request){ + public ApiResult> getAdvertisementVersions(@Valid @RequestBody @NotNull AdvertisementVersionRequest request){ return ApiResult.success(advertisementService.getVersions(request.getType(), request.getPosition())); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java index c29c51fc..31766c54 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementRequst.java @@ -1,6 +1,6 @@ package com.nflg.wms.common.pojo.qo; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -10,12 +10,12 @@ public class AdvertisementRequst { /** * 广告类型 */ - @NotNull - private Long type; + @NotBlank + private String type; /** * 广告位置 */ - @NotNull - private Long position; + @NotBlank + private String position; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementVersionRequest.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementVersionRequest.java new file mode 100644 index 00000000..da4d7c2b --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/AdvertisementVersionRequest.java @@ -0,0 +1,20 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class AdvertisementVersionRequest { + + /** + * 广告类型id + */ + @NotNull + private Long type; + + /** + * 广告位置id + */ + @NotNull + private Long position; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java index 4012aa92..87b60c16 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java @@ -27,9 +27,25 @@ public class QmsReturnInspectionTaskRecordVO { private String batchNo; + /** + * 送检数量 + */ + private Integer inspectionQty; + + /** + * 合格数量 + */ + private Integer qualifiedQty; + + /** + * 不合格数量 + */ + private Integer unqualifiedQty; + /** * 是否合格 */ + @Deprecated private Boolean qualified; /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java index 6b0a992a..0adcf7ff 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java @@ -1,6 +1,7 @@ package com.nflg.wms.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; @@ -25,6 +26,11 @@ public class QmsReturnInspectionTaskRecord implements Serializable { private Long taskId; private String materialUniqueNo; private String batchNo; + private Integer inspectionQty; + private Integer qualifiedQty; + private Integer unqualifiedQty; + @Deprecated + @TableField(exist = false) private Boolean qualified; private Long createUserId; private String createUserName; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java index f3e0e8e4..4307b191 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java @@ -18,7 +18,7 @@ import java.util.List; public interface AdvertisementMapper extends BaseMapper { - Advertisement getByType(Long type, Long position); + Advertisement getByType(String type, String position); IPage getList(IPage page); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java index 0a3aeae4..850c3cfa 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java @@ -21,7 +21,7 @@ import java.util.List; */ public interface IAdvertisementService extends IService { - AdvertisementVO getByType(Long type, Long position); + AdvertisementVO getByType(String type, String position); void save(AdvertisementSaveRequest request); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java index d1783f27..0ced9835 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java @@ -32,7 +32,7 @@ import java.util.Objects; public class AdvertisementServiceImpl extends ServiceImpl implements IAdvertisementService { @Override - public AdvertisementVO getByType(Long type, Long position) { + public AdvertisementVO getByType(String type, String position) { Advertisement ad = baseMapper.getByType(type, position); if (Objects.isNull(ad)) { return null; diff --git a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml index 5051e86c..2b7e1adc 100644 --- a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml @@ -5,8 +5,10 @@