一键排产的时候，如果是手动模式的话，则不推送

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -1013,6 +1013,20 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             return;
         //过滤首个工序
         List<Long>taskIdList = taskList.stream().filter(task->"1".equals(task.getFirstProcedureFlag())).map(t->t.getId()).collect(Collectors.toList());
+//        //查出零件
+//        List<Long> bomIdList = taskList.stream().map(t->t.getBomId()).distinct().collect(Collectors.toList());
+//
+//        List<BBom>bomList = bBomMapper.selectList(Wraps.<BBom>lbQ().in(BBom::getId,bomIdList));
+//
+//        Map<Long,Long>bBomZoneMap = bomList.stream().collect(Collectors.toMap(BBom::getId, BBom::getZoneId));
+//
+//        List<Long>zoneIdList = bomList.stream().map(t->t.getZoneId()).distinct().collect(Collectors.toList());
+//
+//        List<ZZone>zoneList = zZoneMapper.selectList(Wraps.<ZZone>lbQ().in(ZZone::getId,zoneIdList));
+//
+//        Map<Long,ZZone>zoneMap = zoneList.stream().collect(Collectors.toMap(ZZone::getId, t->t));
+
+
         //把任务列表转成map.方便后面读取
 //        Map<Long,TTask>taskMap = taskList.stream().collect(Collectors.toMap(t->t.getId(), t->t));
         if(taskIdList!=null&&taskIdList.size()>0){
@@ -1022,6 +1036,18 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                 List<TaskNode> l = taskNodeMap.get(completeBatchNo);
                 //TTask task = taskMap.get(taskId);
                 TaskNode taskNode0 = l.get(0);
+                //根据bomid获取ZoneID
+                List<ZZone>zoneList = zZoneMapper.getZoneByCompleteBatchNo(taskNode0.getCompleteBatchNo());
+                //手动模式
+                if(CollectionUtil.isNotEmpty(zoneList)){
+                    ZZone zone = zoneList.get(0);
+                    if("2".equals(zone.getRunMode())){
+                        continue;
+                    }
+                }
+
+
+
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("taskNodeId",taskNode0.getId().toString());
                 jsonObject.put("bizType",BizConstant.MQ_TASK_NODE_TYPE_COMMON);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/ZZoneMapper.java

@@ -10,6 +10,8 @@ import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -23,4 +25,6 @@ import org.springframework.stereotype.Repository;
 public interface ZZoneMapper extends SuperMapper<ZZone> {
 
     IPage<ZZone> findPage(IPage<ZZone> page, @Param(Constants.WRAPPER) Wrapper<ZZone> wrapper, DataScope dataScope);
+
+    List<ZZone> getZoneByCompleteBatchNo(@Param("completeBatchNo") String completeBatchNo);
 }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ZZoneMapper.xml

@@ -46,4 +46,11 @@
     </select>
 
 
+    <select id="getZoneByCompleteBatchNo" parameterType="String"  resultType="com.github.zuihou.business.productionResourceCenter.entity.ZZone">
+    select z.id,z.name,z.run_mode runMode from imcs_t_task t LEFT JOIN imcs_b_bom b on t.bom_id = b.id
+    LEFT JOIN imcs_z_zone z on b.zone_id = z.id
+    where t.complete_batch_no = #{completeBatchNo}
+    </select>
+
+
 </mapper>