-换型增加物料配置

admin

5 天以前 f6789ac9f44a6b1f9d95421329bb1f0a7cd52d6d

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

@@ -311,10 +311,18 @@
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
                if(daParamCollection.getLocationCode().equals("M1OP100-1") || daParamCollection.getLocationCode().equals("M1OP100-2") ){
                    try{
                        //更新工单状态为已执行
                        LambdaUpdateWrapper<OmProductionOrdeInfo> updateWrapper = new LambdaUpdateWrapper<>();
                        updateWrapper.set(OmProductionOrdeInfo::getOrderStatus,"3");
                        updateWrapper.eq(OmProductionOrdeInfo::getProductNum,daParamCollection.getProductBarcode());
                        omProductionOrdeInfoService.update(new OmProductionOrdeInfo(),updateWrapper);

                        //上传工厂MES报工
                        CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                            logger.info("OP100报工开始-工厂MES异步方法");
                            String stationCode = "M1P100";//因为上层系统只支持6为，所有报工工位为M1P100
                            String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
                            String stationCode = "M1P100";//因为上层系统只支持6位，所有报工工位为M1P100
                            //String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
                            String reportResult = OPCUaSubscription.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
                            JSONObject jsonObject = new JSONObject(reportResult);
                            String code = jsonObject.getStr("code");
                            if("success".equals(code)){
@@ -342,11 +350,13 @@

    //半自动工位，先将自动数据保存到数据库
    public void saveParameters(DaParamCollection daParamCollection) {
        OmProductionOrdeInfo omProductionOrdeInfo = omProductionOrdeInfoService.selectOrderByProductNum(daParamCollection.getProductBarcode());
        //添加自动工位参数数据
        //查询参数配置表
        List<DaCollectionParamConf> list = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                .eq(DaCollectionParamConf::getProcessesCode, daParamCollection.getLocationCode())//工位
                .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集
                .eq(DaCollectionParamConf::getProductModel,omProductionOrdeInfo.getProductModel())
        );//类型

        List<String> collectAddressList = list.stream()