Merge branch 'master' of http://dev.ccwin-in.com:3000/Adient/CD-MES

1 year ago · f253bd338b
11 changed files with 109 additions and 31 deletions
--- a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs
@ -113,7 +113,21 @@ namespace Model
            get;
            set;
        }
-
+        public string MbConfig
+        {
+            get;
+            set;
+        }
+        public string MbOrientation
+        {
+            get;
+            set;
+        }
+        public string CreateTime
+        {
+            get;
+            set;
+        }
    }
 }
 
--- a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
@ -165,5 +165,35 @@ namespace Model
        }

        public string KIN { get; set; }
+
+        private string _MbConfig;
+        /// <summary>
+        /// 门板配置
+        /// </summary>
+        public string MbConfig
+        {
+            get { return _MbConfig; }
+            set { _MbConfig = value; }
+        }
+
+        private string _MbOrientation;
+        /// <summary>
+        /// 门板方位
+        /// </summary>
+        public string MbOrientation
+        {
+            get { return _MbOrientation; }
+            set { _MbOrientation = value; }
+        }
+
+        private string _CreateTime;
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; }
+        }
    }
 }
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@ -4,8 +4,8 @@
    <!--主数据库连接-->

    
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
     
    <!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
    <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
@ -22,7 +22,7 @@
    <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
     -->
   
-    <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
+    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
   
    <!--  <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
    
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
@ -93,7 +93,8 @@ namespace QMAPP.WinForm.Forms.Operation
                    string MATERIAL_CODE = cbMaterial.Text.Split('|')[0];
                    string LINE_CODE = cbMaterial.Text.Split('|')[2];

-//*******************20221009DQZhang 成都补码增加条码规则校验*****************************************************************************************************************
+                    //*******************20221009DQZhang 成都补码增加条码规则校验*****************************************************************************************************************
+                    LINE_CODE = LINE_CODE.Substring(0, 5);
                    if (LINE_CODE.Equals("BC316"))
                    {
                        DataTable dataTable = _agent.InvokeServiceFunction<DataTable>(B9IPCService.BZDConfigBLL_GetAppConfigValue.ToString(), "316BZDRule");
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
@ -10,3 +10,6 @@ PASTECARDNO	String	100
 SCANDATE	String	100	
 PRODUCTCODE	String	100
 LINENO	String	100
+MbConfig	String	100
+MbOrientation	String	100
+CreateTime	String	100
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@ -1851,6 +1851,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                nfpastecard.CREATETIME = DateTime.Now.ToString();
                nfpastecard.PLANTNAME = "DPFY"+pFisType.ToString();

+
            }
            TJEPasteDetailsCard pastdetail = new TJEPasteDetailsCard();
            pastdetail.PASTEDETAILED_CARD_KEY = Guid.NewGuid().ToString();
@ -1871,6 +1872,31 @@ namespace QMAPP.WinForm.Forms.TianJin
            pastdetail.DGVROWINDEX = dgvrowindex;
            pastdetail.LINENO = strvin.Substring(0,3);
            pastdetail.MOULDCODE = strmouldcode;
+
+            string strprodtype = "";
+            if (pFisType == "01")
+            {
+                strprodtype = "( 左 )";
+            }
+            else if (pFisType == "02")
+            {
+                strprodtype = "( 右 )";
+            }
+            else if (pFisType == "03")
+            {
+                strprodtype = "( 前 )";
+            }
+            else if (pFisType == "04")
+            {
+                strprodtype = "( 后 )";
+            }
+            if (strvin.Substring(0, 3) == "770")
+                nfpastecard.MbConfig = strvin.Substring(3, 3);
+            else
+                nfpastecard.MbConfig = strvin.Substring(4, 3);
+            nfpastecard.MbOrientation = strprodtype;
+            nfpastecard.CreateTime = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm");
+
            nfpastecard.DetailsCardlist.Add(pastdetail);
            nflist.Add(pastdetail);
            dgvNF.DataMember = null;
@ -2114,6 +2140,9 @@ namespace QMAPP.WinForm.Forms.TianJin
            dt.Columns.Add("CP5A");
            dt.Columns.Add("PRODUCTIONNAME");
            dt.Columns.Add("LINENO");
+            dt.Columns.Add("MbConfig");
+            dt.Columns.Add("MbOrientation");
+            dt.Columns.Add("CreateTime");
            int index = 1;

            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
@ -2143,6 +2172,14 @@ namespace QMAPP.WinForm.Forms.TianJin
                ncsdr["SCANDATE"] = DateTime.Now.ToString();
                ncsdr["PRODUCTIONNAME"] = strprodtype;
                ncsdr["LINENO"] = tbl.Rows[i]["LINENO"].ToString();
+
+                if (strvin.Substring(0, 3) == "770")
+                    ncsdr["MbConfig"] = strvin.Substring(3, 3);
+                else
+                    ncsdr["MbConfig"] = strvin.Substring(4, 3);
+                ncsdr["MbOrientation"]= strprodtype;
+                ncsdr["CreateTime"] = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm");
+
                dt.Rows.Add(ncsdr);
                index++;
            }
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs
@ -8,21 +8,16 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace QMAPP.WinForm.Forms.TianJin
-{
+namespace QMAPP.WinForm.Forms.DisPatch {
    using System;
    using System.ComponentModel;
    using CrystalDecisions.Shared;
    using CrystalDecisions.ReportSource;
    using CrystalDecisions.CrystalReports.Engine;
    
-    /// <summary>
-    /// 
-    /// </summary>
+    
    public class TJPastCard : ReportClass {
-        /// <summary>
-        /// 
-        /// </summary>
+        
        public TJPastCard() {
        }
        
@ -109,14 +104,10 @@ namespace QMAPP.WinForm.Forms.TianJin
            }
        }
    }
-    /// <summary>
-    /// 
-    /// </summary>
+    
    [System.Drawing.ToolboxBitmapAttribute(typeof(CrystalDecisions.Shared.ExportOptions), "report.bmp")]
    public class TJCachedPastCard : Component, ICachedReport {
-        /// <summary>
-        /// 
-        /// </summary>
+        
        public TJCachedPastCard() {
        }
        
@ -154,7 +145,7 @@ namespace QMAPP.WinForm.Forms.TianJin
        }
        
        public virtual CrystalDecisions.CrystalReports.Engine.ReportDocument CreateReport() {
-            TJPastCard rpt = new TJPastCard();
+            PastCard rpt = new PastCard();
            rpt.Site = this.Site;
            return rpt;
        }
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
--- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
+++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2023.04.02.02")]
-[assembly: AssemblyFileVersion("2023.04.02.02")]
+[assembly: AssemblyVersion("2023.04.27.01")]
+[assembly: AssemblyFileVersion("2023.04.27.01")]
--- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
+++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
@ -837,6 +837,12 @@
    <Compile Include="Forms\RePrint\ReprintForm.Designer.cs">
      <DependentUpon>ReprintForm.cs</DependentUpon>
    </Compile>
+    <Compile Include="Forms\TianJin\TJPastCard.cs">
+      <DependentUpon>TJPastCard.rpt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <SubType>Component</SubType>
+      <DesignTime>True</DesignTime>
+    </Compile>
    <Compile Include="Forms\TianJin\PlanRePrintForm.cs">
      <SubType>Form</SubType>
    </Compile>
@ -879,12 +885,6 @@
    <Compile Include="Forms\TianJin\TJPrintPlanLabel.Designer.cs">
      <DependentUpon>TJPrintPlanLabel.cs</DependentUpon>
    </Compile>
-    <Compile Include="Forms\TianJin\TJPastCard.cs">
-      <DependentUpon>TJPastCard.rpt</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <SubType>Component</SubType>
-      <DesignTime>True</DesignTime>
-    </Compile>
    <Compile Include="Forms\TianJin\TJDefaultDataSetNum.cs">
      <SubType>Form</SubType>
    </Compile>
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@ -64,8 +64,10 @@
    <!--主数据库连接-->


-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
+    
+    
    <!--
    <add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
    <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
@ -88,7 +90,7 @@

   <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->

-    <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
+    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>

    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->