调整合并领料查询单据报错的问题

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -262,7 +262,7 @@ namespace ICSSoft.DataProject
                                     a.ToWarehouseCode,";
 
                         tableNameMerge = @"ICSTransfer a 
-                                    INNER JOIN ICSMOPickMerge mer ON a.TransferDetailID=mer.SourceID AND a.WorkPoint=mer.WorkPoint";
+                                    INNER JOIN ICSMOPickMerge mer ON a.ID=mer.SourceID AND a.WorkPoint=mer.WorkPoint";
 
                         #region SLQ
                         sql = @"SELECT a.ID,
@@ -999,7 +999,7 @@ namespace ICSSoft.DataProject
                         string sqlMerge = "SELECT ID FROM ICSMOPickMerge WHERE MergeID='" + JsonData.TransCode + "' AND WorkPoint='" + JsonData.WorkPoint + "'";
 
                         DataTable sign = DBHelper.SQlReturnData(sqlMerge, cmd);
-                        if (sign != null && flag.Rows.Count > 0)
+                        if (sign != null && sign.Rows.Count > 0)
                         {
                             string whereMerge = string.Format("mer.MergeID='{0}' AND mer.WorkPoint='{1}'", JsonData.TransCode, JsonData.WorkPoint);
                             sql = string.Format(sql, columnsMerge, tableNameMerge, whereMerge, JsonData.TransCode, JsonData.WorkPoint);