Merge branch 'master' of http://119.3.29.177:3000/zhongming/Shengpo

ICS.CreateCompRpt/CustCreateCompRptSrvSub.cs.cs

@@ -199,9 +199,10 @@ namespace UFIDA.ISV.CreateCompRpt
                         throw new Exception("批号生成失败，完工报告生成失败！");
                     }
                 }
+                data.m_docNo = item.DocNO;
                 data.m_completeDocType = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData();
                 data.m_completeDocType.m_code = item.docTypeCode;
-                //data.m_completeDocType.m_iD = GetTypeID(docTypeCode);
+                data.m_completeDocType.m_iD = GetTypeID(item.docTypeCode, OrgID);
                 data.m_mO = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData();
                 data.m_mO.m_code = item.moCode;
                 data.m_handlePerson = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData();
@@ -413,12 +414,13 @@ namespace UFIDA.ISV.CreateCompRpt
             return datas.ToArray();
 
         }
-        private static long GetTypeID(string docTypeCode)
+        private static long GetTypeID(string docTypeCode, string OrgID)
         {
             string sql = @"SELECT  A.[ID] as [ID], A.[Code] as [Code]
-	 FROM  MO_IssueDocType as A  
-	 left join [MO_IssueDocType_Trl] as A1 on (A1.SysMlFlag = 'zh-CN') and (A.[ID] = A1.[ID])
-	 left join [Base_Organization] as A4 on (A.[Org] = A4.[ID]) WHERE  ((A.[Code] = '" + docTypeCode + "' and (1 = 1)) and (A4.[ID] = '" + ConfigurationManager.AppSettings["orgID"].ToString() + "')) ";
+                           FROM  MO_CompleteRptDocType as A  
+                           left join [MO_CompleteRptDocType_Trl] as A1 on (A1.SysMlFlag = 'zh-CN') and (A.[ID] = A1.[ID])
+                           left join [Base_Organization] as A4 on (A.[Org] = A4.[ID]) 
+                           WHERE  ((A.[Code] = '"+ docTypeCode + "' and (1 = 1)) and (A4.[ID] = '" + OrgID + "')) ";
             DataTable dt = DBhlper.Query(sql, Appconfig.GetU9ConnStr());
             if (dt.Rows.Count > 0)
             {
@@ -461,6 +463,7 @@ namespace UFIDA.ISV.CreateCompRpt
 
     public class CompRpt
     {
+        public string DocNO { get; set; }
         public decimal qty { get; set; }
         public string docTypeCode { get; set; }
         public string moCode { get; set; }