diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo index 7b8f926..76a262b 100644 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs index 0a09eed..c47bdb5 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs @@ -15928,7 +15928,7 @@ namespace SlabHandle } //####头尾坯不能轧制 宽度大于2450的订单 - if (BOI.ORD_WID > 2450) + if (BOI.ORD_WID >= 2450) { logger.InfoFormat(" ####头尾坯不能轧制 宽度大于2450的订单 :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM); return true; diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs index 5db8421..820a81e 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs @@ -92,7 +92,7 @@ namespace SlabHandle strSql.AppendLine("WHERE 1 = 1 "); //TODO:测试数据 - //strSql.AppendLine(" AND A.SLAB_NO = '2520150232'"); + strSql.AppendLine(" AND A.SLAB_NO = '2530897033'"); /// strSql.AppendLine(" AND A.SLAB_NO = '2331114206'"); diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe index e4d9f1f..db8b3a0 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb index 131b6ff..c08112e 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe index e4d9f1f..db8b3a0 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb index 131b6ff..c08112e 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ diff --git a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo index ff0fe0e..b431e94 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo b/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo index eb420e5..febd0c5 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilService - 复制.cs b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilService - 复制.cs index dc93ff5..65eabbd 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilService - 复制.cs +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilService - 复制.cs @@ -19,40 +19,12 @@ namespace SlabHandle public class SlabCoilService_test { private static readonly ILog logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - string slab_no = " ('2520506606')"; - - string ord_no = "('OME25060012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-003'" + - ",'EMC25060027-011'" + - ",'EMC25060027-010'" + - ",'EMC25050012-006'" + - ",'EMC25050012-006'" + - ",'EMC25050012-005'" + - ",'EMC25050012-142'" + - ",'EMC25050012-142'" + - ",'EMC25050012-141'" + - ",'EMC25050012-145'" + - ",'EMC25050012-145'" + - ",'EMC25050012-144'" + - ",'EMC25050012-143'" + - ",'EMC25050012-143'" + - ",'EMC25050012-006'" + - ",'OME25060011-002'" + - ",'OME25060011-002'" + - ",'OME25060011-001'" + - ",'EMC25050012-146'" + - ",'EMC25050012-146'" + - ",'EMC25050012-141'" + - ",'EMC25050012-141'" + - ",'EMC25050012-004'" + - ",'EMC25050012-004'" + - ",'OME25060012-004'" + - ",'OME25060012-004')"; + string slab_no = " ('2530813935')"; + + string ord_no = "('EMC25080004-124'" + + ",'EMC25080004-122'" + + ",'OME25080006-186'" + + ",'OME25080006-184')"; diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe index 63758cf..7f18f32 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb index bd2b960..2d71b1f 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe index 63758cf..7f18f32 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb index bd2b960..2d71b1f 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ diff --git a/余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo b/余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo index 7a594a0..645dbe5 100644 Binary files a/余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo and b/余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index e05a63b..4be2760 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 374eb2e..b56bbe5 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -929,17 +929,17 @@ namespace ibk.IPD.Controller.IPD_PS if (intPLATE_DAYS_DIFF != 0) { //测试test指定 - //strWHerePlate += " AND GP.PLATE_NO in ('25101286010101')"; + strWHerePlate += " AND GP.PLATE_NO in ('25309251080101')"; - strWHerePlate += " AND (GP.PROD_DATE > TO_CHAR(SYSdate + '" + intPLATE_DAYS_DIFF.ToString() + "' ,'yyyyMMdd') or GP.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT', 'A20051NIQQT', 'A20090NIQQT', 'A20092NIQQT', 'A20093NIQQT')))"; + //strWHerePlate += " AND (GP.PROD_DATE > TO_CHAR(SYSdate + '" + intPLATE_DAYS_DIFF.ToString() + "' ,'yyyyMMdd') or GP.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT', 'A20051NIQQT', 'A20090NIQQT', 'A20092NIQQT', 'A20093NIQQT')))"; } //余材自动替代周期 if (intORD_DAYS_DIFF != 0) { //测试test指定 - //strWHereOrd += " AND boi.ORD_NO='OMB22110001' AND boi.ORD_ITEM='038'"; + strWHereOrd += " AND boi.ORD_NO='OMB22110001' --AND boi.ORD_ITEM='038'"; - strWHereOrd += " AND (boi.CUST_DEL_TO_DATE > TO_CHAR(SYSdate + '" + intORD_DAYS_DIFF.ToString() + "' ,'yyyyMMdd') or boi.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT','A20051NIQQT','A20090NIQQT','A20092NIQQT','A20093NIQQT'))) "; + //strWHereOrd += " AND (boi.CUST_DEL_TO_DATE > TO_CHAR(SYSdate + '" + intORD_DAYS_DIFF.ToString() + "' ,'yyyyMMdd') or boi.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT','A20051NIQQT','A20090NIQQT','A20092NIQQT','A20093NIQQT'))) "; } //获取特殊替代可替代订单数据 gltTBSpecialOrdYes = GetTbSpecialOrd("可替代"); diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs index 01be292..16d6c64 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs @@ -346,7 +346,7 @@ namespace ibk.IPD.Service.IPD_PS //查询可用订单以及常用字段 //测试test指定 - //strSql.AppendLine(" SELECT * from("); + strSql.AppendLine(" SELECT * from("); strSql.AppendLine(" SELECT DISTINCT"); strSql.AppendLine(" ORD_REMARK.REMARK ,"); @@ -519,7 +519,7 @@ namespace ibk.IPD.Service.IPD_PS //strSql.AppendLine(", ORD_REMARK.REMARK "); //测试test指定 - //strSql.AppendLine(") where ORD_NO ='OML24050001' AND ORD_ITEM ='147' "); + strSql.AppendLine(") where ORD_NO ='OMB22110001' --AND ORD_ITEM ='147' "); try { @@ -877,7 +877,7 @@ namespace ibk.IPD.Service.IPD_PS //查询语句日期时间拼接起来格式化成yyyy-mm-dd hh24:mi:ss PROD_WGT //测试test指定 - //strSql.AppendLine("SELECT * from("); + strSql.AppendLine("SELECT * from("); strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); @@ -985,7 +985,7 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("ORDER BY GP.PLATE_NO"); //测试test指定 - //strSql.AppendLine(") where PLATE_NO = '24102504620101'"); + strSql.AppendLine(") where PLATE_NO = '25309251080101'"); try { diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 366a586..e9f2273 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 f8b8a4c..ed4d2e6 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.csproj.AssemblyReference.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index 6eb26ca..5b8de0a 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index 366a586..e9f2273 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 f8b8a4c..ed4d2e6 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ diff --git a/取样并样程序/SubResult/.vs/SubResult/v17/.suo b/取样并样程序/SubResult/.vs/SubResult/v17/.suo index 9f593d0..14fe726 100644 Binary files a/取样并样程序/SubResult/.vs/SubResult/v17/.suo and b/取样并样程序/SubResult/.vs/SubResult/v17/.suo differ diff --git a/取样并样程序/SubResult/SubResult/SurMatSubController.cs b/取样并样程序/SubResult/SubResult/SurMatSubController.cs index 77f6975..0de17af 100644 --- a/取样并样程序/SubResult/SubResult/SurMatSubController.cs +++ b/取样并样程序/SubResult/SubResult/SurMatSubController.cs @@ -1069,6 +1069,11 @@ namespace ibk.IPD { try { + //DZB 不并号，容易冲突 + if (plate.PROC_CD=="DZB") + { + continue; + } //并样存在不做并号 if (ipdi.Where(p => p.PLATE_NO == plate.PLATE_NO).Count() > 0) { diff --git a/取样并样程序/SubResult/SubResult/SurMatSubService.cs b/取样并样程序/SubResult/SubResult/SurMatSubService.cs index 05b553b..d0b19ad 100644 --- a/取样并样程序/SubResult/SubResult/SurMatSubService.cs +++ b/取样并样程序/SubResult/SubResult/SurMatSubService.cs @@ -173,7 +173,7 @@ namespace ibk.IPD strSql.AppendLine(" and length(PLATE_NO) =14 "); //测试test - //strSql.AppendLine(" AND PLATE_NO in ('24302750010204') "); + //strSql.AppendLine(" AND PLATE_NO in ('24109735020603') "); try diff --git a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe index 7d0d43b..1df0fc6 100644 Binary files a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe and b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe differ diff --git a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb index 35b1d21..5c5f0a3 100644 Binary files a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb and b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe index 7d0d43b..1df0fc6 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb index 35b1d21..5c5f0a3 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb differ diff --git a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo index b4daec5..97fe80e 100644 Binary files a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo and b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo differ diff --git a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 8441106..453c200 100644 Binary files a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/炼轧可替代余材/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/炼轧可替代余材/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 3a7ad98..ae42bb3 100644 Binary files a/炼轧可替代余材/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/炼轧可替代余材/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/Enity/YCTD_WH.cs b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/Enity/YCTD_WH.cs index 13e9053..64fbd4c 100644 --- a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/Enity/YCTD_WH.cs +++ b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/Enity/YCTD_WH.cs @@ -44,5 +44,8 @@ namespace ibk.IPD.Entity.IpdPs [Persistent("UPD_EMP"), DisplayName("修改人员")] public string UPD_EMP { get; set; } + + [Persistent("FCB_TD"), DisplayName("船板标准")] + public string FCB_TD { get; set; } } } \ No newline at end of file diff --git a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index ec65d63..3ab987b 100644 --- a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -2238,6 +2238,19 @@ namespace ibk.IPD.Controller.IPD_PS } } } + + //订单标准前面带G1 G2 G3 高表暂时不做切割，请后台管控下。 + if (order.STDSPEC.StartsWith("G1-") || order.STDSPEC.StartsWith("G2-") || order.STDSPEC.StartsWith("G3-")) + { + if (itemGP_PLATE.APLY_STDSPEC == order.STDSPEC && itemGP_PLATE.SUB_FULL == "C") + { + + } + else + { + continue; + } + } //logger.InfoFormat("钢板:{0}，订单号:{1}，协议号:{2},存储临时表", itemGP_PLATE.PLATE_NO, order.ORD_NO, order.ORD_ITEM); //二次试样号先停 @@ -3123,7 +3136,18 @@ namespace ibk.IPD.Controller.IPD_PS } } } + //订单标准前面带G1 G2 G3 高表暂时不做切割，请后台管控下。 + if (order.STDSPEC.StartsWith("G1-") || order.STDSPEC.StartsWith("G2-") || order.STDSPEC.StartsWith("G3-")) + { + if (itemGP_PLATE.APLY_STDSPEC == order.STDSPEC && itemGP_PLATE.SUB_FULL == "C") + { + } + else + { + continue; + } + } //if(i==1) //{ @@ -7260,6 +7284,7 @@ namespace ibk.IPD.Controller.IPD_PS //{ // return true; //} + //船板 if (gQP_STD_HEAD.Where(p => p.STDSPEC == prP_PLATE.APLY_STDSPEC).ToList().Count == 0) { @@ -7369,9 +7394,94 @@ namespace ibk.IPD.Controller.IPD_PS prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/标准"; } + //船板验证 + if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && p.STANDARD_NO == prP_PLATE.APLY_STDSPEC && p.FCB_TD == "是").ToList().Count > 0) + { + //-对非船板替代的标准（标准表维护输入值为“是”） + //-厚度规格≤40mm; + //-碳当量（CEQ）≤0.44 + //- 余材原因：厚度超下限（不替） + if (ConverDataToDecimal(prP_PLATE.THK) > 40) + { + return false; + } + //BAN 厚度超下限 + //QQA 性能不合 + if (prP_PLATE.WOO_RSN == "BAN" + || prP_PLATE.WOO_RSN == "QQA" + || prP_PLATE.WOO_RSN == "BAM" + || prP_PLATE.WOO_RSN == "BAQ" + || prP_PLATE.WOO_RSN == "AFB" + || prP_PLATE.WOO_RSN == "QZE" + || prP_PLATE.WOO_RSN == "QAF" + || prP_PLATE.WOO_RSN == "DAA") + { + return false; + } + + //获取炉号 + string strHeatNo = gFP_SLAB.Where(p => p.SLAB_NO == prP_PLATE.SLAB_NO).ToList().Count > 0 ? gFP_SLAB.Where(p => p.SLAB_NO == prP_PLATE.SLAB_NO).ToList().First().HEAT_NO : ""; + + List ltQPChemRslt = gQP_CHEM_RSLT.Where(p => p.HEAT_NO == strHeatNo && p.CHEM_COMP_CD.Contains("Ceq")).ToList(); + + if (ltQPChemRslt.Count() > 0) + { + foreach (var item in ltQPChemRslt) + { + if (ConverDataToDecimal(item.CHEM_RSLT) > ConverDataToDecimal(0.44)) + { + return false; + } + } + } + else + { + return false; + } + ////记录是船板 + //prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/船板"; + return true; + } + + //20240401 相同标准可替代 + if (prorde.STDSPEC == prP_PLATE.APLY_STDSPEC) + { + if (prP_PLATE.SUB_FULL == "P") + { + if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && p.STANDARD_NO == prP_PLATE.APLY_STDSPEC).ToList().Count > 0) + { + if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && p.STANDARD_NO == prP_PLATE.APLY_STDSPEC && ConverDataToString(p.TD_FL).Contains("完全")).ToList().Count > 0) + { + return false; + } + else + { + return true; + } + } + else + { + return false; + } + } + else + { + if (prP_PLATE.SUB_FULL == "C") + { + //logger.InfoFormat("余材:{0},订单：{1}-{2},标准相同可替代:{3}", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM, prP_PLATE.APLY_STDSPEC); + return true; + } + else + { + return false; + } + + } + } + List ltPlateSTD = null; //余材替代标准按照当前钢板标准来选择，不要按原始订单的标准 注：完全替代之前是按当前标准，现在部分替代一样，只用当前标准 --2023.3.16 刘桂英 - ltPlateSTD = gYCTD_WHs.Where(p => p.STANDARD_NO == prP_PLATE.APLY_STDSPEC).ToList(); + ltPlateSTD = gYCTD_WHs.Where(p => p.STANDARD_NO == prP_PLATE.APLY_STDSPEC && ConverDataToString(p.FCB_TD) == "").ToList(); if (ltPlateSTD.Count == 0) { @@ -7383,24 +7493,48 @@ namespace ibk.IPD.Controller.IPD_PS //gCOM_DATA.Add(CD);//全局变量添加对不结果数据 //20240307 未维护标准信息 - lock (LOCK) - { - if (gYCTD_WH_NO_TIME.Where(p => p.STANDARD_NO == prP_PLATE.APLY_STDSPEC).ToList().Count > 0) - { + //20240401注释 新增异标准维护程序 + //lock (LOCK) + //{ + // if ((prP_PLATE.APLY_STDSPEC.Contains("Q355") || prP_PLATE.APLY_STDSPEC.Contains("Q235")) && (prorde.STDSPEC.Contains("Q355") || prorde.STDSPEC.Contains("Q235"))) + // { + // if (gYCTD_WH_NO_TIME.Where(p => p.STANDARD_NO == prP_PLATE.APLY_STDSPEC && p.TD_STANDARD_NO == prorde.STDSPEC).ToList().Count > 0) + // { - } - else - { - //logger.InfoFormat("余材:{0},订单：{1}-{2},标准:{3},标准未维护", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM, prP_PLATE.APLY_STDSPEC); - YCTD_WH_NO_TIME yCTD_WH_NO = new YCTD_WH_NO_TIME(); - yCTD_WH_NO.STANDARD_NO = prP_PLATE.APLY_STDSPEC;//标准号 - yCTD_WH_NO.TD_STANDARD_NO = "";//替代标准 - yCTD_WH_NO.TD_FL = ""; - yCTD_WH_NO.INS_DATE = DateTime.Now.ToString("yyyyMMddHHmmss");//:读取时间; - yCTD_WH_NO.UPD_DATE = DateTime.Now.ToString("yyyyMMddHHmmss"); - gYCTD_WH_NO_TIME.Add(yCTD_WH_NO); - } - } + // } + // else + // { + // YCTD_WH_NO_TIME yCTD_WH_NO = new YCTD_WH_NO_TIME(); + // yCTD_WH_NO.STANDARD_NO = prP_PLATE.APLY_STDSPEC;//标准号 + // //yCTD_WH_NO.TD_STANDARD_NO = "";//替代标准 + // yCTD_WH_NO.TD_STANDARD_NO = prorde.STDSPEC;//替代标准 + // yCTD_WH_NO.TD_FL = ""; + // yCTD_WH_NO.INS_DATE = DateTime.Now.ToString("yyyyMMddHHmmss");//:读取时间; + // yCTD_WH_NO.UPD_DATE = DateTime.Now.ToString("yyyyMMddHHmmss"); + // gYCTD_WH_NO_TIME.Add(yCTD_WH_NO); + // } + // } + // else + // { + // if (gYCTD_WH_NO_TIME.Where(p => p.STANDARD_NO == prP_PLATE.APLY_STDSPEC).ToList().Count > 0) + // { + + // } + // else + // { + // //logger.InfoFormat("余材:{0},订单：{1}-{2},标准:{3},标准未维护", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM, prP_PLATE.APLY_STDSPEC); + // YCTD_WH_NO_TIME yCTD_WH_NO = new YCTD_WH_NO_TIME(); + // yCTD_WH_NO.STANDARD_NO = prP_PLATE.APLY_STDSPEC;//标准号 + // yCTD_WH_NO.TD_STANDARD_NO = "";//替代标准 + // yCTD_WH_NO.TD_FL = ""; + // yCTD_WH_NO.INS_DATE = DateTime.Now.ToString("yyyyMMddHHmmss");//:读取时间; + // yCTD_WH_NO.UPD_DATE = DateTime.Now.ToString("yyyyMMddHHmmss"); + // gYCTD_WH_NO_TIME.Add(yCTD_WH_NO); + // } + // } + + + //} return false; } @@ -7412,7 +7546,6 @@ namespace ibk.IPD.Controller.IPD_PS { if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && ConverDataToString(p.TD_FL).Contains("完全")).ToList().Count > 0) { - return false; } else @@ -9214,6 +9347,18 @@ namespace ibk.IPD.Controller.IPD_PS { //if (prP_PLATE.APLY_STDSPEC.StartsWith("G1-") || prorder.STDSPEC.StartsWith("G1-")) //特殊钢，只看订单 + if (prorder.STDSPEC.StartsWith("G1-") || prorder.STDSPEC.StartsWith("G2-") || prorder.STDSPEC.StartsWith("G3-")) + { + if (prP_PLATE.APLY_STDSPEC == prorder.STDSPEC && prP_PLATE.SUB_FULL == "C") + { + return true; + } + else + { + return false; + } + } + if (prorder.STDSPEC.StartsWith("G1-")) { if (prP_PLATE.APLY_STDSPEC == prorder.STDSPEC && prP_PLATE.SUB_FULL == "C") diff --git a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index e3078f4..5f532f0 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 1e2abbd..11a0ded 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.csproj.AssemblyReference.cache b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index 1912d75..f84c4c8 100644 Binary files a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index e3078f4..5f532f0 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 1e2abbd..11a0ded 100644 Binary files a/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/炼轧可替代余材/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ diff --git a/统计程序/SubResult/.vs/SubResult/v17/.suo b/统计程序/SubResult/.vs/SubResult/v17/.suo index b3357a4..63b21f6 100644 Binary files a/统计程序/SubResult/.vs/SubResult/v17/.suo and b/统计程序/SubResult/.vs/SubResult/v17/.suo differ diff --git a/统计程序/SubResult/SubResult/App.config b/统计程序/SubResult/SubResult/App.config index 961c21b..32bdc06 100644 --- a/统计程序/SubResult/SubResult/App.config +++ b/统计程序/SubResult/SubResult/App.config @@ -27,7 +27,7 @@ - + diff --git a/统计程序/SubResult/SubResult/Enity/TB_SUB_RESULT.cs b/统计程序/SubResult/SubResult/Enity/TB_SUB_RESULT.cs index 6bb41f5..d5b1467 100644 --- a/统计程序/SubResult/SubResult/Enity/TB_SUB_RESULT.cs +++ b/统计程序/SubResult/SubResult/Enity/TB_SUB_RESULT.cs @@ -46,5 +46,13 @@ namespace SlabHandle.Enity //替代日期 [Persistent("PLT"), DisplayName("工厂")] public string PLT { get; set; } + + //人工吨数 + [Persistent("WGT_M"), DisplayName("人工吨数")] + public decimal? WGT_M { get; set; } + + //系统吨数 + [Persistent("WGT_S"), DisplayName("系统吨数")] + public decimal? WGT_S { get; set; } } } diff --git a/统计程序/SubResult/SubResult/SlabNumService.cs b/统计程序/SubResult/SubResult/SlabNumService.cs index 2686629..9bd2d87 100644 --- a/统计程序/SubResult/SubResult/SlabNumService.cs +++ b/统计程序/SubResult/SubResult/SlabNumService.cs @@ -26,8 +26,8 @@ namespace SlabHandle { private static readonly ILog logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //public static string StartDay = ConfigurationManager.AppSettings["StartDay"].ToString(); - public static string end_time = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); - public static string start_time = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); + public static string end_time = DateTime.Now.AddDays(0).ToString("yyyy-MM-dd"); + public static string start_time = DateTime.Now.AddDays(0).ToString("yyyy-MM-dd"); public static IList GetHisC1RATE_ALL() { StringBuilder strSql = new StringBuilder(); //声明拼接Sql语句变量 @@ -43,7 +43,7 @@ namespace SlabHandle try { - strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE ,'C1' PLT "); + strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT,SUM(wgt_M) AS wgt_M,SUM(wgt_S) AS wgt_S, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE ,'C1' PLT "); strSql.AppendLine("FROM "); strSql.AppendLine("( "); strSql.AppendLine("select count(case when UPD_PGMID LIKE 'ACE%' then 1 else null end) ManmMde_COUNT "); @@ -52,6 +52,8 @@ namespace SlabHandle strSql.AppendLine(",case when sum(case when UPD_PGMID IN ('WEC4005C') then wgt2 else 0 end ) != 0 then sum(case when UPD_PGMID IN ('WEC4005C') then wgt1 else 0 end )/ sum(case when UPD_PGMID IN('WEC4005C') then wgt2 else 0 end ) else 0 end SYS_Yield "); strSql.AppendLine(",case when count(1) != 0 then count(case when UPD_PGMID IN ('WEC4005C') then 1 else null end)/ count(1) else 0 end SYS_PERCENT "); strSql.AppendLine(", TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') SUB_DATE "); + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID LIKE 'ACE%' THEN wgt1 END) wgt_M"); + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID IN('WEC4005C') THEN wgt1 END) wgt_S"); strSql.AppendLine("from(select p.* "); strSql.AppendLine(", (select sum(WGT) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ != '00' AND FSD.SEQ != '00') wgt1 "); strSql.AppendLine(",(select sum(slab_wgt) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ = '00' AND FSD.SEQ = '00' AND FSD.PROC_CD != 'CAC') wgt2 "); @@ -74,7 +76,8 @@ namespace SlabHandle strSql.AppendLine("GROUP BY TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine("order by TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine(") "); - + strSql.AppendLine("GROUP BY SUB_DATE, ManmMde_COUNT, SYS_COUNT, ManmMde_Yield, SYS_Yield, SYS_PERCENT "); + strSql.AppendLine("ORDER BY SUB_DATE "); //开启数据库连接查询数据 using (IDbContext db = ObjectContainer.GetObject("db_sur")) { @@ -176,7 +179,7 @@ namespace SlabHandle try { - strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE,'C2' PLT "); + strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT,SUM(wgt_M) AS wgt_M,SUM(wgt_S) AS wgt_S, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE,'C2' PLT "); strSql.AppendLine("FROM "); strSql.AppendLine("( "); strSql.AppendLine("select count(case when UPD_PGMID LIKE 'WEF%' then 1 else null end) ManmMde_COUNT "); @@ -185,6 +188,8 @@ namespace SlabHandle strSql.AppendLine(",case when sum(case when UPD_PGMID IN ('WEC4004C') then wgt2 else 0 end ) != 0 then sum(case when UPD_PGMID IN ('WEC4004C') then wgt1 else 0 end )/ sum(case when UPD_PGMID IN('WEC4004C') then wgt2 else 0 end ) else 0 end SYS_Yield "); strSql.AppendLine(",case when count(1) != 0 then count(case when UPD_PGMID IN ('WEC4004C') then 1 else null end)/ count(1) else 0 end SYS_PERCENT "); strSql.AppendLine(", TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') SUB_DATE "); + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID LIKE 'WEF%' THEN wgt1 END) wgt_M"); + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID IN('WEC4004C') THEN wgt1 END) wgt_S"); strSql.AppendLine("from(select p.* "); strSql.AppendLine(", (select sum(WGT) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ != '00' AND FSD.SEQ != '00') wgt1 "); strSql.AppendLine(",(select sum(slab_wgt) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ = '00' AND FSD.SEQ = '00' AND FSD.PROC_CD != 'CAC') wgt2 "); @@ -206,7 +211,8 @@ namespace SlabHandle strSql.AppendLine("GROUP BY TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine("order by TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine(") "); - + strSql.AppendLine("GROUP BY SUB_DATE, ManmMde_COUNT, SYS_COUNT, ManmMde_Yield, SYS_Yield, SYS_PERCENT "); + strSql.AppendLine("ORDER BY SUB_DATE "); //开启数据库连接查询数据 using (IDbContext db = ObjectContainer.GetObject("db_sur")) { @@ -249,7 +255,7 @@ namespace SlabHandle try { //每个日期统计数量 - foreach (SLAB_DATE iSlabDate in ltSlabDate.Where(p => p.INS_DATE == iDate.INS_DATE).OrderBy(p=>p.MAT_NO).ToList()) + foreach (SLAB_DATE iSlabDate in ltSlabDate.Where(p => p.INS_DATE == iDate.INS_DATE).OrderBy(p => p.MAT_NO).ToList()) { //没有记录 减一 @@ -309,7 +315,7 @@ namespace SlabHandle try { - strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE,'C3' PLT "); + strSql.AppendLine(" SELECT ManmMde_COUNT, SYS_COUNT,SUM(wgt_M) AS wgt_M,SUM(wgt_S) AS wgt_S, nvl(TO_CHAR(ManmMde_Yield * 100, 'FM9999999990.00'), 0) ManmMde_Yield, nvl(TO_CHAR(SYS_Yield * 100, 'FM9999999990.00'), 0) SYS_Yield, nvl(TO_CHAR(SYS_PERCENT * 100, 'FM9999999990.00'), 0) SYS_PERCENT , SUB_DATE,'C3' PLT "); strSql.AppendLine("FROM "); strSql.AppendLine("( "); strSql.AppendLine("select count(case when UPD_PGMID LIKE 'CEF%' then 1 else null end) ManmMde_COUNT "); @@ -318,6 +324,9 @@ namespace SlabHandle strSql.AppendLine(",case when sum(case when UPD_PGMID IN ('WEC4003C') then wgt2 else 0 end ) != 0 then sum(case when UPD_PGMID IN ('WEC4003C') then wgt1 else 0 end )/ sum(case when UPD_PGMID IN('WEC4003C') then wgt2 else 0 end ) else 0 end SYS_Yield "); strSql.AppendLine(",case when count(1) != 0 then count(case when UPD_PGMID IN ('WEC4003C') then 1 else null end)/ count(1) else 0 end SYS_PERCENT "); strSql.AppendLine(", TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') SUB_DATE "); + + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID LIKE 'CEF%' THEN wgt1 END) wgt_M"); + strSql.AppendLine(",SUM(CASE WHEN UPD_PGMID IN('WEC4003C') THEN wgt1 END) wgt_S"); strSql.AppendLine("from(select p.* "); strSql.AppendLine(", (select sum(WGT) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ != '00' AND FSD.SEQ != '00') wgt1 "); strSql.AppendLine(",(select sum(slab_wgt) from nisco.FP_slab_des FSD where FSD.slab_no = P.MAT_NO AND FSD.BLOCK_SEQ = '00' AND FSD.SEQ = '00' AND FSD.PROC_CD != 'CAC') wgt2 "); @@ -340,7 +349,8 @@ namespace SlabHandle strSql.AppendLine("GROUP BY TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine("order by TO_CHAR(TO_DATE(ins_date, 'yyyy-MM-dd HH24:mi:ss'), 'yyyy-MM-dd') "); strSql.AppendLine(") "); - + strSql.AppendLine("GROUP BY SUB_DATE, ManmMde_COUNT, SYS_COUNT, ManmMde_Yield, SYS_Yield, SYS_PERCENT "); + strSql.AppendLine("ORDER BY SUB_DATE "); //开启数据库连接查询数据 using (IDbContext db = ObjectContainer.GetObject("db_sur")) { @@ -504,6 +514,31 @@ namespace SlabHandle } } } + + public static void UpdateInfo(IList ltFSD) + { + using (IDbContext db = ObjectContainer.GetObject("db")) + { + try + { + //因为是同时操作两个表, 所以开启事务 + db.BeginTransaction(); + foreach (var item in ltFSD) + { + db.Execute("UPDATE TB_SUB_RESULT SET WGT_M='" + item.WGT_M + "',WGT_S='" + item.WGT_S + "' WHERE PLT='" + item.PLT + "' AND SUB_DATE='" + item.SUB_DATE + "'"); + } + //db.Execute("UPDATE TB_SUB_RESULT SET WGT_M='" + ltFSD"'"); + db.Commit(); + } + catch (Exception ex) + { + //数据如果发生错误则回滚 + db.Rollback(); + logger.ErrorFormat("存储错误！信息：{0}", ex.ToString()); + } + } + } + #region 方法 diff --git a/统计程序/SubResult/SubResult/SubResultControler.cs b/统计程序/SubResult/SubResult/SubResultControler.cs index 5b85b77..37d2d25 100644 --- a/统计程序/SubResult/SubResult/SubResultControler.cs +++ b/统计程序/SubResult/SubResult/SubResultControler.cs @@ -100,12 +100,16 @@ namespace SlabHandle { if (tB_SUB_RESULTs_HIS.Where(p => p.SUB_DATE == INS_DATE).Count() > 0) { - logger.Info("删除"+ INS_DATE+"数据"); + logger.Info("删除" + INS_DATE + "数据"); SlabNumService.deleteInfo(INS_DATE); } logger.Info("插入" + INS_DATE + "数据"); - SlabNumService.SaveInfo(tB_SUB_RESULTs.Where(p=>p.SUB_DATE== INS_DATE).ToList()); + SlabNumService.SaveInfo(tB_SUB_RESULTs.Where(p => p.SUB_DATE == INS_DATE).ToList()); } + + + //SlabNumService.UpdateInfo(tB_SUB_RESULTs); + } diff --git a/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe b/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe index 2f6b911..1469819 100644 Binary files a/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe and b/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe differ diff --git a/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe.config b/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe.config index f1b3d00..6e7a530 100644 --- a/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe.config +++ b/统计程序/SubResult/SubResult/bin/Debug/SubResult.exe.config @@ -27,7 +27,7 @@ - + @@ -113,6 +113,8 @@ + + diff --git a/统计程序/SubResult/SubResult/bin/Debug/SubResult.pdb b/统计程序/SubResult/SubResult/bin/Debug/SubResult.pdb index eb618b7..517568d 100644 Binary files a/统计程序/SubResult/SubResult/bin/Debug/SubResult.pdb and b/统计程序/SubResult/SubResult/bin/Debug/SubResult.pdb differ diff --git a/统计程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/统计程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 51589ea..696a93a 100644 Binary files a/统计程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/统计程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache index f134e5d..4e53663 100644 Binary files a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache and b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache differ diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache index cdc5780..f4f3c0c 100644 --- a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache +++ b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -123ee2c6ff412bb1bc2055e1576e5777b6ece3e1 +bc924b3d52651b206582dd4343a6600f5a29804c diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt index c9cabca..03c7dc8 100644 --- a/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt +++ b/统计程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt @@ -61,3 +61,23 @@ D:\新建文件夹\ipd-file\SubResult\SubResult\obj\Debug\SubResult.csproj.CoreC D:\新建文件夹\ipd-file\SubResult\SubResult\obj\Debug\SubResult.csproj.CopyComplete D:\新建文件夹\ipd-file\SubResult\SubResult\obj\Debug\SubResult.exe D:\新建文件夹\ipd-file\SubResult\SubResult\obj\Debug\SubResult.pdb +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.exe +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.pdb +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\log4net.config +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\SubResult.exe.config +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\SubResult.exe +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\SubResult.pdb +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\Google.OrTools.x86.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\Google.OrTools.x86.pdb +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\Google.Protobuf.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.exe.config +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\统计程序\SubResult\SubResult\obj\Debug\SubResult.csproj.CopyComplete diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe b/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe index 2f6b911..1469819 100644 Binary files a/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe and b/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe differ diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe.config b/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe.config index f1b3d00..6e7a530 100644 --- a/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe.config +++ b/统计程序/SubResult/SubResult/obj/Debug/SubResult.exe.config @@ -27,7 +27,7 @@ - + @@ -113,6 +113,8 @@ + + diff --git a/统计程序/SubResult/SubResult/obj/Debug/SubResult.pdb b/统计程序/SubResult/SubResult/obj/Debug/SubResult.pdb index eb618b7..517568d 100644 Binary files a/统计程序/SubResult/SubResult/obj/Debug/SubResult.pdb and b/统计程序/SubResult/SubResult/obj/Debug/SubResult.pdb differ diff --git a/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.dgspec.json b/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.dgspec.json index 418e269..aa24592 100644 --- a/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.dgspec.json +++ b/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.dgspec.json @@ -1,24 +1,24 @@ { "format": 1, "restore": { - "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj": {} + "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj": {} }, "projects": { - "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj": { + "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj", + "projectUniqueName": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj", "projectName": "SubResult", - "projectPath": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj", - "packagesPath": "C:\\Users\\sukura\\.nuget\\packages\\", - "outputPath": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\obj\\", + "projectPath": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj", + "packagesPath": "C:\\Users\\vaibl\\.nuget\\packages\\", + "outputPath": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\obj\\", "projectStyle": "PackageReference", "skipContentFileWrite": true, "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\sukura\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vaibl\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -53,6 +53,9 @@ "win": { "#import": [] }, + "win-arm64": { + "#import": [] + }, "win-x64": { "#import": [] }, diff --git a/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.g.props b/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.g.props index d2c7f7a..4d49cab 100644 --- a/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.g.props +++ b/统计程序/SubResult/SubResult/obj/SubResult.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\sukura\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\vaibl\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.3.0 + 6.7.0 - + \ No newline at end of file diff --git a/统计程序/SubResult/SubResult/obj/project.assets.json b/统计程序/SubResult/SubResult/obj/project.assets.json index 21a194c..5dda780 100644 --- a/统计程序/SubResult/SubResult/obj/project.assets.json +++ b/统计程序/SubResult/SubResult/obj/project.assets.json @@ -75,6 +75,40 @@ } } }, + ".NETFramework,Version=v4.7.2/win-arm64": { + "Google.OrTools.runtime.win-x64/9.5.2237": { + "type": "package" + }, + "Google.OrTools.x86/5.0.6170.24109": { + "type": "package", + "dependencies": { + "Google.Protobuf": "3.0.0" + }, + "compile": { + "lib/net40/Google.OrTools.x86.dll": { + "related": ".pdb" + } + }, + "runtime": { + "lib/net40/Google.OrTools.x86.dll": { + "related": ".pdb" + } + } + }, + "Google.Protobuf/3.0.0": { + "type": "package", + "compile": { + "lib/net45/Google.Protobuf.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net45/Google.Protobuf.dll": { + "related": ".xml" + } + } + } + }, ".NETFramework,Version=v4.7.2/win-x64": { "Google.OrTools.runtime.win-x64/9.5.2237": { "type": "package", @@ -197,24 +231,24 @@ ] }, "packageFolders": { - "C:\\Users\\sukura\\.nuget\\packages\\": {}, + "C:\\Users\\vaibl\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj", + "projectUniqueName": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj", "projectName": "SubResult", - "projectPath": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj", - "packagesPath": "C:\\Users\\sukura\\.nuget\\packages\\", - "outputPath": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\obj\\", + "projectPath": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj", + "packagesPath": "C:\\Users\\vaibl\\.nuget\\packages\\", + "outputPath": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\obj\\", "projectStyle": "PackageReference", "skipContentFileWrite": true, "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\sukura\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vaibl\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -249,6 +283,9 @@ "win": { "#import": [] }, + "win-arm64": { + "#import": [] + }, "win-x64": { "#import": [] }, diff --git a/统计程序/SubResult/SubResult/obj/project.nuget.cache b/统计程序/SubResult/SubResult/obj/project.nuget.cache index 4e569cf..f218048 100644 --- a/统计程序/SubResult/SubResult/obj/project.nuget.cache +++ b/统计程序/SubResult/SubResult/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "GdS9+eXkcK+k8BoR8XxSL9wWeKyCgyZJ7Gvd0L5SPjwsKP3ZYmsppbHAGwN1TFEo6Wn8RARs/Nqm6EqiUeYz2Q==", + "dgSpecHash": "DVuRPvKtw27vsJZwXE0XDIaGNcuqFDTBHG5s4PuYuI8v9OPNAelq3zhjviz4VSvjTZQ3Xo1KC6N15RKQJEqnLA==", "success": true, - "projectFilePath": "D:\\新建文件夹\\ipd-file\\SubResult\\SubResult\\SubResult.csproj", + "projectFilePath": "D:\\_NG_1\\NG_Project\\统计程序\\SubResult\\SubResult\\SubResult.csproj", "expectedPackageFiles": [ - "C:\\Users\\sukura\\.nuget\\packages\\google.ortools.runtime.win-x64\\9.5.2237\\google.ortools.runtime.win-x64.9.5.2237.nupkg.sha512", - "C:\\Users\\sukura\\.nuget\\packages\\google.ortools.x86\\5.0.6170.24109\\google.ortools.x86.5.0.6170.24109.nupkg.sha512", - "C:\\Users\\sukura\\.nuget\\packages\\google.protobuf\\3.0.0\\google.protobuf.3.0.0.nupkg.sha512" + "C:\\Users\\vaibl\\.nuget\\packages\\google.ortools.runtime.win-x64\\9.5.2237\\google.ortools.runtime.win-x64.9.5.2237.nupkg.sha512", + "C:\\Users\\vaibl\\.nuget\\packages\\google.ortools.x86\\5.0.6170.24109\\google.ortools.x86.5.0.6170.24109.nupkg.sha512", + "C:\\Users\\vaibl\\.nuget\\packages\\google.protobuf\\3.0.0\\google.protobuf.3.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file