Merge remote-tracking branch 'origin/master'

console/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         <Property name="log.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</Property>
     </Properties>
 
-    <!-- 日志输出器 -->
     <Appenders>
         <Console name="console" target="SYSTEM_OUT">
             <PatternLayout>
@@ -14,8 +13,22 @@
             </PatternLayout>
         </Console>
 
-        <RollingFile name="file_info"
-                     fileName="${log.path}/mes-info.log"
+        <RollingFile name="optimize" fileName="${log.path}/mes-optimize.log"
+                     filePattern="${log.path}/$${date:yyyy-MM}/mes-optimize.%d{yyyy-MM-dd}-%i.log">
+            <Filters>
+                <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
+                <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
+            <PatternLayout>
+                <pattern>${log.pattern}</pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+        </RollingFile>
+
+        <RollingFile name="file_info" fileName="${log.path}/mes-info.log"
                      filePattern="${log.path}/$${date:yyyy-MM}/mes-info.%d{yyyy-MM-dd}-%i.log">
             <Filters>
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
@@ -30,8 +43,7 @@
             </Policies>
         </RollingFile>
 
-        <RollingFile name="file_error"
-                     fileName="${log.path}/mes-error.log"
+        <RollingFile name="file_error" fileName="${log.path}/mes-error.log"
                      filePattern="${log.path}/$${date:yyyy-MM}/mes-error.%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
@@ -44,12 +56,14 @@
         </RollingFile>
     </Appenders>
 
-
     <Loggers>
-        <logger name="info" level="debug">
+        <logger name="optimize" level="debug">
+            <AppenderRef ref="optimize"/>
+        </logger>
+        <logger name="com.foreverwin" level="debug">
             <AppenderRef ref="file_info"/>
         </logger>
-        <Root level="error">
+        <Root level="info">
             <AppenderRef ref="console"/>
             <AppenderRef ref="file_error"/>
         </Root>

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

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.*;
+
 /**
  * <p>
  * 产品条码拆分表 服务实现类
@@ -57,7 +57,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> 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<SplitSfcMapper, SplitSfc> i
                     throw new BaseException("处置工艺路线没有步骤");
                 }
                 sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence());
+                //创建专检任务
+                Map<String, Object> 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));