Jelajahi Sumber

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

Hcsy 7 tahun lalu
induk
melakukan
e0d332fffc

+ 38 - 11
PLCDataReader/Main.Designer.cs

@@ -136,6 +136,8 @@ namespace UAS_PLCDataReader
             this.PollSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.PollSettingDeviceSearchLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+            this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.dpc_dename = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_interval = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -190,12 +192,12 @@ namespace UAS_PLCDataReader
             this.drr_doman = new DevExpress.XtraGrid.Columns.GridColumn();
             this.drr_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageClientParam = new DevExpress.XtraTab.XtraTabPage();
+            this.ButtonSaveClientParam = new DevExpress.XtraEditors.SimpleButton();
             this.UpdateTimeSpan = new System.Windows.Forms.NumericUpDown();
             this.label1 = new System.Windows.Forms.Label();
             this.TimerDeviceStatus = new System.Windows.Forms.Timer(this.components);
             this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
             this.TimerUpdateDevice = new System.Windows.Forms.Timer(this.components);
-            this.ButtonSaveClientParam = new DevExpress.XtraEditors.SimpleButton();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -222,6 +224,8 @@ namespace UAS_PLCDataReader
             this.PagePollingSetting.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PollSettingDeviceSearchLookUpEdit)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollSettingItemSearchLookUpEdit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollSettingItemSearchLookUpEditView)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollingSetItemLookUpEdit)).BeginInit();
@@ -1257,7 +1261,8 @@ namespace UAS_PLCDataReader
             this.GridPollingSetting.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.dpc_enableCheckEdit,
             this.PollingSetItemLookUpEdit,
-            this.PollSettingItemSearchLookUpEdit});
+            this.PollSettingItemSearchLookUpEdit,
+            this.PollSettingDeviceSearchLookUpEdit});
             this.GridPollingSetting.RowCount = 0;
             this.GridPollingSetting.Size = new System.Drawing.Size(1027, 543);
             this.GridPollingSetting.TabIndex = 0;
@@ -1286,6 +1291,7 @@ namespace UAS_PLCDataReader
             this.GridViewPollSetting.Name = "GridViewPollSetting";
             this.GridViewPollSetting.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
             this.GridViewPollSetting.OptionsView.ShowGroupPanel = false;
+            this.GridViewPollSetting.CellValueChanged += new DevExpress.XtraGrid.Views.Base.CellValueChangedEventHandler(this.GridViewPollSetting_CellValueChanged);
             // 
             // PollSettingCheckedColumn
             // 
@@ -1308,12 +1314,29 @@ namespace UAS_PLCDataReader
             // dpc_decode
             // 
             this.dpc_decode.Caption = "设备编号";
+            this.dpc_decode.ColumnEdit = this.PollSettingDeviceSearchLookUpEdit;
             this.dpc_decode.FieldName = "DPC_DECODE";
             this.dpc_decode.Name = "dpc_decode";
             this.dpc_decode.Visible = true;
             this.dpc_decode.VisibleIndex = 1;
             this.dpc_decode.Width = 90;
             // 
+            // PollingSettingDeviceSearchLookUpEdit1
+            // 
+            this.PollSettingDeviceSearchLookUpEdit.AutoHeight = false;
+            this.PollSettingDeviceSearchLookUpEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.PollSettingDeviceSearchLookUpEdit.Name = "PollSettingDeviceSearchLookUpEdit";
+            this.PollSettingDeviceSearchLookUpEdit.NullText = "";
+            this.PollSettingDeviceSearchLookUpEdit.View = this.repositoryItemSearchLookUpEdit1View;
+            // 
+            // repositoryItemSearchLookUpEdit1View
+            // 
+            this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
+            this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
             // dpc_dename
             // 
             this.dpc_dename.Caption = "设备名称";
@@ -1869,6 +1892,15 @@ namespace UAS_PLCDataReader
             this.PageClientParam.Size = new System.Drawing.Size(1027, 577);
             this.PageClientParam.VisibleChanged += new System.EventHandler(this.PageClientParam_VisibleChanged);
             // 
+            // ButtonSaveClientParam
+            // 
+            this.ButtonSaveClientParam.Location = new System.Drawing.Point(140, 122);
+            this.ButtonSaveClientParam.Name = "ButtonSaveClientParam";
+            this.ButtonSaveClientParam.Size = new System.Drawing.Size(64, 23);
+            this.ButtonSaveClientParam.TabIndex = 2;
+            this.ButtonSaveClientParam.Text = "保存";
+            this.ButtonSaveClientParam.Click += new System.EventHandler(this.ButtonSaveClientParam_Click);
+            // 
             // UpdateTimeSpan
             // 
             this.UpdateTimeSpan.Location = new System.Drawing.Point(140, 30);
@@ -1900,15 +1932,6 @@ namespace UAS_PLCDataReader
             this.TimerUpdateDevice.Interval = 20000;
             this.TimerUpdateDevice.Tick += new System.EventHandler(this.TimerUpdateDevice_Tick);
             // 
-            // ButtonSaveClientParam
-            // 
-            this.ButtonSaveClientParam.Location = new System.Drawing.Point(140, 122);
-            this.ButtonSaveClientParam.Name = "ButtonSaveClientParam";
-            this.ButtonSaveClientParam.Size = new System.Drawing.Size(64, 23);
-            this.ButtonSaveClientParam.TabIndex = 2;
-            this.ButtonSaveClientParam.Text = "保存";
-            this.ButtonSaveClientParam.Click += new System.EventHandler(this.ButtonSaveClientParam_Click);
-            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -1953,6 +1976,8 @@ namespace UAS_PLCDataReader
             this.PagePollingSetting.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PollSettingDeviceSearchLookUpEdit)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollSettingItemSearchLookUpEdit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollSettingItemSearchLookUpEditView)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PollingSetItemLookUpEdit)).EndInit();
@@ -2143,5 +2168,7 @@ namespace UAS_PLCDataReader
         private System.Windows.Forms.NumericUpDown UpdateTimeSpan;
         private System.Windows.Forms.Label label1;
         private SimpleButton ButtonSaveClientParam;
+        private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+        private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit PollSettingDeviceSearchLookUpEdit;
     }
 }

+ 28 - 22
PLCDataReader/Main.cs

@@ -51,6 +51,7 @@ namespace UAS_PLCDataReader
             DataItemRepositoryItemComboBox1.SelectedValueChanged += DataItemRepositoryItemComboBox1_SelectedValueChanged;
             CheckEditCommandSet.QueryCheckStateByValue += CheckedEdit_QueryCheckStateByValue;
             PollSettingItemSearchLookUpEdit.ParseEditValue += PollSettingItemSearchLookUpEdit_ParseEditValue;
+            PollSettingDeviceSearchLookUpEdit.ParseEditValue += PollSettingItemSearchLookUpEdit_ParseEditValue;
             GridViewPollSetting.RowCellStyle += GridViewPollSetting_RowCellStyle;
             #region 添加发送接收编码规则的静态值
             ComboBoxData cbd = new ComboBoxData();
@@ -142,15 +143,6 @@ namespace UAS_PLCDataReader
             ButtonAddDevice.Grid = GridDeviceList;
             ButtonSaveDevice.Grid = GridDeviceList;
             ButtonDeleteDevice.Grid = GridDeviceList;
-            //ToolPageControlDeviceList.Gridcontrol = GridDeviceList;
-            //轮询业务
-            //GridPolling.GetDataSQL = "select 0 CHECKEDCOLUMN,pl_id,pl_code,pl_name,pl_type,pl_dccode,pl_remark from polling".ToUpper();
-            //GridPolling.ID = "pl_id";
-            //GridPolling.TableName = "polling";
-            //GridPolling.InsertSQL = "insert into polling(pl_id,pl_code,pl_name,pl_type,pl_dccode,pl_remark) values(polling_seq.nextval,:pl_code,:pl_name,:pl_type,:pl_dccode,:pl_remark)";
-            //ButtonDeletePolling.Grid = GridPolling;
-            //ButtonSavePolling.Grid = GridPolling;
-            //ButtonAddPolling.Grid = GridPolling;
             //轮询配置界面
             GridPollingSetting.GetDataSQL = "SELECT '' POLLSETTINGSTATUSCOLUMN,0 CHECKEDCOLUMN,DPC_MAN,DPC_ID,DPC_DECODE,de_name DPC_DENAME ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , nvl(DPC_ENABLE,0)DPC_ENABLE,DPC_STATUS,DPC_REMARK,EM_NAME FROM DEVICEPOLLINGCONFIG left join EMPLOYEE on em_code=dpc_man left join device on de_code=dpc_decode WHERE DPC_MAN='" + User.UserCode + "' ORDER BY DPC_ID";
             GridPollingSetting.ID = "DPC_ID";
@@ -340,20 +332,16 @@ namespace UAS_PLCDataReader
         /// <param name="e"></param>
         private void TimerUpdateDevice_Tick(object sender, EventArgs e)
         {
-            foreach (var device in ReturnData)
-            {
-                Entity.Device item = device.Value;
-                LogicHandler.DoDevicePollingLog(item.Decode, item.SendDataSize.ToString(), item.ReceiveDataSize.ToString());
-                LogicHandler.UpdateDeviceData(item.Decode, item.ItemData);
-            }
-            //while (QueueUpdateDevice.Count > 0)
-            //{
-            //    Entity.Device item = QueueUpdateDevice.Dequeue();
-            //    SQL.Clear();
-            //    //更新轮询日志状态
-            //    LogicHandler.DoDevicePollingLog(item.Decode, item.SendDataSize.ToString(), item.ReceiveDataSize.ToString());
-            //}
+            if (ReturnData != null)
+                foreach (var device in ReturnData)
+                {
+                    Entity.Device item = device.Value;
+                    LogicHandler.DoDevicePollingLog(item.Decode, item.SendDataSize.ToString(), item.ReceiveDataSize.ToString());
+                    LogicHandler.UpdateDeviceData(item.Decode, item.ItemData);
+                }
         }
+
+
         #endregion
 
         #region PageCommandSet业务代码(指令设置)
@@ -645,6 +633,24 @@ namespace UAS_PLCDataReader
                 PollSettingItemSearchLookUpEdit.DataSource = dt;
                 PollSettingItemSearchLookUpEdit.DisplayMember = "DC_CODE";
                 PollSettingItemSearchLookUpEdit.ValueMember = "DC_CODE";
+
+                DataTable dt1 = (DataTable)SystemInf.dh.ExecuteSql("SELECT DE_CODE,DE_NAME FROM device", "select");
+                PollSettingDeviceSearchLookUpEdit.DataSource = dt1;
+                PollSettingDeviceSearchLookUpEdit.DisplayMember = "DE_CODE";
+                PollSettingDeviceSearchLookUpEdit.ValueMember = "DE_CODE";
+            }
+        }
+
+        private void GridViewPollSetting_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
+        {
+            if (e.Column.FieldName == "DPC_DECODE")
+            {
+                DataTable dt = (DataTable)PollSettingDeviceSearchLookUpEdit.DataSource;
+                DataRow[] dr = dt.Select("de_code='" + e.Value + "'");
+                if (dr.Length > 0)
+                {
+                    GridViewPollSetting.SetRowCellValue(e.RowHandle, "DPC_DENAME", dr[0]["de_name"]);
+                }
             }
         }
         #endregion

+ 11 - 11
UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -1696,7 +1696,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(162, 117);
+            this.label2.Location = new System.Drawing.Point(162, 121);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(32, 17);
             this.label2.TabIndex = 94;
@@ -1706,7 +1706,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(250, 116);
+            this.label1.Location = new System.Drawing.Point(250, 121);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(20, 17);
             this.label1.TabIndex = 93;
@@ -1715,7 +1715,7 @@
             // numericUpDown1
             // 
             this.numericUpDown1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.numericUpDown1.Location = new System.Drawing.Point(201, 115);
+            this.numericUpDown1.Location = new System.Drawing.Point(201, 119);
             this.numericUpDown1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.numericUpDown1.Name = "numericUpDown1";
             this.numericUpDown1.Size = new System.Drawing.Size(44, 23);
@@ -1725,7 +1725,7 @@
             // 
             this.OnlyPrint.AutoSize = true;
             this.OnlyPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OnlyPrint.Location = new System.Drawing.Point(167, 88);
+            this.OnlyPrint.Location = new System.Drawing.Point(167, 90);
             this.OnlyPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OnlyPrint.Name = "OnlyPrint";
             this.OnlyPrint.Size = new System.Drawing.Size(63, 21);
@@ -1969,7 +1969,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(169, 43);
+            this.label9.Location = new System.Drawing.Point(170, 42);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(32, 17);
             this.label9.TabIndex = 98;
@@ -1978,7 +1978,7 @@
             // cu_print_papercount
             // 
             this.cu_print_papercount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_papercount.Location = new System.Drawing.Point(210, 40);
+            this.cu_print_papercount.Location = new System.Drawing.Point(211, 39);
             this.cu_print_papercount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_papercount.Name = "cu_print_papercount";
             this.cu_print_papercount.Size = new System.Drawing.Size(38, 23);
@@ -2051,7 +2051,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(228, 13);
+            this.LogingOut.Location = new System.Drawing.Point(231, 11);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -2063,7 +2063,7 @@
             // 
             this.OutBoxNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OutBoxNum.ID = null;
-            this.OutBoxNum.Location = new System.Drawing.Point(211, 100);
+            this.OutBoxNum.Location = new System.Drawing.Point(212, 99);
             this.OutBoxNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxNum.Name = "OutBoxNum";
             this.OutBoxNum.Size = new System.Drawing.Size(37, 23);
@@ -2076,7 +2076,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(169, 102);
+            this.label10.Location = new System.Drawing.Point(170, 101);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -2086,7 +2086,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(169, 72);
+            this.label6.Location = new System.Drawing.Point(170, 71);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -2104,7 +2104,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(210, 69);
+            this.OutboxCapacity.Location = new System.Drawing.Point(211, 68);
             this.OutboxCapacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutboxCapacity.Name = "OutboxCapacity";
             this.OutboxCapacity.Size = new System.Drawing.Size(38, 23);

+ 5 - 2
UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -287,14 +287,17 @@ namespace UAS_LabelMachine
                                 }
                                 LabelInf.Rows[CurrentRowIndex].Cells["pib_ifpick"].Value = true;
                                 adh.ExecuteSql("update prodiobarcode set pib_lotno='" + LotNo + "',pib_datecode='" + DateCode + "',pib_ifpick=-1 where pib_id=" + pib_id, "update");
-                                if (CurrentRowIndex + 1 < LabelInf.Rows.Count)
-                                    CurrentRowIndex = CurrentRowIndex + 1;
                                 LabelInf.Refresh();
                             }
                         }
                         break;
                     case "BackendCheck":
                         BackCheck.Text = msg;
+                        LabelInf.Rows[CurrentRowIndex].Cells["pib_ifrecheck"].Value = true;
+                        adh.ExecuteSql("update prodiobarcode set pib_ifrecheck=-1 where pib_id=" + pib_id, "update");
+                        LabelInf.Refresh();
+                        if (CurrentRowIndex + 1 < LabelInf.Rows.Count)
+                            CurrentRowIndex = CurrentRowIndex + 1;
                         break;
                     default:
                         break;

File diff ditekan karena terlalu besar
+ 229 - 187
UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs


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

@@ -564,10 +564,21 @@ namespace UAS_LabelMachine
                 LoadCheck = true;
                 Input.Clear();
                 sql.Clear();
-                sql.Append("select pi_id,pi_cardcode,pi_title,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
+                sql.Append("select pi_id,pi_cardcode,pi_combine_user,pi_title,to_char(pi_date,'yyyymmdd')pi_date,nvl(pi_combine_user,0)pi_combine_user from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
+                    switch (dt.Rows[0]["pi_combine_user"].ToString())
+                    {
+                        case "1":
+                            Combindetail.Checked = true;
+                            break;
+                        case "2":
+                            CombindetailTwo.Checked = true;
+                            break;
+                        default:
+                            break;
+                    }
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_title.Text = dt.Rows[0]["pi_title"].ToString();
                     if (pi_cardcode.Text != "ZGCC")
@@ -1383,6 +1394,7 @@ namespace UAS_LabelMachine
                 }
                 else GridPrcode.DataSource = CSPrcode;
             }
+            dh.UpdateByCondition("prodinout", "pi_combine_user=" + combined, "pi_inoutno='" + pi_inoutno.Text + "'");
             if (CSPrcode.Rows.Count == 0)
             {
                 sql.Clear();
@@ -1482,6 +1494,7 @@ namespace UAS_LabelMachine
                         }
                         else
                         {
+                            SQL = SQL.Replace("{pd_pdno}", CurrentPDNO);
                             //替换参数后重新执行SQL
                             foreach (Match mch in match.Matches(SQL))
                             {
@@ -1846,5 +1859,10 @@ namespace UAS_LabelMachine
                 pi_inoutno_KeyDown(sender, new KeyEventArgs(Keys.Enter));
             }
         }
+
+        private void AddNewOutBox_Click(object sender, EventArgs e)
+        {
+            OutBoxNum.Text = "新增";
+        }
     }
 }

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini