-

懒羊羊

2024-04-12 c5e9c5922da7de2bf6df6dce42e7162dbe5cdd2d

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

@@ -145,8 +145,10 @@
        return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
    }

    //1-非本工位物料 2-正常扫描可继续下次 3-扫描结束已经是最后一位工步
    @Override
    public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
        String result = "";
        BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
        checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
        checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
@@ -154,6 +156,7 @@
//        bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
        List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
        if(bsFormulaChildInfos.size()>0){
            String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
            bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode());
            bsFormulaChildInfos.get(0).setResults("OK");
            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
@@ -161,10 +164,21 @@
            bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
            bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
            addParameterCollection(bsFormulaChildInfo);
            if (spareField4 != null && !spareField4.isEmpty()) {
                // 执行操作
                if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
                    try {
                        result = "3";
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
                    } catch (Exception e) {
                        throw new RuntimeException(e);
                    }
                }
            }
        }else {
            return AjaxResult.error("非本工位物料，请重新扫描");
            result = "1";
        }
        return AjaxResult.success("成功");
        return AjaxResult.success(result);
    }

    public void addParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){