-

懒羊羊

2024-04-15 63b2548414682dd0127f0bffe3313ea465046957

-

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

@@ -39,6 +39,9 @@
    private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;

    @Autowired
    private IBsFormulaChildInfoService bsFormulaChildInfoService;

    @Autowired
    private DaParamCollectionMapper daParamCollectionMapper;

    @Autowired
@@ -152,7 +155,7 @@
        BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
        checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
        checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
        checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
        checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
//        bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
        List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
        if(bsFormulaChildInfos.size()>0){
@@ -195,7 +198,14 @@

    @Override
    public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
        bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
                .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
        for (BsFormulaChildInfo info : list) {
            info.setSpareField4("");
            info.setResults("");
            bsFormulaChildInfoService.saveOrUpdate(info);
        }
        return AjaxResult.success();
    }


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

@@ -54,16 +54,16 @@
        List<String> lists = new ArrayList<>();
//        lists.add(OPCElement.PACK_OP010_RecordSN);//请求下发SN号
        lists.add(OPCElement.PACK_OP230_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP240_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP240_RecordData);//请求记录数据.
//        lists.add(OPCElement.PACK_OP240_AngleResult);//请求记录数据
//        lists.add(OPCElement.PACK_OP250_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP250_AngleResult);//请求记录数据
//        lists.add(OPCElement.PACK_OP380_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP380_AngleResult);//请求记录数据
//        lists.add(OPCElement.PACK_OP300_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP300_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP300_AngleResult);//请求记录数据
//        lists.add(OPCElement.PACK_OP270_RecordData);//请求记录数据
//        lists.add(OPCElement.PACK_OP270_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP270_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP270_AngleResult);//请求记录数据
//        lists.add(OPCElement.PACK_OP370_RecordData);//请求记录数据

        return lists;

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -31,8 +31,10 @@
    //自动工位
    public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");

    public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP33");
    //采集模组工位
    public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");

    //空的
    public List<String> nullList = Arrays.asList("OP250","OP260");


@@ -90,11 +92,17 @@
                        //校验入站是否可以工作

                        //plc给我们一个pack码，拿pack码校验出型号

                        if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
                            //读模组码
                            String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
                            String productTye = thoroughfare + "." + device + ".ProductType";
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7,8))).build());
                        }
                        //进站保存数据
//                        inSaveDate(thoroughfare,device)
                        //记录数据完成
                        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";

                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());

                        if(automaticList.stream().noneMatch(s -> s.equals(device))){

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

@@ -621,7 +621,7 @@
          saveCampaignTimeParameters(param).then(response => {});
          self.cakeLamp.release = 1;
          self.endClear()

          workpieceRelease(param).then(response => {});
        } else if (event.data.includes("[")) {
          let formulaChilds = "";
          self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);