diff --git a/XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java b/XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java
index c0bda71..e426608 100644
--- a/XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java
+++ b/XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java
@@ -2426,94 +2426,94 @@ public class SubServiceImpl implements SubService {
     public boolean ChkCombinationOrderFlag(GGrpOrderFir GOF, GPreOrder GPO) {
         try {
 
-
-            //全程热处理类型
-            if (!nvl(GOF.getWHOLE_HEAT_TREATMENT_TYPE(),"").equals(nvl(GPO.getWHOLE_HEAT_TREATMENT_TYPE(),""))) {
-                return false;
-            }
-
-            //切断方式
-            if (!nvl(GOF.getCUT_MODE_CODE(),"").equals(nvl(GPO.getCUT_MODE_CODE(),""))) {
-                return false;
-            }
-            //缓冷代码
-            //        GGOF.setCOOL_CODE(p.getCOOL_CODE());
-            if (!nvl(GOF.getCOOL_CODE(),"").equals(nvl(GPO.getCOOL_CODE(),""))) {
-                return false;
-            }
-            //二次开坯母材合同标记
-            //        GGOF.setTWO_ROLL_FLAG(p.getTWO_ROLL_FLAG() );
-            if (!nvl(GOF.getTWO_ROLL_FLAG(),"").equals(nvl(GPO.getTWO_ROLL_FLAG(),""))) {
-                return false;
-            }
-            //见证要求  QE_TJ_WITNESS_PRO_ORDER TODO:QE_TJ_WITNESS_PRO_ORDER.WITNESS_PRO_NO  见证要求
-            //GGOF.setWITNESS_PRO_NO(p.getWITNESS_PRO_NO());
-            // AD控制模式第134位相等
-            //        GGOF.setAD_MODE_CODE(p.getAD_MODE_CODE());
-            if (!nvl(GOF.getAD_MODE_CODE(),"").equals(nvl(GPO.getAD_MODE_CODE(),""))) {
-                return false;
-            }
-
-            // AD控制模式第1位、第3位和第4位相等
-            if ((nvl(GOF.getAD_MODE_CODE(),"").length() != 0 && nvl(GPO.getAD_MODE_CODE(),"").length() == 0)
-                    || (nvl(GOF.getAD_MODE_CODE(),"").length() == 0 && nvl(GPO.getAD_MODE_CODE(),"").length() != 0)) {
-                return false;
-            } else {
-                if (nvl(GOF.getAD_MODE_CODE(),"").length() < 4 || nvl(GPO.getAD_MODE_CODE(),"").length() < 4 ||
-                        nvl(GOF.getAD_MODE_CODE(),"").charAt(0) != nvl(GPO.getAD_MODE_CODE(),"").charAt(0) ||
-                                nvl(GOF.getAD_MODE_CODE(),"").charAt(2) != nvl(GPO.getAD_MODE_CODE(),"").charAt(2) ||
-                                        nvl(GOF.getAD_MODE_CODE(),"").charAt(3) != nvl(GPO.getAD_MODE_CODE(),"").charAt(3)) {
-                    return false;
-                }
-            }
-
-            // 控轧代码第134位相等
-            //        GGOF.setCTRL_ROLL_CODE(p.getCTRL_ROLL_CODE());
-            if ((nvl(GOF.getCTRL_ROLL_CODE(),"").length() != 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() == 0)
-                    || (nvl(GOF.getCTRL_ROLL_CODE(),"").length() == 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() != 0)) {
-                return false;
-            } else {
-                if (nvl(GOF.getCTRL_ROLL_CODE(),"").length() < 4 || nvl(GPO.getCTRL_ROLL_CODE(),"").length() < 4 ||
-                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(0) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(0) ||
-                                nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(2) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(2) ||
-                                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(3) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(3)) {
-                    return false;
-                }
-            }
-
-            //边部形态
-            //        GGOF.setPROD_SIDE_MARK(p.getPROD_SIDE_MARK());
-            if (!nvl(GOF.getPROD_SIDE_MARK(),"").equals(nvl(GPO.getPROD_SIDE_MARK(),""))) {
-                return false;
-            }
-
-            //会检方式代码
-            //        GGOF.setCHECK_METHOD_CODE(p.getCHECK_METHOD_CODE());
-            if (!nvl(GOF.getCHECK_METHOD_CODE(),"").equals(nvl(GPO.getCHECK_METHOD_CODE(),""))) {
-                return false;
-            }
-            //验收机关代码
-            //        GGOF.setACCP_AUTH_CODE(p.getACCP_AUTH_CODE());
-            if (!nvl(GOF.getACCP_AUTH_CODE(),"").equals(nvl(GPO.getACCP_AUTH_CODE(),""))) {
-                return false;
-            }
-            //最终用户代码
-            //        GGOF.setFIN_CUST_CODE(p.getFIN_CUST_CODE());
-            if (!nvl(GOF.getFIN_CUST_CODE(),"").equals(nvl(GPO.getFIN_CUST_CODE(),""))) {
-                return false;
-            }
-
-            //超声探伤代码
-            //        GGOF.setULT_CODE(p.getULT_CODE());
-            if (!nvl(GOF.getULT_CODE(),"").equals(nvl(GPO.getULT_CODE(),""))) {
-                return false;
-            }
-
-            //四毛交货的合同单独组板
-            //        GGOF.setTRIM_CODE(p.getTRIM_CODE());
-            if (!nvl(GOF.getTRIM_CODE(),"").equals(nvl(GPO.getTRIM_CODE(),""))) {
-                return false;
-            }
+//
+//            //全程热处理类型
+//            if (!nvl(GOF.getWHOLE_HEAT_TREATMENT_TYPE(),"").equals(nvl(GPO.getWHOLE_HEAT_TREATMENT_TYPE(),""))) {
+//                return false;
+//            }
+//
+//            //切断方式
+//            if (!nvl(GOF.getCUT_MODE_CODE(),"").equals(nvl(GPO.getCUT_MODE_CODE(),""))) {
+//                return false;
+//            }
+//            //缓冷代码
+//            //        GGOF.setCOOL_CODE(p.getCOOL_CODE());
+//            if (!nvl(GOF.getCOOL_CODE(),"").equals(nvl(GPO.getCOOL_CODE(),""))) {
+//                return false;
+//            }
+//            //二次开坯母材合同标记
+//            //        GGOF.setTWO_ROLL_FLAG(p.getTWO_ROLL_FLAG() );
+//            if (!nvl(GOF.getTWO_ROLL_FLAG(),"").equals(nvl(GPO.getTWO_ROLL_FLAG(),""))) {
+//                return false;
+//            }
+//            //见证要求  QE_TJ_WITNESS_PRO_ORDER TODO:QE_TJ_WITNESS_PRO_ORDER.WITNESS_PRO_NO  见证要求
+//            //GGOF.setWITNESS_PRO_NO(p.getWITNESS_PRO_NO());
+//            // AD控制模式第134位相等
+//            //        GGOF.setAD_MODE_CODE(p.getAD_MODE_CODE());
+//            if (!nvl(GOF.getAD_MODE_CODE(),"").equals(nvl(GPO.getAD_MODE_CODE(),""))) {
+//                return false;
+//            }
+//
+//            // AD控制模式第1位、第3位和第4位相等
+//            if ((nvl(GOF.getAD_MODE_CODE(),"").length() != 0 && nvl(GPO.getAD_MODE_CODE(),"").length() == 0)
+//                    || (nvl(GOF.getAD_MODE_CODE(),"").length() == 0 && nvl(GPO.getAD_MODE_CODE(),"").length() != 0)) {
+//                return false;
+//            } else {
+//                if (nvl(GOF.getAD_MODE_CODE(),"").length() < 4 || nvl(GPO.getAD_MODE_CODE(),"").length() < 4 ||
+//                        nvl(GOF.getAD_MODE_CODE(),"").charAt(0) != nvl(GPO.getAD_MODE_CODE(),"").charAt(0) ||
+//                                nvl(GOF.getAD_MODE_CODE(),"").charAt(2) != nvl(GPO.getAD_MODE_CODE(),"").charAt(2) ||
+//                                        nvl(GOF.getAD_MODE_CODE(),"").charAt(3) != nvl(GPO.getAD_MODE_CODE(),"").charAt(3)) {
+//                    return false;
+//                }
+//            }
+//
+//            // 控轧代码第134位相等
+//            //        GGOF.setCTRL_ROLL_CODE(p.getCTRL_ROLL_CODE());
+//            if ((nvl(GOF.getCTRL_ROLL_CODE(),"").length() != 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() == 0)
+//                    || (nvl(GOF.getCTRL_ROLL_CODE(),"").length() == 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() != 0)) {
+//                return false;
+//            } else {
+//                if (nvl(GOF.getCTRL_ROLL_CODE(),"").length() < 4 || nvl(GPO.getCTRL_ROLL_CODE(),"").length() < 4 ||
+//                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(0) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(0) ||
+//                                nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(2) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(2) ||
+//                                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(3) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(3)) {
+//                    return false;
+//                }
+//            }
+//
+//            //边部形态
+//            //        GGOF.setPROD_SIDE_MARK(p.getPROD_SIDE_MARK());
+//            if (!nvl(GOF.getPROD_SIDE_MARK(),"").equals(nvl(GPO.getPROD_SIDE_MARK(),""))) {
+//                return false;
+//            }
+//
+//            //会检方式代码
+//            //        GGOF.setCHECK_METHOD_CODE(p.getCHECK_METHOD_CODE());
+//            if (!nvl(GOF.getCHECK_METHOD_CODE(),"").equals(nvl(GPO.getCHECK_METHOD_CODE(),""))) {
+//                return false;
+//            }
+//            //验收机关代码
+//            //        GGOF.setACCP_AUTH_CODE(p.getACCP_AUTH_CODE());
+//            if (!nvl(GOF.getACCP_AUTH_CODE(),"").equals(nvl(GPO.getACCP_AUTH_CODE(),""))) {
+//                return false;
+//            }
+//            //最终用户代码
+//            //        GGOF.setFIN_CUST_CODE(p.getFIN_CUST_CODE());
+//            if (!nvl(GOF.getFIN_CUST_CODE(),"").equals(nvl(GPO.getFIN_CUST_CODE(),""))) {
+//                return false;
+//            }
+//
+//            //超声探伤代码
+//            //        GGOF.setULT_CODE(p.getULT_CODE());
+//            if (!nvl(GOF.getULT_CODE(),"").equals(nvl(GPO.getULT_CODE(),""))) {
+//                return false;
+//            }
+//
+//            //四毛交货的合同单独组板
+//            //        GGOF.setTRIM_CODE(p.getTRIM_CODE());
+//            if (!nvl(GOF.getTRIM_CODE(),"").equals(nvl(GPO.getTRIM_CODE(),""))) {
+//                return false;
+//            }
         } catch (Exception ex1) {
             logger.info("错误信息：合同-->" + ex1);
         }
@@ -2522,94 +2522,94 @@ public class SubServiceImpl implements SubService {
 
     public boolean ChkCombinationGrpFlag(GCalGrp GOF, GCalGrp GPO) {
         try {
-
-            //全程热处理类型
-            if (!nvl(GOF.getWHOLE_HEAT_TREATMENT_TYPE(),"").equals(nvl(GPO.getWHOLE_HEAT_TREATMENT_TYPE(),""))) {
-                return false;
-            }
-
-            //切断方式
-            if (!nvl(GOF.getCUT_MODE_CODE(),"").equals(nvl(GPO.getCUT_MODE_CODE(),""))) {
-                return false;
-            }
-            //缓冷代码
-            //        GGOF.setCOOL_CODE(p.getCOOL_CODE());
-            if (!nvl(GOF.getCOOL_CODE(),"").equals(nvl(GPO.getCOOL_CODE(),""))) {
-                return false;
-            }
-            //二次开坯母材合同标记
-            //        GGOF.setTWO_ROLL_FLAG(p.getTWO_ROLL_FLAG() );
-            if (!nvl(GOF.getTWO_ROLL_FLAG(),"").equals(nvl(GPO.getTWO_ROLL_FLAG(),""))) {
-                return false;
-            }
-            //见证要求  QE_TJ_WITNESS_PRO_ORDER TODO:QE_TJ_WITNESS_PRO_ORDER.WITNESS_PRO_NO  见证要求
-            //GGOF.setWITNESS_PRO_NO(p.getWITNESS_PRO_NO());
-            // AD控制模式第134位相等
-            //        GGOF.setAD_MODE_CODE(p.getAD_MODE_CODE());
-            if (!nvl(GOF.getAD_MODE_CODE(),"").equals(nvl(GPO.getAD_MODE_CODE(),""))) {
-                return false;
-            }
-
-            // AD控制模式第1位、第3位和第4位相等
-            if ((nvl(GOF.getAD_MODE_CODE(),"").length() != 0 && nvl(GPO.getAD_MODE_CODE(),"").length() == 0)
-                    || (nvl(GOF.getAD_MODE_CODE(),"").length() == 0 && nvl(GPO.getAD_MODE_CODE(),"").length() != 0)) {
-                return false;
-            } else {
-                if (nvl(GOF.getAD_MODE_CODE(),"").length() < 4 || nvl(GPO.getAD_MODE_CODE(),"").length() < 4 ||
-                        nvl(GOF.getAD_MODE_CODE(),"").charAt(0) != nvl(GPO.getAD_MODE_CODE(),"").charAt(0) ||
-                        nvl(GOF.getAD_MODE_CODE(),"").charAt(2) != nvl(GPO.getAD_MODE_CODE(),"").charAt(2) ||
-                        nvl(GOF.getAD_MODE_CODE(),"").charAt(3) != nvl(GPO.getAD_MODE_CODE(),"").charAt(3)) {
-                    return false;
-                }
-            }
-
-            // 控轧代码第134位相等
-            //        GGOF.setCTRL_ROLL_CODE(p.getCTRL_ROLL_CODE());
-            if ((nvl(GOF.getCTRL_ROLL_CODE(),"").length() != 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() == 0)
-                    || (nvl(GOF.getCTRL_ROLL_CODE(),"").length() == 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() != 0)) {
-                return false;
-            } else {
-                if (nvl(GOF.getCTRL_ROLL_CODE(),"").length() < 4 || nvl(GPO.getCTRL_ROLL_CODE(),"").length() < 4 ||
-                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(0) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(0) ||
-                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(2) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(2) ||
-                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(3) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(3)) {
-                    return false;
-                }
-            }
-
-            //边部形态
-            //        GGOF.setPROD_SIDE_MARK(p.getPROD_SIDE_MARK());
-            if (!nvl(GOF.getPROD_SIDE_MARK(),"").equals(nvl(GPO.getPROD_SIDE_MARK(),""))) {
-                return false;
-            }
-
-            //会检方式代码
-            //        GGOF.setCHECK_METHOD_CODE(p.getCHECK_METHOD_CODE());
-            if (!nvl(GOF.getCHECK_METHOD_CODE(),"").equals(nvl(GPO.getCHECK_METHOD_CODE(),""))) {
-                return false;
-            }
-            //验收机关代码
-            //        GGOF.setACCP_AUTH_CODE(p.getACCP_AUTH_CODE());
-            if (!nvl(GOF.getACCP_AUTH_CODE(),"").equals(nvl(GPO.getACCP_AUTH_CODE(),""))) {
-                return false;
-            }
-            //最终用户代码
-            //        GGOF.setFIN_CUST_CODE(p.getFIN_CUST_CODE());
-            if (!nvl(GOF.getFIN_CUST_CODE(),"").equals(nvl(GPO.getFIN_CUST_CODE(),""))) {
-                return false;
-            }
-
-            //超声探伤代码
-            //        GGOF.setULT_CODE(p.getULT_CODE());
-            if (!nvl(GOF.getULT_CODE(),"").equals(nvl(GPO.getULT_CODE(),""))) {
-                return false;
-            }
-
-            //四毛交货的合同单独组板
-            //        GGOF.setTRIM_CODE(p.getTRIM_CODE());
-            if (!nvl(GOF.getTRIM_CODE(),"").equals(nvl(GPO.getTRIM_CODE(),""))) {
-                return false;
-            }
+//
+//            //全程热处理类型
+//            if (!nvl(GOF.getWHOLE_HEAT_TREATMENT_TYPE(),"").equals(nvl(GPO.getWHOLE_HEAT_TREATMENT_TYPE(),""))) {
+//                return false;
+//            }
+//
+//            //切断方式
+//            if (!nvl(GOF.getCUT_MODE_CODE(),"").equals(nvl(GPO.getCUT_MODE_CODE(),""))) {
+//                return false;
+//            }
+//            //缓冷代码
+//            //        GGOF.setCOOL_CODE(p.getCOOL_CODE());
+//            if (!nvl(GOF.getCOOL_CODE(),"").equals(nvl(GPO.getCOOL_CODE(),""))) {
+//                return false;
+//            }
+//            //二次开坯母材合同标记
+//            //        GGOF.setTWO_ROLL_FLAG(p.getTWO_ROLL_FLAG() );
+//            if (!nvl(GOF.getTWO_ROLL_FLAG(),"").equals(nvl(GPO.getTWO_ROLL_FLAG(),""))) {
+//                return false;
+//            }
+//            //见证要求  QE_TJ_WITNESS_PRO_ORDER TODO:QE_TJ_WITNESS_PRO_ORDER.WITNESS_PRO_NO  见证要求
+//            //GGOF.setWITNESS_PRO_NO(p.getWITNESS_PRO_NO());
+//            // AD控制模式第134位相等
+//            //        GGOF.setAD_MODE_CODE(p.getAD_MODE_CODE());
+//            if (!nvl(GOF.getAD_MODE_CODE(),"").equals(nvl(GPO.getAD_MODE_CODE(),""))) {
+//                return false;
+//            }
+//
+//            // AD控制模式第1位、第3位和第4位相等
+//            if ((nvl(GOF.getAD_MODE_CODE(),"").length() != 0 && nvl(GPO.getAD_MODE_CODE(),"").length() == 0)
+//                    || (nvl(GOF.getAD_MODE_CODE(),"").length() == 0 && nvl(GPO.getAD_MODE_CODE(),"").length() != 0)) {
+//                return false;
+//            } else {
+//                if (nvl(GOF.getAD_MODE_CODE(),"").length() < 4 || nvl(GPO.getAD_MODE_CODE(),"").length() < 4 ||
+//                        nvl(GOF.getAD_MODE_CODE(),"").charAt(0) != nvl(GPO.getAD_MODE_CODE(),"").charAt(0) ||
+//                        nvl(GOF.getAD_MODE_CODE(),"").charAt(2) != nvl(GPO.getAD_MODE_CODE(),"").charAt(2) ||
+//                        nvl(GOF.getAD_MODE_CODE(),"").charAt(3) != nvl(GPO.getAD_MODE_CODE(),"").charAt(3)) {
+//                    return false;
+//                }
+//            }
+//
+//            // 控轧代码第134位相等
+//            //        GGOF.setCTRL_ROLL_CODE(p.getCTRL_ROLL_CODE());
+//            if ((nvl(GOF.getCTRL_ROLL_CODE(),"").length() != 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() == 0)
+//                    || (nvl(GOF.getCTRL_ROLL_CODE(),"").length() == 0 && nvl(GPO.getCTRL_ROLL_CODE(),"").length() != 0)) {
+//                return false;
+//            } else {
+//                if (nvl(GOF.getCTRL_ROLL_CODE(),"").length() < 4 || nvl(GPO.getCTRL_ROLL_CODE(),"").length() < 4 ||
+//                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(0) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(0) ||
+//                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(2) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(2) ||
+//                        nvl(GOF.getCTRL_ROLL_CODE(),"").charAt(3) != nvl(GPO.getCTRL_ROLL_CODE(),"").charAt(3)) {
+//                    return false;
+//                }
+//            }
+//
+//            //边部形态
+//            //        GGOF.setPROD_SIDE_MARK(p.getPROD_SIDE_MARK());
+//            if (!nvl(GOF.getPROD_SIDE_MARK(),"").equals(nvl(GPO.getPROD_SIDE_MARK(),""))) {
+//                return false;
+//            }
+//
+//            //会检方式代码
+//            //        GGOF.setCHECK_METHOD_CODE(p.getCHECK_METHOD_CODE());
+//            if (!nvl(GOF.getCHECK_METHOD_CODE(),"").equals(nvl(GPO.getCHECK_METHOD_CODE(),""))) {
+//                return false;
+//            }
+//            //验收机关代码
+//            //        GGOF.setACCP_AUTH_CODE(p.getACCP_AUTH_CODE());
+//            if (!nvl(GOF.getACCP_AUTH_CODE(),"").equals(nvl(GPO.getACCP_AUTH_CODE(),""))) {
+//                return false;
+//            }
+//            //最终用户代码
+//            //        GGOF.setFIN_CUST_CODE(p.getFIN_CUST_CODE());
+//            if (!nvl(GOF.getFIN_CUST_CODE(),"").equals(nvl(GPO.getFIN_CUST_CODE(),""))) {
+//                return false;
+//            }
+//
+//            //超声探伤代码
+//            //        GGOF.setULT_CODE(p.getULT_CODE());
+//            if (!nvl(GOF.getULT_CODE(),"").equals(nvl(GPO.getULT_CODE(),""))) {
+//                return false;
+//            }
+//
+//            //四毛交货的合同单独组板
+//            //        GGOF.setTRIM_CODE(p.getTRIM_CODE());
+//            if (!nvl(GOF.getTRIM_CODE(),"").equals(nvl(GPO.getTRIM_CODE(),""))) {
+//                return false;
+//            }
         } catch (Exception ex1) {
             logger.info("错误信息：分组-->" + ex1);
         }
@@ -4873,46 +4873,46 @@ public class SubServiceImpl implements SubService {
     public String SaveData(SlabInfoDO p, List<PmPdSlab> pmPdSlabDOList, List<PmPdPlateCut> pmPdPlateCutDOList, List<PmPdBlockPos> pmPdBlockPosDOList, List<PmPdContSum> pmPdContSumDOList, List<PmSmallPltPos> pmSmallPltPosDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdCont> pmCmdContDOList, List<PmCmdSmallPlt> pmCmdSmallPltDOList, List<PmSubHis> plistpmSubHisDO, List<PmSubOrd> plistpmSubOrdDO, List<PmPdRecDTO> pmPdRecDTOList, Long organizationId) {
 
         String strSubLog = "";
-//        //抛合同事件
-//        String bizId = pmPdRecDTOList.get(0).getKeyvalue1();
-//        String key = String.format(PmPlateConstants.YIELD_EXEC_LOCK_KEY, organizationId.toString(), bizId);
-//        if (redisHelper.hasKey(key)) {
-//            throw new CommonException("pm.pm_pro_cont_043", bizId);
-//        }
-//
-//        PdMatTypeStrategy pdMatTypeStrategy = PdMatTypeStrategyFactory.matchStrategy("S");
-//        try {
-//            // 抛合同组板事件
-//            pmPdRecService.createEvent(organizationId, pmPdRecDTOList
-//                    , PdEventType.HP04, Constants.SYSTEM_PD_CODE, pdMatTypeStrategy.pdProgram());
-//            redisHelper.strSet(key, "1", 30L, TimeUnit.SECONDS);
-//            // 抛组板履历事件
-//            List<PmPdRecDTO> pmPdRecs = new ArrayList<>();
-//            CustomUserDetails userDetails = DetailsHelper.getUserDetails();
-//            for (PmPdContSum contSum : pmPdContSumDOList) {
-//                PmPdRecDTO pmPdRecDTO = new PmPdRecDTO();
-//                pmPdRecDTO.setOrderNo(contSum.getOrderNo());
-//                pmPdRecDTO.setEventMaker(userDetails == null ? "" : userDetails.getUserId().toString());
-//                pmPdRecDTO.setMscLineNo(pmPdRecDTOList.get(0).getMscLineNo());
-//                pmPdRecDTO.setKeyvalue1(bizId);
-//                pmPdRecDTO.setKeyvalue1Desc(PmPdRecDTO.DESC_VIRTUAL_SLAB_NO);
-//                pmPdRecDTO.setMatNo(bizId);
-//                pmPdRecDTO.setQty(contSum.getOrderPlateNum());
-//                pmPdRecs.add(pmPdRecDTO);
-//            }
-//            pmPdRecService.createEvent(organizationId, pmPdRecs, PdEventType.HP10,
-//                    Constants.SYSTEM_PD_CODE, "余材板坯组板");
-//            System.out.println("抛合同组板事件 执行成功");
-//            strSubLog = "-----抛合同组板事件 执行成功";
-//            // 抛合同
-//
-//
-//        } finally {
-//            // 抛合同组板释放事件
-//            pmPdRecService.createEvent(organizationId, pmPdRecDTOList
-//                    , PdEventType.HP05, Constants.SYSTEM_PD_CODE, pdMatTypeStrategy.pdProgram());
-//            redisHelper.delKey(key);
-//        }
+        //抛合同事件
+        String bizId = pmPdRecDTOList.get(0).getKeyvalue1();
+        String key = String.format(PmPlateConstants.YIELD_EXEC_LOCK_KEY, organizationId.toString(), bizId);
+        if (redisHelper.hasKey(key)) {
+            throw new CommonException("pm.pm_pro_cont_043", bizId);
+        }
+
+        PdMatTypeStrategy pdMatTypeStrategy = PdMatTypeStrategyFactory.matchStrategy("S");
+        try {
+            // 抛合同组板事件
+            pmPdRecService.createEvent(organizationId, pmPdRecDTOList
+                    , PdEventType.HP04, Constants.SYSTEM_PD_CODE, pdMatTypeStrategy.pdProgram());
+            redisHelper.strSet(key, "1", 30L, TimeUnit.SECONDS);
+            // 抛组板履历事件
+            List<PmPdRecDTO> pmPdRecs = new ArrayList<>();
+            CustomUserDetails userDetails = DetailsHelper.getUserDetails();
+            for (PmPdContSum contSum : pmPdContSumDOList) {
+                PmPdRecDTO pmPdRecDTO = new PmPdRecDTO();
+                pmPdRecDTO.setOrderNo(contSum.getOrderNo());
+                pmPdRecDTO.setEventMaker(userDetails == null ? "" : userDetails.getUserId().toString());
+                pmPdRecDTO.setMscLineNo(pmPdRecDTOList.get(0).getMscLineNo());
+                pmPdRecDTO.setKeyvalue1(bizId);
+                pmPdRecDTO.setKeyvalue1Desc(PmPdRecDTO.DESC_VIRTUAL_SLAB_NO);
+                pmPdRecDTO.setMatNo(bizId);
+                pmPdRecDTO.setQty(contSum.getOrderPlateNum());
+                pmPdRecs.add(pmPdRecDTO);
+            }
+            pmPdRecService.createEvent(organizationId, pmPdRecs, PdEventType.HP10,
+                    Constants.SYSTEM_PD_CODE, "余材板坯组板");
+            System.out.println("抛合同组板事件 执行成功");
+            strSubLog = "-----抛合同组板事件 执行成功";
+            // 抛合同
+
+
+        } finally {
+            // 抛合同组板释放事件
+            pmPdRecService.createEvent(organizationId, pmPdRecDTOList
+                    , PdEventType.HP05, Constants.SYSTEM_PD_CODE, pdMatTypeStrategy.pdProgram());
+            redisHelper.delKey(key);
+        }
 
 
         if (plistpmSubHisDO.size() > 0) {
@@ -4926,74 +4926,74 @@ public class SubServiceImpl implements SubService {
             strSubLog += "-----pmSubOrd表 保存成功";
         }
 
-//        if (pmPdSlabDOList.size() > 0) {
-//            pmPdSlabRepository.batchInsertSelective(pmPdSlabDOList);
-//            System.out.println("PmPdSlab表 保存成功");
-//            strSubLog += "-----PmPdSlab表 保存成功";
-//        }
-//        if (pmPdPlateCutDOList.size() > 0) {
-//            pmPdPlateCutRepository.batchInsertSelective(pmPdPlateCutDOList);
-//            System.out.println("PmPdPlateCut 大板粗切位置 保存成功");
-//            strSubLog += "-----PmPdPlateCut 大板粗切位置 保存成功";
-//        }
-//        if (pmPdBlockPosDOList.size() > 0) {
-//            pmPdBlockPosRepository.batchInsertSelective(pmPdBlockPosDOList);
-//            System.out.println("PmPdBlockPos 组合子板位置表 保存成功");
-//            strSubLog += "-----PmPdBlockPos 组合子板位置表 保存成功";
-//        }
-//        if (pmPdContSumDOList.size() > 0) {
-//            pmPdContSumRepository.batchInsertSelective(pmPdContSumDOList);
-//            System.out.println("PmPdContSum 合同总量表 保存成功");
-//            strSubLog += "-----PmPdContSum  合同总量表 保存成功";
-//        }
-//        if (pmSmallPltPosDOList.size() > 0) {
-//            pmSmallPltPosRepository.batchInsertSelective(pmSmallPltPosDOList);
-//            System.out.println("PmSmallPltPos 命令小板位置表  保存成功");
-//            strSubLog += "-----PmSmallPltPos  命令小板位置表 保存成功";
-//        }
-//        if (pmCmdSlabDOList.size() > 0) {
-//            pmCmdSlabRepository.batchInsertSelective(pmCmdSlabDOList);
-//            System.out.println("PmCmdSlab 保存成功");
-//            strSubLog += "-----PmCmdSlab 保存成功";
-//        }
-//        if (pmCmdLargePltDOList.size() > 0) {
-//            pmCmdLargePltRepository.batchInsertSelective(pmCmdLargePltDOList);
-//            System.out.println("pmCmdLargePltDO 命令大板 保存成功");
-//            strSubLog += "-----pmCmdLargePltDO 命令大板 保存成功";
-//        }
-//        if (pmCmdContDOList.size() > 0) {
-//            pmCmdContRepository.batchInsertSelective(pmCmdContDOList);
-//            System.out.println("PmCmdCont 命令参数 保存成功");
-//            strSubLog += "-----PmCmdCont  命令参数 保存成功";
-//        }
-//        if (pmCmdSmallPltDOList.size() > 0) {
-//            pmCmdSmallPltRepository.batchInsertSelective(pmCmdSmallPltDOList);
-//            System.out.println("PmCmdSmallPlt 命令小板表 保存成功");
-//            strSubLog += "-----PmCmdSmallPlt  命令小板表 保存成功";
-//        }
-//
-//        // 调用mm接口
-//        // 查询MM_SLAB 信息获取板坯信息
-//        PmPdSlabSplitDTO pmPdSlabSplitDTO = pmPdSlabRepository.selectMmSlabBySlabId(p.getSlabId(), p.getTenantId());
-//        // 查询板坯信息表。第一次查询可能无值
-//        PmPdSlabInfo pmPdSlabInfo = pmPdSlabInfoRepository.selectBySlabNo(p.getSlabNo(), p.getTenantId());
-//
-//        pmPdSlabInfo = buildPmPdSlabInfo(pmPdSlabSplitDTO, p.getSlabNo(), p.getMscLineNo(), p.getTenantId());
-//        pmPdSlabInfoRepository.insertSelective(pmPdSlabInfo);
-//        System.out.println("pmPdSlabInfo表 保存成功");
-//        strSubLog += "-----pmPdSlabInfo表 保存成功";
-//
-//        // 轧钢模块“在制品材料管理封锁事件接口"
-//        callMatStatusModify(pmPdSlabInfo);
-//        System.out.println("mm模块接口 调用成功");
-//        strSubLog += "-----mm模块接口 调用成功";
-//
-//
-//        //抛合同
-//        zbCtEventRec(organizationId, pmPdSlabDOList, pmCmdLargePltDOList, pmCmdSlabDOList, pmSmallPltPosDOList);
-//        System.out.println("抛合同事件完成");
-//        System.out.println("程序执行完成！");
-//        strSubLog += "-----抛合同事件完成  -----程序执行完成！";
+        if (pmPdSlabDOList.size() > 0) {
+            pmPdSlabRepository.batchInsertSelective(pmPdSlabDOList);
+            System.out.println("PmPdSlab表 保存成功");
+            strSubLog += "-----PmPdSlab表 保存成功";
+        }
+        if (pmPdPlateCutDOList.size() > 0) {
+            pmPdPlateCutRepository.batchInsertSelective(pmPdPlateCutDOList);
+            System.out.println("PmPdPlateCut 大板粗切位置 保存成功");
+            strSubLog += "-----PmPdPlateCut 大板粗切位置 保存成功";
+        }
+        if (pmPdBlockPosDOList.size() > 0) {
+            pmPdBlockPosRepository.batchInsertSelective(pmPdBlockPosDOList);
+            System.out.println("PmPdBlockPos 组合子板位置表 保存成功");
+            strSubLog += "-----PmPdBlockPos 组合子板位置表 保存成功";
+        }
+        if (pmPdContSumDOList.size() > 0) {
+            pmPdContSumRepository.batchInsertSelective(pmPdContSumDOList);
+            System.out.println("PmPdContSum 合同总量表 保存成功");
+            strSubLog += "-----PmPdContSum  合同总量表 保存成功";
+        }
+        if (pmSmallPltPosDOList.size() > 0) {
+            pmSmallPltPosRepository.batchInsertSelective(pmSmallPltPosDOList);
+            System.out.println("PmSmallPltPos 命令小板位置表  保存成功");
+            strSubLog += "-----PmSmallPltPos  命令小板位置表 保存成功";
+        }
+        if (pmCmdSlabDOList.size() > 0) {
+            pmCmdSlabRepository.batchInsertSelective(pmCmdSlabDOList);
+            System.out.println("PmCmdSlab 保存成功");
+            strSubLog += "-----PmCmdSlab 保存成功";
+        }
+        if (pmCmdLargePltDOList.size() > 0) {
+            pmCmdLargePltRepository.batchInsertSelective(pmCmdLargePltDOList);
+            System.out.println("pmCmdLargePltDO 命令大板 保存成功");
+            strSubLog += "-----pmCmdLargePltDO 命令大板 保存成功";
+        }
+        if (pmCmdContDOList.size() > 0) {
+            pmCmdContRepository.batchInsertSelective(pmCmdContDOList);
+            System.out.println("PmCmdCont 命令参数 保存成功");
+            strSubLog += "-----PmCmdCont  命令参数 保存成功";
+        }
+        if (pmCmdSmallPltDOList.size() > 0) {
+            pmCmdSmallPltRepository.batchInsertSelective(pmCmdSmallPltDOList);
+            System.out.println("PmCmdSmallPlt 命令小板表 保存成功");
+            strSubLog += "-----PmCmdSmallPlt  命令小板表 保存成功";
+        }
+
+        // 调用mm接口
+        // 查询MM_SLAB 信息获取板坯信息
+        PmPdSlabSplitDTO pmPdSlabSplitDTO = pmPdSlabRepository.selectMmSlabBySlabId(p.getSlabId(), p.getTenantId());
+        // 查询板坯信息表。第一次查询可能无值
+        PmPdSlabInfo pmPdSlabInfo = pmPdSlabInfoRepository.selectBySlabNo(p.getSlabNo(), p.getTenantId());
+
+        pmPdSlabInfo = buildPmPdSlabInfo(pmPdSlabSplitDTO, p.getSlabNo(), p.getMscLineNo(), p.getTenantId());
+        pmPdSlabInfoRepository.insertSelective(pmPdSlabInfo);
+        System.out.println("pmPdSlabInfo表 保存成功");
+        strSubLog += "-----pmPdSlabInfo表 保存成功";
+
+        // 轧钢模块“在制品材料管理封锁事件接口"
+        callMatStatusModify(pmPdSlabInfo);
+        System.out.println("mm模块接口 调用成功");
+        strSubLog += "-----mm模块接口 调用成功";
+
+
+        //抛合同
+        zbCtEventRec(organizationId, pmPdSlabDOList, pmCmdLargePltDOList, pmCmdSlabDOList, pmSmallPltPosDOList);
+        System.out.println("抛合同事件完成");
+        System.out.println("程序执行完成！");
+        strSubLog += "-----抛合同事件完成  -----程序执行完成！";
 
         return strSubLog;
 //