修改

hdy

2025-03-25 287ef80679ed099cfb4f49dfc2b776375a4ce67f

修改

 billion-main/src/main/java/com/billion/main/api/RestfulAPI.java

@@ -1,9 +1,9 @@
package com.billion.main.api;

import com.billion.main.api.domain.ApiResponse;
import com.billion.main.api.domain.CollectQualityData;
import com.billion.main.api.domain.WorkOrdersInfo;
import com.billion.main.api.service.IWorkOrdersInfoService;
import com.billion.main.da.domain.CollectQualityData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 billion-main/src/main/java/com/billion/main/api/domain/CollectQualityData.java

ÎļþÒÑɾ³ý

 billion-main/src/main/java/com/billion/main/api/service/ICollectQualityDataService.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java

@@ -12,9 +12,7 @@
import com.billion.main.bs.service.IBsBomChildInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.CollectMT;
import com.billion.main.da.domain.CollectTrack;
import com.billion.main.om.domain.OmOrderScheduling;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.service.IOmOrderSchedulingService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

 billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java

@@ -3,9 +3,8 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.billion.main.api.domain.CollectQualityData;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.CollectTrack;
import com.billion.main.da.domain.CollectQualityData;
import com.billion.main.da.domain.DaParamCollection;
import com.billion.main.da.mapper.DaParamCollectionMapper;
import com.billion.main.da.service.IDaParamCollectionService;

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

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.billion.main.bs.domain.BsBomChildInfo;
import com.billion.main.bs.domain.BsLineInfo;
import com.billion.main.bs.service.IBsBomChildInfoService;
import com.billion.main.bs.service.IBsLineInfoService;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.DaCollectionParamConf;
import com.billion.main.da.domain.DaMaterialCollection;
@@ -45,6 +47,7 @@
    public IDaCollectionParamConfService daCollectionParamConfService;
    public IDaMaterialCollectionService daMaterialCollectionService;
    public ISysCountService sysCountService;
    public IBsLineInfoService bsLineInfoService;


    public OPCUaSubscription(MiloService miloService,
@@ -55,7 +58,8 @@
                             IBsBomChildInfoService bsBomChildInfoService,
                             IDaCollectionParamConfService daCollectionParamConfService,
                             IDaMaterialCollectionService daMaterialCollectionService,
                             ISysCountService sysCountService
                             ISysCountService sysCountService,
                             IBsLineInfoService bsLineInfoService
                             ) {
        OPCUaSubscription.miloService = miloService;
        this.daParamCollectionService = daParamCollectionService;
@@ -66,7 +70,9 @@
        this.daCollectionParamConfService = daCollectionParamConfService;
        this.daMaterialCollectionService = daMaterialCollectionService;
        this.sysCountService = sysCountService;
        this.bsLineInfoService = bsLineInfoService;
    }

    @Override
    public void onSubscribe(String identifier, Object value) {
        log.info("地址："+identifier+"值："+value);
@@ -101,6 +107,7 @@
                    }
                    //1.2//除首工站所有工站
                    else if(
                            Constants.TEST.contains(device) ||
                            Constants.PLC1.contains(device) ||
                            Constants.PLC2.contains(device) ||
                            Constants.PLC3.contains(device) ||
@@ -110,12 +117,58 @@
                        //校验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());
                                }

                                //9L发动机涂胶轨迹下发
                                else if(Constants.OP080.equals(device) && Constants.PLC_4.equals(thoroughfare)){
                                    // 1. åˆå§‹åŒ–工单对象并查询工单信息
                                    String workOrderNo = resultList.get(0).getWorkOrderNo();
                                    OmProductionOrderInfo queryOrder = new OmProductionOrderInfo();
                                    queryOrder.setWorkOrderNo(workOrderNo);
                                    List<OmProductionOrderInfo> orderList = omProductionOrderInfoService.selectOmProductionOrderInfoList(queryOrder);
                                    // 2. åˆ¤æ–­ç±»åž‹åˆ†æ”¯é€»è¾‘
                                    String engineName = orderList.get(0).getEngineName();
                                    if (!"9L".equals(engineName)) {
                                        // éž9L直接写0
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(0).build());
                                    } else {
                                        // 3. æŸ¥è¯¢äº§çº¿é…ç½®çš„两条预置数据
                                        BsLineInfo lineQuery = new BsLineInfo();
                                        lineQuery.setLineCode(engineName);  // å‡è®¾é€šè¿‡lineCode=9L获取两条数据
                                        List<BsLineInfo> configuredLines = bsLineInfoService.selectBsLineInfoList(lineQuery);
                                            // ç¬¬ä¸€æ¡é…ç½®æ•°æ®çš„校验
                                            BsLineInfo firstLine = configuredLines.get(0);
                                            BsBomChildInfo checkFirst  = new BsBomChildInfo();
                                            checkFirst.setMaterialCode(firstLine.getLineName());
                                            checkFirst.setBomCode(workOrderNo);
                                            List<BsBomChildInfo> firstCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkFirst);
                                            if (firstCheckList.size() == 1) {
                                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(1).build());
                                            } else {
                                                // ç¬¬äºŒæ¡é…ç½®æ•°æ®çš„校验
                                                BsLineInfo secondLine = configuredLines.get(1);
                                                BsBomChildInfo checkSecond  = new BsBomChildInfo();
                                                checkSecond.setMaterialCode(secondLine.getLineName());
                                                checkSecond.setBomCode(workOrderNo);
                                                List<BsBomChildInfo> secondCheckList = bsBomChildInfoService.selectBsBomChildInfoList(checkSecond);
                                                if (secondCheckList.size() == 1) {
                                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".GlueType").value(2).build());
                                                }
                                            }
                                    }
                                }
                                String getWorkOrderNo = resultList.get(0).getWorkOrderNo();
                                BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
                                bsbomChildInfo.setLocationCode(device);
@@ -124,6 +177,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 +188,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 +216,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 +230,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 +270,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,9 +279,58 @@
                        sysCountService.updatePreNumber();
                        omProductionOrderInfoService.updatePreStatus1();
                        OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
                        if (Objects.equals(getPreOrder2.getPreQty(), getPreOrder2.getPlanQty())){
                        if (Objects.equals(nowQty, getPreOrder2.getPlanQty().toString())){
                            omProductionOrderInfoService.updatePreStatus2();
                        }
                    }else if (Constants.OP020.equals(device)){
                        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        // éåŽ† MaterialCode35 åˆ° MaterialCode40 å…±6组数据
                        for (int i = 35; i <= 40; i++) {  // ä¿®æ”¹å¾ªçŽ¯èŒƒå›´
                                // æž„建OPC UA节点地址（例如：PLC1.OP020.MaterialCode35）
                                String nodeId = "PLC1." + device + ".MaterialCode" + i;
                                // åˆ›å»ºé‡‡é›†å¯¹è±¡
                                DaMaterialCollection materialCollection = new DaMaterialCollection();
                                materialCollection.setSfcCode(SFCCode.toString());
                                materialCollection.setLocationCode(device);
                                // è®¾ç½®å‚数名称（活塞1到活塞6）
                                int pistonNumber = i - 34;  // 35→1, 36→2...40→6
                                materialCollection.setParamName("活塞" + pistonNumber);
                                // é€šè¿‡OPC UA读取参数值
                                ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
                                if (dataRead != null && dataRead.getValue() != null) {
                                    materialCollection.setParamValue(dataRead.getValue().toString());
                                } else {
                                    materialCollection.setParamValue("N/A");  // å¤„理空值情况
                                }
                                Date collectTime = new Date();
                                ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//进站时间
                                collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
                                materialCollection.setCollectTime( collectTime);
                                // æ’入数据库
                                daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
                        }
                    }else if (Constants.OP130.equals(device)){
                        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        // éåŽ† MaterialCode35 åˆ° MaterialCode40 å…±6组数据
                            String nodeId = "PLC1." + device + ".MaterialCode35" ;
                            // åˆ›å»ºé‡‡é›†å¯¹è±¡
                            DaMaterialCollection materialCollection = new DaMaterialCollection();
                            materialCollection.setSfcCode(SFCCode.toString());
                            materialCollection.setLocationCode(device);
                            materialCollection.setParamName("缸盖码");
                            // é€šè¿‡OPC UA读取参数值
                            ReadWriteEntity dataRead = miloService.readFromOpcUa(nodeId);
                            if (dataRead != null && dataRead.getValue() != null) {
                                materialCollection.setParamValue(dataRead.getValue().toString());
                            } else {
                                materialCollection.setParamValue("N/A");  // å¤„理空值情况
                            }
                            Date collectTime = new Date();
                            ReadWriteEntity collectTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StopTime");//进站时间
                            collectTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(collectTimeRead.getValue().toString())));
                            materialCollection.setCollectTime( collectTime);
                            // æ’入数据库
                            daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
                    }
                    //出站保存
                    DaStationCollection daStationCollection = new DaStationCollection();
@@ -270,7 +374,7 @@
                                    daMaterialCollectionService.insertDaMaterialCollection(materialCollection);
                                }
                                else {
                                    log.debug("采集项为空: {}", gatherAddress);
                                    log.info("采集项为空: {}", gatherAddress);
                                }
                            }
                        }
@@ -296,7 +400,7 @@
                            daParamCollectionService.insertDaParamCollection(paramCollection);
                        }
                        else {
                            log.debug("采集项为空: {}", gatherAddress);
                            log.info("采集项为空: {}", gatherAddress);
                        }
                    }
                }
@@ -306,6 +410,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 +440,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 +454,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 +475,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 +501,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 +513,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 +530,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 +555,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 +567,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 +584,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());
                    }
                }