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

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -57,7 +57,7 @@ namespace UAS_MES.Make
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n",Color.Red);
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 
@@ -143,6 +143,7 @@ namespace UAS_MES.Make
                                 pa_makecode.Text = carton_macode;
                                 dh.ExecuteSql("update package set pa_makecode='" + carton_macode + "' where pa_outboxcode='" + bigoutboxcode.Text + "'", "update");
                             }
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "卡通箱" + outboxcode.Text + "采集成功", outboxcode.Text, "");
                             OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
                             LoadGridData();
                             LoadCollectNum();
@@ -232,6 +233,7 @@ namespace UAS_MES.Make
             dh.ExecuteSql("delete from packagedetail where pd_paid=(select pa_id from package where pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2)", "delete");
             dh.ExecuteSql("update package set pa_totalqty=0,pa_packageqty=0 where pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2", "update");
             OperateResult.AppendText(">>箱号" + outboxcode.Text + "解除成功\n", Color.Green);
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "解除大箱" + outboxcode.Text + "成功", bigoutboxcode.Text, "");
             palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
         }
 
@@ -245,6 +247,7 @@ namespace UAS_MES.Make
             if (pa_prodcode.Text != "" && bigoutboxcode.Text != "")
             {
                 OperateResult.AppendText(">>" + bigoutboxcode.Text + "装箱成功\n", Color.Green);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "装箱" + bigoutboxcode.Text + "成功", outboxcode.Text, "");
                 bigoutboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
                 sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -132,10 +132,12 @@ namespace UAS_MES.Make
                         {
                             Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                         }
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量合格", outboxcode.Text, "");
                         OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测合格\n", Color.Green);
                     }
                     else
                     {
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量不合格", outboxcode.Text, "");
                         OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测未通过\n", Color.Red);
                     }
                     ListViewItem lsi = new ListViewItem();

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.Designer.cs

@@ -68,12 +68,12 @@
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.ob_checkno = new System.Windows.Forms.Label();
             this.ob_nowcheckqty = new System.Windows.Forms.Label();
             this.ob_batchqty = new System.Windows.Forms.Label();
             this.ob_nowcheckqty_label = new System.Windows.Forms.Label();
             this.ob_batchqty_label = new System.Windows.Forms.Label();
             this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_checkno = new System.Windows.Forms.Label();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -497,6 +497,7 @@
             this.columnHeader2,
             this.columnHeader3,
             this.columnHeader4});
+            this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WeighRecord.Location = new System.Drawing.Point(540, 272);
             this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.WeighRecord.Name = "WeighRecord";
@@ -551,6 +552,17 @@
             this.groupBoxWithBorder2.Text = "打印";
             this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
             // 
+            // ob_checkno
+            // 
+            this.ob_checkno.AutoSize = true;
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_checkno.Location = new System.Drawing.Point(50, 111);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno.Name = "ob_checkno";
+            this.ob_checkno.Size = new System.Drawing.Size(0, 27);
+            this.ob_checkno.TabIndex = 179;
+            this.ob_checkno.Visible = false;
+            // 
             // ob_nowcheckqty
             // 
             this.ob_nowcheckqty.AutoSize = true;
@@ -614,17 +626,6 @@
             this.SendCheck.Text = "送检";
             this.SendCheck.UseVisualStyleBackColor = true;
             // 
-            // ob_checkno
-            // 
-            this.ob_checkno.AutoSize = true;
-            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(50, 111);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 27);
-            this.ob_checkno.TabIndex = 179;
-            this.ob_checkno.Visible = false;
-            // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);