From 07931d7a6c4dde03adf3ef48a3610c9072ce4959 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 09 七月 2024 11:02:10 +0800
Subject: [PATCH] 名称统一
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
index 4b4cd0c..e96a2e3 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
@@ -7,21 +7,19 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
-import com.dy.pmsGlobal.pojoPr.PrEquip;
+import com.dy.pmsGlobal.pojoPr.PrDevice;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 缁勮浠诲姟璁″垝
@@ -124,8 +122,8 @@
@PostMapping(path="someEquip")
@SsoPowerAop(power = "-1")
@Log("鍒嗛〉鏌ヨ璁惧鍙�")
- public BaseResponse<QueryResultVo<List<PrEquip>>> someEquip(@RequestBody QueryVo queryVo){
- QueryResultVo<List<PrEquip>> list = sv.selectSomeEquip(queryVo) ;
+ public BaseResponse<QueryResultVo<List<PrDevice>>> someEquip(@RequestBody QueryVo queryVo){
+ QueryResultVo<List<PrDevice>> list = sv.selectSomeEquip(queryVo) ;
return BaseResponseUtils.buildSuccess(list);
}
@@ -136,11 +134,11 @@
Date start = new Date() ;
List<Converter> list = new ArrayList<>();
- List<PrEquip> equipList = sv.selectEquipByBatchId(batchId) ;
+ List<PrDevice> equipList = sv.selectEquipByBatchId(batchId) ;
// 浣跨敤骞惰娴佹彁楂樻�ц兘
equipList.parallelStream().forEach(equip -> {
ExcelVo vo = new ExcelVo();
- vo.equipNo = equip.equipNo;
+ vo.equipNo = equip.deviceNo;
try {
vo.qrCode = QrCodeUtil.genQrCode(vo.equipNo);
} catch (IOException | WriterException e) {
--
Gitblit v1.8.0