mes工单模块

src/main/java/net/vtstar/zhongtong/avi/equipment/controller/BasicInfoController.java

@@ -145,4 +145,10 @@ public class BasicInfoController {
             return Return.failed("工单导入失败!");
         }
     }
+
+    @ApiOperation("Mes工单查询")
+    @PostMapping("/mes/workOrder")
+    public Return getWorkOrder(@RequestBody SearchVo pageFilter) {
+        return Return.success(new PageInfo<>(basicInfoService.getWorkOrder(pageFilter.toJSONObject())));
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/equipment/service/BasicInfoService.java

@@ -11,7 +11,7 @@ import net.vtstar.utils.asserts.ParamAssert;
 import net.vtstar.zhongtong.avi.equipment.domain.*;
 import net.vtstar.zhongtong.avi.equipment.mapper.*;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -250,7 +250,7 @@ public class BasicInfoService {
                 MesWorkOrderInfo workOrder = new MesWorkOrderInfo();
                 //车间计划工单号
                 if (row.getCell(0) != null) {
-                    row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
+                    row.getCell(0).setCellType(CellType.STRING);
                     String workOrderNo = row.getCell(0).getStringCellValue();
                     if (StringUtils.isEmpty(workOrderNo)){
                         continue;
@@ -259,7 +259,7 @@ public class BasicInfoService {
                 }
                 //车型
                 if (row.getCell(1) != null) {
-                    row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
+                    row.getCell(1).setCellType(CellType.STRING);
                     String vehicleModel = row.getCell(1).getStringCellValue();
                     if (null == vehicleModel){
                         continue;
@@ -268,13 +268,13 @@ public class BasicInfoService {
                 }
                 //单位
                 if (row.getCell(2) != null) {
-                    row.getCell(2).setCellType(Cell.CELL_TYPE_STRING);
+                    row.getCell(2).setCellType(CellType.STRING);
                     String unit = row.getCell(2).getStringCellValue();
                     workOrder.setUnit(unit);
                 }
                 //产线
                 if (row.getCell(3) != null) {
-                    row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
+                    row.getCell(3).setCellType(CellType.STRING);
                     String productionLine = row.getCell(3).getStringCellValue();
                     workOrder.setProductionLine(productionLine);
                 }
@@ -287,4 +287,9 @@ public class BasicInfoService {
         mesWorkOrderMapper.insertList(list);
         return true;
     }
+
+    public List<MesWorkOrderInfo> getWorkOrder(JSONObject pageFilter) {
+        PageHelper.startPage(pageFilter.getIntValue("pageNum"), pageFilter.getIntValue("pageSize"));
+        return mesWorkOrderMapper.findList(searchService.pageFilter2Filter(pageFilter, new WhereFilter()), MesWorkOrderInfo.class);
+    }
 }