From 7cacc17a7f446a08259b82a9cbfb14798e3eb627 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 3 Sep 2021 18:00:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8E=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SplitSfcServiceImpl.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index 40abd7e1..53fa66cf 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -3,9 +3,11 @@ package com.foreverwin.mesnac.production.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.enums.DispatchStatusEnum; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.service.InspectionTaskService; import com.foreverwin.mesnac.common.service.SfcDispatchCommonService; import com.foreverwin.mesnac.common.util.ExceptionUtil; import com.foreverwin.mesnac.common.util.StringUtil; @@ -15,7 +17,6 @@ import com.foreverwin.mesnac.meapi.model.Router; import com.foreverwin.mesnac.meapi.service.RouterService; import com.foreverwin.mesnac.meapi.service.RouterStepService; import com.foreverwin.mesnac.meapi.service.ShopOrderService; -import com.foreverwin.mesnac.meapi.service.WorkCenterService; import com.foreverwin.mesnac.production.dto.SplitSfcDto; import com.foreverwin.mesnac.production.mapper.SfcCrossMapper; import com.foreverwin.mesnac.production.mapper.SplitSfcMapper; @@ -36,9 +37,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; + /** *

* 产品条码拆分表 服务实现类 @@ -57,7 +57,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i @Autowired private SfcDispatchCommonService sfcDispatchCommonService; @Autowired - private WorkCenterService workCenterService; + private InspectionTaskService inspectionTaskService; @Autowired private ShopOrderService shopOrderService; @Autowired @@ -260,6 +260,17 @@ public class SplitSfcServiceImpl extends ServiceImpl i throw new BaseException("处置工艺路线没有步骤"); } sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence()); + //创建专检任务 + Map paramMap=new HashMap<>(); + paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); + paramMap.put("SFC",sfc ); + paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); + paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); + paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId());; + paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); + paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); + paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); + inspectionTaskService.createNewTask(paramMap); } SplitSfc splitSfc=new SplitSfc(); splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc));