From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 05 八月 2024 20:40:48 +0800 Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备,第二次修改就只针对当前样品 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java index 72eea8e..c325808 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java @@ -92,6 +92,13 @@ return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory)); } + @ValueAuth + @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽") + @PostMapping("/upPlanUser2") + public Result<?> upPlanUser2(Integer orderId) { + return Result.success(insOrderPlanService.upPlanUser2(orderId)); + } + @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "澶嶆牳妫�楠屼换鍔�") @PostMapping("/verifyPlan") @@ -109,12 +116,12 @@ @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "妫�楠屼换鍔℃彁浜�") @PostMapping("/submitPlan") - public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) { - int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, sampleCode); + public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) { + int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode); return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�"); } - @ValueClassify("妫�楠屼换鍔�") + @ValueClassify("璁惧") @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�") @DeleteMapping("/isItAllowedToModifyTheCollectedValues") public Result<?> isItAllowedToModifyTheCollectedValues() { -- Gitblit v1.9.3