Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-出货标签管理(泽天)/SetLoadingWindow.cs

@@ -27,7 +27,7 @@ namespace UAS_LabelMachine.PublicForm
             loadingCircle1.OuterCircleRadius = 20;
             loadingCircle1.InnerCircleRadius = 12;
             loadingCircle1.Active = true;
-            
+            LoadingThread.ApartmentState = ApartmentState.STA;
             LoadingThread.Start();
             //在本窗体新建一个进程用来判断传递的进程是否执行结束
             Thread t1 = new Thread(SetLoadFinish);

UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UAS_出货标签打印));
             this.pi_inoutno_label = new System.Windows.Forms.Label();
             this.label24 = new System.Windows.Forms.Label();
@@ -38,7 +37,7 @@
             this.pi_cardcode = new System.Windows.Forms.Label();
             this.pi_cardcode_label = new System.Windows.Forms.Label();
             this.Fresh = new System.Windows.Forms.LinkLabel();
-            this.RefreshDBConnect = new System.Windows.Forms.Timer(this.components);
+            this.RefreshDBConnect = new System.Windows.Forms.Timer();
             this.GetGridOnly = new System.Windows.Forms.CheckBox();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -66,7 +65,7 @@
             this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MidSource = new System.Windows.Forms.BindingSource(this.components);
+            this.MidSource = new System.Windows.Forms.BindingSource();
             this.ChooseAll = new System.Windows.Forms.Button();
             this.ExportFileDialog = new System.Windows.Forms.FolderBrowserDialog();
             this.AttachInfo = new System.Windows.Forms.Button();
@@ -79,6 +78,10 @@
             this.label1 = new System.Windows.Forms.Label();
             this.Pack = new System.Windows.Forms.Button();
             this.PrintStatus = new System.Windows.Forms.Button();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.bi_inman = new System.Windows.Forms.Label();
+            this.pib_inman = new System.Windows.Forms.Label();
             this.DCCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.GridPrcode = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
             this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -106,6 +109,7 @@
             this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pjd_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -543,7 +547,7 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = global::UAS_LabelMachine.Properties.Resources.Status;
-            this.pictureBox1.Location = new System.Drawing.Point(320, 126);
+            this.pictureBox1.Location = new System.Drawing.Point(411, 99);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(122, 64);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -584,6 +588,44 @@
             this.PrintStatus.UseVisualStyleBackColor = true;
             this.PrintStatus.Click += new System.EventHandler(this.PrintStatus_Click);
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(232, 155);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(51, 20);
+            this.label3.TabIndex = 98;
+            this.label3.Text = "备货员";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(232, 185);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(51, 20);
+            this.label4.TabIndex = 99;
+            this.label4.Text = "出货员";
+            // 
+            // bi_inman
+            // 
+            this.bi_inman.AutoSize = true;
+            this.bi_inman.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.bi_inman.Location = new System.Drawing.Point(297, 155);
+            this.bi_inman.Name = "bi_inman";
+            this.bi_inman.Size = new System.Drawing.Size(0, 20);
+            this.bi_inman.TabIndex = 100;
+            // 
+            // pib_inman
+            // 
+            this.pib_inman.AutoSize = true;
+            this.pib_inman.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pib_inman.Location = new System.Drawing.Point(297, 185);
+            this.pib_inman.Name = "pib_inman";
+            this.pib_inman.Size = new System.Drawing.Size(0, 20);
+            this.pib_inman.TabIndex = 101;
+            // 
             // DCCheck
             // 
             this.DCCheck.ID = null;
@@ -828,6 +870,7 @@
             this.pib_id1,
             this.pib_pdno,
             this.pib_prodcode,
+            this.pd_custprodcode,
             this.pjd_orispeccode,
             this.pib_brand,
             this.pr_zxbzs,
@@ -892,6 +935,13 @@
             this.pib_prodcode.ReadOnly = true;
             this.pib_prodcode.Width = 78;
             // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "CPN";
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.Width = 48;
+            // 
             // pjd_orispeccode
             // 
             this.pjd_orispeccode.DataPropertyName = "pjd_orispeccode";
@@ -913,6 +963,7 @@
             this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
             this.pr_zxbzs.HeaderText = "最小包装数";
             this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.ReadOnly = true;
             this.pr_zxbzs.Visible = false;
             this.pr_zxbzs.Width = 90;
             // 
@@ -953,6 +1004,7 @@
             this.pib_custmidboxcode.DataPropertyName = "pib_custmidboxcode";
             this.pib_custmidboxcode.HeaderText = "中盒条码";
             this.pib_custmidboxcode.Name = "pib_custmidboxcode";
+            this.pib_custmidboxcode.ReadOnly = true;
             this.pib_custmidboxcode.Width = 78;
             // 
             // pib_custoutboxcode
@@ -986,6 +1038,7 @@
             this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
             this.pib_outboxcode1.HeaderText = "中盒号";
             this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.ReadOnly = true;
             this.pib_outboxcode1.Width = 90;
             // 
             // pib_outboxcode2
@@ -994,6 +1047,7 @@
             this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
             this.pib_outboxcode2.HeaderText = "外箱号";
             this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.ReadOnly = true;
             this.pib_outboxcode2.Width = 90;
             // 
             // pi_inoutno
@@ -1096,7 +1150,7 @@
             // MidboxCapacity
             // 
             this.MidboxCapacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidboxCapacity.Location = new System.Drawing.Point(40, 119);
+            this.MidboxCapacity.Location = new System.Drawing.Point(48, 119);
             this.MidboxCapacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidboxCapacity.Name = "MidboxCapacity";
             this.MidboxCapacity.Size = new System.Drawing.Size(78, 23);
@@ -1116,7 +1170,7 @@
             // 
             this.MidLabelNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MidLabelNum.ID = null;
-            this.MidLabelNum.Location = new System.Drawing.Point(40, 151);
+            this.MidLabelNum.Location = new System.Drawing.Point(48, 151);
             this.MidLabelNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelNum.Name = "MidLabelNum";
             this.MidLabelNum.Size = new System.Drawing.Size(78, 23);
@@ -1218,7 +1272,7 @@
             this.OutBoxNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OutBoxNum.Items.AddRange(new object[] {
             "新增"});
-            this.OutBoxNum.Location = new System.Drawing.Point(41, 144);
+            this.OutBoxNum.Location = new System.Drawing.Point(52, 144);
             this.OutBoxNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxNum.Name = "OutBoxNum";
             this.OutBoxNum.Size = new System.Drawing.Size(72, 25);
@@ -1259,7 +1313,7 @@
             // OutboxCapacity
             // 
             this.OutboxCapacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutboxCapacity.Location = new System.Drawing.Point(41, 108);
+            this.OutboxCapacity.Location = new System.Drawing.Point(52, 108);
             this.OutboxCapacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutboxCapacity.Name = "OutboxCapacity";
             this.OutboxCapacity.Size = new System.Drawing.Size(72, 23);
@@ -1296,6 +1350,10 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1257, 729);
+            this.Controls.Add(this.pib_inman);
+            this.Controls.Add(this.bi_inman);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.PrintStatus);
             this.Controls.Add(this.Pack);
             this.Controls.Add(this.label1);
@@ -1440,11 +1498,25 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button Pack;
         private System.Windows.Forms.Button PrintStatus;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label bi_inman;
+        private System.Windows.Forms.Label pib_inman;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_id1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_pdno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pjd_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_zxbzs;
@@ -1458,14 +1530,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
     }
 }

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -115,12 +115,6 @@ namespace UAS_LabelMachine
 
         private void 贴标机条码打印_Load(object sender, EventArgs e)
         {
-            //杀死之前全部未关闭的进程
-            Process[] processes = Process.GetProcessesByName("lppa");
-            for (int i = 0; i < processes.Length; i++)
-            {
-                processes[i].Kill();
-            }
             //用计时器重置数据库链接
             LogManager.DoLog("程序启动,登陆人员【" + User.UserName + "】");
             dh = SystemInf.dh;
@@ -490,7 +484,7 @@ namespace UAS_LabelMachine
                 }
             if (MidLabelCombox.Text != "")
             {
-                MidReport.Load(ftpOperater.DownLoadTo+ MidLabelCombox.Text);
+                MidReport.Load(ftpOperater.DownLoadTo + MidLabelCombox.Text);
             }
             //缓存中盒参数
             sql.Clear();
@@ -554,6 +548,8 @@ namespace UAS_LabelMachine
                             GridPrcode.Rows[i].Selected = true;
                         }
                     }
+                    bi_inman.Text = dh.getFieldDataByCondition("barcodeio left join employee on bi_inman=em_code", "wm_concat(distinct em_name)", "bi_piid=" + PI_ID).ToString();
+                    pib_inman.Text = dh.getFieldDataByCondition("prodiobarcode left join employee on pib_inman=em_code", "wm_concat(distinct em_name)", "pib_piid=" + PI_ID).ToString();
                     Attach = (DataTable)dh.ExecuteSql("select lap_param lp_name,lap_value lp_sql from LABELATTACHPARAMETER where lap_custcode='" + pi_cardcode.Text + "'", "select");
                     thread = new Thread(GetInOutInfAndLabelFile);
                     stw = new SetLoadingWindow(thread, "正在获取打印标签");
@@ -759,7 +755,15 @@ namespace UAS_LabelMachine
                 }
                 for (int i = 0; i < MidOutBoxCodeIndex.Count; i++)
                 {
-                    MidBoxCodePrint(la_id, MidOutBoxCodeIndex[i]);
+                    try
+                    {
+                        MidBoxCodePrint(la_id, MidOutBoxCodeIndex[i]);
+                    }
+                    catch (Exception e)
+                    {
+                        MessageBox.Show(e.Message);
+                        return;
+                    }
                 }
                 return;
             }
@@ -815,34 +819,26 @@ namespace UAS_LabelMachine
             {
                 for (int i = 0; i < LabelInf.RowCount; i++)
                 {
-                    if (LabelInf.Rows[i].Cells["Choose"].FormattedValue.ToString().ToLower() == "true")
-                    {
-                        string outboxcode2 = LabelInf.Rows[i].Cells["pib_outboxcode2"].Value.ToString();
-                        //富为使用包装单的逻辑
-                        //如果不包含该箱号则进行添加
-                        if (!Outboxcode.Contains(outboxcode2))
-                            Outboxcode.Add(outboxcode2);
-                    }
+                    string outboxcode2 = LabelInf.Rows[i].Cells["pib_outboxcode2"].Value.ToString();
+                    //富为使用包装单的逻辑
+                    //如果不包含该箱号则进行添加
+                    if (!Outboxcode.Contains(outboxcode2))
+                        Outboxcode.Add(outboxcode2);
                 }
                 //按获取到的箱号列表进行打印
                 if (Outboxcode.ToArray().Length > 0)
                 {
-                    //try
-                    //{
-                        // 循环打印外箱号
-                        for (int i = 0; i < Outboxcode.ToArray().Length; i++)
+                    for (int i = 0; i < Outboxcode.ToArray().Length; i++)
+                    {
+                        for (int h = 0; h < LabelInf.RowCount; h++)
                         {
-                            for (int h = 0; h < LabelInf.RowCount; h++)
+                            if (LabelInf.Rows[h].Cells["pib_outboxcode2"].Value.ToString() == Outboxcode.ToArray()[i])
                             {
-                                if (LabelInf.Rows[h].Cells["pib_outboxcode2"].Value.ToString() == Outboxcode.ToArray()[i])
-                                {
-                                    OutBoxCodePrint(la_id, h);
-                                    break;
-                                }
+                                OutBoxCodePrint(la_id, h);
+                                break;
                             }
                         }
-                    //}
-                    //catch { }
+                    }
                 }
                 else
                 {
@@ -894,19 +890,12 @@ namespace UAS_LabelMachine
                 //名称相等的时候，取SQL进行值的查询
                 string pib_id = LabelInf.Rows[rowindex].Cells["pib_id1"].Value.ToString();
                 string pib_outboxcode1 = LabelInf.Rows[rowindex].Cells["pib_outboxcode1"].Value.ToString();
-                DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiomidinfo_view where =" + pib_id + "' and 中盒号='" + pib_outboxcode1 + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiomidinfo_view where 出货单号='" + pi_inoutno.Text + "' and 中盒号='" + pib_outboxcode1 + "'", "select");
                 MidReport.RegisterData(dt, "prodiomidinfo_view");
                 MidReport.GetDataSource("prodiomidinfo_view").Enabled = true;
+                MidReport.PrintSettings.ShowDialog = false;
                 MidReport.PrintSettings.Printer = MidLabelPrinter.Text;
-                try
-                {
-                    MidReport.Print();
-                }
-                catch (Exception e)
-                {
-                    MessageBox.Show(e.Message);
-                    return;
-                }
+                MidReport.Print();
                 Properties.Settings.Default.MPrinter = MidLabelPrinter.Text;
                 Properties.Settings.Default.Save();
             }
@@ -1430,13 +1419,13 @@ namespace UAS_LabelMachine
         private void PrintFooter_Click(object sender, EventArgs e)
         {
             DataTable dt = (DataTable)dh.ExecuteSql("select pib_outboxcode2,max(pib_id) pib_id from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' group by pib_outboxcode2 order by pib_outboxcode2", "select");
-            string SQL = "select pib_outboxcode2||'/'||(select max(pib_outboxcode2) from prodiobarcode where pib_inoutno='"+pi_inoutno.Text+"') from prodiobarcode  where pib_id=";
+            string SQL = "select pib_outboxcode2||'/'||(select max(pib_outboxcode2) from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "') from prodiobarcode  where pib_id=";
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                DataTable dt1 = (DataTable)dh.ExecuteSql(SQL+dt.Rows[i]["pib_id"].ToString(), "select");
+                DataTable dt1 = (DataTable)dh.ExecuteSql(SQL + dt.Rows[i]["pib_id"].ToString(), "select");
                 FootReport.SetParameterValue("唛头", dt1.Rows[0][0].ToString());
                 FootReport.PrintSettings.ShowDialog = false;
-                FootReport.PrintSettings.Printer= SingleLabelPrinter.Text;
+                FootReport.PrintSettings.Printer = SingleLabelPrinter.Text;
                 FootReport.Print();
             }
             LogManager.DoCommandLog(pi_inoutno.Text, User.UserCode, "打印唛头", "成功");

UAS-出货标签管理(泽天)/UAS_出货标签管理.resx

@@ -153,6 +153,9 @@
   <metadata name="pjd_zxbzs_user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pr_zxbzs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-出货标签管理(泽天)/客户标签维护.Designer.cs

@@ -55,7 +55,7 @@ namespace UAS_LabelMachine
             this.la_name = new System.Windows.Forms.TextBox();
             this.la_name_label = new System.Windows.Forms.Label();
             this.FTPShare = new System.Windows.Forms.CheckBox();
-            this.CodeSoft = new System.Windows.Forms.RadioButton();
+            this.FastReport = new System.Windows.Forms.RadioButton();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
             this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
@@ -273,19 +273,19 @@ namespace UAS_LabelMachine
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
             // 
-            // CodeSoft
+            // FastReport
             // 
-            this.CodeSoft.AutoSize = true;
-            this.CodeSoft.Checked = true;
-            this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CodeSoft.Location = new System.Drawing.Point(1058, 86);
-            this.CodeSoft.Name = "CodeSoft";
-            this.CodeSoft.Size = new System.Drawing.Size(99, 25);
-            this.CodeSoft.TabIndex = 161;
-            this.CodeSoft.TabStop = true;
-            this.CodeSoft.Text = "CodeSoft";
-            this.CodeSoft.UseVisualStyleBackColor = true;
-            this.CodeSoft.Visible = false;
+            this.FastReport.AutoSize = true;
+            this.FastReport.Checked = true;
+            this.FastReport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FastReport.Location = new System.Drawing.Point(1058, 86);
+            this.FastReport.Name = "FastReport";
+            this.FastReport.Size = new System.Drawing.Size(110, 25);
+            this.FastReport.TabIndex = 161;
+            this.FastReport.TabStop = true;
+            this.FastReport.Text = "FastReport";
+            this.FastReport.UseVisualStyleBackColor = true;
+            this.FastReport.Visible = false;
             // 
             // pictureBox1
             // 
@@ -332,17 +332,22 @@ namespace UAS_LabelMachine
             // 
             // la_code
             // 
+            this.la_code.AllPower = null;
             this.la_code.Caller = null;
             this.la_code.Condition = null;
+            this.la_code.DBTitle = null;
             this.la_code.FormName = null;
             this.la_code.Location = new System.Drawing.Point(659, 455);
             this.la_code.Name = "la_code";
+            this.la_code.Power = null;
+            this.la_code.ReturnData = null;
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
             this.la_code.Size = new System.Drawing.Size(161, 21);
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
+            this.la_code.TextBoxEnable = false;
             // 
             // Save
             // 
@@ -519,31 +524,41 @@ namespace UAS_LabelMachine
             // 
             // 客户编号
             // 
+            this.客户编号.AllPower = null;
             this.客户编号.Caller = null;
             this.客户编号.Condition = null;
+            this.客户编号.DBTitle = null;
             this.客户编号.FormName = null;
             this.客户编号.Location = new System.Drawing.Point(116, 453);
             this.客户编号.Name = "客户编号";
+            this.客户编号.Power = null;
+            this.客户编号.ReturnData = null;
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
             this.客户编号.Size = new System.Drawing.Size(136, 21);
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
+            this.客户编号.TextBoxEnable = false;
             // 
             // cu_code
             // 
+            this.cu_code.AllPower = null;
             this.cu_code.Caller = null;
             this.cu_code.Condition = null;
+            this.cu_code.DBTitle = null;
             this.cu_code.FormName = null;
             this.cu_code.Location = new System.Drawing.Point(127, 16);
             this.cu_code.Name = "cu_code";
+            this.cu_code.Power = null;
+            this.cu_code.ReturnData = null;
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
             this.cu_code.Size = new System.Drawing.Size(150, 21);
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
+            this.cu_code.TextBoxEnable = false;
             // 
             // UpdateGrid
             // 
@@ -612,7 +627,7 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.PrintTest);
             this.Controls.Add(this.客户编号);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.CodeSoft);
+            this.Controls.Add(this.FastReport);
             this.Controls.Add(this.cu_code);
             this.Controls.Add(this.UpdateGrid);
             this.Controls.Add(this.Screen);
@@ -671,7 +686,7 @@ namespace UAS_LabelMachine
         private CheckBox FTPShare;
         private NormalButton NewLabel;
         private Pagination pagination1;
-        private RadioButton CodeSoft;
+        private RadioButton FastReport;
         private DataGridViewCheckBoxColumn Choose;
         private DataGridViewTextBoxColumn la_id;
         private DataGridViewTextBoxColumn cu_name1;

UAS-出货标签管理(泽天)/客户标签维护.cs

@@ -167,9 +167,9 @@ namespace UAS_LabelMachine
         {
             string LabelSoft = "";
             //需要处理新增的行和原有数据然后更新的行
-            if (CodeSoft.Checked)
+            if (FastReport.Checked)
             {
-                LabelSoft = "CodeSoft";
+                LabelSoft = "FastReport";
             }
             DataTable dt = (DataTable)LabelDataGridView.DataSource;
             //如果有改变的行才传递到后台
@@ -203,7 +203,7 @@ namespace UAS_LabelMachine
         private void OpenFolder_Click(object sender, EventArgs e)
         {
             //根据勾选的不同设置不同的文件后缀过滤
-            if (CodeSoft.Checked)
+            if (FastReport.Checked)
             {
                 openFileDialog1.Filter = "(*.frx)|*.frx";
             }
@@ -315,7 +315,7 @@ namespace UAS_LabelMachine
                 {
                     ftpOperater ftp = new ftpOperater();
                     ftp.UpLoadFile(sourcePath, fileName);
-                    string SoftWare = "CodeSoft";
+                    string SoftWare = "FastReport";
                     if (CL_ID2 != null)
                     {
                         sql.Clear();
@@ -356,7 +356,7 @@ namespace UAS_LabelMachine
                             Directory.CreateDirectory(targetPath);
                         //将文件复制到指定位置
                         File.Copy(sourceFile, destFile, true);
-                        string SoftWare = "CodeSoft";
+                        string SoftWare = "FastReport";
                         sql.Clear();
                         sql.Append("insert into customerlabel (cl_id,cl_labelcode,cl_custcode,cl_labeltype,cl_labelurl,cl_labelname,cl_labelsoft,cl_date) values( customerlabel_seq.nextval, ");
                         sql.Append("'" + la_code.Text + "','" + (客户编号.Text == "" ? "共用" : 客户编号.Text) + "','" + la_type1.Text + "','" + destFile + "','" + la_name.Text + "','" + SoftWare + "',sysdate)");