1

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/QP_QLTY_TECH_REPLACE.cs

@@ -0,0 +1,239 @@
+
+using Newtonsoft.Json;
+using SOA.Persistent;
+using System;
+using System.ComponentModel;
+
+namespace ibk.IPD.Entity.IpdPs
+{
+    [Serializable, Table("QP_QLTY_TECH_REPLACE")]
+    [JsonObject]
+    public class QP_QLTY_TECH_REPLACE
+    {
+        [Persistent("MILL_PLT"), DisplayName("")]
+        public string MILL_PLT { get; set; }
+
+
+        [Persistent("ORESTLGRD"), DisplayName("")]
+        public string ORESTLGRD { get; set; }
+
+
+        [Persistent("TGT_STLGRD"), DisplayName("")]
+        public string TGT_STLGRD { get; set; }
+
+
+        [Persistent("SLAB_THK_MIN"), DisplayName("")]
+        public Decimal SLAB_THK_MIN { get; set; }
+
+
+        [Persistent("SLAB_THK_MAX"), DisplayName("")]
+        public Decimal SLAB_THK_MAX { get; set; }
+
+
+        [Persistent("ORD_THK_MIN"), DisplayName("")]
+        public Decimal ORD_THK_MIN { get; set; }
+
+
+        [Persistent("ORD_THK_MAX"), DisplayName("")]
+        public Decimal ORD_THK_MAX { get; set; }
+
+
+        [Persistent("HEAT_TGT_TMP"), DisplayName("")]
+        public int HEAT_TGT_TMP { get; set; }
+
+
+        [Persistent("HEAT_TGT_TMP_MAX"), DisplayName("")]
+        public int HEAT_TGT_TMP_MAX { get; set; }
+
+
+        [Persistent("HEAT_TGT_TMP_MIN"), DisplayName("")]
+        public int HEAT_TGT_TMP_MIN { get; set; }
+
+
+        [Persistent("AVGH_TGT_TMP"), DisplayName("")]
+        public int AVGH_TGT_TMP { get; set; }
+
+
+        [Persistent("AVGH_TGT_TMP_MAX"), DisplayName("")]
+        public int AVGH_TGT_TMP_MAX { get; set; }
+
+
+        [Persistent("AVGH_TGT_TMP_MIN"), DisplayName("")]
+        public int AVGH_TGT_TMP_MIN { get; set; }
+
+
+        [Persistent("MILL_TMP_MIN"), DisplayName("")]
+        public int MILL_TMP_MIN { get; set; }
+
+
+        [Persistent("MILL_TMP_MAX"), DisplayName("")]
+        public int MILL_TMP_MAX { get; set; }
+
+
+        [Persistent("MILL_TMP_TGT"), DisplayName("")]
+        public int MILL_TMP_TGT { get; set; }
+
+
+        [Persistent("AVG_HEAT_TIME_MIN"), DisplayName("")]
+        public Decimal AVG_HEAT_TIME_MIN { get; set; }
+
+
+        [Persistent("COOL_TMP_MIN"), DisplayName("")]
+        public int COOL_TMP_MIN { get; set; }
+
+
+        [Persistent("COOL_TMP_MAX"), DisplayName("")]
+        public int COOL_TMP_MAX { get; set; }
+
+
+        [Persistent("COOL_TMP_TGT"), DisplayName("")]
+        public int COOL_TMP_TGT { get; set; }
+
+
+        [Persistent("UST_FL"), DisplayName("")]
+        public string UST_FL { get; set; }
+
+
+        [Persistent("HOT_LVL_USE"), DisplayName("")]
+        public string HOT_LVL_USE { get; set; }
+
+
+        [Persistent("COOL_TMP_RATE"), DisplayName("")]
+        public int COOL_TMP_RATE { get; set; }
+
+
+        [Persistent("COOL_BED_TMP_TGT"), DisplayName("")]
+        public int COOL_BED_TMP_TGT { get; set; }
+
+
+        [Persistent("CR_CD"), DisplayName("")]
+        public string CR_CD { get; set; }
+
+
+        [Persistent("HEAT_TIME_MAX"), DisplayName("")]
+        public Decimal HEAT_TIME_MAX { get; set; }
+
+
+        [Persistent("HEAT_TIME_MIN"), DisplayName("")]
+        public Decimal HEAT_TIME_MIN { get; set; }
+
+
+        [Persistent("COOL_WAY"), DisplayName("")]
+        public string COOL_WAY { get; set; }
+
+
+        [Persistent("HCR_KND_1"), DisplayName("")]
+        public string HCR_KND_1 { get; set; }
+
+
+        [Persistent("CR_MILL_TMPT1"), DisplayName("")]
+        public int CR_MILL_TMPT1 { get; set; }
+
+
+        [Persistent("CR_MILL_RATET1"), DisplayName("")]
+        public Decimal CR_MILL_RATET1 { get; set; }
+
+
+        [Persistent("COOL_CTL_TYP"), DisplayName("")]
+        public string COOL_CTL_TYP { get; set; }
+
+
+        [Persistent("DEL_STATE"), DisplayName("")]
+        public string DEL_STATE { get; set; }
+
+
+        [Persistent("CR_MILL_TMPT2"), DisplayName("")]
+        public int CR_MILL_TMPT2 { get; set; }
+
+
+        [Persistent("CR_MILL_RATET2"), DisplayName("")]
+        public Decimal CR_MILL_RATET2 { get; set; }
+
+
+        [Persistent("MILL_STD_EDT_NO"), DisplayName("")]
+        public string MILL_STD_EDT_NO { get; set; }
+
+
+        [Persistent("INS_DATE"), DisplayName("")]
+        public string INS_DATE { get; set; }
+
+
+        [Persistent("INS_TIME"), DisplayName("")]
+        public string INS_TIME { get; set; }
+
+
+        [Persistent("INS_EMP"), DisplayName("")]
+        public string INS_EMP { get; set; }
+
+
+        [Persistent("UPD_DATE"), DisplayName("")]
+        public string UPD_DATE { get; set; }
+
+
+        [Persistent("UPD_TIME"), DisplayName("")]
+        public string UPD_TIME { get; set; }
+
+
+        [Persistent("UPD_EMP"), DisplayName("")]
+        public string UPD_EMP { get; set; }
+
+
+        [Persistent("AVG_HEAT_TIME_MAX"), DisplayName("")]
+        public Decimal AVG_HEAT_TIME_MAX { get; set; }
+
+
+        [Persistent("CR_MILL_TMPT2_MIN"), DisplayName("")]
+        public int CR_MILL_TMPT2_MIN { get; set; }
+
+
+        [Persistent("CR_MILL_TMPT2_MAX"), DisplayName("")]
+        public int CR_MILL_TMPT2_MAX { get; set; }
+
+
+        [Persistent("COOLHOT_LOAD"), DisplayName("")]
+        public string COOLHOT_LOAD { get; set; }
+
+
+        [Persistent("DIFFER_CODE"), DisplayName("")]
+        public string DIFFER_CODE { get; set; }
+
+
+        [Persistent("FLG"), DisplayName("")]
+        public string FLG { get; set; }
+
+
+        [Persistent("TAP_TMP_TGT"), DisplayName("")]
+        public int TAP_TMP_TGT { get; set; }
+
+
+        [Persistent("TAP_TMP_MIN"), DisplayName("")]
+        public int TAP_TMP_MIN { get; set; }
+
+
+        [Persistent("TAP_TMP_MAX"), DisplayName("")]
+        public int TAP_TMP_MAX { get; set; }
+
+
+        [Persistent("COOL_RATE"), DisplayName("")]
+        public Decimal COOL_RATE { get; set; }
+
+
+        [Persistent("MES_STDSPEC"), DisplayName("")]
+        public string MES_STDSPEC { get; set; }
+
+        [Persistent("ROLL_GCJX_STEEL"), DisplayName("")]
+        public string ROLL_GCJX_STEEL { get; set; }
+    }
+}
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+
+//namespace PlateAnalysisStandard.Enity
+//{
+//    internal class QP_QLTY_TECH_REPLACE
+//    {
+//    }
+//}

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_LOG.cs

@@ -0,0 +1,48 @@
+using Newtonsoft.Json;
+using SOA.Persistent;
+using System;
+using System.ComponentModel;
+
+namespace ibk.IPD.Entity.IpdPs
+{
+    [Serializable, Table("YCTD_WH_LOG")]
+    [JsonObject]
+    public class YCTD_WH_LOG
+    {
+        [Persistent("PLT"), DisplayName("工厂")]
+        public string PLT { get; set; }
+
+        [Persistent("PLT_NAME"), DisplayName("工厂名称")]
+        public string PLT_NAME { get; set; }
+
+        [Persistent("STANDARD_NO"), DisplayName("标准号")]
+        public string STANDARD_NO { get; set; }
+
+        [Persistent("TD_STANDARD_NO"), DisplayName("替代标准")]
+        public string TD_STANDARD_NO { get; set; }
+
+        [Persistent("TD_FL"), DisplayName("替代分类")]
+        public string TD_FL { get; set; }
+
+        [Persistent("SEQ_NO"), DisplayName("优先顺序")]
+        public string SEQ_NO { get; set; }
+
+        [Persistent("INS_DATE"), DisplayName("录入日期")]
+        public string INS_DATE { get; set; }
+
+        [Persistent("INS_TIME"), DisplayName("录入时刻")]
+        public string INS_TIME { get; set; }
+
+        [Persistent("INS_EMP"), DisplayName("录入人员")]
+        public string INS_EMP { get; set; }
+
+        [Persistent("UPD_DATE"), DisplayName("修改日期")]
+        public string UPD_DATE { get; set; }
+
+        [Persistent("UPD_TIEM"), DisplayName("修改时刻")]
+        public string UPD_TIEM { get; set; }
+
+        [Persistent("UPD_EMP"), DisplayName("修改人员")]
+        public string UPD_EMP { get; set; }
+    }
+}

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO.cs

@@ -16,6 +16,24 @@ namespace ibk.IPD.Entity.IpdPs
         [Persistent("TD_STANDARD_NO"), DisplayName("替代标准")]
         public string TD_STANDARD_NO { get; set; }
 
+        [Persistent("YP_MIN"), DisplayName("屈服最小值")]
+        public decimal YP_MIN { get; set; }
+
+        [Persistent("YP_MAX"), DisplayName("屈服最大值")]
+        public decimal YP_MAX { get; set; }
+
+        [Persistent("YP_RST"), DisplayName("屈服实绩")]
+        public decimal YP_RST { get; set; }
+
+
+        [Persistent("TS_MIN"), DisplayName("拉伸强度最小值")]
+        public decimal TS_MIN { get; set; }
+
+        [Persistent("TS_MAX"), DisplayName("拉伸强度最大值")]
+        public decimal TS_MAX { get; set; }
+
+        [Persistent("TS_RST"), DisplayName("拉伸强度实绩")]
+        public decimal TS_RST { get; set; }
         [Persistent("TD_FL"), DisplayName("替代分类")]
         public string TD_FL { get; set; }
 

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_COPY.cs

@@ -16,6 +16,24 @@ namespace ibk.IPD.Entity.IpdPs
         [Persistent("TD_STANDARD_NO"), DisplayName("替代标准")]
         public string TD_STANDARD_NO { get; set; }
 
+        [Persistent("YP_MIN"), DisplayName("屈服最小值")]
+        public decimal YP_MIN { get; set; }
+
+        [Persistent("YP_MAX"), DisplayName("屈服最大值")]
+        public decimal YP_MAX { get; set; }
+
+        [Persistent("YP_RST"), DisplayName("屈服实绩")]
+        public decimal YP_RST { get; set; }
+
+
+        [Persistent("TS_MIN"), DisplayName("拉伸强度最小值")]
+        public decimal TS_MIN { get; set; }
+
+        [Persistent("TS_MAX"), DisplayName("拉伸强度最大值")]
+        public decimal TS_MAX { get; set; }
+
+        [Persistent("TS_RST"), DisplayName("拉伸强度实绩")]
+        public decimal TS_RST { get; set; }
         [Persistent("TD_FL"), DisplayName("替代分类")]
         public string TD_FL { get; set; }
 

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_TIME.cs

@@ -16,6 +16,27 @@ namespace ibk.IPD.Entity.IpdPs
         [Persistent("TD_STANDARD_NO"), DisplayName("替代标准")]
         public string TD_STANDARD_NO { get; set; }
 
+
+        [Persistent("YP_MIN"), DisplayName("屈服最小值")]
+        public decimal YP_MIN { get; set; }
+
+        [Persistent("YP_MAX"), DisplayName("屈服最大值")]
+        public decimal YP_MAX { get; set; }
+
+        [Persistent("YP_RST"), DisplayName("屈服实绩")]
+        public decimal YP_RST { get; set; }
+
+
+        [Persistent("TS_MIN"), DisplayName("拉伸强度最小值")]
+        public decimal TS_MIN { get; set; }
+
+        [Persistent("TS_MAX"), DisplayName("拉伸强度最大值")]
+        public decimal TS_MAX { get; set; }
+
+        [Persistent("TS_RST"), DisplayName("拉伸强度实绩")]
+        public decimal TS_RST { get; set; }
+
+
         [Persistent("TD_FL"), DisplayName("替代分类")]
         public string TD_FL { get; set; }
 

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/PlateAnalysisStandard.csproj

@@ -195,6 +195,7 @@
     <Compile Include="Enity\TB_PROCESS_DATA.cs" />
     <Compile Include="Enity\TB_SPECIAL_ORD.cs" />
     <Compile Include="Enity\YCTD_WH.cs" />
+    <Compile Include="Enity\YCTD_WH_LOG.cs" />
     <Compile Include="Enity\YCTD_WH_NO.cs" />
     <Compile Include="Enity\YCTD_WH_NO_COPY.cs" />
     <Compile Include="Enity\YCTD_WH_NO_TIME.cs" />

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubController.cs

@@ -3558,6 +3558,13 @@ namespace ibk.IPD.Controller.IPD_PS
                                 yCTD_WH_NO.STANDARD_NO = yCTD.STANDARD_NO;//标准号 
                                 yCTD_WH_NO.TD_STANDARD_NO = yCTD.TD_STANDARD_NO;//替代标准
 
+                                yCTD_WH_NO.YP_MIN = yCTD.YP_MIN;
+                                yCTD_WH_NO.YP_MAX = yCTD.YP_MAX;
+                                yCTD_WH_NO.YP_RST = yCTD.YP_RST;
+                                yCTD_WH_NO.TS_MIN = yCTD.TS_MIN;
+                                yCTD_WH_NO.TS_MAX = yCTD.TS_MAX;
+                                yCTD_WH_NO.TS_RST = yCTD.TS_RST;
+
                                 //yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
                                 //yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
                                 //yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
@@ -3601,6 +3608,12 @@ namespace ibk.IPD.Controller.IPD_PS
                                     //yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
                                     //yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
                                     //yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
+                                    yCTD_WH_NO.YP_MIN = yCTD.YP_MIN;
+                                    yCTD_WH_NO.YP_MAX = yCTD.YP_MAX;
+                                    yCTD_WH_NO.YP_RST = yCTD.YP_RST;
+                                    yCTD_WH_NO.TS_MIN = yCTD.TS_MIN;
+                                    yCTD_WH_NO.TS_MAX = yCTD.TS_MAX;
+                                    yCTD_WH_NO.TS_RST = yCTD.TS_RST;
 
                                     yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;//板坯钢种说明
                                     yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;//订单牌号
@@ -3630,6 +3643,12 @@ namespace ibk.IPD.Controller.IPD_PS
                                     //yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
                                     //yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
                                     //yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
+                                    yCTD_WH_NO.YP_MIN = yCTD.YP_MIN;
+                                    yCTD_WH_NO.YP_MAX = yCTD.YP_MAX;
+                                    yCTD_WH_NO.YP_RST = yCTD.YP_RST;
+                                    yCTD_WH_NO.TS_MIN = yCTD.TS_MIN;
+                                    yCTD_WH_NO.TS_MAX = yCTD.TS_MAX;
+                                    yCTD_WH_NO.TS_RST = yCTD.TS_RST;
 
                                     yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;//板坯钢种说明
                                     yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;//订单牌号
@@ -6793,9 +6812,31 @@ namespace ibk.IPD.Controller.IPD_PS
                         decimal decRate = Math.Round((((Convert.ToDecimal(prorde.ORD_WID) * Convert.ToDecimal(prorde.ORD_LEN) * Convert.ToDecimal(1))
                                                         / (Convert.ToDecimal(prP_PLATE.WID) * Convert.ToDecimal(prP_PLATE.LEN))) * 100), 2);
 
+
                         //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();
 
+                        #region 屈服点和抗拉强度
+
+                        //获取订单的物理特性
+                        List<QP_QLTY_MATR_HA> ltQPQltyMatrHA = gQP_QLTY_MATR_HA.Where(p => p.ORD_NO == prorde.ORD_NO && p.ORD_ITEM == prorde.ORD_ITEM).ToList();
+                        string SlabNo = prP_PLATE.PLATE_NO.Substring(0, 10);
+                        //List<GP_SMP_NO> SMP_NOs = gGP_SMP_NOs.Where(p => p.PLATE_NO.Contains(SlabNo)&&!string.IsNullOrEmpty(p.SMP_NO)).ToList();
+
+                        //获取钢板的物理特性
+                        List<QP_TEST_RSLT_HA> ltQPTestRsltHA = gQP_TEST_RSLT_HA.Where(p => p.SMP_NO == prP_PLATE.SMP_NO && p.TEST_KND == "0").ToList();
+
+
+                        yCTD_WH_NO.YP_MIN = ConverDataToDecimal(ltQPQltyMatrHA[0].YP_MIN);
+                        yCTD_WH_NO.YP_MAX = ConverDataToDecimal(ltQPQltyMatrHA[0].YP_MAX);
+                        yCTD_WH_NO.YP_RST = ConverDataToDecimal(ltQPTestRsltHA[0].YP_RST);
+
+                        yCTD_WH_NO.TS_MIN = ConverDataToDecimal(ltQPQltyMatrHA[0].TS_MIN);
+                        yCTD_WH_NO.TS_MAX = ConverDataToDecimal(ltQPQltyMatrHA[0].TS_MAX);
+                        yCTD_WH_NO.TS_RST = ConverDataToDecimal(ltQPTestRsltHA[0].TS_RST);
+
+                        #endregion
+
                         yCTD_WH_NO.STEEL_GRD_DETAIL = prP_PLATE.STEEL_GRD_DETAIL;//板坯钢种说明
                         yCTD_WH_NO.STDSPEC_STLGRD = prorde.STDSPEC_STLGRD;//订单牌号
                         yCTD_WH_NO.STD_FLG = strYesOrNo;//是否满足异钢种替代工艺   是   否

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubService.cs

@@ -4144,6 +4144,8 @@ namespace ibk.IPD.Service.IPD_PS
             try
             {
                 strSql.AppendLine("SELECT  *  FROM NISCO.YCTD_WH");
+                strSql.AppendLine("UNION");
+                strSql.AppendLine("SELECT  *  FROM NISCO.YCTD_WH_LOG");
                 strSql.AppendLine("WHERE 1=1 ");
                 strSql.AppendLine(strWhereSTD);
 

余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e3c9eb27013f90f3673691b00081b3434425f5f1
+f751502d511bf8da4fc423f45caa7dbe1ee013b1