|
@@ -551,18 +551,16 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
XSSFCell productSchedulingNumCell = row.getCell(0);
|
|
XSSFCell productSchedulingNumCell = row.getCell(0);
|
|
XSSFCell productNameCell = row.getCell(1);
|
|
XSSFCell productNameCell = row.getCell(1);
|
|
XSSFCell steelStampNumberCell = row.getCell(2);
|
|
XSSFCell steelStampNumberCell = row.getCell(2);
|
|
- XSSFCell vehiclSerialNumberCell = row.getCell(3);
|
|
|
|
- XSSFCell numCell = row.getCell(4);
|
|
|
|
- XSSFCell mainProcessCell = row.getCell(5);
|
|
|
|
- XSSFCell stationNameCell = row.getCell(6);
|
|
|
|
- XSSFCell startDateCell = row.getCell(7);
|
|
|
|
- XSSFCell endDateCell = row.getCell(8);
|
|
|
|
- XSSFCell describtionCell = row.getCell(9);
|
|
|
|
|
|
+ XSSFCell numCell = row.getCell(3);
|
|
|
|
+ XSSFCell mainProcessCell = row.getCell(4);
|
|
|
|
+ XSSFCell stationNameCell = row.getCell(5);
|
|
|
|
+ XSSFCell startDateCell = row.getCell(6);
|
|
|
|
+ XSSFCell endDateCell = row.getCell(7);
|
|
|
|
+ XSSFCell describtionCell = row.getCell(8);
|
|
|
|
|
|
if (productSchedulingNumCell != null) productSchedulingNumCell.setCellType(CellType.STRING);
|
|
if (productSchedulingNumCell != null) productSchedulingNumCell.setCellType(CellType.STRING);
|
|
if (productNameCell != null) productNameCell.setCellType(CellType.STRING);
|
|
if (productNameCell != null) productNameCell.setCellType(CellType.STRING);
|
|
if (steelStampNumberCell != null) steelStampNumberCell.setCellType(CellType.STRING);
|
|
if (steelStampNumberCell != null) steelStampNumberCell.setCellType(CellType.STRING);
|
|
- if (vehiclSerialNumberCell != null) vehiclSerialNumberCell.setCellType(CellType.STRING);
|
|
|
|
if (numCell != null) numCell.setCellType(CellType.NUMERIC);
|
|
if (numCell != null) numCell.setCellType(CellType.NUMERIC);
|
|
if (mainProcessCell != null) mainProcessCell.setCellType(CellType.STRING);
|
|
if (mainProcessCell != null) mainProcessCell.setCellType(CellType.STRING);
|
|
if (stationNameCell != null) stationNameCell.setCellType(CellType.STRING);
|
|
if (stationNameCell != null) stationNameCell.setCellType(CellType.STRING);
|
|
@@ -631,11 +629,6 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
msg.setError("产品名称不能为空");
|
|
msg.setError("产品名称不能为空");
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
- if(vehiclSerialNumberCell!=null){
|
|
|
|
- String[] split = vehiclSerialNumberCell.getStringCellValue().split("-");
|
|
|
|
- plan.setVehicleNumStart(Integer.valueOf(split[0]));
|
|
|
|
- plan.setVehicleNumEnd(split.length>1?Integer.valueOf(split[1]):Integer.valueOf(split[0]));
|
|
|
|
- }
|
|
|
|
plan.setNum(numCell==null?0:Double.valueOf(numCell.getNumericCellValue()).intValue());
|
|
plan.setNum(numCell==null?0:Double.valueOf(numCell.getNumericCellValue()).intValue());
|
|
plan.setMainProcess(mainProcessCell==null?"":mainProcessCell.getStringCellValue());
|
|
plan.setMainProcess(mainProcessCell==null?"":mainProcessCell.getStringCellValue());
|
|
if(stationNameCell!=null){
|
|
if(stationNameCell!=null){
|