From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 28 三月 2025 13:49:53 +0800 Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示 --- cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java b/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java index d93381f..bf94ea9 100644 --- a/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java +++ b/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java @@ -6,6 +6,7 @@ import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.dto.QualitySuperviseDetailsDto; +import com.yuanchu.mom.dto.QualitySuperviseDto; import com.yuanchu.mom.exception.ErrorException; import com.yuanchu.mom.mapper.QualitySuperviseDetailsCorrectFileMapper; import com.yuanchu.mom.pojo.*; @@ -61,9 +62,9 @@ @ValueAuth @ApiOperation(value = "鐩戠潱璁″垝鍒楄〃") @PostMapping("/pageQualitySupervise") - public Result<IPage<QualitySupervise>> pageQualitySupervise(@RequestBody Map<String, Object> data) throws Exception { + public Result<IPage<QualitySuperviseDto>> pageQualitySupervise(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - QualitySupervise qualitySupervise = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), QualitySupervise.class); + QualitySupervise qualitySupervise = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), QualitySuperviseDto.class); return Result.success(qualitySuperviseService.pageQualitySupervise(page, qualitySupervise)); } -- Gitblit v1.9.3