From 607cff1cefe640dee994e6d18d5f6a8f23c62755 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 22 八月 2023 17:38:56 +0800
Subject: [PATCH] # 修改配置角色 报角色编码存在
---
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 8 +
server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java | 3
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 76 ++++++++++++++-----
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordBathExportExtListVO.java | 72 ++++++++++++++++++
server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 7 -
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java | 32 +++++--
6 files changed, 161 insertions(+), 37 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
index c861e05..39931c4 100644
--- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -30,10 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 鐢熶骇璁惧淇℃伅鎺ュ彛
@@ -162,7 +159,7 @@
find.setModel(device.getModel());
find.setProcedureId(device.getProcedureId());
find.setStationCode(device.getStationCode());
- find.setType(device.getType());
+ find.setType(Objects.nonNull(device.getType()) ? device.getType() : Constants.ONE);
find.setGroupId(device.getGroupId());
find.setProduceWarehouseLocationId(device.getProduceWarehouseLocationId());
find.setFinishWarehouseLocationId(device.getFinishWarehouseLocationId());
diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index d91263c..903c367 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -181,12 +181,18 @@
- @ApiOperation("瀵煎嚭Excel")
+ @ApiOperation("鐢熶骇浜у嚭瀵煎嚭Excel")
@PostMapping("/exportExcel")
// @RequiresPermissions("ext:workorderrecordext:exportExcel")
public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
workorderRecordExtService.exportExcel(pageWrap,response);
}
+
+ @ApiOperation("鐢熶骇鎶曟枡瀵煎嚭Excel")
+ @PostMapping("/exportExcelFeeding")
+ public void exportExcelFeeding(@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response){
+ workorderRecordExtService.exportExcel2(pageWrap,response);
+ }
@ApiOperation("瀵煎嚭鍛樺伐缁╂晥鏄庣粏")
@PostMapping("/exportUserSalary")
public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordBathExportExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordBathExportExtListVO.java
new file mode 100644
index 0000000..0c9da98
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordBathExportExtListVO.java
@@ -0,0 +1,72 @@
+package doumeemes.dao.ext.vo;
+
+import doumeemes.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鐢熶骇鎶曟枡鏄庣粏")
+public class WorkorderRecordBathExportExtListVO {
+
+
+ @ApiModelProperty(value = "宸ュ崟缂栧彿")
+ @ExcelColumn(name = "宸ュ崟缂栧彿",index =1 ,width =15)
+ private String workordercode;
+
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
+ @ExcelColumn(name="宸ュ崟鐘舵��", index = 2,width =15)
+ private String status;
+
+ @ApiModelProperty(value = "缂栫爜锛屼笉鍙噸澶�")
+ @ExcelColumn(name="鐗╂枡缂栫爜",index =3,width =15)
+ private String materialcode;
+
+ @ApiModelProperty(value = "鍚嶇О锛屼笉鍙噸澶�")
+ @ExcelColumn(name="鐗╂枡鍚嶇О",index =4,width =15)
+ private String materialname;
+
+ @ApiModelProperty(value = "鎵规鍙�")
+ @ExcelColumn(name="鐢熶骇鎵规鍙�",index =5,width =15)
+ private String batch;
+
+ @ApiModelProperty(value = "宸ュ簭")
+ @ExcelColumn(name="宸ュ簭",index =6,width =15)
+ private String proceduresname;
+
+ @ApiModelProperty(value = "璁″垝鏁伴噺")
+ @ExcelColumn(name="璁″垝鏁伴噺",index =7,width =15)
+ private String planNum;
+
+ @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+ private String unitname;
+
+ @ApiModelProperty(value = "鐢熶骇鍛樺伐")
+ @ExcelColumn(name="鐢熶骇鍛樺伐",index =8,width =15)
+ private String procedureName;
+
+ @ApiModelProperty(value = "璐ㄩ噺灞炴��0鍚堟牸 1涓嶈壇 2鎶ュ簾锛堝彧鏈塼ype=1鎵嶆湁鍊硷級")
+ @ExcelColumn(name="璐ㄩ噺灞炴��",index = 9,width =15,valueMapping = "0=鍚堟牸;1=涓嶈壇;2=鎶ュ簾")
+ private Integer materialDonetype;
+
+ @ApiModelProperty(value = "鏁伴噺", example = "1")
+ @ExcelColumn(name="鏁伴噺",index = 10,width =15)
+ private String num;
+
+// @ExcelColumn(name="鍗曚綅",index =11,width =15)
+ private String unintname;
+
+
+ @ApiModelProperty(value = "璁惧")
+ @ExcelColumn(name="璁惧",index =11,width =15)
+ private String deviceCode;
+
+ @ApiModelProperty(value = "鎶曟枡鏃堕棿")
+ @ExcelColumn(name="鎶曟枡鏃堕棿",index =12,width =15)
+ private String createTime;
+
+
+}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
index 15084eb..e2b02c4 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
@@ -46,31 +46,41 @@
@ApiModelProperty(value = "鍗曚綅鍚嶇О")
private String unitname;
- /* @ApiModelProperty(value = "璁″垝鏁伴噺")
- @ExcelColumn(name="璁″垝鏁伴噺",index =8)
- private String procedurenum;*/
-
@ApiModelProperty(value = "鐢熶骇鍛樺伐")
@ExcelColumn(name="鐢熶骇鍛樺伐",index =8,width =15)
private String procedureName;
- @ApiModelProperty(value = "鎶ュ伐绫诲瀷0鍚堟牸 1涓嶈壇,2鎶ュ簾锛堝彧鏈塼ype=1鎵嶆湁鍊硷級")
- @ExcelColumn(name="鎶ュ伐绫诲瀷",index =9,width =15)
- private String doneType;
+ @ApiModelProperty(value = "妫�楠屽悎鏍兼暟閲�", example = "1")
+ @ExcelColumn(name="妫�楠屽悎鏍兼暟閲�",index = 9,width =15)
+ private String qualifiedNum;
+
+ @ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
+ @ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺",index = 10,width =15)
+ private String unqualifiedNum;
+
+ /* @ApiModelProperty(value = "璁″垝鏁伴噺")
+ @ExcelColumn(name="璁″垝鏁伴噺",index =8)
+ private String procedurenum;*/
+
@ApiModelProperty(value = "鏁伴噺")
- @ExcelColumn(name="鏁伴噺",index =10,width =15)
+ @ExcelColumn(name="鎶ュ伐鏁伴噺",index =11,width =15)
private String appliancenum;
@ApiModelProperty(value = "鍗曚綅")
- @ExcelColumn(name="鍗曚綅",index =11,width =15)
+// @ExcelColumn(name="鍗曚綅",index =11,width =15)
private String unintname;
- @ApiModelProperty(value = "宸ヨ鍣ㄥ叿")
- @ExcelColumn(name="宸ヨ鍣ㄥ叿",index =12,width =15)
+// @ApiModelProperty(value = "宸ヨ鍣ㄥ叿")
+// @ExcelColumn(name="宸ヨ鍣ㄥ叿",index =12,width =15)
private String appliancecode;
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
+ @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�",index =12,width =15)
+ private Integer duration;
+
+
@ApiModelProperty(value = "璁惧")
@ExcelColumn(name="璁惧",index =13,width =15)
private String deviceCode;
diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
index 5fe02b9..357087b 100644
--- a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
+++ b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java
@@ -49,6 +49,9 @@
void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);
+
+ void exportExcel2(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);
+
PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap);
PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap);
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index d155676..6dfb8b2 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1737,45 +1737,81 @@
unintname = re.getUmodel().getName();
}
if (re.getPmodel() != null) {
- Integer pmodelnum = re.getPmodel().getNum() != null ? re.getPmodel().getNum() : 0;
+ BigDecimal pmodelnum = re.getNum() != null ? re.getNum() : new BigDecimal("0");
// wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() + unintname);
- wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() );
- }
- if (re.getDoneType() != null) {
- switch (re.getDoneType()) {
- case 0:
- wreev.setDoneType("鍚堟牸");
- break;
- case 1:
- wreev.setDoneType("涓嶈壇");
- break;
- case 2:
- wreev.setDoneType("鎶ュ簾");
- break;
- default:
- break;
- }
+ wreev.setPlanNum( re.getNum().stripTrailingZeros().toPlainString()+unintname);
}
wreev.setProcedureName(re.getProcedureName());
+ wreev.setUnintname(unintname);
if(re.getNum()!=null){
- wreev.setAppliancenum(re.getNum().stripTrailingZeros().toPlainString() );
+ wreev.setAppliancenum(re.getNum().stripTrailingZeros().toPlainString()+unintname );
}
- wreev.setUnintname(unintname);
+
if (re.getAmodel() != null) {
wreev.setAppliancecode(re.getAmodel().getCode());
}
wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
wreev.setCreateTime(format.format(re.getCreateTime()));
+ wreev.setQualifiedNum(re.getQualifiedNum()+unintname);
+ wreev.setUnqualifiedNum(re.getUnqualifiedNum()+unintname);
+ wreev.setDuration(re.getDuration());
list.add(wreev);
}
- ExcelExporter.build(WorkorderRecordExportExtListVO.class).export(list, "宸ュ崟鐢熶骇杩囩▼璁板綍"+System.currentTimeMillis(), response);
+ ExcelExporter.build(WorkorderRecordExportExtListVO.class).export(list, "鐢熶骇浜у嚭鏄庣粏"+System.currentTimeMillis(), response);
// EasyExcelUtil.exportExcel(list, "宸ュ崟鐢熶骇杩囩▼璁板綍","宸ュ崟鐢熶骇杩囩▼璁板綍",WorkorderRecordExportExtListVO.class,"宸ュ崟鐢熶骇杩囩▼璁板綍"+System.currentTimeMillis()+".xls", response);
}
+ @Override
+ public void exportExcel2(PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
+ List<WorkorderRecordExtListVO> result=this.findPage(pageWrap).getRecords();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ List<WorkorderRecordBathExportExtListVO> list=new ArrayList<>();
+ for(int i=0;i<result.size();i++) {
+ WorkorderRecordExtListVO re = result.get(i);
+ WorkorderRecordBathExportExtListVO wreev = new WorkorderRecordBathExportExtListVO();
+ if (re.getOmodel() != null) {
+ wreev.setWorkordercode(re.getOmodel().getCode());
+ if (re.getOmodel().getStatus() != null) {
+ String status = Constants.WORKORDER_STATUS.getTitleByStatus(null, re.getOmodel().getStatus());
+ wreev.setStatus(status);
+ }
+ }
+ if (re.getMmodel() != null) {
+ wreev.setMaterialcode(re.getMmodel().getCode());
+ wreev.setMaterialname(re.getMmodel().getName());
+ }
+ wreev.setBatch(re.getBatch());
+ if (re.getPromodel() != null) {
+ wreev.setProceduresname(re.getPromodel().getName());
+ }
+
+ String unintname = "";
+ if (re.getUmodel() != null) {
+ unintname = re.getUmodel().getName();
+ }
+ if (re.getNum() != null) {
+ BigDecimal pmodelnum = re.getNum() != null ? re.getNum() : new BigDecimal("0");
+ // wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() + unintname);
+ wreev.setNum( pmodelnum.stripTrailingZeros().toPlainString()+unintname);
+ }
+ wreev.setProcedureName(re.getProcedureName());
+ wreev.setUnintname(unintname);
+ if(re.getOmodel().getPlanNum() != null){
+ wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
+ }
+ wreev.setMaterialDonetype(re.getMaterialDonetype());
+ wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
+ wreev.setCreateTime(format.format(re.getCreateTime()));
+ list.add(wreev);
+
+ }
+ ExcelExporter.build(WorkorderRecordBathExportExtListVO.class).export(list, "鐢熶骇鎶曟枡鏄庣粏"+System.currentTimeMillis(), response);
+
+ }
}
--
Gitblit v1.9.3