callm 23 часов назад
Родитель
Сommit
7eb0937c47

+ 3 - 17
UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrintZZ.Designer.cs

@@ -41,7 +41,6 @@
             this.CheckTSN = new System.Windows.Forms.CheckBox();
             this.CollectRemark = new System.Windows.Forms.CheckBox();
             this.Remark = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
@@ -201,17 +200,6 @@
             this.Remark.TabIndex = 196;
             this.Remark.Text = "";
             // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1457, 613);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(6);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(159, 45);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 189;
-            // 
             // LockMakeCode
             // 
             this.LockMakeCode.AutoSize = true;
@@ -456,7 +444,7 @@
             this.label3.TabIndex = 212;
             this.label3.Text = "份数";
             // 
-            // Make_ColorBoxLabelPrint
+            // Make_ColorBoxLabelPrintZZ
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -471,7 +459,6 @@
             this.Controls.Add(this.locksalecode);
             this.Controls.Add(this.CollectRemark);
             this.Controls.Add(this.Remark);
-            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.CheckTSN);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.ma_code);
@@ -495,14 +482,14 @@
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Make_ColorBoxLabelPrint";
+            this.Name = "Make_ColorBoxLabelPrintZZ";
             this.Tag = "Make!ColorBoxLabelPrint";
             this.Text = "W";
             this.Activated += new System.EventHandler(this.Make_ColorBoxLabelPrint_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLabelPrint_SizeChanged);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -530,7 +517,6 @@
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private System.Windows.Forms.CheckBox CheckTSN;
-        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
         private System.Windows.Forms.CheckBox CollectRemark;
         private CustomControl.RichText.RichTextAutoBottom Remark;
         private System.Windows.Forms.CheckBox locksalecode;

+ 5 - 5
UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrintZZ.cs

@@ -64,11 +64,11 @@ namespace UAS_MES_NEW.Make
             ma_code.DbChange += Ma_code_DbChange;
             OperateResult.AppendText(">>请输入TSN\n", Color.Black);
             dh = SystemInf.dh;
-            StepCount.StepCode = User.CurrentStepCode;
-            StepCount.Source = User.UserSourceCode;
-            StepCount.LineCode = User.UserLineCode;
-            StepCount.Dh = dh;
-            StepCount.Start();
+            //StepCount.StepCode = User.CurrentStepCode;
+            //StepCount.Source = User.UserSourceCode;
+            //StepCount.LineCode = User.UserLineCode;
+            //StepCount.Dh = dh;
+            //StepCount.Start();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

+ 1 - 1
UAS_MES_LGDZ/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -167,7 +167,7 @@ namespace UAS_MES_NEW.Make
                                             string fp_path = label.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
                                             fp_name = label.Rows[0]["fp_name"].ToString();
                                             WebClient wc = new WebClient();
-                                            wc.DownloadFile("http://10.98.0.21:8099/" + fp_path, @"C:\打印标签\" + fp_name);
+                                            wc.DownloadFile("http://10.11.28.21:8099/" + fp_path, @"C:\打印标签\" + fp_name);
                                         }
                                     }
                                 }