shim 8 лет назад
Родитель
Сommit
c45ba41229
1 измененных файлов с 14 добавлено и 4 удалено
  1. 14 4
      UAS-MES/FunctionCode/Packing/Packing_ProdWeightSet.cs

+ 14 - 4
UAS-MES/FunctionCode/Packing/Packing_ProdWeightSet.cs

@@ -81,10 +81,6 @@ namespace UAS_MES.Packing
             lvi.SubItems.Add(time.ToString());
             //添加结果的信息进去
             showResult.Items.Add(lvi);
-            //将重量信息加到集合中
-            sncodes.Add(palletcode);
-            indates.Add(time.ToString("YYYY-MM-dd HH:mm:ss"));
-            weights.Add(weigh);
             //更新已称重量最大值最小值
             if (index > 1)
             {
@@ -100,6 +96,10 @@ namespace UAS_MES.Packing
                 indates.Clear();
                 weights.Clear();
             }
+            //将重量信息加到集合中
+            sncodes.Add(palletcode);
+            indates.Add(time.ToString("yyyy-MM-dd HH:mm:ss"));
+            weights.Add(weigh);
         }
 
         private void startWeigh_Click(object sender, EventArgs e)
@@ -201,6 +201,12 @@ namespace UAS_MES.Packing
                     OperateResult.AppendText("<<重量不能等于0\n", Color.Red, sncode);
                     return;
                 }
+                //验证序列号是否存在
+                if (!dh.CheckExist("makeserial", "ms_sncode = '" + sncode.Text + "'"))
+                {
+                    OperateResult.AppendText("<<序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                    return;
+                }
                 //验证彩盒是否与产品对应
                 if (!dh.CheckExist("makeserial","ms_prodcode='"+pr_code.Text+"' and ms_sncode = '"+sncode.Text+"'"))
                 {
@@ -215,6 +221,7 @@ namespace UAS_MES.Packing
                 }
                 //记录重量
                 recordResult(showResult.Items.Count+1,sncode.Text, weight.Text, System.DateTime.Now);
+                sncode.Text = "";
             }
         }
 
@@ -243,6 +250,9 @@ namespace UAS_MES.Packing
             OperateResult.AppendText("<<重量设置需采样个数为" + samplesCount + "\n", Color.Black);
             //清空称量记录
             showResult.Items.Clear();
+            indates.Clear();
+            sncodes.Clear();
+            weights.Clear();
         }
 
         private void ma_code_TextKeyDown(object sender, KeyEventArgs e)