From 795565345a05fd6f3d6aeb97cb586d8299b399e2 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 13 十二月 2024 11:50:18 +0800
Subject: [PATCH] change wx name
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 76d27ab..6cddd03 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -7,6 +7,7 @@
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
import com.dy.pmsGlobal.daoSta.*;
+import com.dy.pmsGlobal.daoTst.TstCommandMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoOth.OthFile;
@@ -16,10 +17,13 @@
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
+import com.dy.pmsGlobal.pojoTst.TstCommand;
import com.dy.pmsGlobal.util.DeviceResult;
import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
+import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -51,6 +55,7 @@
private StaRepairInfoMapper repairInfoDao;
private PltProductQualityInspectionItemsMapper qualityItemsDao;
private PltProductTestInspectionItemsMapper testItemsDao;
+ private TstCommandMapper tstCommandDao;
private PltProductMapper productDao;
private PltProParamsMapper paramsDao;
private PltProductFileMapper productFileDao;
@@ -137,6 +142,11 @@
@Autowired
public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
this.deviceLifeLastDao = deviceLifeLastDao;
+ }
+
+ @Autowired
+ public void setTstCommandDao(TstCommandMapper tstCommandDao) {
+ this.tstCommandDao = tstCommandDao;
}
@Transactional
@@ -621,4 +631,14 @@
bill.orgName = file.orgName;
bill.extName = file.extName;
}
+ public List<TstCommand> getCommand(String proId, int type) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("proId", proId);
+ params.put("type", type);
+ return tstCommandDao.selectSome(params);
+ }
+ public List<PltProduct> selectAll(QueryVo queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ return productDao.selectAll(params);
+ }
}
--
Gitblit v1.8.0