修改数据采集

cl

2024-02-23 73bc0656dc15cd9cc95c6f4f51949ef0437088ce

 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/InitCallback.java

@@ -99,15 +99,6 @@
    static {
        logger = Logger.getLogger(InitCallback.class);
    }
    private static Date IN_TIME = null;
    private static String S_ORDER_CODE = "";//工单编号
    private static String S_PRODUCT_CODE = "";//产品编号
    private static String S_PRODUCT_TYPE= "";//产品类型
    private static String S_SFC_CODE = "";//总成编码
    private static String PRODUCTION_LINE  = "OP";//产线号
    private static String LOCATION_CODE  = "OP010";//工位号

    private static Integer ACTUAL_ONLINE_QTY  = 0 ;//上线数量

    OP010Callback OP010Callback;
    OP020Callback OP020Callback;
@@ -432,8 +423,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP020Callback.handleFinsh();
                    OP020Callback.handleMaterial();
                    OP020Callback.handleInfo();
                    OP020Callback.handleMaterial();

                }

                //OP030
@@ -449,8 +441,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP030Callback.handleFinsh();
                    OP030Callback.handleMaterial();
                    OP030Callback.handleInfo();
                    OP030Callback.handleMaterial();

                }

                //OP040
@@ -466,8 +459,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP040Callback.handleFinsh();
                    OP040Callback.handleMaterial();
                    OP040Callback.handleInfo();
                    OP040Callback.handleMaterial();

                }

                //OP050
@@ -484,7 +478,6 @@
                else if (identifier.equals(OPCElement.OP050_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP050Callback.handleFinsh();
                    OP050Callback.handleInfo();

                    OP050Callback.handleMaterial();
                }

@@ -541,8 +534,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP090_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP090Callback.handleFinsh();
                    OP090Callback.handleMaterial();
                    OP090Callback.handleInfo();
                    OP090Callback.handleMaterial();


                }

@@ -558,9 +552,11 @@
                }
                //PLC出站
                else if (identifier.equals(OPCElement.OP100_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP100Callback.handleMaterial();
                    OP100Callback.handleInfo();
                    OP100Callback.handleFinsh();
                    OP100Callback.handleInfo();
                    OP100Callback.handleMaterial();


                }

                //OP110
@@ -576,8 +572,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP110_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP110Callback.handleFinsh();
                    OP110Callback.handleMaterial();
                    OP110Callback.handleInfo();
                    OP110Callback.handleMaterial();

                }

                //OP120
@@ -593,8 +590,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP120_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP120Callback.handleFinsh();
                    OP120Callback.handleMaterial();
                    OP120Callback.handleInfo();
                    OP120Callback.handleMaterial();

                }

                //OP120B
@@ -627,8 +625,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP130_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP130Callback.handleFinsh();
                    OP130Callback.handleMaterial();
                    OP130Callback.handleInfo();
                    OP130Callback.handleMaterial();

                }

                //OP130B
@@ -644,8 +643,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP130B_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP130BCallback.handleFinsh();
                    OP130BCallback.handleMaterial();
                    OP130BCallback.handleInfo();
                    OP130BCallback.handleMaterial();

                }

                //OP140
@@ -661,8 +661,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.OP140_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    OP140Callback.handleFinsh();
                    OP140Callback.handleMaterial();
                    OP140Callback.handleInfo();
                    OP140Callback.handleMaterial();

                }

                //OP150
@@ -752,8 +753,8 @@
                //PLC出站
                else if (identifier.equals(OPCElement.BOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    BOP020Callback.handleFinsh();
                    BOP020Callback.handleMaterial();
                    BOP020Callback.handleInfo();
                    BOP020Callback.handleMaterial();
                }


@@ -770,8 +771,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.BOP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    BOP030Callback.handleFinsh();
                    BOP030Callback.handleMaterial();
                    BOP030Callback.handleInfo();
                    BOP030Callback.handleMaterial();

                }

                //BOP030B
@@ -804,8 +806,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.BOP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    BOP040Callback.handleFinsh();
                    BOP040Callback.handleMaterial();
                    BOP040Callback.handleInfo();
                    BOP040Callback.handleMaterial();

                }

                //BOP040B
@@ -862,8 +865,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.COP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    COP020Callback.handleFinsh();
                    COP020Callback.handleMaterial();
                    COP020Callback.handleInfo();
                    COP020Callback.handleMaterial();

                }


@@ -880,8 +884,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.COP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    COP030Callback.handleFinsh();
                    COP030Callback.handleMaterial();
                    COP030Callback.handleInfo();
                    COP030Callback.handleMaterial();

                }


@@ -921,8 +926,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.DOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    DOP020Callback.handleFinsh();
                    DOP020Callback.handleMaterial();
                    DOP020Callback.handleInfo();
                    DOP020Callback.handleMaterial();

                }

                //EOP010
@@ -938,8 +944,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP010_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP010Callback.handleFinsh();
                    EOP010Callback.handleMaterial();
                    EOP010Callback.handleInfo();
                    EOP010Callback.handleMaterial();

                }
                //EOP020
                //心跳
@@ -954,8 +961,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP020_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP020Callback.handleFinsh();
                    EOP020Callback.handleMaterial();
                    EOP020Callback.handleInfo();
                    EOP020Callback.handleMaterial();

                }

                //EOP030
@@ -971,8 +979,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP030_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP030Callback.handleFinsh();
                    EOP030Callback.handleMaterial();
                    EOP030Callback.handleInfo();
                    EOP030Callback.handleMaterial();

                }

                //EOP040
@@ -988,8 +997,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP040_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP040Callback.handleFinsh();
                    EOP040Callback.handleMaterial();
                    EOP040Callback.handleInfo();
                    EOP040Callback.handleMaterial();

                }

                //EOP050
@@ -1005,8 +1015,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP050_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP050Callback.handleFinsh();
                    EOP050Callback.handleMaterial();
                    EOP050Callback.handleInfo();
                    EOP050Callback.handleMaterial();

                }

                //EOP060
@@ -1022,8 +1033,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP060_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP060Callback.handleFinsh();
                    EOP060Callback.handleMaterial();
                    EOP060Callback.handleInfo();
                    EOP060Callback.handleMaterial();

                }

                //EOP070
@@ -1039,8 +1051,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP070_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP070Callback.handleFinsh();
                    EOP070Callback.handleMaterial();
                    EOP070Callback.handleInfo();
                    EOP070Callback.handleMaterial();

                }

                //EOP080
@@ -1056,8 +1069,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP080_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP080Callback.handleFinsh();
                    EOP080Callback.handleMaterial();
                    EOP080Callback.handleInfo();
                    EOP080Callback.handleMaterial();

                }

                //EOP090
@@ -1073,8 +1087,9 @@
                //PLC出站
                else if (identifier.equals(OPCElement.EOP090_J_PLC_FINISH) && null != value && "true".equals(value.toString())) {
                    EOP090Callback.handleFinsh();
                    EOP090Callback.handleMaterial();
                    EOP090Callback.handleInfo();
                    EOP090Callback.handleMaterial();

                }

                //EOP090B