From 9a16d4675b22d0845158d0f07424f4bda2e39475 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index 82273bf..e503657 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -3,6 +3,7 @@
import com.yuanchu.mom.mapper.InspectionItemMapper;
import com.yuanchu.mom.mapper.TechniqueMapper;
import com.yuanchu.mom.pojo.InspectionItem;
+import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.dto.UpdateInspectionItemDto;
import com.yuanchu.mom.service.DeviceService;
@@ -38,8 +39,8 @@
//鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
@Override
- public List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type) {
- return inspectionItemMapper.selectInspectionItem(finishInspectId,type);
+ public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
+ return inspectionItemMapper.selectInspectionItem(id,type);
}
@@ -51,6 +52,18 @@
return techniqueMapper.selDevByVerTecIdFaNam(technologyId, father, name, ver);
}
+ //鏇存敼璁惧
+ @Override
+ public void updateDevByInsId(Integer id, Integer type, Integer devId) {
+ InspectionItem inspectionItem = new InspectionItem();
+ inspectionItem.setId(id);
+ inspectionItem.setType(type);
+ inspectionItem.setDeviceId(devId);
+ inspectionItem.setInspectionValue(null);
+ inspectionItem.setResult(null);
+ inspectionItemMapper.updateById(inspectionItem);
+ }
+
//鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
@Override
public Integer addProcessInspectionSheet(String username, UpdateInspectionItemDto updateInspectionItemDto) {
--
Gitblit v1.9.3