From 8bf55e1ac0ac6eb6c97a025f0c03b78e208f668e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 八月 2024 17:26:58 +0800
Subject: [PATCH] 复核确认+插队+认领判断是否在库
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 3b166f9..87c04e6 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
@@ -7,8 +7,10 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.service.InsOrderFileService;
import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsOrderStateService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -36,6 +38,7 @@
private InsOrderFileService insOrderFileService;
private InsProductService insProductService;
+ private InsOrderStateService insOrderStateService;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -71,7 +74,7 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+ @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
@PostMapping("/getReportModel")
@ValueAuth
public Result<?> getReportModel(Integer sampleId) {
@@ -116,12 +119,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() {
@@ -186,4 +189,14 @@
public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
}
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鎻掗槦鎿嶄綔")
+ @PostMapping("/jumpTeam")
+ public Result<?> jumpTeam(Integer orderStateId,Integer sort) {
+ InsOrderState orderState = new InsOrderState();
+ orderState.setId(orderStateId);
+ orderState.setSort(sort);
+ return Result.success(insOrderStateService.updateById(orderState));
+ }
}
--
Gitblit v1.9.3