From 2bc94fed189ef2da4112f9f836343a6a579b93c6 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 10 七月 2024 17:25:31 +0800
Subject: [PATCH] add a inputtime and outputtime
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 748f1cc..5e5be8c 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,7 +7,7 @@
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;
@@ -104,14 +104,14 @@
/**
* 澧炲姞璁惧鍙�
*/
- @PostMapping(path="addEquip")
+ @PostMapping(path="addDevice")
@SsoPowerAop(power = "-1")
@Log("澧炲姞璁惧鍙�")
- public BaseResponse<?> addEquip(@RequestBody QueryVo vo){
+ public BaseResponse<?> addDevice(@RequestBody QueryVo vo){
if(vo.addNum == null || vo.addNum <= 0 || vo.planId == null){
return BaseResponseUtils.buildFail("鍙傛暟閿欒");
}
- int count = sv.addEquip(vo.planId,vo.addNum);
+ int count = sv.addDevice(vo.planId,vo.addNum);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -119,28 +119,28 @@
}
}
- @PostMapping(path="someEquip")
+ @PostMapping(path="someDevice")
@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>>> someDevice(@RequestBody QueryVo queryVo){
+ QueryResultVo<List<PrDevice>> list = sv.selectSomeDevice(queryVo) ;
return BaseResponseUtils.buildSuccess(list);
}
- @GetMapping(path="exportEquip")
+ @GetMapping(path="exportDevice")
@SsoPowerAop(power = "-1")
@Log("瀵煎嚭璁惧鍙�")
- public void exportEquip(Long batchId, HttpServletResponse response){
+ public void exportDevice(Long batchId, HttpServletResponse response){
Date start = new Date() ;
List<Converter> list = new ArrayList<>();
- List<PrEquip> equipList = sv.selectEquipByBatchId(batchId) ;
+ List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
// 浣跨敤骞惰娴佹彁楂樻�ц兘
- equipList.parallelStream().forEach(equip -> {
+ deviceList.parallelStream().forEach(device -> {
ExcelVo vo = new ExcelVo();
- vo.equipNo = equip.equipNo;
+ vo.deviceNo = device.deviceNo;
try {
- vo.qrCode = QrCodeUtil.genQrCode(vo.equipNo);
+ vo.qrCode = QrCodeUtil.genQrCode(vo.deviceNo);
} catch (IOException | WriterException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0