接口调整

UAS_MesInterface(4.0)/MesHelper.cs

@@ -1363,7 +1363,7 @@ namespace BenQGuru.eMES.DLLService
             TSN_List = _TSN.ToArray();
 
             //导入后的清单
-            DataTable listafter = (DataTable)ExecuteSql("select msl_sncode from makesnlist where msl_makecode='" + iMaCode + "' and msl_type='after' and nvl(msl_status,0)=0  order by msl_sncode", "select");
+            DataTable listafter = (DataTable)ExecuteSql("select msl_sncode from makesnlist where msl_makecode='" + iMaCode + "' and msl_type='after' and nvl(msl_status,0)=0 and msl_sncode not in (select ms_firstsn from makeserial where ms_makecode='"+iMaCode+"')  order by msl_sncode", "select");
             List<string> _SN = new List<string>();
             for (int i = 0; i < listafter.Rows.Count; i++)
             {
@@ -1372,7 +1372,7 @@ namespace BenQGuru.eMES.DLLService
             SN_List = _SN.ToArray();
 
             //转换前的规则
-            DataTable rulebefore = (DataTable)ExecuteSql("select msd_sncode from MAKESNRULEDETAIL where msd_makecode='" + iMaCode + "' and msd_type='before' and nvl(msd_status,0)=0 order by msd_sncode", "select");
+            DataTable rulebefore = (DataTable)ExecuteSql("select msd_sncode from MAKESNRULEDETAIL where msd_makecode='" + iMaCode + "' and msd_type='before' and nvl(msd_status,0)=0 and msd_sncode not in (select ms_firstsn from makeserial where ms_makecode='" + iMaCode + "') order by msd_sncode", "select");
             List<string> _TSN_rule = new List<string>();
             for (int i = 0; i < rulebefore.Rows.Count; i++)
             {