修改

hdy

2025-03-18 5c4c78563bc55ac7a18e029a211f4a6be14b047a

修改

 billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java

@@ -50,8 +50,8 @@
            omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
            omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
            omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());
            omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
            omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
            omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineName());
            omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineType());
            omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date startTime = sdf.parse(workOrdersInfo.getStartTime());

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

@@ -104,14 +104,16 @@
        Constants.PLC4.add(Constants.OP030);
        Constants.PLC4.add(Constants.OP050);
        Constants.PLC4.add(Constants.OP110);
        Constants.PLC4.add(Constants.OP070_1);
        Constants.PLC4.add(Constants.OP070);
        Constants.PLC4.add(Constants.OP075);
        Constants.PLC4.add(Constants.OP080);
        Constants.PLC4.add(Constants.OP140);
        //上线工位
        Constants.ONLINE.add(Constants.C005);
        Constants.ONLINE.add(Constants.OP005);
        //下线工位
        Constants.OFFLINE.add(Constants.C060);
        Constants.OFFLINE.add(Constants.OP300);
        Constants.OFFLINE.add(Constants.OP310);




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

@@ -67,6 +67,7 @@
        this.daMaterialCollectionService = daMaterialCollectionService;
        this.sysCountService = sysCountService;
    }

    @Override
    public void onSubscribe(String identifier, Object value) {
        log.info("地址："+identifier+"值："+value);
@@ -110,12 +111,19 @@
                        //校验SFCCode是否存在
                        Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
                        if (SFCCode == null ) {
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
                            log.info( "进站失败：地址SFCCode为空");
                        } else {
                            OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
                            omOrderScheduling.setSfcCode(SFCCode.toString());
                            List<OmOrderScheduling> resultList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
                            if(resultList != null){
                                if(Constants.OP010.equals(device)||Constants.OP310.equals(device)){
                                    String EngineType =resultList.get(0).getProductCode();
                                    String SerialNumber = SFCCode.toString().substring(EngineType.length());
                                    miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(EngineType).build());
                                    miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
                                }
                                String getWorkOrderNo = resultList.get(0).getWorkOrderNo();
                                BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
                                bsbomChildInfo.setLocationCode(device);
@@ -124,6 +132,7 @@
                                formula(thoroughfare, device, bsbomChildInfo);
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                            }else {
                                log.info( "进站失败：未检索到SFCCode:{}对应工单" ,SFCCode);
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(13).build());
                            }
                        }
@@ -134,25 +143,26 @@
                    OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
                    Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
                    //上线工位
//                    if(Constants.ONLINE.contains(device) || Constants.TEST.equals(device) ){
                    if(Constants.ONLINE.contains(device)){
                        Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
                        Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
                        Object nowQty = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue().toString();
                        Object EngineType = miloService.readFromOpcUa(thoroughfare + "." + device + ".EngineType").getValue().toString();
                        omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
                        omOrderScheduling.setNowQty(nowQty.toString());
                        omOrderScheduling.setSfcCode(SFCCode.toString());
                        omOrderScheduling.setProductCode(EngineType.toString());
                        omOrderScheduling.setStatus("1");
                        Date Time = new Date();
                        ReadWriteEntity TimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");
                        Time = format.parse(TimeUtil.test(TimeUtil.stringProcessing(TimeRead.getValue().toString())));
                        omOrderScheduling.setOnlineTime(Time);
                        omOrderScheduling.setStatus("1");
                        //托盘绑定SFCCode和工单和产线
                        if(Constants.OP005.equals(device)){
                            omProductionOrderInfoService.updateBodyStatus1();
                            omOrderScheduling.setRemarks("Body");
                            sysCountService.updateSerialNumber();
                            OmProductionOrderInfo getBodyOrder2 = omProductionOrderInfoService.getBodyOrder();
                            if (Objects.equals(getBodyOrder2.getBodyQty(), getBodyOrder2.getPlanQty())){
                            if (Objects.equals(nowQty, getBodyOrder2.getPlanQty().toString())){
                                omProductionOrderInfoService.updateBodyStatus2();
                            }
                        }
@@ -161,7 +171,7 @@
                            omOrderScheduling.setRemarks("Head");
                            sysCountService.updateHeadNumber();
                            OmProductionOrderInfo getHeadOrder2 = omProductionOrderInfoService.getHeadOrder();
                            if (Objects.equals(getHeadOrder2.getHeadQty(), getHeadOrder2.getPlanQty())){
                            if (Objects.equals(nowQty, getHeadOrder2.getPlanQty().toString())){
                                omProductionOrderInfoService.updateHeadStatus2();
                            }
                        }
@@ -175,27 +185,27 @@
                            omOrderScheduling.setRemarks("Head");
                            omOrderScheduling.setSfcCode(SFCCode.toString());
                            List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
                            Object nowQty = omOrderSchedulingList.get(0).getNowQty();
                            String nowQty = omOrderSchedulingList.get(0).getNowQty();
                            Object WorkOrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
                            omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
                            List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                            Object headQty = omProductionOrderInfoList.get(0).getHeadQty();
                            if (nowQty == headQty){
                            if (Objects.equals(nowQty, headQty.toString())){
                                UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                                updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                                updateWrapper.set("head_status", "2");
                                omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
                            }
                        } else if (Constants.OP300.equals(device)) {
                        } else if (Constants.OP310.equals(device)) {
                            omOrderScheduling.setRemarks("Body");
                            omOrderScheduling.setSfcCode(SFCCode.toString());
                            List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
                            Object nowQty = omOrderSchedulingList.get(0).getNowQty();
                            String nowQty = omOrderSchedulingList.get(0).getNowQty();
                            Object WorkOrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
                            omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
                            List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                            Object bodyQty = omProductionOrderInfoList.get(0).getBodyQty();
                            if (nowQty == bodyQty){
                            if (Objects.equals(nowQty, bodyQty.toString())){
                                UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                                updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                                updateWrapper.set("body_status", "2");
@@ -215,7 +225,7 @@
                        omProductionOrderInfo.setWorkOrderNo(WorkOrderNumber.toString());
                        List<OmProductionOrderInfo> omProductionOrderInfoList = omProductionOrderInfoService.selectOmProductionOrderInfoList(omProductionOrderInfo);
                        Object preQty = omProductionOrderInfoList.get(0).getPreQty();
                        if (nowQty == preQty){
                        if (nowQty == preQty.toString()){
                            UpdateWrapper<OmProductionOrderInfo> updateWrapper = new UpdateWrapper<>();
                            updateWrapper.eq("work_order_no", omProductionOrderInfoList.get(0).getWorkOrderNo());
                            updateWrapper.set("pre_status", "2");
@@ -224,7 +234,7 @@
                        sysCountService.updatePreNumber();
                        omProductionOrderInfoService.updatePreStatus1();
                        OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
                        if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
                        if (Objects.equals(nowQty, getPreOrder2.getPlanQty().toString())){
                            omProductionOrderInfoService.updatePreStatus2();
                        }
                    }
@@ -270,7 +280,7 @@
                                    daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
                                }
                                else {
                                    log.debug("采集项为空: {}", gatherAddress);
                                    log.info("采集项为空: {}", gatherAddress);
                                }
                            }
                        }
@@ -296,7 +306,7 @@
                            daParamCollectionService.insertDaParamCollection(paramCollection);
                        }
                        else {
                            log.debug("采集项为空: {}", gatherAddress);
                            log.info("采集项为空: {}", gatherAddress);
                        }
                    }
                }
@@ -306,6 +316,9 @@
            log.error(e.getMessage());
        }
}




    //首工站下发工单,并生成SN码
    private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
@@ -333,8 +346,11 @@
                                String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 获取当前月份（1-12）
                                String A5 = String.format("%05d", serialNumber.getSerialNumber());
                                String SFCCode = A1 + A2 + A3+ A4 + A5;
                                String SerialNumber = A2 + A3+ A4 + A5;
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                                log.info("SFCCode：{}下发成功",SFCCode);
                            }else{
                                sysCountService.clean();
                                sysCountService.updateYear();
@@ -344,8 +360,11 @@
                                String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 获取当前月份（1-12）
                                String A5 = String.format("%05d", sysCountService.getSerialNumber().getSerialNumber());
                                String SFCCode = A1 + A2 + newA3+ A4 + A5;
                                String SerialNumber = A2 + newA3+ A4 + A5;
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SerialNumber").value(SerialNumber).build());
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                                log.info("SFCCode：{}下发成功",SFCCode);
                            }
                            // 更新 WorkOrderRequestDone 地址块
                            BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -362,8 +381,10 @@
                            String PalletID = String.valueOf(getBodyOrder.getBodyQty() + 1);
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
                            log.info("工位{}请求工单成功",device);
                    }
                    else{
                        log.info("请求工单失败：未检索到工单");
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
                        }
                } else if (Constants.C005.equals(device)) {
@@ -386,6 +407,7 @@
                            String SFCCode = A1 + A2 + A3+ A4 + A5;
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                            log.info("SFCCode：{}下发成功",SFCCode);
                        }else{
                            sysCountService.clean();
                            sysCountService.updateYear();
@@ -397,6 +419,7 @@
                            String SFCCode = A1 + A2 + newA3+ A4 + A5;
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                            log.info("SFCCode：{}下发成功",SFCCode);
                        }
                        // 更新 WorkOrderRequestDone 地址块
                        BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -413,8 +436,10 @@
                        String PalletID = String.valueOf(getHeadOrder.getHeadQty() + 1);
                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
                        log.info("工位{}请求工单成功",device);
                    }
                    else{
                        log.info("请求工单失败：未检索到对应工单");
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
                    }
                } else if (Constants.P010.equals(device)) {
@@ -436,6 +461,7 @@
                            String SFCCode = A1 + A2 + A3+ A4 + A5;
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                            log.info("SFCCode：{}下发成功",SFCCode);
                        }else{
                            sysCountService.clean();
                            sysCountService.updateYear();
@@ -447,6 +473,7 @@
                            String SFCCode = A1 + A2 + newA3+ A4 + A5;
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MESSFCCode").value(SFCCode).build());
                            log.info("SFCCode：{}下发成功",SFCCode);
                        }
                        // 更新 WorkOrderRequestDone 地址块
                        BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
@@ -463,8 +490,10 @@
                        String PalletID = String.valueOf(getPreOrder.getPreQty() + 1);
                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".PalletID").value(PalletID).build());
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(11).build());
                        log.info("工位{}请求工单成功",device);
                    }
                    else{
                        log.info("请求工单失败：未检索到对应工单");
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value(12).build());
                    }
                }

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

@@ -60,6 +60,7 @@
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="remarks != null">remarks,</if>
            <if test="nowQty != null">now_qty,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="workOrderNo != null and workOrderNo != ''">#{workOrderNo},</if>
@@ -74,6 +75,7 @@
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="remarks != null">#{remarks},</if>
            <if test="nowQty != null">#{nowQty},</if>
         </trim>
    </insert>


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

@@ -41,7 +41,6 @@
            SELECT TOP 1 *
            FROM om_production_order_info
            WHERE body_status IN (0,1)
            AND body_qty != plan_qty
            ORDER BY plan_start_time ASC
    </select>
    <select id="updateBodyStatus1" resultType="OmProductionOrderInfo">
@@ -69,7 +68,6 @@
        SELECT TOP 1 *
        FROM om_production_order_info
        WHERE head_status IN (0,1)
          AND head_qty != plan_qty
        ORDER BY plan_start_time ASC
    </select>
    <select id="updateHeadStatus1" resultType="OmProductionOrderInfo">
@@ -97,7 +95,6 @@
        SELECT TOP 1 *
        FROM om_production_order_info
        WHERE pre_status IN (0,1)
          AND pre_qty != plan_qty
        ORDER BY plan_start_time ASC
    </select>
    <select id="updatePreStatus1" resultType="OmProductionOrderInfo">