diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 456a1d5..4ba9b53 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/Enity/GP_PLATE.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/Enity/GP_PLATE.cs index bd3679b..80febe5 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/Enity/GP_PLATE.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/Enity/GP_PLATE.cs @@ -17,6 +17,10 @@ namespace ibk.IPD.Entity.IpdPs [Persistent("OCCR_CD"), DisplayName("发生代码")] public string OCCR_CD { get; set; } + //焊接标识 + [Persistent("HJ_FLG"), DisplayName("焊接标识")] + public string HJ_FLG { get; set; } + //厚度公差最小值 [Persistent("THK_TOL_MIN"), DisplayName("厚度公差最小值")] public string THK_TOL_MIN { get; set; } diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 9b3de60..7a39c06 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -1532,13 +1532,7 @@ namespace ibk.IPD.Controller.IPD_PS foreach (BP_ORDER_ITEM order in orderEntities) { - //验证订单状态 - if (order.REC_STS != "2") - { - logger.InfoFormat("订单状态：{0}-{1}-{2}", order.ORD_NO, order.ORD_ITEM, order.REC_STS); - continue; - } - + //测试 //logger.InfoFormat("订单：{0}-{1}", order.ORD_NO, order.ORD_ITEM); #region 线程 @@ -1566,8 +1560,16 @@ namespace ibk.IPD.Controller.IPD_PS int intLackNum = Convert.ToInt32(order.SUB_LACK_NUM);//欠量 intLackNum = SetSubNum(order); intLackNum -= GetSubNum(order);//减掉待确认数据=实际欠量 - //测试test - //intLackNum = 1; + //测试test + //intLackNum = 1; + + + //验证订单状态 + if (order.REC_STS != "2") + { + logger.InfoFormat("订单状态：{0}-{1}-{2}", order.ORD_NO, order.ORD_ITEM, order.REC_STS); + return; + } #region 协议替代 @@ -9133,6 +9135,21 @@ namespace ibk.IPD.Controller.IPD_PS decimal exceedingTHK = 0;//下限超限量 decimal thkmax = 0;//最大厚度 decimal thkmin = 0;//最小厚度 + + //焊接判断 2025年9月21日追加 不允许补焊 + if (prP_PLATE.HJ_FLG == "1" && (prorde.REMARK.Contains("不允许补焊") || prorde.COLOR_STROKE.Contains("不允许补焊")) ) + { + COM_DATA CD = new COM_DATA(); + CD.PLATE_NO = prP_PLATE.PLATE_NO; + CD.ORD_NO = prorde.ORD_NO; + CD.ORD_ITEM = prorde.ORD_ITEM; + CD.Thk = "1"; //标准替代没有信息 + //gCOM_DATA.Add(CD);//全局变量添加对不结果数据 + logger.InfoFormat("钢板:{0}，订单号:{1}-{2},订单备注：{3}, 判断不允许补焊", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM, prorde.REMARK); + + return false; + } + THK_TOLER_INTER zpcd = gltGCJJ.Where(p => p.PLT == prP_PLATE.PLT).FirstOrDefault(); if (!string.IsNullOrEmpty(zpcd.LOWER_LIMIT_EXCEEDING)) { diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs index 50655eb..01be292 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs @@ -881,7 +881,9 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); - strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); + strSql.AppendLine(",CASE WHEN(SELECT COUNT(*) FROM nisco.GP_BH_INSPLATE GBI WHERE GBI.MAT_NO= GP.PLATE_NO)> 0 THEN '1' ELSE '0' END HJ_FLG"); + + strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); strSql.AppendLine(",(SELECT COUNT(*) "); strSql.AppendLine(" FROM NISCO.GP_USTRESULT GU "); strSql.AppendLine(" WHERE GU.PLATE_NO = TRIM(GP.PLATE_NO) "); @@ -1015,6 +1017,8 @@ namespace ibk.IPD.Service.IPD_PS //strSql.AppendLine("SELECT * from("); strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); + strSql.AppendLine(",CASE WHEN(SELECT COUNT(*) FROM nisco.GP_BH_INSPLATE GBI WHERE GBI.MAT_NO= GP.PLATE_NO)> 0 THEN '1' ELSE '0' END HJ_FLG"); + strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); strSql.AppendLine(",(SELECT COUNT(*) "); strSql.AppendLine(" FROM NISCO.GP_USTRESULT GU "); @@ -1317,6 +1321,7 @@ namespace ibk.IPD.Service.IPD_PS //查询语句日期时间拼接起来格式化成yyyy-mm-dd hh24:mi:ss PROD_WGT strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); + strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); strSql.AppendLine(",(SELECT COUNT(*) "); strSql.AppendLine(" FROM NISCO.GP_USTRESULT GU "); diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs index 36d81e5..cfd9a1b 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs @@ -888,6 +888,8 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); + strSql.AppendLine(",CASE WHEN(SELECT COUNT(*) FROM nisco.GP_BH_INSPLATE GBI WHERE GBI.MAT_NO= GP.PLATE_NO)> 0 THEN '1' ELSE '0' END HJ_FLG"); + strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); strSql.AppendLine(",(SELECT COUNT(*) "); strSql.AppendLine(" FROM NISCO.GP_USTRESULT GU "); @@ -1022,6 +1024,8 @@ namespace ibk.IPD.Service.IPD_PS //strSql.AppendLine("SELECT * from("); strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); + strSql.AppendLine(",CASE WHEN(SELECT COUNT(*) FROM nisco.GP_BH_INSPLATE GBI WHERE GBI.MAT_NO= GP.PLATE_NO)> 0 THEN '1' ELSE '0' END HJ_FLG"); + strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); strSql.AppendLine(",(SELECT COUNT(*) "); strSql.AppendLine(" FROM NISCO.GP_USTRESULT GU "); diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 61d6339..f086ead 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb index 8f43630..2cd6597 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index 61d6339..f086ead 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb index 8f43630..2cd6597 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ