yangle
2024-01-05 a88c2dbb327d3a3a0b9a9bcc91ce4f31450159ba
自动同步
定时保存 优化
1个文件已添加
30个文件已修改
173 ■■■■■ 已修改文件
WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs
@@ -38,15 +38,15 @@
        }
        public DBHelper()
        {
            sServer = "47.96.97.237,15127";
            sDataBase = "HX_LMESsys";
            sUser = "HX_USER";
            sPassword = "lc@841022";
            //斯莫尔
            //sServer = "10.11.18.195";
            //sDataBase = "HX_LMESsys_test";
            //sServer = "47.96.97.237,15127";
            //sDataBase = "HX_LMESsys";
            //sUser = "HX_USER";
            //sPassword = "lc@841022";
            //斯莫尔
            sServer = "10.11.18.195";
            sDataBase = "HX_LMESsys_test";
            sUser = "HX_USER";
            sPassword = "lc@841022";
        }
        private bool CnOpen()//OPEN数据库连接
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs
@@ -112,12 +112,12 @@
            // 
            // timer1
            // 
            this.timer1.Interval = 3000;
            this.timer1.Interval = 15000;
            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
            // 
            // txtHBath
            // 
            this.txtHBath.Location = new System.Drawing.Point(604, 141);
            this.txtHBath.Location = new System.Drawing.Point(604, 140);
            this.txtHBath.Name = "txtHBath";
            this.txtHBath.ReadOnly = true;
            this.txtHBath.Size = new System.Drawing.Size(82, 28);
@@ -164,6 +164,7 @@
            this.HSouce.Name = "HSouce";
            this.HSouce.Size = new System.Drawing.Size(118, 28);
            this.HSouce.TabIndex = 24;
            this.HSouce.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HSouce_KeyDown);
            // 
            // label2
            // 
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -45,7 +45,7 @@
                else
                {
                    string HProjectNum = ds.Tables[0].Rows[0]["HProjectNum"].ToString();
                    this.txtHBath.Text = HProjectNum;
                    this.txtHBath.Text = HProjectNum.Split('-')[0];
                    this.txtHBardCode.ReadOnly = true;
                }
            }
@@ -115,22 +115,26 @@
        private void btnReadData_Click(object sender, EventArgs e)
        {
            if (this.HEmpCode.Text == "" || this.txtHBath.Text == "")
            if (this.HEmpCode.Text == "" || this.txtHBath.Text == ""|| this.HSouceName.Text == "")
            {
                MessageBox.Show("请输入员工编码或者条形码!");
                MessageBox.Show("请输入生产资源,员工编码,者条形码!");
            }
            else {
                if (num == 0)
                {
                    this.btnReadData.Text = "暂停";
                    this.timer1.Enabled = true;
                    this.btnGH.Enabled = false;
                    this.btnSelect.Enabled = false;
                    num = 1;
                }
                else if (num == 1)
                {
                    this.btnReadData.Text = "启动";
                    this.timer1.Enabled = false;
                    this.btnGH.Enabled = true;
                    this.btnSelect.Enabled = true;
                    num = 0;
                }
            }
@@ -140,8 +144,7 @@
        {
            if (this.HEmpCode.Text == ""|| this.txtHBath.Text == "")
            {
                MessageBox.Show("请输入员工编码或者条形码!");
                MessageBox.Show("请输入员工编码或者流转卡!");
            }
            else
            {
@@ -152,9 +155,15 @@
        //读取csv格式文件
        private void ReadCsv()
        {
            string Date = DateTime.Now.ToString("yyMMdd");
            string HBath = this.txtHBath.Text;
            string csv_file_path = $@"C:\Users\admin\Desktop\新建文件夹 (2)\20231123.csv";
            //string csv_file_path = $@"D:\THLCR_Data\{HBath}\20231123.csv";
            //注:斯莫尔组装3 在E盘  _332009
            //其余在D盘 _C332001_2M
            //string csv_file_path = $@"C:\Users\admin\Desktop\新建文件夹 (2)\20231123.csv";
            string csv_file_path = $@"D:\THLCR_Data\{HBath}\{HBath}_{Date}_C332001_2M.csv"; //组装1 组装2路径
            //string csv_file_path = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009.csv";  //组装3路径
            bool flag = File.Exists(csv_file_path);
            if (flag)
@@ -189,7 +198,7 @@
                parser.Close();
                //获取当前时间
                DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-100).ToString("yyyy-MM-dd  HH:mm:ss"));
                DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-1).ToString("yyyy-MM-dd  HH:mm:ss"));
                DateTime EndTime = DateTime.Parse(DateTime.Now.AddMinutes(1).ToString("yyyy-MM-dd  HH:mm:00"));
                foreach (DataRow item in dt.Rows)
@@ -197,16 +206,16 @@
                    DateTime NowTime = DateTime.Parse(item["测试时间"].ToString());
                    string HBadCodeSN = item["序号"].ToString();
                    if (NowTime >= ActionTime && NowTime < EndTime && HBadCodeSN != "")
                    if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
                    {
                        string HSourceCode = "9994";//设备编号 组装1 9994 组装2 9995 组装3 9996
                        string HSourceCode = this.HSouce.Text; //设备编号 组装1 9994 组装2 9995 组装3 9996
                        string HEmpCode = this.HEmpCode.Text;
                        string HBarCode = item["序号"].ToString();
                        string HCreateTime = item["测试时间"].ToString();
                        string HDate = DateTime.Parse(item["测试时间"].ToString()).ToString("yyyy-MM-dd");
                        string HResult = item["分选"].ToString() == "PASS" ? "OK" : "NG";
                        string HProcNumber = "105";
                        string HProcNumber = "005";
                        int HFlag = 0;
                        //string HEmpCode = "";
                        if (HBadCodeSN != "")
@@ -227,7 +236,7 @@
                        for (int i = 0; i < dt.Columns.Count; i++)
                        {
                            if (dt.Columns[i].ColumnName.Contains("Ls"))
                            if (dt.Columns[i].ColumnName.Contains("Hz"))
                            {
                                string HType = dt.Columns[i].ColumnName;
                                string HCount = item[HType].ToString();
@@ -247,5 +256,39 @@
                }
            }
        }
        //生产资源回车
        private void HSouce_KeyDown(object sender, KeyEventArgs e)
        {
            if (e.KeyCode == Keys.Enter)
            {
                SelectHSouc(this.HSouce.Text);
            }
        }
        //查询生产资源
        public void SelectHSouc(string HNumber)
        {
            try
            {
                DataSet ds = oCN.RunProcReturn("select  * from Gy_Source where HNumber='" + HNumber + "' ", "Gy_Source");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    MessageBox.Show("查无数据!");
                }
                else
                {
                    string HSouceName = ds.Tables[0].Rows[0]["HName"].ToString();
                    string HSouceNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
                    this.HSouceName.Text = HSouceName;
                    this.HSouce.Text = HSouceNumber;
                    this.HSouce.ReadOnly = true;
                }
            }
            catch (Exception e)
            {
                MessageBox.Show(this, e.Message, "提示");
            }
        }
    }
}
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
@@ -108,7 +108,7 @@
            // 
            // timer1
            // 
            this.timer1.Interval = 3000;
            this.timer1.Interval = 15000;
            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
            // 
            // HSouceName
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx
@@ -118,6 +118,6 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
    <value>19, 21</value>
  </metadata>
</root>
WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
@@ -11,6 +11,7 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -23,7 +24,6 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
@@ -7,10 +7,10 @@
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\Newtonsoft.Json.xml
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.AssemblyReference.cache
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.Properties.Resources.resources
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV.resources
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadyDataForm.resources
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.GenerateResource.cache
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CoreCompileInputs.cache
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CopyComplete
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.exe
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.pdb
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV.resources
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
Binary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
@@ -38,7 +38,7 @@
            // timer1
            // 
            timer1.Enabled = true;
            timer1.Interval = 5000;
            timer1.Interval = 15000;
            timer1.Tick += new System.EventHandler(this.timer1_Tick);
            // 
            // btnReadData
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -104,9 +104,9 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                string HBadCodeSN = dic["HBarCode"].ToString();
                CustomWriteLog("条码:" + HBadCodeSN + ",错误原因:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                return false;
            }
        }
@@ -121,7 +121,7 @@
                HBadCodeSN = TM_ZH(HBadCodeSN);
                num = SNHBardCodeList(HBadCodeSN);
                if (num == 0)
                if (num == 0 || num == 1)
                {
                    flag = getOutBillAdd(dic, HBadCodeSN, "NG");
@@ -133,13 +133,6 @@
                        oCN.RunProc("update Gy_BarCodeBill set HStatus='不良',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
                    }
                }
                else if (num == 1)
                {
                    //条码存在 生成不良汇报单
                    flag = getBadBillAdd(dic);
                    //反写条码状态
                    oCN.RunProc("update Gy_BarCodeBill set HStatus='不良',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
                }
                else if (num == 2)
                {
                    flag = false;
@@ -148,10 +141,10 @@
            }
            catch (Exception e)
            {
                string HBadCodeSN = dic["HBarCode"].ToString();
                CustomWriteLog("条码:" + HBadCodeSN + ",错误原因:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                //回滚事务
                oCN.RollBack();
                string HBadCodeSN = dic["HBarCode"].ToString();
                CustomWriteLog("条码:" + HBadCodeSN + ",错误原因:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                return false;
            }
        }
@@ -333,20 +326,21 @@
                }
                else
                {
                    CustomWriteLog("结果不为OK或NG!", DateTime.Now.ToString("yyyy-MM-dd"));
                    oCN.RollBack();
                    CustomWriteLog("结果不为OK或NG!", DateTime.Now.ToString("yyyy-MM-dd"));
                    return false;
                }
                bool flag = false;
                //flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
                flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
                //if (!flag) {
                //    CustomWriteLog("系统参数保存失败,条码:" + HBadCodeSN , DateTime.Now.ToString("yyyy-MM-dd"));
                //    oCN.RollBack();
                //    return false;
                //}
                if (!flag)
                {
                    oCN.RollBack();
                    CustomWriteLog("系统参数保存失败,条码:" + HBadCodeSN, DateTime.Now.ToString("yyyy-MM-dd"));
                    return false;
                }
                //增加产线组装追溯单
                DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
@@ -359,8 +353,8 @@
                        double SYHQty = double.Parse(dataSet.Tables[0].Rows[i]["配件数量"].ToString());
                        string HMaterNamePJ = dataSet.Tables[0].Rows[i]["配件代码"].ToString();
                        if (SYHQty == 0) {
                            CustomWriteLog("配件代码:" + HMaterNamePJ + ",数量为0!", DateTime.Now.ToString("yyyy-MM-dd"));
                            oCN.RollBack();
                            CustomWriteLog("配件代码:" + HMaterNamePJ + ",数量为0!", DateTime.Now.ToString("yyyy-MM-dd"));
                            return false;
                        }
                    }
@@ -406,8 +400,8 @@
            }
            catch (Exception e)
            {
                CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                return false;
            }
        }
@@ -492,8 +486,8 @@
                if (ds.Tables[0].Rows.Count == 0)
                {
                    CustomWriteLog("条码:" + HBadCodeSN + ",无返修记录", DateTime.Now.ToString("yyyy-MM-dd"));
                    oCN.RollBack();
                    CustomWriteLog("条码:" + HBadCodeSN + ",无返修记录", DateTime.Now.ToString("yyyy-MM-dd"));
                    return false;
                }
@@ -523,8 +517,8 @@
                }
                else
                {
                    CustomWriteLog("结果不为OK!", DateTime.Now.ToString("yyyy-MM-dd"));
                    oCN.RollBack();
                    CustomWriteLog("结果不为OK!", DateTime.Now.ToString("yyyy-MM-dd"));
                    return false;
                }
@@ -532,14 +526,15 @@
            }
            catch (Exception e)
            {
                CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                return false;
            }
        }
        //保存系统参数到出站单
        public bool AddXt_XtRoutBill(long HInterID, string HBillNo,string HBadCodeSN) {
            string sql = "";
            try
            {
@@ -550,9 +545,10 @@
                string HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
                ds = oCN.RunProcReturn(@"select  s.HItemID HMouldID,t.HItemID HTechParamID,HCount,HCreateTime from  Sb_EquipMentCollectionTechParam_SN a WITH(NOLOCK)
left join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
left join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HNumber
inner join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
inner join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HName
where a.HFlag=0 and a.HBarCode='" + HBadCodeSN + "'", "Sb_EquipMentCollectionTechParam_SN");
                //注:当前只有一道工序有参数 如果有多道工序的话 需要增加 工序的过滤
                if (ds.Tables[0].Rows.Count != 0) {
@@ -563,20 +559,22 @@
                        string HCount = ds.Tables[0].Rows[i]["HCount"].ToString();
                        string HGetTime = ds.Tables[0].Rows[i]["HCreateTime"].ToString();
                        DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "' and HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_TechParam");
                        DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "'", "Sc_StationOutBillSub_TechParam");
                        oCN.RunProc("insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
                            $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})");
                        sql = "insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
                            $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})";
                        oCN.RunProc(sql);
                    }
                    oCN.RunProc("update Sb_EquipMentCollectionTechParam_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "'");
                }
                return true;
            }
            catch (Exception e)
            {
                CustomWriteLog("工艺参数保存:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog("工艺参数保存:" + sql + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                return false;
            }
        }
@@ -603,15 +601,15 @@
                        }
                        else
                        {
                            CustomWriteLog("条码:" + HBadCodeSN + ",流转卡不存在!", DateTime.Now.ToString("yyyy-MM-dd"));
                            oCN.RollBack();
                            CustomWriteLog("条码:" + HBadCodeSN + ",流转卡不存在!", DateTime.Now.ToString("yyyy-MM-dd"));
                            return 2;
                        }
                    }
                    else
                    {
                        CustomWriteLog("条码:" + HBadCodeSN + ",长度不等于29位!", DateTime.Now.ToString("yyyy-MM-dd"));
                        oCN.RollBack();
                        CustomWriteLog("条码:" + HBadCodeSN + ",长度不等于29位!", DateTime.Now.ToString("yyyy-MM-dd"));
                        return 2;
                    }
                }
@@ -623,8 +621,8 @@
            }
            catch (Exception e)
            {
                CustomWriteLog("条码:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog("条码:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                return 2;
            }
        }
@@ -645,8 +643,8 @@
                //判断流转卡不能为空
                if (HBarCode.Trim() == "")
                {
                    CustomWriteLog("条码:" + HBarCode + ",流转卡不能为空!", DateTime.Now.ToString("yyyy-MM-dd"));
                    oCN.RollBack();
                    CustomWriteLog("条码:" + HBarCode + ",流转卡不能为空!", DateTime.Now.ToString("yyyy-MM-dd"));
                }
              
                //日期获取方式
@@ -715,8 +713,8 @@
            }
            catch (Exception e)
            {
                CustomWriteLog("条码:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog("条码:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
            }
        }
@@ -872,8 +870,8 @@
            }
            catch (Exception e)
            {
                CustomWriteLog("报错原因:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
                oCN.RollBack();
                CustomWriteLog("报错原因:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
                return false;
            }
        }
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>/nKAflmBh/TRO+mFhW9m+xlCiEDVi/+bphJ3aFsdPw4=</dsig:DigestValue>
        <dsig:DigestValue>8Sj2fUCF+DPzvNwSEG0+LaAme+iSIjx9lyYGCAvdvuA=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>2RHbf73sp2HcWRLN55JZdxxZ1PQWFHWnJO7hbFaX44w=</dsig:DigestValue>
        <dsig:DigestValue>kSXIZlMRzQeIw+fo2ApCn4XExHBfk9fvo7IO6cPRYKQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>/nKAflmBh/TRO+mFhW9m+xlCiEDVi/+bphJ3aFsdPw4=</dsig:DigestValue>
        <dsig:DigestValue>8Sj2fUCF+DPzvNwSEG0+LaAme+iSIjx9lyYGCAvdvuA=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
@@ -21,6 +21,7 @@
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.pdb
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.dll
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.xml
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Form1.resources
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Properties.Resources.resources
E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.GenerateResource.cache
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
        <dsig:DigestValue>2RHbf73sp2HcWRLN55JZdxxZ1PQWFHWnJO7hbFaX44w=</dsig:DigestValue>
        <dsig:DigestValue>kSXIZlMRzQeIw+fo2ApCn4XExHBfk9fvo7IO6cPRYKQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ