From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 313d8ad..707b560 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -5,9 +5,11 @@
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.vo.Result;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -16,7 +18,9 @@
*/
public interface DeviceService extends IService<Device> {
- Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);
+ List<User> selectUserList();
+
+ Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull);
int addDeviceParameter(Device itemParameter);
@@ -34,7 +38,7 @@
List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
- Device selectDeviceByCode(String code);
+ Device selectDeviceByCode(Integer id);
Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);
@@ -44,5 +48,7 @@
Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
- Object formulaCalculation(Map<String, Object> map, Boolean isAdopt);
+ void exportDeviceFile(Integer deviceId, HttpServletResponse response);
+
+ void exportEquipmentDetails(HttpServletResponse response);
}
--
Gitblit v1.9.3