修改

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -480,7 +480,11 @@ namespace UAS_MES.Make
             TSNLength_checkBox.Enabled = true;
             SNPre_checkBox.Enabled = true;
             SNLength_checkBox.Enabled = true;
-
+            //判断工单是否导入了序列号清单
+            if (dh.CheckExist("makesnlist", "msl_makecode='" + oMakecode + "' and msl_type='after'"))
+            {
+                return;
+            }
             //查询表工单序列号防呆规则表
             rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakecode + "'", "select");
             if (rules.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -309,8 +309,13 @@ namespace UAS_MES.Make
             beforeTransSNLength_checkBox.Enabled = true;
             afterTransSNPre_checkBox.Enabled = true;
             afterTransSNLength_checkBox.Enabled = true;
-            //查询表工单序列号防呆规则表
-            rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakeCode + "'", "select");
+            //判断工单是否导入了序列号清单
+            if (dh.CheckExist("makesnlist", "msl_makecode='" + oMakeCode + "' and msl_type='after'"))
+            {
+                return;
+            }
+                //查询表工单序列号防呆规则表
+                rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakeCode + "'", "select");
             if (rules.Rows.Count > 0)
             {
                 foreach (DataRow dr in rules.Rows)