Merge remote-tracking branch 'origin/master'

刘小明

2024-07-16 080b6ef99a53e35fc2c1fd5b4a3ef84e0656c98c

Merge remote-tracking branch 'origin/master'

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -24,7 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigInteger;
import java.util.*;
import java.util.stream.Collectors;

@Slf4j
@Service
@@ -53,46 +55,57 @@
    private OthFileMapper othFileMapper;
    @Value("${dy.webFile.fmUrl}")
    private String fmUrl;

    @Autowired
    public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
        this.deviceLastDao = deviceLastDao;
    }

    @Autowired
    public void setDeviceLifeDao(StaDeviceLifeMapper deviceLifeDao) {
        this.deviceLifeDao = deviceLifeDao;
    }

    @Autowired
    public void setWipSnExDao(StaWipSnExMapper wipSnExDao) {
        this.wipSnExDao = wipSnExDao;
    }

    @Autowired
    public void setDeviceProductionLogDao(StaDeviceProductionLogMapper deviceProductionLogDao) {
        this.deviceProductionLogDao = deviceProductionLogDao;
    }

    @Autowired
    public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
        this.assemblyWorkLastDao = assemblyWorkLastDao;
    }

    @Autowired
    public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
        this.assemblyPlanDao = assemblyPlanDao;
    }

    @Autowired
    public void setNodeDao(PrProductionNodeMapper nodeDao) {
        this.nodeDao = nodeDao;
    }

    @Autowired
    public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
        this.repairInfoDao = repairInfoDao;
    }

    @Autowired
    public void setQualityItemsDao(PltProductQualityInspectionItemsMapper qualityItemsDao) {
        this.qualityItemsDao = qualityItemsDao;
    }

    @Autowired
    public void setTestItemsDao(PltProductTestInspectionItemsMapper testItemsDao) {
        this.testItemsDao = testItemsDao;
    }

    @Autowired
    public void setProductDao(PltProductMapper productDao) {
        this.productDao = productDao;
@@ -117,6 +130,7 @@
    public void setOthFileMapper(OthFileMapper othFileMapper) {
        this.othFileMapper = othFileMapper;
    }

    @Autowired
    public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
        this.deviceLifeLastDao = deviceLifeLastDao;
@@ -134,13 +148,25 @@
        Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo));
        // 分类设备号和物料号
        List<String> deviceList = new ArrayList<>();
        List<String> materialList = new ArrayList<>();
        List<Map<String, String>> materialList = new ArrayList<>();
        List<PltProduct> productList = productDao.selectAll(null);
        deviceSet.forEach(device -> {
            if (device.contains(plan.batchNo)) {
                deviceList.add(device);
            } else if(isOurProduct(device,productList)){
                materialList.add(device);
        deviceSet.forEach(deviceNo -> {
            if (deviceNo.contains(plan.batchNo)) {
                deviceList.add(deviceNo);
            } else {
                //判断是不是是本厂物料,如果是,则添加物料到ex表中
                PltProduct product = null;
                if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
                    product = productList.stream().filter(p -> deviceNo.startsWith(QrCodeConstant.TypeProduct + p.getCode())).findFirst().orElse(null);
                }
                if(product != null){
                    Map<String, String> map = new HashMap<>();
                    map.put("deviceNo", deviceNo);
                    map.put("proName", product.getName());
                    BigInteger proId = BigInteger.valueOf(product.getId());
                    map.put("proId", proId.toString());
                    materialList.add(map);
                }
            }
        });

@@ -148,7 +174,7 @@
            throw new RuntimeException("设备号(" + Arrays.toString(params.deviceNo) + ")均不属于当前任务计划");
        }
        if (deviceList.size() > 1) {
            throw new RuntimeException("设备号有且只能有一个属于当前任务计划");
            throw new RuntimeException("在产设备(" + deviceList.stream().collect(Collectors.joining(",")) + ")有且只能有一个属于当前任务计划");
        }

        StaDeviceLast deviceLast = buildDeviceLast(params, workLast, deviceList.get(0));
@@ -162,7 +188,7 @@
            saveDeviceLife(deviceLast);
        }
        if (CollectionUtils.isNotEmpty(materialList)) {
            saveSnEx(workLast, deviceList, materialList, plan);
            saveSnEx(workLast, deviceList, materialList);
        }
        return count;
    }
@@ -198,7 +224,6 @@
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
            record.outLineTime = preRecord.outLineTime;
        }else{
            record.inTime = new Date();
            record.inLineTime = new Date();
@@ -233,15 +258,16 @@
        return record;
    }

    private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<String> materialList, PrAssemblyPlan plan) {
        for (String material : materialList) {
    private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<Map<String, String>> materialList) {
        for (Map<String, String> material : materialList) {
            StaWipSnEx snEx = new StaWipSnEx();
            snEx.deviceNo = deviceList.get(0);
            snEx.productId = plan.process.proId;
            snEx.productNo = material;
            snEx.productNo = material.get("deviceNo");
            snEx.productName = material.get("proName");
            snEx.productId = Long.parseLong(material.get("proId"));
            snEx.createTime = workLast.startTime;
            snEx.createBy = workLast.userId;
            snEx.productName = plan.proName;

            wipSnExDao.insertSelective(snEx);
        }
    }
@@ -315,6 +341,7 @@
        saveDeviceProductionLog(deviceLast);
        return count;
    }

    //根据节点查出节点作业指导书
    public PrProductionNode getSopByNodeId(String nodeId) {
        if(com.alibaba.excel.util.StringUtils.isBlank(nodeId)){
@@ -329,6 +356,7 @@
        }
        return  node;
    }

    //主要技术参数    俩个方法同 platform-->product-->productSv
    public List<PltProductParams> getParamsByProId(String proId) {
        if(StringUtils.isBlank(proId)){
@@ -337,6 +365,7 @@
        List<PltProductParams> proParams = paramsDao.selectParams(Long.parseLong(proId));
        return  proParams;
    }

    // 根据产品查出产品文件
    public List<PltProductFile> getFileByProId(String proId) {
        if(StringUtils.isBlank(proId)){
@@ -379,6 +408,7 @@
        }
        return false;
    }

    private void addUrl(PrWorkingInstruction ins) {
        if (ins == null || ins.fileId == null) {
            return;
@@ -392,6 +422,7 @@
        ins.orgName = file.orgName;
        ins.extName = file.extName;
    }

    private PltProduct addWebUrl(PltProduct pro) {
        if (pro != null) {
            if (pro.image != null) {
@@ -413,6 +444,7 @@
        }
        return pro;
    }

    private String getFilePathWithWebUrl(Long fileId) {
        OthFile file = othFileMapper.selectByPrimaryKey(fileId);
        FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/config/WebListenerConfiguration.java

New file
@@ -0,0 +1,50 @@
package com.dy.pmsStation.config;

import com.dy.common.webListener.GenerateIdSetSuffixListener;
import jakarta.servlet.ServletContextListener;
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class WebListenerConfiguration {

    /**
     * 启动顺序
     */
    //private static final int order_config = 0 ;
    private static final int order_idSetSuffix = 1 ;

    /*
    * 解析各种***config.xml配置的ConfigListener，当前springboot工程暂时不采用此种配置方式
    *
    @Bean
    public ConfigListener getGlConfigListener(){
        return new ConfigListener() ;
    }
    /**
     * 外部提供Listener
     * @param listener 外部提供Listener
     * @return 注册Bean
    @Bean
    public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
        ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
        listenerRegistrationBean.setListener(listener);
        listenerRegistrationBean.setOrder(order_config);
        return listenerRegistrationBean;
    }
    */

    /**
     * 内部提供listener，该listener在系统启动时，根据配置 设置ID产生器的后缀
     * @return 注册Bean
     */
    @Bean
    public ServletListenerRegistrationBean<? extends ServletContextListener> regIdSuffixListener() {
        ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
        listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener());
        listenerRegistrationBean.setOrder(order_idSetSuffix);
        return listenerRegistrationBean;
    }

}

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java

@@ -15,6 +15,7 @@
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,7 @@
            if (product != null) {
                result.setProId(product.getId());
                result.setProName(product.getName());
                String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
                String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
                result.setDevicePrefix(devicePrefix);
            }
        }
@@ -308,7 +309,7 @@
        }
        result.setProId(product.getId());
        result.setProName(product.getName());
        String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
        String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
        result.setDevicePrefix(devicePrefix);
        return result;
    }