From 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 19:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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 6539a54..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);
@@ -41,4 +41,6 @@
Map<String,Object> getReportModel(Integer sampleId);
Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
+
+ List<String> upPlanUser2(Integer orderId);
}
--
Gitblit v1.9.3