From f086664481f69eda8a5dd30747b3ed7cb496b9ba Mon Sep 17 00:00:00 2001
From: Calvin <2440603509@qq.com>
Date: 星期三, 31 七月 2024 09:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 30 +++++++++++++++---------------
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java | 2 ++
4 files changed, 20 insertions(+), 18 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 f6f0ab1..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
@@ -116,8 +116,8 @@
@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("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index c7cf7fb..df0c1ae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -14,25 +14,25 @@
@ValueTableShow(name = "鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(value = 2, name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 1, name = "鏍峰搧鍚嶇О")
private String sample;
- @ValueTableShow(value = 4, name = "鏍峰搧鍨嬪彿")
+ @ValueTableShow(value = 2, name = "妫�楠岄」")
+ private String inspectionItem;
+
+ @ValueTableShow(value = 3, name = "妫�楠屽瓙椤�")
+ private String inspectionItemSubclass;
+
+ @ValueTableShow(value = 4, name = "鍗曚綅")
+ private String unit;
+
+ @ValueTableShow(value = 5, name = "鏍峰搧鍨嬪彿")
private String model;
// @ValueTableShow(value = 5, name = "鏍峰搧鐘舵��")
private Integer insState;
- @ValueTableShow(value = 15, name = "鍗曚綅")
- private String unit;
-
- @ValueTableShow(value = 7, name = "妫�楠岄」")
- private String inspectionItem;
-
- @ValueTableShow(value = 8, name = "妫�楠屽瓙椤�")
- private String inspectionItemSubclass;
-
- @ValueTableShow(value = 17, name = "瀹為獙瀹�")
+// @ValueTableShow(value = 17, name = "瀹為獙瀹�")
private String sonLaboratory;
private String inspectionItemType;
@@ -40,13 +40,13 @@
// @ValueTableShow(value = 11, name = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(value = 12, name = "瑕佹眰鍊�")
+ @ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
private String ask;
- @ValueTableShow(value = 13, name = "鏈�缁堝��")
+ @ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
private String lastValue;
- @ValueTableShow(value = 14, name = "鏄惁鍚堟牸")
+ @ValueTableShow(value = 14, name = "缁撴灉鍒ゅ畾")
private Integer insResult;
private String equipValue;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
index ba0ffcd..88c2c4a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -28,7 +28,7 @@
int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode);
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);
List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 5006210..8aa3601 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -4,6 +4,7 @@
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.pojo.Enums;
@@ -118,6 +119,7 @@
private UserService userService;
@ApiOperation(value = "涓存椂鎺ュ彛-娣诲姞7鏈堜唤8鏈堜唤鐨勬暟鎹�")
+ @ValueAuth
@GetMapping("temporaryInterface")
public void temporaryInterface() {
System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
--
Gitblit v1.9.3