From a016e3f59d1b2227cd22aeb82090b82d487c8235 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 十二月 2024 14:36:42 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 9eecab7..6863ffb 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
@@ -54,10 +54,10 @@
int deleteInsContext(InsProductResultVo insProductResultVo);
//鎵爜鎶ユ(鍏ュ簱)
- int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
+ int scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode);
//鎵爜鍑哄簱
- int outInsOrderState(String sonLaboratory, String sampleCode);
+ int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode);
List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
@@ -65,4 +65,5 @@
Object preview(Integer id) throws Exception;
int saveInsContext3(InsProductResult insProductResult);
+
}
--
Gitblit v1.9.3