diff --git a/console/src/main/resources/log4j2.xml b/console/src/main/resources/log4j2.xml index 8009dd35..b52b1bd8 100644 --- a/console/src/main/resources/log4j2.xml +++ b/console/src/main/resources/log4j2.xml @@ -6,7 +6,6 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n - @@ -14,8 +13,22 @@ - + + + + + + ${log.pattern} + + + + + + + + @@ -30,8 +43,7 @@ - @@ -44,12 +56,14 @@ - - + + + + - + diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index b0950a61..ac8408bb 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -776,7 +776,7 @@ SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION, SD.DISPATCH_STATUS, SD.DISPATCH_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION, SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE, - IM.LOT_SIZE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER + CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER ) WIP LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ 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));