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

UAS-MES/FunctionCode/Special/Special_CancelCollection.cs

@@ -84,6 +84,8 @@ namespace UAS_MES.Special
                         dh.BatchInsert(sql.GetString(), new string[] { "barcode" }, barcode.ToArray());
                         sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
                     }
+                    //删除打印日志
+                    sqls.Add("delete from labelprintlog where lpl_value='" + sn_code.Text + "' and lpl_makecode='" + ms_makecode + "'");
                     //删除老化记录
                     sqls.Add("delete from AGINGRECORD where ar_sncode='" + sn_code.Text + "' and ar_macode='" + ms_makecode + "'");
                     //解除前一工单板的使用