src/main/java/cn/ezhizao/project/business/controller/BizDayworkController.java

@@ -234,7 +234,7 @@ public class BizDayworkController extends BaseController {
 
         List<BizLotTechnologicalProcessDetail> lotProcessList = new ArrayList<>();//新工序列表
         List<BizTechnologicalProcessDetail> processList = new ArrayList<>();//标准工序列表
-        if(itemList.size()>0) {
+        if(!itemList.isEmpty()) {
             //是否废回用或单批但改
             if (bizDayworkItem.getIsAmend() == 1 || bizDayworkItem.getIsWasteRecycling() == 1) {
                 //查询新工序列表
@@ -266,10 +266,19 @@ public class BizDayworkController extends BaseController {
         }
         //如果进行到最后一条报工，则不能删除，拿到工艺计划单的最后一道工序步骤编码
         String lastProcessStepNumber;
+        String firstProcessStepNumber;
         if(bizDayworkItem.getIsAmend() == 1 || bizDayworkItem.getIsWasteRecycling() == 1){
-          lastProcessStepNumber = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id",bizDayworkItem.getTechnologicalProcessId()).orderByDesc("process_step_number").list().get(0).getProcessStepNumber();
+          lastProcessStepNumber = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id",bizDayworkItem.getTechnologicalProcessId())
+                  .orderByDesc("process_step_number").list().get(0).getProcessStepNumber();
+            firstProcessStepNumber = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id",bizDayworkItem.getTechnologicalProcessId())
+                    .orderByAsc("process_step_number").list().get(0).getProcessStepNumber();
         }else{
-          lastProcessStepNumber = bizTechnologicalProcessDetailService.query().eq("technological_process_id",bizDayworkItem.getTechnologicalProcessId()).ne("tenant_id",9).orderByDesc("process_step_number").list().get(0).getProcessStepNumber();
+          lastProcessStepNumber = bizTechnologicalProcessDetailService.query()
+                  .eq("technological_process_id",bizDayworkItem.getTechnologicalProcessId())
+                  .ne("tenant_id",9).orderByDesc("process_step_number").list().get(0).getProcessStepNumber();
+          firstProcessStepNumber = bizTechnologicalProcessDetailService.query()
+                      .eq("technological_process_id",bizDayworkItem.getTechnologicalProcessId())
+                      .ne("tenant_id",9).orderByAsc("process_step_number").list().get(0).getProcessStepNumber();
         }
         TableDataInfo info = getDataTable(itemList);
         Map<String, Object> map = new HashMap<>();
@@ -277,6 +286,7 @@ public class BizDayworkController extends BaseController {
         map.put("latestProcessId", bizDayworkItemService.getLatestDayworkItemId(bizDayworkItem));
         map.put("lastItem",bizDayworkItemService.getLastItem(bizDayworkItem));
         map.put("lastProcessStepNumber",lastProcessStepNumber);
+        map.put("isFirst", firstProcessStepNumber);
         info.setOthers(map);
         return info;
     }