-切换大模组代码更改

admin

2024-07-18 0aaabac24ac4ebc2fe3e54c56e95f250ea238d5b

-切换大模组代码更改

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -7,6 +7,9 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;
import com.jcdm.main.bs.formulaChildInfoTemp.service.IBsFormulaChildInfoTempService;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
@@ -50,6 +53,9 @@
    @Autowired
    private MiloService miloService;

    @Autowired
    private IBsFormulaChildInfoTempService bsFormulaChildInfoTempService;

    /**
     * æ‰«ç ç¡®è®¤
     */
@@ -89,9 +95,10 @@
    @GetMapping("/manualNgOffline")
    public AjaxResult manualNgOffline(BsFormulaChildInfo bsFormulaChildInfo)
    {
        Integer stepNumber = 90;
        Integer stepNumber = 31;
        try {
            String str = "PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber";
            logger.info("手动下线，写入ArtificialNgSignal为：{}",stepNumber);
            String str = "PACK."+bsFormulaChildInfo.getLocationCode()+".ArtificialNgSignal";
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepNumber).build());
        } catch (Exception e) {
            throw new RuntimeException(e);
@@ -137,14 +144,85 @@
    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯åˆ—表
     */
//    @GetMapping("/noPageListFormulaChild")
//    public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
//    {
//
//        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
//                .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
//                .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
//        );
//        if (CollUtil.isNotEmpty(list)){
//            List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
//            List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList());
//            list = collect1;
//            list.addAll(collect2);
//        }
//
//        if("1".equals(bsFormulaChildInfo.getArtificialNgFlag())){
//            List<BsFormulaChildInfoTemp> tempList = bsFormulaChildInfoTempService.list(new LambdaQueryWrapper<BsFormulaChildInfoTemp>()
//                    .eq(BsFormulaChildInfoTemp::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
//                    .eq(BsFormulaChildInfoTemp::getProductCode, bsFormulaChildInfo.getProductCode())
//                    .eq(BsFormulaChildInfoTemp::getSfcCode, bsFormulaChildInfo.getSfcBarcode()));
//
//            for (int i = 0; i < list.size(); i++) {
//                BsFormulaChildInfo formulaChildInfo = list.get(i);
//                if(i < tempList.size()){
//                    BsFormulaChildInfoTemp childInfoTemp = tempList.get(i);
//                    if(ObjectUtil.isNotEmpty(childInfoTemp)){
//                        formulaChildInfo.setResults(childInfoTemp.getResults());
//                        formulaChildInfo.setCollectData(childInfoTemp.getCollectData());
//                        bsFormulaChildInfoService.saveOrUpdate(formulaChildInfo);
//                    }
//                }
//                if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
//                    if(formulaChildInfo.getCollectData().contains("[")){
//                        String data = formulaChildInfo.getCollectData();
//                        data = data.replace("[", "").replace("]", "").replace(" ", "");
//                        String[] tightenDataParts = data.split(",");
//                        formulaChildInfo.setCollectData("扭矩"+tightenDataParts[0]+"角度"+tightenDataParts[1]+"扭矩结果"+tightenDataParts[2]+"角度结果"+tightenDataParts[3]);
//                    }
//                }
//            }
//
//            //给plc写ng工步
//            BsFormulaChildInfoTemp lastTemp = tempList.get(tempList.size()-1);
//            try {
//                Integer stepSort = Integer.valueOf(lastTemp.getStepSort()+1);
//                logger.info("ng工件给plc写工步为:{}---工位{}---pack码{}",stepSort,lastTemp.getProcessesCode(),lastTemp.getSfcCode());
//                String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
//                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepSort+1).build());
//            } catch (Exception e) {
//                throw new RuntimeException(e);
//            }
//
//            //清除工单标记
//            LambdaUpdateWrapper<OmProductionOrdeInfo> updateWrapper = new LambdaUpdateWrapper<>();
//            updateWrapper.set(OmProductionOrdeInfo::getArtificialNgFlag, "");
//            updateWrapper.eq(OmProductionOrdeInfo::getProductNum, lastTemp.getSfcCode());
//            boolean update = omProductionOrdeInfoService.update(new OmProductionOrdeInfo(), updateWrapper);
//        }else {
//            for (BsFormulaChildInfo formulaChildInfo : list) {
//                if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
//                    if(formulaChildInfo.getCollectData().contains("[")){
//                        String data = formulaChildInfo.getCollectData();
//                        data = data.replace("[", "").replace("]", "").replace(" ", "");
//                        String[] tightenDataParts = data.split(",");
//                        formulaChildInfo.setCollectData("扭矩"+tightenDataParts[0]+"角度"+tightenDataParts[1]+"扭矩结果"+tightenDataParts[2]+"角度结果"+tightenDataParts[3]);
//                    }
//                }
//            }
//        }
//        return getDataTable(list);
//    }

    @GetMapping("/noPageListFormulaChild")
    public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
    {

        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
                .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
//                .orderByAsc(BsFormulaChildInfo::getStepSort)
                        .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
                        .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
        );
        if (CollUtil.isNotEmpty(list)){
            List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java

@@ -155,6 +155,9 @@
    @TableField(exist = false)
    private String productBarcode;

    @TableField(exist = false)
    private String artificialNgFlag;

    public String getParamName() {
        return paramName;
    }

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java

@@ -18,6 +18,8 @@
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;
import com.jcdm.main.bs.formulaChildInfoTemp.service.IBsFormulaChildInfoTempService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
@@ -81,6 +83,9 @@
    private IDaParamCollectionTempService daParamCollectionTempService;

    Map<String, Session> map = WebSocketUsers.getUsers();

    @Autowired
    private IBsFormulaChildInfoTempService bsFormulaChildInfoTempService;

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯
@@ -393,6 +398,7 @@
        LambdaUpdateWrapper<BsFormulaChildInfo> updateWrapper = new LambdaUpdateWrapper();
        updateWrapper.set(BsFormulaChildInfo::getCollectData, "");
        updateWrapper.set(BsFormulaChildInfo::getResults,"");
        updateWrapper.set(BsFormulaChildInfo::getNgTimes,0);
        updateWrapper.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode());
        updateWrapper.eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode());
        BsFormulaChildInfo info = new BsFormulaChildInfo();
@@ -550,12 +556,13 @@

//            Integer ngTimes = bsFormulaChildInfo.getNgTimes();
//            bsFormulaChildInfo.setNgTimes(ngTimes+1);
//            if(ngTimes > 3){
//            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
//
//            if(bsFormulaChildInfo.getNgTimes() > 3){
//                this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
//                WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
//                this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode());
//                return AjaxResult.error("超过三次拧紧 pack NG下线！");
//            }
            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
            return AjaxResult.error("拧紧结果NG,请重新拧紧！");
        }else {
            //List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
@@ -603,7 +610,7 @@
        return AjaxResult.success("拧紧成功！");
    }

    public void recordNgTighteningData(String locationCode,String productCode){
    public void recordNgTighteningData(String locationCode,String productCode,String packId){
        List<BsFormulaChildInfo> ngFormulaList = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProcessesCode, locationCode)
                .eq(BsFormulaChildInfo::getProductCode, productCode)
@@ -612,9 +619,15 @@
                .filter(formula -> formula.getResults() != null && !formula.getResults().isEmpty())
                .collect(Collectors.toList());
        for (BsFormulaChildInfo childInfo : filteredList) {
            childInfo.setNgCollectData(childInfo.getCollectData());
            childInfo.setNgResults(childInfo.getResults());
            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(childInfo);
            BsFormulaChildInfoTemp childInfoTemp = new BsFormulaChildInfoTemp();
            childInfoTemp.setCollectData(childInfo.getCollectData());
            childInfoTemp.setResults(childInfo.getResults());
            childInfoTemp.setSfcCode(packId);
            childInfoTemp.setProcessesCode(childInfo.getProcessesCode());
            childInfoTemp.setProductCode(childInfo.getProductCode());
            childInfoTemp.setStepSort(childInfo.getStepSort());
//            childInfoTemp.setLineCode(childInfo.getId());
            bsFormulaChildInfoTempService.save(childInfoTemp);
        }
    }


 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/controller/BsFormulaChildInfoTempController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,104 @@
package com.jcdm.main.bs.formulaChildInfoTemp.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;
import com.jcdm.main.bs.formulaChildInfoTemp.service.IBsFormulaChildInfoTempService;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;

/**
 * é…æ–¹é…ç½®å­ä¿¡æ¯-备份Controller
 * 
 * @author Yi
 * @date 2024-07-15
 */
@RestController
@RequestMapping("/bs/formulaChildInfoTemp")
public class BsFormulaChildInfoTempController extends BaseController
{
    @Autowired
    private IBsFormulaChildInfoTempService bsFormulaChildInfoTempService;

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:list')")
    @GetMapping("/list")
    public TableDataInfo list(BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        startPage();
        List<BsFormulaChildInfoTemp> list = bsFormulaChildInfoTempService.selectBsFormulaChildInfoTempList(bsFormulaChildInfoTemp);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºé…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:export')")
    @Log(title = "配方配置子信息-备份", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        List<BsFormulaChildInfoTemp> list = bsFormulaChildInfoTempService.selectBsFormulaChildInfoTempList(bsFormulaChildInfoTemp);
        ExcelUtil<BsFormulaChildInfoTemp> util = new ExcelUtil<BsFormulaChildInfoTemp>(BsFormulaChildInfoTemp.class);
        util.exportExcel(response, list, "配方配置子信息-备份数据");
    }

    /**
     * èŽ·å–配方配置子信息-备份详细信息
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(bsFormulaChildInfoTempService.selectBsFormulaChildInfoTempById(id));
    }

    /**
     * æ–°å¢žé…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:add')")
    @Log(title = "配方配置子信息-备份", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        return toAjax(bsFormulaChildInfoTempService.insertBsFormulaChildInfoTemp(bsFormulaChildInfoTemp));
    }

    /**
     * ä¿®æ”¹é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:edit')")
    @Log(title = "配方配置子信息-备份", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        return toAjax(bsFormulaChildInfoTempService.updateBsFormulaChildInfoTemp(bsFormulaChildInfoTemp));
    }

    /**
     * åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChildInfoTemp:remove')")
    @Log(title = "配方配置子信息-备份", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(bsFormulaChildInfoTempService.deleteBsFormulaChildInfoTempByIds(ids));
    }
}

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,375 @@
package com.jcdm.main.bs.formulaChildInfoTemp.domain;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;

/**
 * é…æ–¹é…ç½®å­ä¿¡æ¯-备份对象 bs_formula_child_info_temp
 * 
 * @author Yi
 * @date 2024-07-15
 */
public class BsFormulaChildInfoTemp extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** id */
    private Long id;

    /** æ€»æˆç  */
    @Excel(name = "总成码")
    private String sfcCode;

    /** äº§çº¿ */
    @Excel(name = "产线")
    private String lineCode;

    /** å·¥åº */
    @Excel(name = "工序")
    private String processesCode;

    /** äº§å“ç¼–号 */
    @Excel(name = "产品编号")
    private String productCode;

    /** æ“ä½œå†…容 */
    @Excel(name = "操作内容")
    private String operationSteps;

    /** æŠ€æœ¯è¦æ±‚ */
    @Excel(name = "技术要求")
    private String techRequirement;

    /** ç±»åž‹ï¼ˆæ‰«æäº§å“æ¡ç 1、扫描物料条码2、拧紧类3） */
    @Excel(name = "类型", readConverterExp = "扫=描产品条码1、扫描物料条码2、拧紧类3")
    private String operationType;

    /** æŽ’序 */
    @Excel(name = "排序")
    private String stepSort;

    /** å‚数编码 */
    @Excel(name = "参数编码")
    private String paramCode;

    /** ç‰©æ–™ç¼–码 */
    @Excel(name = "物料编码")
    private String materialCode;

    /** é…æ–¹ç¼–码 */
    @Excel(name = "配方编码")
    private String formulaCode;

    /** å›¾ç‰‡ */
    @Excel(name = "图片")
    private String picture;

    /** å¤‡æ³¨ */
    @Excel(name = "备注")
    private String remarks;

    /** åˆ›å»ºç”¨æˆ· */
    @Excel(name = "创建用户")
    private String createUser;

    /** æ›´æ”¹ç”¨æˆ· */
    @Excel(name = "更改用户")
    private String updateUser;

    /** é¢„留字段1 */
    @Excel(name = "预留字段1")
    private String spareField1;

    /** é¢„留字段2 */
    @Excel(name = "预留字段2")
    private String spareField2;

    /** é¢„留字段3 */
    @Excel(name = "预留字段3")
    private String spareField3;

    /** é¢„留字段4 */
    @Excel(name = "预留字段4")
    private String spareField4;

    /** é‡‡é›†æ•°æ® */
    @Excel(name = "采集数据")
    private String collectData;

    /** ç»“æžœ */
    @Excel(name = "结果")
    private String results;

    /** ng次数 */
    @Excel(name = "ng次数")
    private Long ngTimes;

    /** ng采集数据 */
    @Excel(name = "ng采集数据")
    private String ngCollectData;

    /** ng结果 */
    @Excel(name = "ng结果")
    private String ngResults;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setSfcCode(String sfcCode) 
    {
        this.sfcCode = sfcCode;
    }

    public String getSfcCode() 
    {
        return sfcCode;
    }
    public void setLineCode(String lineCode) 
    {
        this.lineCode = lineCode;
    }

    public String getLineCode() 
    {
        return lineCode;
    }
    public void setProcessesCode(String processesCode) 
    {
        this.processesCode = processesCode;
    }

    public String getProcessesCode() 
    {
        return processesCode;
    }
    public void setProductCode(String productCode) 
    {
        this.productCode = productCode;
    }

    public String getProductCode() 
    {
        return productCode;
    }
    public void setOperationSteps(String operationSteps) 
    {
        this.operationSteps = operationSteps;
    }

    public String getOperationSteps() 
    {
        return operationSteps;
    }
    public void setTechRequirement(String techRequirement) 
    {
        this.techRequirement = techRequirement;
    }

    public String getTechRequirement() 
    {
        return techRequirement;
    }
    public void setOperationType(String operationType) 
    {
        this.operationType = operationType;
    }

    public String getOperationType() 
    {
        return operationType;
    }
    public void setStepSort(String stepSort) 
    {
        this.stepSort = stepSort;
    }

    public String getStepSort() 
    {
        return stepSort;
    }
    public void setParamCode(String paramCode) 
    {
        this.paramCode = paramCode;
    }

    public String getParamCode() 
    {
        return paramCode;
    }
    public void setMaterialCode(String materialCode) 
    {
        this.materialCode = materialCode;
    }

    public String getMaterialCode() 
    {
        return materialCode;
    }
    public void setFormulaCode(String formulaCode) 
    {
        this.formulaCode = formulaCode;
    }

    public String getFormulaCode() 
    {
        return formulaCode;
    }
    public void setPicture(String picture) 
    {
        this.picture = picture;
    }

    public String getPicture() 
    {
        return picture;
    }
    public void setRemarks(String remarks) 
    {
        this.remarks = remarks;
    }

    public String getRemarks() 
    {
        return remarks;
    }
    public void setCreateUser(String createUser) 
    {
        this.createUser = createUser;
    }

    public String getCreateUser() 
    {
        return createUser;
    }
    public void setUpdateUser(String updateUser) 
    {
        this.updateUser = updateUser;
    }

    public String getUpdateUser() 
    {
        return updateUser;
    }
    public void setSpareField1(String spareField1) 
    {
        this.spareField1 = spareField1;
    }

    public String getSpareField1() 
    {
        return spareField1;
    }
    public void setSpareField2(String spareField2) 
    {
        this.spareField2 = spareField2;
    }

    public String getSpareField2() 
    {
        return spareField2;
    }
    public void setSpareField3(String spareField3) 
    {
        this.spareField3 = spareField3;
    }

    public String getSpareField3() 
    {
        return spareField3;
    }
    public void setSpareField4(String spareField4) 
    {
        this.spareField4 = spareField4;
    }

    public String getSpareField4() 
    {
        return spareField4;
    }
    public void setCollectData(String collectData) 
    {
        this.collectData = collectData;
    }

    public String getCollectData() 
    {
        return collectData;
    }
    public void setResults(String results) 
    {
        this.results = results;
    }

    public String getResults() 
    {
        return results;
    }
    public void setNgTimes(Long ngTimes) 
    {
        this.ngTimes = ngTimes;
    }

    public Long getNgTimes() 
    {
        return ngTimes;
    }
    public void setNgCollectData(String ngCollectData) 
    {
        this.ngCollectData = ngCollectData;
    }

    public String getNgCollectData() 
    {
        return ngCollectData;
    }
    public void setNgResults(String ngResults) 
    {
        this.ngResults = ngResults;
    }

    public String getNgResults() 
    {
        return ngResults;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("sfcCode", getSfcCode())
            .append("lineCode", getLineCode())
            .append("processesCode", getProcessesCode())
            .append("productCode", getProductCode())
            .append("operationSteps", getOperationSteps())
            .append("techRequirement", getTechRequirement())
            .append("operationType", getOperationType())
            .append("stepSort", getStepSort())
            .append("paramCode", getParamCode())
            .append("materialCode", getMaterialCode())
            .append("formulaCode", getFormulaCode())
            .append("picture", getPicture())
            .append("remarks", getRemarks())
            .append("createUser", getCreateUser())
            .append("createTime", getCreateTime())
            .append("updateUser", getUpdateUser())
            .append("updateTime", getUpdateTime())
            .append("spareField1", getSpareField1())
            .append("spareField2", getSpareField2())
            .append("spareField3", getSpareField3())
            .append("spareField4", getSpareField4())
            .append("collectData", getCollectData())
            .append("results", getResults())
            .append("ngTimes", getNgTimes())
            .append("ngCollectData", getNgCollectData())
            .append("ngResults", getNgResults())
            .toString();
    }
}

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/mapper/BsFormulaChildInfoTempMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.jcdm.main.bs.formulaChildInfoTemp.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;

/**
 * é…æ–¹é…ç½®å­ä¿¡æ¯-备份Mapper接口
 * 
 * @author Yi
 * @date 2024-07-15
 */
public interface BsFormulaChildInfoTempMapper extends BaseMapper<BsFormulaChildInfoTemp>
{
    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    public BsFormulaChildInfoTemp selectBsFormulaChildInfoTempById(Long id);

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份集合
     */
    public List<BsFormulaChildInfoTemp> selectBsFormulaChildInfoTempList(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * æ–°å¢žé…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    public int insertBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * ä¿®æ”¹é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    public int updateBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return ç»“æžœ
     */
    public int deleteBsFormulaChildInfoTempById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteBsFormulaChildInfoTempByIds(Long[] ids);
}

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/service/IBsFormulaChildInfoTempService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.jcdm.main.bs.formulaChildInfoTemp.service;

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;

/**
 * é…æ–¹é…ç½®å­ä¿¡æ¯-备份Service接口
 * 
 * @author Yi
 * @date 2024-07-15
 */
public interface IBsFormulaChildInfoTempService extends IService<BsFormulaChildInfoTemp>
{
    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    public BsFormulaChildInfoTemp selectBsFormulaChildInfoTempById(Long id);

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份集合
     */
    public List<BsFormulaChildInfoTemp> selectBsFormulaChildInfoTempList(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * æ–°å¢žé…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    public int insertBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * ä¿®æ”¹é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    public int updateBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp);

    /**
     * æ‰¹é‡åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param ids éœ€è¦åˆ é™¤çš„配方配置子信息-备份主键集合
     * @return ç»“æžœ
     */
    public int deleteBsFormulaChildInfoTempByIds(Long[] ids);

    /**
     * åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份信息
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return ç»“æžœ
     */
    public int deleteBsFormulaChildInfoTempById(Long id);
}

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/service/impl/BsFormulaChildInfoTempServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
package com.jcdm.main.bs.formulaChildInfoTemp.service.impl;

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.lineInfo.domain.BsLineInfo;
import com.jcdm.main.bs.lineInfo.mapper.BsLineInfoMapper;
import com.jcdm.main.bs.lineInfo.service.IBsLineInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jcdm.main.bs.formulaChildInfoTemp.mapper.BsFormulaChildInfoTempMapper;
import com.jcdm.main.bs.formulaChildInfoTemp.domain.BsFormulaChildInfoTemp;
import com.jcdm.main.bs.formulaChildInfoTemp.service.IBsFormulaChildInfoTempService;

/**
 * é…æ–¹é…ç½®å­ä¿¡æ¯-备份Service业务层处理
 * 
 * @author Yi
 * @date 2024-07-15
 */
@Service
public class BsFormulaChildInfoTempServiceImpl extends ServiceImpl<BsFormulaChildInfoTempMapper, BsFormulaChildInfoTemp> implements IBsFormulaChildInfoTempService
{
    @Autowired
    private BsFormulaChildInfoTempMapper bsFormulaChildInfoTempMapper;

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    @Override
    public BsFormulaChildInfoTemp selectBsFormulaChildInfoTempById(Long id)
    {
        return bsFormulaChildInfoTempMapper.selectBsFormulaChildInfoTempById(id);
    }

    /**
     * æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     */
    @Override
    public List<BsFormulaChildInfoTemp> selectBsFormulaChildInfoTempList(BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        return bsFormulaChildInfoTempMapper.selectBsFormulaChildInfoTempList(bsFormulaChildInfoTemp);
    }

    /**
     * æ–°å¢žé…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    @Override
    public int insertBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        bsFormulaChildInfoTemp.setCreateTime(DateUtils.getNowDate());
        return bsFormulaChildInfoTempMapper.insertBsFormulaChildInfoTemp(bsFormulaChildInfoTemp);
    }

    /**
     * ä¿®æ”¹é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param bsFormulaChildInfoTemp é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * @return ç»“æžœ
     */
    @Override
    public int updateBsFormulaChildInfoTemp(BsFormulaChildInfoTemp bsFormulaChildInfoTemp)
    {
        bsFormulaChildInfoTemp.setUpdateTime(DateUtils.getNowDate());
        return bsFormulaChildInfoTempMapper.updateBsFormulaChildInfoTemp(bsFormulaChildInfoTemp);
    }

    /**
     * æ‰¹é‡åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
     * 
     * @param ids éœ€è¦åˆ é™¤çš„配方配置子信息-备份主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteBsFormulaChildInfoTempByIds(Long[] ids)
    {
        return bsFormulaChildInfoTempMapper.deleteBsFormulaChildInfoTempByIds(ids);
    }

    /**
     * åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份信息
     * 
     * @param id é…æ–¹é…ç½®å­ä¿¡æ¯-备份主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteBsFormulaChildInfoTempById(Long id)
    {
        return bsFormulaChildInfoTempMapper.deleteBsFormulaChildInfoTempById(id);
    }
}

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -677,17 +677,6 @@
        parentVO.setTotalResult("1");
        parentVO.setCheckList(childVOList);
        HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
//        try{
//            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
//                logger.info("开始执行异步方法");
//                HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
//                System.out.println(execute.body());
//                logger.info("异步方法执行结束");
//                logger.info("称重异步方法{}",execute.body());
//            });
//        }catch (Exception e){
//            System.out.println(e.getMessage());
//        }
        RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date()));
    }


 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -85,6 +85,7 @@
        lists.add(OPCElement.PACK_POP330_TighteningFrequency);//请求记录数据
        lists.add(OPCElement.PACK_POP340_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_POP340_TighteningFrequency);//请求记录数据
        lists.add(OPCElement.PACK_POP350_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_POP3601_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_POP3602_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_POP3603_RecordData);//请求记录数据

 jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java

@@ -101,6 +101,9 @@
    public static final String PACK_POP340_RecordData = "PACK.POP340.RecordData";//请求记录数据

    public static final String PACK_POP340_TighteningFrequency = "PACK.POP340.TighteningFrequency";//请求拧紧数据

    public static final String PACK_POP350_RecordData = "PACK.POP350.RecordData";//请求记录数据

    /**
     * OP440
     */

 jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jcdm.main.bs.formulaChildInfoTemp.mapper.BsFormulaChildInfoTempMapper">
    
    <resultMap type="BsFormulaChildInfoTemp" id="BsFormulaChildInfoTempResult">
        <result property="id"    column="id"    />
        <result property="sfcCode"    column="sfc_code"    />
        <result property="lineCode"    column="line_code"    />
        <result property="processesCode"    column="processes_code"    />
        <result property="productCode"    column="product_code"    />
        <result property="operationSteps"    column="operation_steps"    />
        <result property="techRequirement"    column="tech_requirement"    />
        <result property="operationType"    column="operation_type"    />
        <result property="stepSort"    column="step_sort"    />
        <result property="paramCode"    column="param_code"    />
        <result property="materialCode"    column="material_code"    />
        <result property="formulaCode"    column="formula_code"    />
        <result property="picture"    column="picture"    />
        <result property="remarks"    column="remarks"    />
        <result property="createUser"    column="create_user"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="spareField1"    column="spare_field1"    />
        <result property="spareField2"    column="spare_field2"    />
        <result property="spareField3"    column="spare_field3"    />
        <result property="spareField4"    column="spare_field4"    />
        <result property="collectData"    column="collect_data"    />
        <result property="results"    column="results"    />
        <result property="ngTimes"    column="ng_times"    />
        <result property="ngCollectData"    column="ng_collect_data"    />
        <result property="ngResults"    column="ng_results"    />
    </resultMap>

    <sql id="selectBsFormulaChildInfoTempVo">
        select id, sfc_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field1, spare_field2, spare_field3, spare_field4, collect_data, results, ng_times, ng_collect_data, ng_results from bs_formula_child_info_temp
    </sql>

    <select id="selectBsFormulaChildInfoTempList" parameterType="BsFormulaChildInfoTemp" resultMap="BsFormulaChildInfoTempResult">
        <include refid="selectBsFormulaChildInfoTempVo"/>
        <where>  
            <if test="sfcCode != null  and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
            <if test="lineCode != null  and lineCode != ''"> and line_code = #{lineCode}</if>
            <if test="processesCode != null  and processesCode != ''"> and processes_code = #{processesCode}</if>
            <if test="productCode != null  and productCode != ''"> and product_code = #{productCode}</if>
            <if test="operationSteps != null  and operationSteps != ''"> and operation_steps = #{operationSteps}</if>
            <if test="techRequirement != null  and techRequirement != ''"> and tech_requirement = #{techRequirement}</if>
            <if test="operationType != null  and operationType != ''"> and operation_type = #{operationType}</if>
            <if test="stepSort != null  and stepSort != ''"> and step_sort = #{stepSort}</if>
            <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
            <if test="formulaCode != null  and formulaCode != ''"> and formula_code = #{formulaCode}</if>
            <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
            <if test="spareField1 != null  and spareField1 != ''"> and spare_field1 = #{spareField1}</if>
            <if test="spareField2 != null  and spareField2 != ''"> and spare_field2 = #{spareField2}</if>
            <if test="spareField3 != null  and spareField3 != ''"> and spare_field3 = #{spareField3}</if>
            <if test="spareField4 != null  and spareField4 != ''"> and spare_field4 = #{spareField4}</if>
            <if test="collectData != null  and collectData != ''"> and collect_data = #{collectData}</if>
            <if test="results != null  and results != ''"> and results = #{results}</if>
            <if test="ngTimes != null "> and ng_times = #{ngTimes}</if>
            <if test="ngCollectData != null  and ngCollectData != ''"> and ng_collect_data = #{ngCollectData}</if>
            <if test="ngResults != null  and ngResults != ''"> and ng_results = #{ngResults}</if>
        </where>
    </select>
    
    <select id="selectBsFormulaChildInfoTempById" parameterType="Long" resultMap="BsFormulaChildInfoTempResult">
        <include refid="selectBsFormulaChildInfoTempVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertBsFormulaChildInfoTemp" parameterType="BsFormulaChildInfoTemp" useGeneratedKeys="true" keyProperty="id">
        insert into bs_formula_child_info_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="sfcCode != null">sfc_code,</if>
            <if test="lineCode != null">line_code,</if>
            <if test="processesCode != null">processes_code,</if>
            <if test="productCode != null">product_code,</if>
            <if test="operationSteps != null">operation_steps,</if>
            <if test="techRequirement != null">tech_requirement,</if>
            <if test="operationType != null">operation_type,</if>
            <if test="stepSort != null">step_sort,</if>
            <if test="paramCode != null">param_code,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="formulaCode != null">formula_code,</if>
            <if test="picture != null">picture,</if>
            <if test="remarks != null">remarks,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="spareField1 != null">spare_field1,</if>
            <if test="spareField2 != null">spare_field2,</if>
            <if test="spareField3 != null">spare_field3,</if>
            <if test="spareField4 != null">spare_field4,</if>
            <if test="collectData != null">collect_data,</if>
            <if test="results != null">results,</if>
            <if test="ngTimes != null">ng_times,</if>
            <if test="ngCollectData != null">ng_collect_data,</if>
            <if test="ngResults != null">ng_results,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sfcCode != null">#{sfcCode},</if>
            <if test="lineCode != null">#{lineCode},</if>
            <if test="processesCode != null">#{processesCode},</if>
            <if test="productCode != null">#{productCode},</if>
            <if test="operationSteps != null">#{operationSteps},</if>
            <if test="techRequirement != null">#{techRequirement},</if>
            <if test="operationType != null">#{operationType},</if>
            <if test="stepSort != null">#{stepSort},</if>
            <if test="paramCode != null">#{paramCode},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="formulaCode != null">#{formulaCode},</if>
            <if test="picture != null">#{picture},</if>
            <if test="remarks != null">#{remarks},</if>
            <if test="createUser != null">#{createUser},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="spareField1 != null">#{spareField1},</if>
            <if test="spareField2 != null">#{spareField2},</if>
            <if test="spareField3 != null">#{spareField3},</if>
            <if test="spareField4 != null">#{spareField4},</if>
            <if test="collectData != null">#{collectData},</if>
            <if test="results != null">#{results},</if>
            <if test="ngTimes != null">#{ngTimes},</if>
            <if test="ngCollectData != null">#{ngCollectData},</if>
            <if test="ngResults != null">#{ngResults},</if>
         </trim>
    </insert>

    <update id="updateBsFormulaChildInfoTemp" parameterType="BsFormulaChildInfoTemp">
        update bs_formula_child_info_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="sfcCode != null">sfc_code = #{sfcCode},</if>
            <if test="lineCode != null">line_code = #{lineCode},</if>
            <if test="processesCode != null">processes_code = #{processesCode},</if>
            <if test="productCode != null">product_code = #{productCode},</if>
            <if test="operationSteps != null">operation_steps = #{operationSteps},</if>
            <if test="techRequirement != null">tech_requirement = #{techRequirement},</if>
            <if test="operationType != null">operation_type = #{operationType},</if>
            <if test="stepSort != null">step_sort = #{stepSort},</if>
            <if test="paramCode != null">param_code = #{paramCode},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="formulaCode != null">formula_code = #{formulaCode},</if>
            <if test="picture != null">picture = #{picture},</if>
            <if test="remarks != null">remarks = #{remarks},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="spareField1 != null">spare_field1 = #{spareField1},</if>
            <if test="spareField2 != null">spare_field2 = #{spareField2},</if>
            <if test="spareField3 != null">spare_field3 = #{spareField3},</if>
            <if test="spareField4 != null">spare_field4 = #{spareField4},</if>
            <if test="collectData != null">collect_data = #{collectData},</if>
            <if test="results != null">results = #{results},</if>
            <if test="ngTimes != null">ng_times = #{ngTimes},</if>
            <if test="ngCollectData != null">ng_collect_data = #{ngCollectData},</if>
            <if test="ngResults != null">ng_results = #{ngResults},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteBsFormulaChildInfoTempById" parameterType="Long">
        delete from bs_formula_child_info_temp where id = #{id}
    </delete>

    <delete id="deleteBsFormulaChildInfoTempByIds" parameterType="String">
        delete from bs_formula_child_info_temp where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 jcdm-ui/src/api/main/bs/formulaChildInfoTemp/formulaChildInfoTemp.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import request from '@/utils/request'

// æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表
export function listFormulaChildInfoTemp(query) {
  return request({
    url: '/bs/formulaChildInfoTemp/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份详细
export function getFormulaChildInfoTemp(id) {
  return request({
    url: '/bs/formulaChildInfoTemp/' + id,
    method: 'get'
  })
}

// æ–°å¢žé…æ–¹é…ç½®å­ä¿¡æ¯-备份
export function addFormulaChildInfoTemp(data) {
  return request({
    url: '/bs/formulaChildInfoTemp',
    method: 'post',
    data: data
  })
}

// ä¿®æ”¹é…æ–¹é…ç½®å­ä¿¡æ¯-备份
export function updateFormulaChildInfoTemp(data) {
  return request({
    url: '/bs/formulaChildInfoTemp',
    method: 'put',
    data: data
  })
}

// åˆ é™¤é…æ–¹é…ç½®å­ä¿¡æ¯-备份
export function delFormulaChildInfoTemp(id) {
  return request({
    url: '/bs/formulaChildInfoTemp/' + id,
    method: 'delete'
  })
}

 jcdm-ui/src/views/main/bs/formulaChildInfoTemp/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,598 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="总成码" prop="sfcCode">
            <el-input
              v-model="queryParams.sfcCode"
              placeholder="请输入总成码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="产线" prop="lineCode">
            <el-input
              v-model="queryParams.lineCode"
              placeholder="请输入产线"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="工序" prop="processesCode">
            <el-input
              v-model="queryParams.processesCode"
              placeholder="请输入工序"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="产品编号" prop="productCode">
            <el-input
              v-model="queryParams.productCode"
              placeholder="请输入产品编号"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="操作内容" prop="operationSteps">
            <el-input
              v-model="queryParams.operationSteps"
              placeholder="请输入操作内容"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="技术要求" prop="techRequirement">
            <el-input
              v-model="queryParams.techRequirement"
              placeholder="请输入技术要求"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="排序" prop="stepSort">
            <el-input
              v-model="queryParams.stepSort"
              placeholder="请输入排序"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="参数编码" prop="paramCode">
            <el-input
              v-model="queryParams.paramCode"
              placeholder="请输入参数编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="物料编码" prop="materialCode">
            <el-input
              v-model="queryParams.materialCode"
              placeholder="请输入物料编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="配方编码" prop="formulaCode">
            <el-input
              v-model="queryParams.formulaCode"
              placeholder="请输入配方编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="图片" prop="picture">
            <el-input
              v-model="queryParams.picture"
              placeholder="请输入图片"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="备注" prop="remarks">
            <el-input
              v-model="queryParams.remarks"
              placeholder="请输入备注"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="创建用户" prop="createUser">
            <el-input
              v-model="queryParams.createUser"
              placeholder="请输入创建用户"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="更改用户" prop="updateUser">
            <el-input
              v-model="queryParams.updateUser"
              placeholder="请输入更改用户"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="预留字段1" prop="spareField1">
            <el-input
              v-model="queryParams.spareField1"
              placeholder="请输入预留字段1"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="预留字段2" prop="spareField2">
            <el-input
              v-model="queryParams.spareField2"
              placeholder="请输入预留字段2"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="预留字段3" prop="spareField3">
            <el-input
              v-model="queryParams.spareField3"
              placeholder="请输入预留字段3"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="预留字段4" prop="spareField4">
            <el-input
              v-model="queryParams.spareField4"
              placeholder="请输入预留字段4"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="采集数据" prop="collectData">
            <el-input
              v-model="queryParams.collectData"
              placeholder="请输入采集数据"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="结果" prop="results">
            <el-input
              v-model="queryParams.results"
              placeholder="请输入结果"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="ng次数" prop="ngTimes">
            <el-input
              v-model="queryParams.ngTimes"
              placeholder="请输入ng次数"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="ng采集数据" prop="ngCollectData">
            <el-input
              v-model="queryParams.ngCollectData"
              placeholder="请输入ng采集数据"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="ng结果" prop="ngResults">
            <el-input
              v-model="queryParams.ngResults"
              placeholder="请输入ng结果"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
    </el-card>

    <el-card style="margin-top: 10px" class="box-card">
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              @click="handleAdd"
              v-hasPermi="['bs:formulaChildInfoTemp:add']"
            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="success"
              plain
              icon="el-icon-edit"
              size="mini"
              :disabled="single"
              @click="handleUpdate"
              v-hasPermi="['bs:formulaChildInfoTemp:edit']"
            >修改</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="danger"
              plain
              icon="el-icon-delete"
              size="mini"
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['bs:formulaChildInfoTemp:remove']"
            >删除</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-download"
              size="mini"
              @click="handleExport"
              v-hasPermi="['bs:formulaChildInfoTemp:export']"
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

        <el-table border v-loading="loading" :data="formulaChildInfoTempList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="id" align="center" prop="id" />
          <el-table-column label="总成码" align="center" prop="sfcCode">
          </el-table-column>
          <el-table-column label="产线" align="center" prop="lineCode">
          </el-table-column>
          <el-table-column label="工序" align="center" prop="processesCode">
          </el-table-column>
          <el-table-column label="产品编号" align="center" prop="productCode">
          </el-table-column>
          <el-table-column label="操作内容" align="center" prop="operationSteps">
          </el-table-column>
          <el-table-column label="技术要求" align="center" prop="techRequirement">
          </el-table-column>
          <el-table-column label="类型" align="center" prop="operationType">
          </el-table-column>
          <el-table-column label="排序" align="center" prop="stepSort">
          </el-table-column>
          <el-table-column label="参数编码" align="center" prop="paramCode">
          </el-table-column>
          <el-table-column label="物料编码" align="center" prop="materialCode">
          </el-table-column>
          <el-table-column label="配方编码" align="center" prop="formulaCode">
          </el-table-column>
          <el-table-column label="图片" align="center" prop="picture">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="更改用户" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="预留字段1" align="center" prop="spareField1">
          </el-table-column>
          <el-table-column label="预留字段2" align="center" prop="spareField2">
          </el-table-column>
          <el-table-column label="预留字段3" align="center" prop="spareField3">
          </el-table-column>
          <el-table-column label="预留字段4" align="center" prop="spareField4">
          </el-table-column>
          <el-table-column label="采集数据" align="center" prop="collectData">
          </el-table-column>
          <el-table-column label="结果" align="center" prop="results">
          </el-table-column>
          <el-table-column label="ng次数" align="center" prop="ngTimes">
          </el-table-column>
          <el-table-column label="ng采集数据" align="center" prop="ngCollectData">
          </el-table-column>
          <el-table-column label="ng结果" align="center" prop="ngResults">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['bs:formulaChildInfoTemp:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['bs:formulaChildInfoTemp:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
        </el-table>
    </el-card>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- æ·»åŠ æˆ–修改配方配置子信息-备份对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="总成码" prop="sfcCode">
          <el-input v-model="form.sfcCode" placeholder="请输入总成码" />
        </el-form-item>
        <el-form-item label="产线" prop="lineCode">
          <el-input v-model="form.lineCode" placeholder="请输入产线" />
        </el-form-item>
        <el-form-item label="工序" prop="processesCode">
          <el-input v-model="form.processesCode" placeholder="请输入工序" />
        </el-form-item>
        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
        </el-form-item>
        <el-form-item label="操作内容" prop="operationSteps">
          <el-input v-model="form.operationSteps" placeholder="请输入操作内容" />
        </el-form-item>
        <el-form-item label="技术要求" prop="techRequirement">
          <el-input v-model="form.techRequirement" placeholder="请输入技术要求" />
        </el-form-item>
        <el-form-item label="排序" prop="stepSort">
          <el-input v-model="form.stepSort" placeholder="请输入排序" />
        </el-form-item>
        <el-form-item label="参数编码" prop="paramCode">
          <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
        </el-form-item>
        <el-form-item label="物料编码" prop="materialCode">
          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
        </el-form-item>
        <el-form-item label="配方编码" prop="formulaCode">
          <el-input v-model="form.formulaCode" placeholder="请输入配方编码" />
        </el-form-item>
        <el-form-item label="图片" prop="picture">
          <el-input v-model="form.picture" placeholder="请输入图片" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="创建用户" prop="createUser">
          <el-input v-model="form.createUser" placeholder="请输入创建用户" />
        </el-form-item>
        <el-form-item label="更改用户" prop="updateUser">
          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />
        </el-form-item>
        <el-form-item label="预留字段1" prop="spareField1">
          <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />
        </el-form-item>
        <el-form-item label="预留字段2" prop="spareField2">
          <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />
        </el-form-item>
        <el-form-item label="预留字段3" prop="spareField3">
          <el-input v-model="form.spareField3" placeholder="请输入预留字段3" />
        </el-form-item>
        <el-form-item label="预留字段4" prop="spareField4">
          <el-input v-model="form.spareField4" placeholder="请输入预留字段4" />
        </el-form-item>
        <el-form-item label="采集数据" prop="collectData">
          <el-input v-model="form.collectData" placeholder="请输入采集数据" />
        </el-form-item>
        <el-form-item label="结果" prop="results">
          <el-input v-model="form.results" placeholder="请输入结果" />
        </el-form-item>
        <el-form-item label="ng次数" prop="ngTimes">
          <el-input v-model="form.ngTimes" placeholder="请输入ng次数" />
        </el-form-item>
        <el-form-item label="ng采集数据" prop="ngCollectData">
          <el-input v-model="form.ngCollectData" placeholder="请输入ng采集数据" />
        </el-form-item>
        <el-form-item label="ng结果" prop="ngResults">
          <el-input v-model="form.ngResults" placeholder="请输入ng结果" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">ç¡® å®š</el-button>
        <el-button @click="cancel">取 æ¶ˆ</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import { listFormulaChildInfoTemp, getFormulaChildInfoTemp, delFormulaChildInfoTemp, addFormulaChildInfoTemp, updateFormulaChildInfoTemp } from "@/api/main/bs/formulaChildInfoTemp/formulaChildInfoTemp";

export default {
  name: "FormulaChildInfoTemp",
  data() {
    return {
      // é®ç½©å±‚
      loading: true,
      titleName: "",
      // é€‰ä¸­æ•°ç»„
      ids: [],
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // é…æ–¹é…ç½®å­ä¿¡æ¯-备份表格数据
      formulaChildInfoTempList: [],
      // å¼¹å‡ºå±‚标题
      title: "",
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        sfcCode: null,
        lineCode: null,
        processesCode: null,
        productCode: null,
        operationSteps: null,
        techRequirement: null,
        operationType: null,
        stepSort: null,
        paramCode: null,
        materialCode: null,
        formulaCode: null,
        picture: null,
        remarks: null,
        createUser: null,
        updateUser: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        collectData: null,
        results: null,
        ngTimes: null,
        ngCollectData: null,
        ngResults: null
      },
      // è¡¨å•å‚æ•°
      form: {},
      // è¡¨å•æ ¡éªŒ
      rules: {
        id: [
          { required: true, message: "id不能为空", trigger: "blur" }
        ],
      }
    };
  },
  created() {
    this.getList();
  },
  methods: {
    /** æŸ¥è¯¢é…æ–¹é…ç½®å­ä¿¡æ¯-备份列表 */
    getList() {
      this.loading = true;
      listFormulaChildInfoTemp(this.queryParams).then(response => {
        this.formulaChildInfoTempList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    // å–消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // è¡¨å•é‡ç½®
    reset() {
      this.form = {
        id: null,
        sfcCode: null,
        lineCode: null,
        processesCode: null,
        productCode: null,
        operationSteps: null,
        techRequirement: null,
        operationType: null,
        stepSort: null,
        paramCode: null,
        materialCode: null,
        formulaCode: null,
        picture: null,
        remarks: null,
        createUser: null,
        createTime: null,
        updateUser: null,
        updateTime: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        collectData: null,
        results: null,
        ngTimes: null,
        ngCollectData: null,
        ngResults: null
      };
      this.resetForm("form");
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
      this.open = true;
      this.titleName = "添加配方配置子信息-备份";
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      getFormulaChildInfoTemp(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.titleName = "修改配方配置子信息-备份";
      });
    },
    /** æäº¤æŒ‰é’® */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updateFormulaChildInfoTemp(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addFormulaChildInfoTemp(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除配方配置子信息-备份编号为"' + ids + '"的数据项？').then(function() {
        return delFormulaChildInfoTemp(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      this.download('bs/formulaChildInfoTemp/export', {
        ...this.queryParams
      }, `formulaChildInfoTemp_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>

 jcdm-ui/src/views/main/kb/stationTerminal/index.vue

@@ -332,7 +332,7 @@
  addParamCollection,
  addTighteningParameters,
  saveCampaignTimeParameters,
  replaceAssemblyCode, checkRecordDataDone,
  replaceAssemblyCode, checkRecordDataDone, enterWeighing,
} from "@/api/main/da/paramCollection/paramCollection";

export default {
@@ -350,6 +350,8 @@
        pageSize: 10,
        productCode: null,
        processesCode: null,
        artificialNgFlag: null,
        sfcBarcode: null,
      },
      // é…æ–¹é…ç½®å­ä¿¡æ¯è¡¨æ ¼æ•°æ®
      formulaChildList: [],
@@ -392,8 +394,8 @@
      content: '',
      activeName: 'first',
      // url: "ws://192.168.2.248:8080/websocket/message/",
      // url: "ws://10.103.210.248:8080/websocket/message/",
      url: "ws://192.168.2.76:8080/websocket/message/",
      url: "ws://10.103.210.248:8080/websocket/message/",
      // url: "ws://192.168.2.76:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -424,6 +426,7 @@
      originalArray: [],
      yzSfcFlag: 1,
      endYz: false,
      artificialNgFlag: null,
    }
  },
  beforeDestroy() {
@@ -533,6 +536,11 @@
      // this.formulaChildList = []
      this.formulaChildParams.productCode = this.workpieceInformation.productCode
      this.formulaChildParams.processesCode = this.headContent.processesCode
      console.log(this.artificialNgFlag)
      if(this.artificialNgFlag !== null){
        this.formulaChildParams.artificialNgFlag = this.artificialNgFlag
        this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
      }
      console.log(this.formulaChildParams)
      noPageListFormulaChild(this.formulaChildParams).then(response => {
        this.formulaChildList = response.rows;
@@ -573,6 +581,8 @@
      this.headContent.sfcCode = '';
      this.headContent.yzSfcCode = '';
      this.headContent.cardCode = '';
      this.formulaChildParams.artificialNgFlag = null
      this.formulaChildParams.sfcBarcode = null
    },
    changeMenu(tab, event) {
      console.log(tab, event);
@@ -609,6 +619,7 @@
        this.workpieceInformation.productModel = rowsData.productModel;
        this.workpieceInformation.productName = rowsData.productName;
        this.headContent.cardCode = rowsData.trolleyYard;
        this.artificialNgFlag = rowsData.artificialNgFlag;
      });
      this.getListFormulaChild()
      // this.addOverStationCollection()
@@ -702,12 +713,18 @@
        } else if (event.data === "NG") {
          //给plc发下线信号
          //清除数据
          this.$confirm('<span style="font-size: 20px;color: red">拧紧超过三次该产品NG下线，请确认！</span>', '通知', {
          self.$confirm('拧紧三次NG，请确认下线！！！', '消息', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            showCancelButton: false,
            type: 'warning'
          }).then(() => {
            self.ngFunction();
          })
            this.$message({
              type: 'success',
              message: '确认成功!'
            });
          });

        } else if (event.data === "OUT") {
          self.cakeLamp.release = 1;
@@ -736,6 +753,14 @@
            formulaChildEntity: self.formulaChildList[formulaChildIndex]
          }

          // if(param.locationCode === 'POP430'){
          //   let enterWeighingparam = {
          //     sfcCode: param.productBarcode,
          //   }
          //   enterWeighing(enterWeighingparam).then(response => {
          //   });
          // }

          console.log("进入最终方法")
          self.endSaveData(param)
        } else if (event.data.includes("[")) {