修改标签核对功能

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckBXK.cs

@@ -399,8 +399,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                 "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                 "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+                 "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckColorBox.cs

@@ -387,8 +387,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                   "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                   "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+      "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckDark.cs

@@ -385,8 +385,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                 "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                 "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+        "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckFuge.cs

@@ -399,8 +399,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                 "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                 "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+        "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckMidBox.cs

@@ -440,8 +440,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                   "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                   "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+        "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckPallet.cs

@@ -270,7 +270,7 @@ namespace UAS_MES_NEW.Make
             sql.Clear();
             sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ma_bomversion,ma_qty,ma_code,pr_spec,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
             sql.Append(",ms_prodcode,ms_makecode,ms_code,ms_stepname  from makeserial left join make on ma_code=ms_makecode ");
-            sql.Append("left join product on ms_prodcode=pr_code where ms_outboxcode='" + code.Text + "' order by ms_id desc");
+            sql.Append("left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' order by ms_id desc");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -291,7 +291,7 @@ namespace UAS_MES_NEW.Make
             }
             else
             {
-                OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red, code);
+                OperateResult.AppendText(">>获取箱号" + code.Text + "不存在\n", Color.Red, code);
                 code.Text = "";
                 sn_code.Text = "";
                 code.Str = ma_prodcode.Text;
@@ -301,8 +301,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                   "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                   "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+        "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckSH.cs

@@ -387,8 +387,7 @@ namespace UAS_MES_NEW.Make
         private void GetItem()
         {
             dt1 = (DataTable)dh.ExecuteSql("select lcd_sql,lcd_detno,LCD_LABELTYPE, nvl(lcd_alllength,0)lcd_alllength,nvl(LCD_LENGTH,0)LCD_LENGTH,lcd_suffix, LCD_PREFIX from LABELCHECKdetail left join labelcheck " +
-                   "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "' and (LCD_LABELTYPE,lcd_stepcode) not in (select LCL_LABELTYPE,LCL_STEPCODE from labelchecklog where " +
-                   "LCL_SN='" + sn_code.Text + "') order by lcd_detno", "select");
+        "on lcd_lcid=lc_id where  lc_prodcode='" + ma_prodcode.Text + "' and lcd_stepcode='" + User.CurrentStepCode + "'  order by lcd_detno", "select");
             if (dt1.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.Designer.cs

@@ -133,7 +133,7 @@
             this.label12 = new System.Windows.Forms.Label();
             this.pa_width = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label14 = new System.Windows.Forms.Label();
-            this.pa_height = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_heigth = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label15 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -387,7 +387,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(535, 37);
+            this.label1.Location = new System.Drawing.Point(536, 38);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -410,7 +410,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(61, 53);
+            this.checkweightlabel.Location = new System.Drawing.Point(62, 54);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(400, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -421,7 +421,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(697, 181);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(698, 182);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
@@ -431,7 +431,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(697, 105);
+            this.ob_batchqty.Location = new System.Drawing.Point(698, 106);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
@@ -441,7 +441,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(535, 181);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(536, 182);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
@@ -452,7 +452,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(535, 109);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(536, 110);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
@@ -463,7 +463,7 @@
             // 
             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(697, 37);
+            this.ob_checkno.Location = new System.Drawing.Point(698, 38);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 41);
@@ -528,7 +528,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(21, 183);
+            this.label3.Location = new System.Drawing.Point(22, 184);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
@@ -578,7 +578,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(21, 103);
+            this.PrintList_label.Location = new System.Drawing.Point(22, 104);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(178, 41);
@@ -589,7 +589,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(421, 265);
+            this.PrintNum_label.Location = new System.Drawing.Point(422, 266);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(82, 41);
@@ -636,7 +636,7 @@
             this.locksalecode.AutoSize = true;
             this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(589, 39);
+            this.locksalecode.Location = new System.Drawing.Point(590, 40);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -648,7 +648,7 @@
             // 
             this.PreFix_label.AutoSize = true;
             this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PreFix_label.Location = new System.Drawing.Point(363, 35);
+            this.PreFix_label.Location = new System.Drawing.Point(364, 36);
             this.PreFix_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PreFix_label.Name = "PreFix_label";
             this.PreFix_label.Size = new System.Drawing.Size(71, 36);
@@ -676,7 +676,7 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(425, 279);
+            this.pa_salecode_label.Location = new System.Drawing.Point(426, 280);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(146, 41);
@@ -687,7 +687,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(17, 279);
+            this.ma_code_label.Location = new System.Drawing.Point(18, 280);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(114, 41);
@@ -698,7 +698,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(587, 279);
+            this.ms_salecode.Location = new System.Drawing.Point(588, 280);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 41);
@@ -708,7 +708,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(189, 279);
+            this.ms_makecode.Location = new System.Drawing.Point(190, 280);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -719,7 +719,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(167, 35);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(168, 36);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(71, 36);
@@ -785,7 +785,7 @@
             this.AutoGenBoxCode.AutoSize = true;
             this.AutoGenBoxCode.Checked = true;
             this.AutoGenBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(501, 95);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(502, 96);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(178, 45);
@@ -798,7 +798,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(429, 159);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(430, 160);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(146, 41);
@@ -809,7 +809,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(425, 215);
+            this.pr_detail_label.Location = new System.Drawing.Point(426, 216);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -838,7 +838,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(585, 155);
+            this.pa_currentqty.Location = new System.Drawing.Point(586, 156);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 41);
@@ -848,7 +848,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(17, 215);
+            this.pr_code_label.Location = new System.Drawing.Point(18, 216);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(146, 41);
@@ -859,7 +859,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(587, 215);
+            this.pr_detail.Location = new System.Drawing.Point(588, 216);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -869,7 +869,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(17, 153);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(18, 154);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(146, 41);
@@ -880,7 +880,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(189, 215);
+            this.pr_code.Location = new System.Drawing.Point(190, 216);
             this.pr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
@@ -892,7 +892,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(17, 93);
+            this.pa_code_label.Location = new System.Drawing.Point(18, 94);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(114, 41);
@@ -1145,7 +1145,7 @@
             // 
             this.sumpalletweight.AutoSize = true;
             this.sumpalletweight.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.sumpalletweight.Location = new System.Drawing.Point(31, 294);
+            this.sumpalletweight.Location = new System.Drawing.Point(32, 295);
             this.sumpalletweight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sumpalletweight.Name = "sumpalletweight";
             this.sumpalletweight.Size = new System.Drawing.Size(0, 88);
@@ -1155,7 +1155,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(15, 220);
+            this.label4.Location = new System.Drawing.Point(16, 221);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(210, 41);
@@ -1167,7 +1167,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(27, 113);
+            this.weight.Location = new System.Drawing.Point(28, 114);
             this.weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 121);
@@ -1177,7 +1177,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(15, 45);
+            this.label5.Location = new System.Drawing.Point(16, 46);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -1456,21 +1456,21 @@
             this.label14.TabIndex = 196;
             this.label14.Text = "宽";
             // 
-            // pa_height
-            // 
-            this.pa_height.AllPower = null;
-            this.pa_height.BackColor = System.Drawing.Color.White;
-            this.pa_height.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_height.ID = null;
-            this.pa_height.Location = new System.Drawing.Point(1639, 374);
-            this.pa_height.Margin = new System.Windows.Forms.Padding(6);
-            this.pa_height.Name = "pa_height";
-            this.pa_height.Power = null;
-            this.pa_height.Size = new System.Drawing.Size(90, 39);
-            this.pa_height.Str = null;
-            this.pa_height.Str1 = null;
-            this.pa_height.Str2 = null;
-            this.pa_height.TabIndex = 199;
+            // pa_heigth
+            // 
+            this.pa_heigth.AllPower = null;
+            this.pa_heigth.BackColor = System.Drawing.Color.White;
+            this.pa_heigth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_heigth.ID = null;
+            this.pa_heigth.Location = new System.Drawing.Point(1639, 374);
+            this.pa_heigth.Margin = new System.Windows.Forms.Padding(6);
+            this.pa_heigth.Name = "pa_heigth";
+            this.pa_heigth.Power = null;
+            this.pa_heigth.Size = new System.Drawing.Size(90, 39);
+            this.pa_heigth.Str = null;
+            this.pa_heigth.Str1 = null;
+            this.pa_heigth.Str2 = null;
+            this.pa_heigth.TabIndex = 199;
             // 
             // label15
             // 
@@ -1492,7 +1492,7 @@
             this.Controls.Add(this.pa_length);
             this.Controls.Add(this.label12);
             this.Controls.Add(this.pa_width);
-            this.Controls.Add(this.pa_height);
+            this.Controls.Add(this.pa_heigth);
             this.Controls.Add(this.label14);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.label15);
@@ -1663,7 +1663,7 @@
         private System.Windows.Forms.Label label12;
         private CustomControl.TextBoxWithIcon.EnterTextBox pa_width;
         private System.Windows.Forms.Label label14;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_height;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_heigth;
         private System.Windows.Forms.Label label15;
     }
 }

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -166,14 +166,14 @@ namespace UAS_MES_NEW.Packing
                     double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Replace("g", "").Trim());
                     double palletWeightErrorValue = double.Parse(dh.GetConfig("palletWeightErrorValue", "MESSetting").ToString());
                     double totalweight = double.Parse(sumpalletweight.Text);
-                    if (pa_length.Text == "" || pa_width.Text == "" || pa_height.Text == "")
+                    if (pa_length.Text == "" || pa_width.Text == "" || pa_heigth.Text == "")
                     {
                         OperateResult.AppendText(">>长宽高不允许为空" + pa_outboxcode.Text + "\n", Color.Black);
                         return;
                     }
                     if ((ActualWeight >= totalweight - palletWeightErrorValue) && (ActualWeight <= totalweight + palletWeightErrorValue))
                     {
-                        dh.ExecuteSql("update package set PA_WEIGHT='" + weight.Text + "',PA_WIDTH='" + pa_width.Text + "', PA_HEIGTH='" + pa_height.Text + "', PA_LENGTH='" + pa_length.Text + "',pa_printcount=pa_printcount+1,pa_remark='" + PrintLabel.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+                        dh.ExecuteSql("update package set PA_WEIGHT='" + weight.Text + "',PA_WIDTH='" + pa_width.Text + "', PA_HEIGTH='" + pa_heigth.Text + "', PA_LENGTH='" + pa_length.Text + "',pa_printcount=pa_printcount+1,pa_remark='" + PrintLabel.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                     }
                     else
                     {
@@ -235,6 +235,7 @@ namespace UAS_MES_NEW.Packing
             {
                 LoadData();
                 LoadGridData();
+                RefreshWeight();
                 if (CheckOutBoxLength())
                 {
                     sn_code.Focus();
@@ -1058,10 +1059,10 @@ namespace UAS_MES_NEW.Packing
         private string RefreshWeight()
         {
             string boxweight = dh.getFieldDataByCondition("makeserial", "nvl(sum(MS_MIDBOXWEIGHT),0)", "ms_outboxcode='" + pa_outboxcode.Text + "'").ToString();
-            string pr_Singlelevelqty = dh.getFieldDataByCondition("makeserial left join product on ms_prodcode=pr_code", "nvl(pr_Singlelevelqty,1)", "ms_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+            string pr_Singlelevelqty = dh.getFieldDataByCondition("packagedetail left join product on PD_PRODCODE=pr_code", "nvl(pr_Singlelevelqty,1)", "pd_outboxcode='" + pa_outboxcode.Text + "'").ToString();
             string palletweight = dh.getFieldDataByCondition("pallet", "nvl(PL_WEIGHT,0)", "PL_CODE=(select PA_PALLETNO from package where pa_outboxcode='" + pa_outboxcode.Text + "')").ToString();
             sumpalletweight.Text = (double.Parse(boxweight)).ToString();
-            int packageqty = dh.getRowCount("makeserial", "ms_outboxcode='" + pa_outboxcode.Text + "'");
+            int packageqty = dh.getRowCount("packagedetail", "pd_outboxcode='" + pa_outboxcode.Text + "'");
             pr_Singlelevelqty = pr_Singlelevelqty == "" ? "1" : pr_Singlelevelqty;
             //根据单层装的数量，自动计算栈板装的层数
             int rowcount = 0;