导入调整，出库修改，openid ！=null问题修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/archives/archivesController.cs

@@ -22,6 +22,8 @@ using NPOI.HSSF.UserModel;
 using Newtonsoft.Json;
 using CallCenterApi.Common;
 using CallCenterAPI.WechatSDK;
+using NPOI.SS.Formula.Functions;
+using Senparc.Weixin.MP.AdvancedAPIs.User;
 
 namespace CallCenterApi.Interface.Controllers.archives
 {
@@ -683,7 +685,7 @@ namespace CallCenterApi.Interface.Controllers.archives
             stateid = archivesbll.GetStateid("已出库");
 
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty(openid))
             {
                 Model.T_Cus_CustomerBaseNew cust = cusbll.GetModelcus(openid);
                 if (archivesbll.GetCustomerName(openid) != "")
@@ -717,6 +719,8 @@ namespace CallCenterApi.Interface.Controllers.archives
                 }
 
             }
+            var log = LogFactory.GetLogger("archivesController");
+            
             if (inside == 0)
             {
                 //外部操作表的记录
@@ -737,7 +741,9 @@ namespace CallCenterApi.Interface.Controllers.archives
                     //发送消息
                     BLL.T_Cus_CustomerBaseNew bll = new BLL.T_Cus_CustomerBaseNew();
                     Model.T_Cus_CustomerBaseNew model = bll.GetModelcusName(companyName);
-                    model.F_WxOpenId = "oVMGRtxOoKL9nMbRCR_Y2kRxjyRw";
+                    log.Error("wxopenid="+model.F_WxOpenId+";companyname="+companyName+";model:"+model.ToJson());
+
+                   // model.F_WxOpenId = "oVMGRtxOoKL9nMbRCR_Y2kRxjyRw";//苗的微信openid
                     if (model != null && !string.IsNullOrEmpty(model.F_WxOpenId))
                     {
                         sendckwxmsg(arcnames,model.F_WxOpenId);
@@ -788,7 +794,7 @@ namespace CallCenterApi.Interface.Controllers.archives
             stateid = archivesbll.GetStateid("在库");
 
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty( openid))
             {
                 if (archivesbll.GetCustomerName(openid) != "")
                 {
@@ -843,7 +849,7 @@ namespace CallCenterApi.Interface.Controllers.archives
                     //发送消息
                     BLL.T_Cus_CustomerBaseNew bll = new BLL.T_Cus_CustomerBaseNew();
                     Model.T_Cus_CustomerBaseNew model = bll.GetModelcusName(companyName);
-                    model.F_WxOpenId = "oVMGRtxOoKL9nMbRCR_Y2kRxjyRw";
+                  //  model.F_WxOpenId = "oVMGRtxOoKL9nMbRCR_Y2kRxjyRw";//苗的微信openid
                     if (model != null && !string.IsNullOrEmpty(model.F_WxOpenId))
                     {
                         sendrkwxmsg(arcnames, model.F_WxOpenId);
@@ -899,7 +905,7 @@ namespace CallCenterApi.Interface.Controllers.archives
             stateid = archivesbll.GetStateid("借阅中");
 
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty( openid))
             {
                 if (archivesbll.GetCustomerName(openid) != "")
                 {
@@ -967,7 +973,7 @@ namespace CallCenterApi.Interface.Controllers.archives
             stateid = archivesbll.GetStateid("在库");
 
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty(openid))
             {
                 if (archivesbll.GetCustomerName(openid) != "")
                 {
@@ -1483,7 +1489,7 @@ namespace CallCenterApi.Interface.Controllers.archives
 
             //获取用户名称
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty( openid))
             {
                 if (archivesbll.GetCustomerName(openid) != "")
                 {
@@ -1556,7 +1562,7 @@ namespace CallCenterApi.Interface.Controllers.archives
 
             //获取用户名称
             var customername = "";
-            if (openid != null)
+            if (!string.IsNullOrEmpty(openid))
             {
                 if (archivesbll.GetCustomerName(openid) != "")
                 {
@@ -2405,39 +2411,76 @@ namespace CallCenterApi.Interface.Controllers.archives
                     if (dt.Rows.Count < 1)
                         return Error("文件内容没有数据");
                     //导入后要插入数据库
-                    var model = new Model.archivesNew();
+                  //  var model = new Model.archivesNew();
                     //Model.T_RepositoryCategory pModel = new BLL.T_RepositoryCategory().GetModel(int.Parse(pid.Trim()));
                     var pmodel = list.FirstOrDefault();
                     //根据公司名称获取客户编号
                     Model.T_Cus_CustomerBaseNew customs = cusbll.GetModelcusName(dataRow[0].ToString());
+                    string A_archiveCode = "";
                     if (customs != null)
                     {
-                        model.A_archiveCode = customs.F_CustomerCode;// dataRow[0].ToString();
+                         A_archiveCode = customs.F_CustomerCode;// dataRow[0].ToString();
                     }
-                    else
+                    //else
+                    //{
+                    //    model.A_archiveCode = "";
+                    //}
+
+                    string name = dataRow[1].ToString();
+                    if (name.Contains(","))
                     {
-                        model.A_archiveCode = "";
+                        string[] str = name.Split(',');
+                        foreach (string item in str)
+                        {
+                            var modelnew = new Model.archivesNew();
+                            modelnew.A_archiveCode = A_archiveCode;
+                            modelnew.A_archiveName = item;
+                            modelnew.A_CompanyName = dataRow[0].ToString();//公司名称
+
+                            modelnew.fileid = fid;
+                            modelnew.A_archiveState = 1;
+                            modelnew.A_archivePeople = CurrentUser.UserData.F_UserCode;//操作人
+
+
+                            int n2 = bll.Add(modelnew);
+                            if (n2 > 0)
+                            {
+                                var addlog = new addupdatelog();
+                                addlog.OperationDate = DateTime.Now;
+                                addlog.Operator = CurrentUser.UserData.F_UserCode;
+                                addlog.OperationContent = "导入了一条物资,名称为：" + dataRow[1].ToString();
+                                addlog.archivesid = n2;
+                                addlog.companyName = dataRow[0].ToString();//公司名称
+                                addlog.type = 0;//条件
+
+                                count++;
+                            }
+                        }
                     }
-
-                    model.A_CompanyName = dataRow[0].ToString();//公司名称
-                    model.A_archiveName = dataRow[1].ToString();
-                    model.fileid = fid;
-                    model.A_archiveState = 1;
-                    model.A_archivePeople = CurrentUser.UserData.F_UserCode;//操作人
-
-
-                    int n = bll.Add(model);
-                    if (n > 0)
+                    else
                     {
-                        var addlog = new addupdatelog();
-                        addlog.OperationDate = DateTime.Now;
-                        addlog.Operator= CurrentUser.UserData.F_UserCode;
-                        addlog.OperationContent= "导入了一条物资,名称为："+ dataRow[1].ToString();
-                        addlog.archivesid = n;
-                        addlog.companyName= dataRow[0].ToString();//公司名称
-                        addlog.type = 0;//条件
-                       
-                        count++;
+                        var model = new Model.archivesNew();
+                        model.A_archiveCode = A_archiveCode;
+                        model.A_CompanyName = dataRow[0].ToString();//公司名称
+                        model.A_archiveName = dataRow[1].ToString();
+                        model.fileid = fid;
+                        model.A_archiveState = 1;
+                        model.A_archivePeople = CurrentUser.UserData.F_UserCode;//操作人
+
+
+                        int n = bll.Add(model);
+                        if (n > 0)
+                        {
+                            var addlog = new addupdatelog();
+                            addlog.OperationDate = DateTime.Now;
+                            addlog.Operator = CurrentUser.UserData.F_UserCode;
+                            addlog.OperationContent = "导入了一条物资,名称为：" + dataRow[1].ToString();
+                            addlog.archivesid = n;
+                            addlog.companyName = dataRow[0].ToString();//公司名称
+                            addlog.type = 0;//条件
+
+                            count++;
+                        }
                     }
                 }
                 if (dt == null || dt.Rows.Count == 0)