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

UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.cs

@@ -112,7 +112,7 @@ namespace UAS_MES.OQC
                         dh.BatchInsert("delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode =:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         dh.BatchInsert("update package set pa_checkno='" + new_checkno.Text + "' where pa_outboxcode in (select distinct obd_outboxcode from oqcbatchdetail where obd_sncode=:obd_sncode)", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         //删除之前的明细
-                        dh.BatchInsert("update makeserial set ms_checkno=='" + new_checkno.Text + "' where ms_makecode='" + ob_makecode.Text + "' and ms_sncode=:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
+                        dh.BatchInsert("update makeserial set ms_checkno='" + new_checkno.Text + "' where ms_makecode='" + ob_makecode.Text + "' and ms_sncode=:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         dh.BatchInsert("delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode =:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         //插入新批次的从表,更新两个批次
                         sqls.Add("update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + new_checkno.Text + "') where ob_checkno='" + new_checkno.Text + "'");

UAS-MES/FunctionCode/Special/Special_BoxSplit.cs

@@ -36,7 +36,7 @@ namespace UAS_MES.Special
                 List<string> ms_sncode = new List<string>();
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    ms_sncode.Add(dt.Rows[0]["v_barcode"].ToString());
+                    ms_sncode.Add(dt.Rows[i]["v_barcode"].ToString());
                 }
                 sql.Clear();
                 sql.Append("select distinct ms_outboxcode,ms_makecode from makeserial left join mes_package_view on v_makecode=ms_makecode and  ");