From 50bcc73377d38017ee5c36655028f53a3c25c58b Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 10 十月 2024 09:40:54 +0800
Subject: [PATCH] 物料清单保存 方法修改
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 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..7dfb822 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;
/**
* 缁勮浠诲姟璁″垝
@@ -39,7 +37,7 @@
}
@PostMapping(path="save")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("淇濆瓨缁勮浠诲姟璁″垝")
public BaseResponse<Boolean> save(@RequestBody @Valid PrAssemblyPlan plan){
int count = sv.save(plan);
@@ -56,7 +54,7 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("鏇存柊缁勮浠诲姟璁″垝")
public BaseResponse<Boolean> update(@RequestBody @Valid PrAssemblyPlan plan){
int count = sv.update(plan);
@@ -68,7 +66,7 @@
}
@PostMapping(path="updateStatus")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("鏇存柊浠诲姟璁″垝鐘舵��")
public BaseResponse<Boolean> updateStatus(@RequestBody PrAssemblyPlan plan){
int count = sv.updateStatus(plan);
@@ -83,7 +81,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200000")
@Log("鏍规嵁ID鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<PrAssemblyPlan> one(Long id){
PrAssemblyPlan plan=sv.selectById(id);
@@ -96,7 +94,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200000")
@Log("鍒嗛〉鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<QueryResultVo<List<PrAssemblyPlan>>> some(@RequestBody QueryVo vo){
QueryResultVo<List<PrAssemblyPlan>> list = sv.selectSome(vo) ;
@@ -106,14 +104,14 @@
/**
* 澧炲姞璁惧鍙�
*/
- @PostMapping(path="addEquip")
- @SsoPowerAop(power = "-1")
+ @PostMapping(path="addDevice")
+ @SsoPowerAop(power = "10200001")
@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 {
@@ -121,35 +119,56 @@
}
}
- @PostMapping(path="someEquip")
- @SsoPowerAop(power = "-1")
+ @PostMapping(path="someDevice")
+ @SsoPowerAop(power = "10200000")
@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")
- @SsoPowerAop(power = "-1")
- @Log("瀵煎嚭璁惧鍙�")
- public void exportEquip(Long batchId, HttpServletResponse response){
+ @GetMapping(path="exportDevice")
+ @SsoPowerAop(power = "10200001")
+ @Log("瀵煎嚭璁惧鍙峰強浜岀淮鐮�")
+ 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();
}
list.add(vo);
});
- log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ }
+ @GetMapping(path="exportDeviceNo")
+ @SsoPowerAop(power = "10200001")
+ @Log("瀵煎嚭璁惧鍙�")
+ public void exportDeviceNo(Long batchId, HttpServletResponse response){
+ Date start = new Date() ;
+ List<Converter> list = new ArrayList<>();
+
+ List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ deviceList.parallelStream().forEach(device -> {
+ ExcelDeviceNoVo vo = new ExcelDeviceNoVo();
+ vo.deviceNo = device.deviceNo;
+ list.add(vo);
+ });
+ //鏍规嵁batchid鎵惧埌浠诲姟鍚嶇О
+ PrAssemblyPlan plan = sv.selectByBatchId(batchId);
+ String fileNameStr = plan.name +"-"+ fileName;
+ log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ QrCodeUtil.downloadExcel(response, fileNameStr,sheetName,list);
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
}
--
Gitblit v1.8.0