fixbug:启动系统报错 注意：推送代码前拉取代码、重新打包运行程序，无误后提交

zhoushihao

2024-07-16 0b75a31354826c139291d4f1e911cd121de410f5

fixbug:启动系统报错
注意：推送代码前拉取代码、重新打包运行程序，无误后提交

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -1,7 +1,8 @@
package com.mes.glassinfo.service;

import com.mes.glassinfo.entity.GlassInfo;
import com.github.yulichang.base.MPJBaseService;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;
import java.util.Map;

@@ -24,13 +25,12 @@
       */
      void saveGlassInfo(List<GlassInfo> glassinfo);

//      int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
      int getGlassInfoCountByFlowCardId(String flowCardId, int layer);

      /**
       * @return
       * 查询所有工程状态不为300不同流程卡号
       * @return 查询所有工程状态不为300不同流程卡号
       */
//      List<Map<String, Object>> getFlowCardId();
      List<Map<String, Object>> getFlowCardId();




 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -11,9 +11,9 @@
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -31,7 +31,7 @@
@Service
@Slf4j
public class GlassInfoServiceImpl extends MPJBaseServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
    @Autowired
    @Resource
    OptimizeProjectMapper optimizeProjectMapper;

    @Override

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java

@@ -304,7 +304,7 @@
        if (CollectionUtils.isNotEmpty(workList)) {
            List<DownWorkstation> downWorkstationList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
                    .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, workList));
            log.info("架子被禁用，无法出片落架");
//            log.info("架子被禁用，无法出片落架");
            if (CollectionUtils.isEmpty(downWorkstationList)) {
                log.info("笼子被禁用，无法走机械臂下片");
                //走人工下片
@@ -488,6 +488,7 @@
        //生成任务信息
        DownGlassInfo downGlassInfo = new DownGlassInfo();
        BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
        //todo：落架片序
        downGlassInfoService.save(downGlassInfo);
        //生成任务信息
        GlassInfo glassInfo = new GlassInfo();