撤销内容修改

UAS_MES_ODLF/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -146,7 +146,7 @@ namespace UAS_MES_NEW.Make
                             dh.UpdateByCondition("makedown", "md_status=0,MD_UPREASON='" + inputreson.Text + "', MD_UPDATE=sysdate, MD_UPMAN='" + User.UserCode + "' ", " md_code = '" + LabelDataGridView.Rows[i].Cells["md_code"].Value.ToString() + "' and md_sncode = '" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "'");
                             //更新序列号状态
                             sql.Clear();
-                            sql.Append("update makeserial set ms_downstatus=0 where ms_sncode='" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "' and ms_makecode='" + LabelDataGridView.Rows[i].Cells["md_macode"].Value.ToString() + "'");
+                            sql.Append("update makeserial set ms_downstatus=0 where (ms_sncode='" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "' or ms_firstsn='" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "') and ms_makecode='" + LabelDataGridView.Rows[i].Cells["md_macode"].Value.ToString() + "'");
                             dh.ExecuteSql(sql.GetString(), "update");
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, LabelDataGridView.Rows[i].Cells["md_macode"].Value.ToString(), User.UserLineCode, User.UserSourceCode, "取消下地操作", "序列号" + LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString() + "下地成功", LabelDataGridView.Rows[i].Cells["md_sncode"].Value.ToString(), "");
                         }

UAS_MES_PW/FunctionCode/Packing/Packing_PalletWightCollection.cs

@@ -759,9 +759,12 @@ namespace UAS_MES_NEW.Packing
                 byteTemp[0] = Convert.ToByte("00", 16);
                 for (int i = 0; i < 10; i++)
                 {
-                    if (data[i].ToString() == "0")
-                        continue;
-                    arr.Add(data[i]);
+                    if (i >= 4)
+                    {
+                        if (data[i].ToString() == "0")
+                            continue;
+                        arr.Add(data[i]);
+                    }
                 }
                 for (int i = 0; i < arr.Count; i++)
                 {