修改

hdy

5 天以前 31960ffca93463cf4f6d417576c8694aed84138e

修改

 billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java

@@ -110,14 +110,12 @@
        Constants.PLC4.add(Constants.OP050);
        Constants.PLC4.add(Constants.OP110);
        Constants.PLC4.add(Constants.OP140);

        //上线工位
        Constants.ONLINE.add(Constants.C005);
        Constants.ONLINE.add(Constants.OP005);
        //下线工位
        Constants.OFFLINE.add(Constants.C070);
        Constants.OFFLINE.add(Constants.OP310);
        Constants.OFFLINE.add(Constants.P010);

        OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,
                daParamCollectionService,

 billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java

@@ -93,19 +93,22 @@
                //请求进站
                } else if (Constants.ONE.equals(valueString)){
                    //1.1//首工站
                    if(Constants.C005.equals(device) || Constants.OP005.equals(device) || Constants.P010.equals(device)){
                    if(Constants.ONLINE.contains(device)){
                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
                    }
                    ///////除首工站所有工站
                    else if(Constants.PLC1.contains(device) && Constants.OP310.contains(device)){
                    //除首工站所有工站
                    else if(Constants.PLC1.contains(device) ||
                            Constants.PLC2.contains(device) ||
                            Constants.PLC3.contains(device) ||
                            Constants.PLC4.contains(device) ||
                            Constants.OFFLINE.contains(device)
                    ){
                        //校验SFCCode是否存在
                        Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
                        Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
                        if (SFCCode == null ) {
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("23").build());
                        } else {
                            OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
                            omOrderScheduling.setRemarks(PalletID.toString());
                            List<OmOrderScheduling> resultList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
                            log.info("查询结果数量: {}", resultList);
                            BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -114,7 +117,6 @@
                            //下发配方
                            formula(thoroughfare, device, bsbomChildInfo);
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());

                        }
                    }
                //出站保存数据
@@ -148,12 +150,9 @@
                            List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                            Object headQty = omProductionOrderInfoList.get(0).getHeadQty();
                            if (nowQty == headQty){
//                                omProductionOrderInfoList.get(0).setHeadStatus("3");
//                                omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));

                                UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                                updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                                updateWrapper.set("body_status", "3");
                                updateWrapper.set("head_status", "3");
                                omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
                            }
                        } else if (Constants.OP310.equals(device)) {
@@ -166,10 +165,10 @@
                            List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                            Object bodyQty = omProductionOrderInfoList.get(0).getBodyQty();
                            if (nowQty == bodyQty){
                                omProductionOrderInfoList.get(0).setBodyStatus("3");


                                omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));
                                UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                                updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                                updateWrapper.set("body_status", "3");
                                omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
                            }
                        }
                    } else if (Constants.P010.equals(device)) {
@@ -186,11 +185,10 @@
                        List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                        Object preQty = omProductionOrderInfoList.get(0).getPreQty();
                        if (nowQty == preQty){
                            omProductionOrderInfoList.get(0).setPreStatus("3");


                            omProductionOrderInfoService.updateOmProductionOrderInfo(omProductionOrderInfoList.get(0));

                            UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                            updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                            updateWrapper.set("pre_status", "3");
                            omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
                        }
                    }
                    //查询descriptive字段等于1的采集项保存到扫码保存到da_material_collection表里
@@ -389,7 +387,6 @@
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                            sysCountService.updateHeadNumber();
                        }

                        // 更新 WorkOrderRequestDone 地址块
                        BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
                        bsbomChildInfo.setLocationCode(device);

 billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml

@@ -111,7 +111,6 @@




    <select id="selectOmProductionOrderInfoList" parameterType="OmProductionOrderInfo" resultMap="OmProductionOrderInfoResult">
        <include refid="selectOmProductionOrderInfoVo"/>
        <where>