blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
admin
5 天以前 f6789ac9f44a6b1f9d95421329bb1f0a7cd52d6d 
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java


@@ -13,6 +13,8 @@


import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;


import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;


import com.jcdm.main.plcserver.sub.OPCUaSubscription;


import com.jcdm.main.sc.materialConf.domain.ScMaterialConf;


import com.jcdm.main.sc.materialConf.service.IScMaterialConfService;


import com.kangaroohy.milo.service.MiloService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.ApplicationArguments;


@@ -54,12 +56,16 @@


    @Autowired


    private IDaPsConfService daPsConfService;




    @Autowired


    private IScMaterialConfService materialConfService;




    @Override


    public void run(ApplicationArguments args) throws Exception {




        //PLC到MES物料转换


        Constants.materialMap.put("1","9900199052A");


        Constants.materialMap.put("2","9900199053B");


        initMaterialConf();


//        Constants.materialMap.put("1","9900199052A");


//        Constants.materialMap.put("2","9900199053B");




        //分段010-090段 电芯工位


        Constants.OP020_OP090.add(Constants.OP020);


@@ -114,6 +120,14 @@


        return lists;


    }




    public void initMaterialConf(){


        List<ScMaterialConf> materialConfList = materialConfService.list(new LambdaQueryWrapper<ScMaterialConf>().eq(ScMaterialConf::getStatus, Constants.USE_ING));


        for (ScMaterialConf materialConf : materialConfList) {


            Constants.materialMap.put(materialConf.getModelCode(),materialConf.getMaterialCode());


        }


        System.out.println("初始化物料转换："+Constants.materialMap);


    }




    /**


     * 将日期放入MAP集合，1P1S用


     */