检验通过修改订单方法

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -15,9 +15,11 @@ import net.sourceforge.barbecue.BarcodeImageHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.FlowConst;
 import org.springblade.desk.basic.pojo.entity.BsAssignEntity;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
@@ -46,6 +48,7 @@ import org.springblade.desk.produce.pojo.enums.WorkOrderEnum;
 import org.springblade.desk.produce.pojo.enums.ProcessCycleEnum;
 import org.springblade.desk.produce.pojo.vo.*;
 import org.springblade.desk.produce.service.*;
+import org.springblade.desk.quality.mapper.InspectionTaskMapper;
 import org.springblade.desk.quality.pojo.entity.*;
 import org.springblade.desk.quality.service.*;
 import org.springblade.desk.util.date.DateUtils;
@@ -91,7 +94,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkPlanItemDetailService workPlanItemDetailService;
 
-    private final IInspectionTaskService iInspectionTaskService;
+    private final InspectionTaskMapper inspectionTaskMapper;
 
     private final IWorkOrderRunService workOrderRunService;
 
@@ -120,8 +123,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IRackSetService rackSetService;
 
-    private final IInspectionTaskService inspectionTaskService;
-
     private final IBsTeamSetService teamSetService;
 
     private final IMesRbFilePreserveSlotService mesRbFilePreserveSlotService;
@@ -263,7 +264,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
 
             wp.setCheckItemList(workPlanItemService.listByWorkPlanId(oldWp.getId()));
-            wp.setInspectionTask(iInspectionTaskService.getPrWorkCheckByWpId(oldWp.getId()));
+            wp.setInspectionTask(inspectionTaskMapper.getPrWorkCheckByWpId(oldWp.getId()));
             wpList.add(wp);
         }
         return wpList;
@@ -988,6 +989,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     private void saveProcessMarkRec(List<WorkPlan> oldList, List<WorkPlan> wpList) {
+        Date date = new Date();
+        BladeUser user = AuthUtil.getUser();
         for (WorkPlan prWorkPlan : oldList) {
             // 如果已经当前工序大于加工中，
             if (prWorkPlan.getStatus() > WorkPlan.STATUS_START) {
@@ -1023,13 +1026,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         }
 
                         // 检验记录
-                        InspectionTask inspectionTask = iInspectionTaskService.getPrWorkCheckByWpId(prWorkPlan.getId());
+                        InspectionTask inspectionTask = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, prWorkPlan.getId()));
                         if (inspectionTask != null && inspectionTask.getId() != null) {
                             InspectionTask newPrWorkCheck = new InspectionTask();
                             BeanUtils.copyProperties(inspectionTask, newPrWorkCheck);
                             newPrWorkCheck.setId(null);
                             newPrWorkCheck.setWpId(workPlan.getId());
-                            iInspectionTaskService.save(inspectionTask);
+                            inspectionTask.setIsDeleted(0);
+                            inspectionTask.setStatus(1);
+                            inspectionTask.setCreateTime(date);
+                            inspectionTask.setUpdateTime(date);
+                            inspectionTask.setCreateUser(user.getUserId());
+                            inspectionTask.setUpdateUser(user.getUserId());
+                            inspectionTask.setCreateDept(Func.firstLong(user.getDeptId()));
+                            inspectionTaskMapper.insert(inspectionTask);
                         }
 
                         // 转试记录
@@ -1350,7 +1360,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
 
         // 检验记录
-        InspectionTask prWorkCheckByWpId = inspectionTaskService.getPrWorkCheckByWpId(wpId);
+        InspectionTask prWorkCheckByWpId = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, wpId));
         if (prWorkCheckByWpId != null) {
             ProduceMonitorWorkCheckVO workCheckVO = new ProduceMonitorWorkCheckVO();
             BeanUtils.copyProperties(prWorkCheckByWpId, workCheckVO);
@@ -1764,7 +1774,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 上序不为空时进行审理单验证
         if (frontWorkPlan != null) {
             // 验证上序是否存在未完成审理，如果存在则不允许接收
-            InspectionTask checkByWpId = iInspectionTaskService.getPrWorkCheckByWpId(frontWorkPlan.getId());
+            InspectionTask checkByWpId = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, frontWorkPlan.getId()));
             if (checkByWpId != null) {
                 // 查询是否存在未完的审理单
                 List<ReviewSheet> rsLst = reviewSheetService.getNoCompleteByWcId(checkByWpId.getId());