微信端和pc端都适用借阅归还出库入库接口

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

@@ -428,11 +428,19 @@ namespace CallCenterApi.Interface.Controllers.archives
 
             //获取用户名称
             var customername = "";
-            if (archivesbll.GetCustomerName(openid) != "")
+            if (openid != null)
             {
-                customername = archivesbll.GetCustomerName(openid);
+                if (archivesbll.GetCustomerName(openid) != "")
+                {
+                    customername = archivesbll.GetCustomerName(openid);
+                }
             }
-
+            else
+            {
+                customername = CurrentUser.UserData.F_UserCode;
+            }
+            if (archivesids == null)
+                return Error("编号为空" + ",操作人：" + customername);
             //将多个物品id数据转成数据格式
             string[] arrStr = archivesids.Split(',');
             foreach (var item in arrStr)
@@ -493,11 +501,19 @@ namespace CallCenterApi.Interface.Controllers.archives
 
             //获取用户名称
             var customername = "";
-            if (archivesbll.GetCustomerName(openid) != "")
+            if (openid != null)
             {
-                customername = archivesbll.GetCustomerName(openid);
+                if (archivesbll.GetCustomerName(openid) != "")
+                {
+                    customername = archivesbll.GetCustomerName(openid);
+                }
             }
-
+            else
+            {
+                customername = CurrentUser.UserData.F_UserCode;
+            }
+            if (archivesids == null)
+                return Error("编号为空" + ",操作人：" + customername);
             //将多个物品id数据转成数据格式
             string[] arrStr = archivesids.Split(',');
             foreach (var item in arrStr)
@@ -692,11 +708,11 @@ namespace CallCenterApi.Interface.Controllers.archives
             
         }
         /// <summary>
-        /// 内部员工入库
+        /// PC内部员工入库
         /// </summary>
         /// <param name="archive"></param>
         /// <returns></returns>
-        public ActionResult insideOperationRK(string archivesids)
+        public ActionResult insideOperationRK(string archivesids, string openid)
         {
             var model = new CallCenterApi.Model.insideOperation();
 
@@ -707,6 +723,21 @@ namespace CallCenterApi.Interface.Controllers.archives
             {
                 stateid = archivesbll.GetStateid("在库");
             }
+            //获取用户名称
+            var customername = "";
+            if(openid!=null)
+            { 
+                if (archivesbll.GetCustomerName(openid) != "")
+                {
+                    customername = archivesbll.GetCustomerName(openid);
+                }
+            }
+            else
+            {
+                customername = CurrentUser.UserData.F_UserCode;
+            }
+            if(archivesids==null)
+                return Error("编号为空" + ",操作人：" + customername);
             //将多个物品id数据转成数据格式
             string[] arrStr = archivesids.Split(',');
             foreach (var item in arrStr)
@@ -717,12 +748,12 @@ namespace CallCenterApi.Interface.Controllers.archives
                 model.archivesid = Convert.ToInt32(item);//物品编号
                 model.Warehousing = "入库";//区分入库还是出库
                 model.WarehousingDate = DateTime.Now;//操作时间
-                model.Operator = CurrentUser.UserData.F_UserCode;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
+                model.Operator = customername;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
                 var arvichid = Convert.ToInt32(item);
                 if (archivesbll.AddinsideOperation(model) > 0)
                 {
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
-                    Operationlogmodel.Operator = CurrentUser.UserData.F_UserCode;
+                    Operationlogmodel.Operator = customername;
                     Operationlogmodel.OperationDate = DateTime.Now;
                     Operationlogmodel.OperationContent = "添加了一条入库信息";
                     Operationlogmodel.archivesid = arvichid;
@@ -730,28 +761,44 @@ namespace CallCenterApi.Interface.Controllers.archives
                 }
                 else
                 {
-                    return Error("失败" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                    return Error("失败" + ",操作人：" + customername);
                 }
 
             }
-            return Success("入库成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+            return Success("入库成功" + ",操作人：" + customername);
         }
+    
         /// <summary>
-        /// 内部员工出库
+        /// PC内部员工出库
         /// </summary>
         /// <param name="archive"></param>
         /// <returns></returns>
-        public ActionResult insideOperationCk(string archivesids)
+        public ActionResult insideOperationCk(string archivesids, string openid)
         {
             var model = new CallCenterApi.Model.insideOperation();
-            
-             ///修改物资状态为已出库
-             //根据状态名称 已出库 获取状态id
-             var stateid = 1;
-            if (archivesbll.GetStateid("已出库") !=0)
+
+            ///修改物资状态为已出库
+            //根据状态名称 已出库 获取状态id
+            var stateid = 1;
+            if (archivesbll.GetStateid("已出库") != 0)
             {
                 stateid = archivesbll.GetStateid("已出库");
             }
+            //获取用户名称
+            var customername = "";
+            if (openid != null)
+            {
+                if (archivesbll.GetCustomerName(openid) != "")
+                {
+                    customername = archivesbll.GetCustomerName(openid);
+                }
+            }
+            else
+            {
+                customername = CurrentUser.UserData.F_UserCode;
+            }
+            if (archivesids == null)
+                return Error("编号为空" + ",操作人：" + customername);
             //将多个物品id数据转成数据格式
             string[] arrStr = archivesids.Split(',');
             foreach (var item in arrStr)
@@ -761,12 +808,12 @@ namespace CallCenterApi.Interface.Controllers.archives
                 model.archivesid = Convert.ToInt32(item);//物品编号
                 model.Warehousing = "出库";//区分入库还是出库
                 model.WarehousingDate = DateTime.Now;//操作时间
-                model.Operator = CurrentUser.UserData.F_UserCode;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
+                model.Operator = customername;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
                 var arvichid = Convert.ToInt32(item);
                 if (archivesbll.AddinsideOperation(model) > 0)
                 {
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
-                    Operationlogmodel.Operator = CurrentUser.UserData.F_UserCode;
+                    Operationlogmodel.Operator = customername;
                     Operationlogmodel.OperationDate = DateTime.Now;
                     Operationlogmodel.OperationContent = "添加了一条出库信息";
                     Operationlogmodel.archivesid = arvichid;
@@ -775,10 +822,10 @@ namespace CallCenterApi.Interface.Controllers.archives
                 }
                 else
                 {
-                    return Error("失败" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                    return Error("失败" + ",操作人：" + customername);
                 }
             }
-            return Success("出库成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+            return Success("出库成功" + ",操作人：" + customername);
         }
         /// <summary>
         /// 删除一条内部员工出入库信息