Augcl
/
workorder-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

1、工序卡错误内容修复 

1.1-工序卡1补充参数目录
1.2-工序卡2/3/4中试确认字段不匹配问题修复
1.3-工序卡2/3/4时间字段显示格式错误问题修复
master
Aug 2 months ago
parent
07fe6f7319
commit
3d84084b6b
2 changed files with 119 additions and 14 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +63
    -11
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java
  2. +56
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExcelServiceImpl.java

+ 63
- 11
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java View File

@ -1,5 +1,6 @@
package org.jeecg.modules.workorderTemplate.service.impl; package org.jeecg.modules.workorderTemplate.service.impl;
import cn.hutool.core.date.DateTime;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@ -43,8 +44,6 @@ import java.util.List;
@Service @Service
public class WorkorderExcelServiceImpl implements WorkorderExcelService { public class WorkorderExcelServiceImpl implements WorkorderExcelService {
//工单信息 //工单信息
@Resource @Resource
private IWorkorderTemplateService workorderTemplateService; private IWorkorderTemplateService workorderTemplateService;
@ -295,6 +294,59 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
cell47.setCellValue("中试作业员"); cell47.setCellValue("中试作业员");
Cell cell48 = row4.createCell(7); Cell cell48 = row4.createCell(7);
cell48.setCellValue(generalStepone.getOperator()); cell48.setCellValue(generalStepone.getOperator());
//第五行
Row row5 = sheet.createRow(4);
//第五行第n列
Cell process = row5.createCell(0);
process.setCellValue("工序");
Cell itemCheck = row5.createCell(1);
itemCheck.setCellValue("检查项目");
Cell specs = row5.createCell(2);
specs.setCellValue("规格");
Cell param1 = row5.createCell(3);
param1.setCellValue("1");
Cell param2 = row5.createCell(4);
param2.setCellValue("2");
Cell param3 = row5.createCell(5);
param3.setCellValue("3");
Cell param4 = row5.createCell(6);
param4.setCellValue("4");
Cell param5 = row5.createCell(7);
param5.setCellValue("5");
Cell param6 = row5.createCell(8);
param6.setCellValue("6");
Cell param7 = row5.createCell(9);
param7.setCellValue("7");
Cell param8 = row5.createCell(10);
param8.setCellValue("8");
Cell param9 = row5.createCell(11);
param9.setCellValue("9");
Cell param10 = row5.createCell(12);
param10.setCellValue("10");
Cell param11 = row5.createCell(13);
param11.setCellValue("11");
Cell param12 = row5.createCell(14);
param12.setCellValue("12");
Cell param13 = row5.createCell(15);
param13.setCellValue("13");
Cell param14 = row5.createCell(16);
param14.setCellValue("14");
Cell param15 = row5.createCell(17);
param15.setCellValue("15");
Cell param16 = row5.createCell(18);
param16.setCellValue("16");
Cell param17 = row5.createCell(19);
param17.setCellValue("17");
Cell param18 = row5.createCell(20);
param18.setCellValue("18");
Cell param19 = row5.createCell(21);
param19.setCellValue("19");
Cell param20 = row5.createCell(22);
param20.setCellValue("20");
Cell remark = row5.createCell(23);
remark.setCellValue("备注");
return sheet.getLastRowNum(); return sheet.getLastRowNum();
} }
@ -346,11 +398,11 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
Cell cell33 = row3.createCell(2); Cell cell33 = row3.createCell(2);
cell33.setCellValue("日期"); cell33.setCellValue("日期");
Cell cell34 = row3.createCell(3); Cell cell34 = row3.createCell(3);
cell34.setCellValue(generalSteptwo.getCurrentdate());
cell34.setCellValue(new DateTime(generalSteptwo.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
Cell cell35 = row3.createCell(4); Cell cell35 = row3.createCell(4);
cell35.setCellValue("中试确认"); cell35.setCellValue("中试确认");
Cell cell36 = row3.createCell(5); Cell cell36 = row3.createCell(5);
cell36.setCellValue(generalSteptwo.getCreateBy());
cell36.setCellValue(generalSteptwo.getConfirmTrial());
Cell cell37 = row3.createCell(6); Cell cell37 = row3.createCell(6);
cell37.setCellValue("品质确认"); cell37.setCellValue("品质确认");
Cell cell38 = row3.createCell(7); Cell cell38 = row3.createCell(7);
@ -444,11 +496,11 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
Cell cell33 = row3.createCell(2); Cell cell33 = row3.createCell(2);
cell33.setCellValue("日期"); cell33.setCellValue("日期");
Cell cell34 = row3.createCell(3); Cell cell34 = row3.createCell(3);
cell34.setCellValue(generalStepthree.getCurrentdate());
cell34.setCellValue(new DateTime(generalStepthree.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
Cell cell35 = row3.createCell(4); Cell cell35 = row3.createCell(4);
cell35.setCellValue("中试确认"); cell35.setCellValue("中试确认");
Cell cell36 = row3.createCell(5); Cell cell36 = row3.createCell(5);
cell36.setCellValue(generalStepthree.getCreateBy());
cell36.setCellValue(generalStepthree.getConfirmTrial());
Cell cell37 = row3.createCell(6); Cell cell37 = row3.createCell(6);
cell37.setCellValue("品质确认"); cell37.setCellValue("品质确认");
Cell cell38 = row3.createCell(7); Cell cell38 = row3.createCell(7);
@ -541,11 +593,11 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
Cell cell33 = row3.createCell(2); Cell cell33 = row3.createCell(2);
cell33.setCellValue("日期"); cell33.setCellValue("日期");
Cell cell34 = row3.createCell(3); Cell cell34 = row3.createCell(3);
cell34.setCellValue(generalStepfour.getCurrentdate());
cell34.setCellValue(new DateTime(generalStepfour.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
Cell cell35 = row3.createCell(4); Cell cell35 = row3.createCell(4);
cell35.setCellValue("中试确认"); cell35.setCellValue("中试确认");
Cell cell36 = row3.createCell(5); Cell cell36 = row3.createCell(5);
cell36.setCellValue(generalStepfour.getCreateBy());
cell36.setCellValue(generalStepfour.getComfirmTrial());
Cell cell37 = row3.createCell(6); Cell cell37 = row3.createCell(6);
cell37.setCellValue("品质确认"); cell37.setCellValue("品质确认");
Cell cell38 = row3.createCell(7); Cell cell38 = row3.createCell(7);
@ -765,7 +817,7 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
param9.setCellValue(paramSteptwo.getParam9()); param9.setCellValue(paramSteptwo.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramSteptwo.getParam10()); param10.setCellValue(paramSteptwo.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramSteptwo.getOperator()); operator.setCellValue(paramSteptwo.getOperator());
} else { } else {
break; break;
@ -804,7 +856,7 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
param9.setCellValue(paramStepthree.getParam9()); param9.setCellValue(paramStepthree.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramStepthree.getParam10()); param10.setCellValue(paramStepthree.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramStepthree.getOperator()); operator.setCellValue(paramStepthree.getOperator());
} else { } else {
break; break;
@ -843,7 +895,7 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
param9.setCellValue(paramStepfour.getParam9()); param9.setCellValue(paramStepfour.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramStepfour.getParam10()); param10.setCellValue(paramStepfour.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramStepfour.getOperator()); operator.setCellValue(paramStepfour.getOperator());
} else { } else {
break; break;


+ 56
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExcelServiceImpl.java View File

@ -264,6 +264,59 @@ public class ExcelServiceImpl implements ExcelService {
cell47.setCellValue("中试作业员"); cell47.setCellValue("中试作业员");
Cell cell48 = row4.createCell(7); Cell cell48 = row4.createCell(7);
cell48.setCellValue(generalStepone.getOperator()); cell48.setCellValue(generalStepone.getOperator());
//第五行
Row row5 = sheet.createRow(4);
//第五行第n列
Cell process = row5.createCell(0);
process.setCellValue("工序");
Cell itemCheck = row5.createCell(1);
itemCheck.setCellValue("检查项目");
Cell specs = row5.createCell(2);
specs.setCellValue("规格");
Cell param1 = row5.createCell(3);
param1.setCellValue("1");
Cell param2 = row5.createCell(4);
param2.setCellValue("2");
Cell param3 = row5.createCell(5);
param3.setCellValue("3");
Cell param4 = row5.createCell(6);
param4.setCellValue("4");
Cell param5 = row5.createCell(7);
param5.setCellValue("5");
Cell param6 = row5.createCell(8);
param6.setCellValue("6");
Cell param7 = row5.createCell(9);
param7.setCellValue("7");
Cell param8 = row5.createCell(10);
param8.setCellValue("8");
Cell param9 = row5.createCell(11);
param9.setCellValue("9");
Cell param10 = row5.createCell(12);
param10.setCellValue("10");
Cell param11 = row5.createCell(13);
param11.setCellValue("11");
Cell param12 = row5.createCell(14);
param12.setCellValue("12");
Cell param13 = row5.createCell(15);
param13.setCellValue("13");
Cell param14 = row5.createCell(16);
param14.setCellValue("14");
Cell param15 = row5.createCell(17);
param15.setCellValue("15");
Cell param16 = row5.createCell(18);
param16.setCellValue("16");
Cell param17 = row5.createCell(19);
param17.setCellValue("17");
Cell param18 = row5.createCell(20);
param18.setCellValue("18");
Cell param19 = row5.createCell(21);
param19.setCellValue("19");
Cell param20 = row5.createCell(22);
param20.setCellValue("20");
Cell remark = row5.createCell(23);
remark.setCellValue("备注");
return sheet.getLastRowNum(); return sheet.getLastRowNum();
} }
@ -734,7 +787,7 @@ public class ExcelServiceImpl implements ExcelService {
param9.setCellValue(paramSteptwo.getParam9()); param9.setCellValue(paramSteptwo.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramSteptwo.getParam10()); param10.setCellValue(paramSteptwo.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramSteptwo.getOperator()); operator.setCellValue(paramSteptwo.getOperator());
} else { } else {
break; break;
@ -773,7 +826,7 @@ public class ExcelServiceImpl implements ExcelService {
param9.setCellValue(paramStepthree.getParam9()); param9.setCellValue(paramStepthree.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramStepthree.getParam10()); param10.setCellValue(paramStepthree.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramStepthree.getOperator()); operator.setCellValue(paramStepthree.getOperator());
} else { } else {
break; break;
@ -812,7 +865,7 @@ public class ExcelServiceImpl implements ExcelService {
param9.setCellValue(paramStepfour.getParam9()); param9.setCellValue(paramStepfour.getParam9());
Cell param10 = row.createCell(12); Cell param10 = row.createCell(12);
param10.setCellValue(paramStepfour.getParam10()); param10.setCellValue(paramStepfour.getParam10());
Cell operator = row.createCell(23);
Cell operator = row.createCell(13);
operator.setCellValue(paramStepfour.getOperator()); operator.setCellValue(paramStepfour.getOperator());
} else { } else {
break; break;


Write Preview
Loading…
Cancel
Save