From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 28 三月 2025 13:49:53 +0800 Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示 --- cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java index d406559..1ebc129 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java @@ -1,15 +1,17 @@ package com.yuanchu.mom.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.annotation.ValueClassify; +import com.yuanchu.mom.pojo.Laboratory; import com.yuanchu.mom.pojo.Seal; import com.yuanchu.mom.service.SealService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -24,29 +26,33 @@ @Resource private SealService sealService; - @ApiOperation(value = "鍒犻櫎鍗扮珷") - @PostMapping("/deleteSeal") - public Result deleteSeal(@RequestBody Integer id) { - return Result.success(sealService.delSeal(id)); - } + @ValueClassify("鍦烘墍鎴栬鏂�") @ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟") @PostMapping("/addSeal") public Result addSeal(@RequestBody Seal seal) { - return Result.success(sealService.addSeal(seal)); + int i = sealService.addSeal(seal); + if(i>0){ + Integer labId = seal.getLabId(); + List<Laboratory> laboratory = sealService.Laboratory(labId); + return Result.success(laboratory); + }else{ + return Result.fail(); + } + } - @ApiOperation(value = "淇敼鍗扮珷鍙傛暟") - @PostMapping("/upSeal") - public Result upSeal(@RequestBody Seal seal){ - return Result.success(sealService.upSeal(seal)); - } + @ValueClassify("鍦烘墍鎴栬鏂�") @ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃") @PostMapping("/selectSeal") public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception { - //鑾峰彇褰撳墠椤垫暟 Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - //鑾峰彇褰撳墠鍗扮珷淇℃伅 Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class); - //鑾峰彇鍒嗛〉鏁版嵁 return Result.success(sealService.selectSeal(page,seal)); } + + @ValueClassify("鍦烘墍鎴栬鏂�") + @ApiOperation(value="鍒犻櫎鍗扮珷") + @PostMapping("/delectSeal") + public Result delectSeal(Seal seal) { + return Result.success(sealService.removeById(seal)); + } } -- Gitblit v1.9.3