解决抽检模块功能Bug

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -37,7 +37,6 @@
         from (
         select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,ifnull(b.produce_num,0) as produceNum, c.bomId, c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,c.order_product_id,d.id as zoneId, d.org_id,
         ifnull(v.completeCount ,0) as completeNum,unqualifiedBomNum,
---         group_concat(t.id) as workpieceIds,
         CASE WHEN ifnull(w.taskCount,0)=0 then 0 else  round(100 *( wcCount / taskCount),2) end process,ifnull(c.plan_bom_num,0) as planBomNum,d.name as zoenDesc from imcs_p_plan a
         left join (
         select ord.* from imcs_o_order ord

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/InspectionController.java

@@ -95,11 +95,6 @@ public class InspectionController extends SuperController<InspectionService, Lon
             //在当前零件加工工序之后
             wrapper.le(BomProcedure::getSort, sort);
         }
-        Inspection inspection = baseService.getOne(new LbqWrapper<Inspection>().eq(Inspection::getWorkpieceId, workPiece.getId()));
-        //排除已经提交抽检的工序
-        if (null != inspection && null != inspection.getProcedureId()) {
-            wrapper.ne(BomProcedure::getId, inspection.getProcedureId());
-        }
 
         List<Long> idList = bomProcedureService.list(wrapper).stream().filter(data -> {
             //排除保障中心设备序
@@ -107,7 +102,15 @@ public class InspectionController extends SuperController<InspectionService, Lon
             return zZoneService.getById(zone_id).getNo() != "safeguard";
         }).map(BomProcedure::getId).collect(Collectors.toList());
         //获取已存在的工序的任务节点
-        List<TTask> dataList = taskService.list(new LbqWrapper<TTask>().eq(TTask::getCompleteBatchNo, workPiece.getCompleteBatchNo()).eq(TTask::getPlanId, map.get("planId").toString()).in(TTask::getProcedureId, idList.toArray()));
+        LbqWrapper<TTask> taskLbqWrapper = new LbqWrapper<TTask>();
+        taskLbqWrapper.eq(TTask::getCompleteBatchNo, workPiece.getCompleteBatchNo()).eq(TTask::getPlanId, map.get("planId").toString()).in(TTask::getProcedureId, idList.toArray());
+
+        Inspection inspection = baseService.getOne(new LbqWrapper<Inspection>().eq(Inspection::getWorkpieceId, workPiece.getId()));
+        //排除已经提交抽检的工序
+        if (null != inspection && null != inspection.getTaskId()) {
+            taskLbqWrapper.ne(TTask::getId, inspection.getTaskId());
+        }
+        List<TTask> dataList = taskService.list(taskLbqWrapper);
         return success(dataList);
     }
 
@@ -116,8 +119,8 @@ public class InspectionController extends SuperController<InspectionService, Lon
     public R<Inspection> save(@RequestBody InspectionSaveDTO model) {
         Inspection inspection = BeanUtil.toBean(model, Inspection.class);
         if (baseService.check(model)) {
-            //baseService.createTaskNode(model);
-            return baseService.save(inspection) ? success(inspection) : fail("新增失败");
+            baseService.createTaskNode(model);
+            //return baseService.save(inspection) ? success(inspection) : fail("新增失败");
         }
         return fail("新增条件判断失败");
     }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/WorkpieceController.java

@@ -78,7 +78,7 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
                 workpiece.getOrderNo()).eq(TWorkpiece::getBomId, workpiece.getBomId()).like(TWorkpiece::getBomNo,
                 workpiece.getBomNo()).eq(TWorkpiece::getBomName, workpiece.getBomName()).like(TWorkpiece::getOrderNo, workpiece.getOrderNo()).eq(
                 TWorkpiece::getPlanId, workpiece.getPlanId()).like(TWorkpiece::getPlanNo, workpiece.getPlanNo()).eq(TWorkpiece::getProduceStatus,
-                workpiece.getProduceStatus()).eq(TWorkpiece::getTestResult, workpiece.getTestResult()).like(TWorkpiece::getUniqueCode, workpiece.getUniqueCode());
+                workpiece.getProduceStatus()).eq(TWorkpiece::getTestResult, workpiece.getTestResult()).like(TWorkpiece::getUniqueCode, workpiece.getUniqueCode()).orderByAsc(TWorkpiece::getCreateTime);
 
         baseService.pageList(page, wrapper);
     }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Plan.java

@@ -325,17 +325,12 @@ public class Plan extends Entity<Long> {
     @Excel(name = "订单明细ID")
     private Long orderProductId;
 
-    @ApiModelProperty(value = "工件IDs")
-    @TableField(exist = false)
-    private String workpieceIds;
-
     @ApiModelProperty(value = "计划IDs")
     @Length(max = 128, message = "计划IDs不能超过128")
     @TableField(exist = false)
     private String planIds;
 
 
-
     @Builder
     public Plan(Long id, LocalDateTime createTime, LocalDateTime updateTime, 
                     String planNo, Long orderId, String auditStatus, String remark,