Explorar el Código

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

zhaozhiqiang %!s(int64=5) %!d(string=hace) años
padre
commit
f7bd5c0808

+ 70 - 23
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/archives/archivesController.cs

428
 
428
 
429
             //获取用户名称
429
             //获取用户名称
430
             var customername = "";
430
             var customername = "";
431
-            if (archivesbll.GetCustomerName(openid) != "")
431
+            if (openid != null)
432
             {
432
             {
433
-                customername = archivesbll.GetCustomerName(openid);
433
+                if (archivesbll.GetCustomerName(openid) != "")
434
+                {
435
+                    customername = archivesbll.GetCustomerName(openid);
436
+                }
434
             }
437
             }
435
-
438
+            else
439
+            {
440
+                customername = CurrentUser.UserData.F_UserCode;
441
+            }
442
+            if (archivesids == null)
443
+                return Error("编号为空" + ",操作人:" + customername);
436
             //将多个物品id数据转成数据格式
444
             //将多个物品id数据转成数据格式
437
             string[] arrStr = archivesids.Split(',');
445
             string[] arrStr = archivesids.Split(',');
438
             foreach (var item in arrStr)
446
             foreach (var item in arrStr)
493
 
501
 
494
             //获取用户名称
502
             //获取用户名称
495
             var customername = "";
503
             var customername = "";
496
-            if (archivesbll.GetCustomerName(openid) != "")
504
+            if (openid != null)
497
             {
505
             {
498
-                customername = archivesbll.GetCustomerName(openid);
506
+                if (archivesbll.GetCustomerName(openid) != "")
507
+                {
508
+                    customername = archivesbll.GetCustomerName(openid);
509
+                }
499
             }
510
             }
500
-
511
+            else
512
+            {
513
+                customername = CurrentUser.UserData.F_UserCode;
514
+            }
515
+            if (archivesids == null)
516
+                return Error("编号为空" + ",操作人:" + customername);
501
             //将多个物品id数据转成数据格式
517
             //将多个物品id数据转成数据格式
502
             string[] arrStr = archivesids.Split(',');
518
             string[] arrStr = archivesids.Split(',');
503
             foreach (var item in arrStr)
519
             foreach (var item in arrStr)
692
             
708
             
693
         }
709
         }
694
         /// <summary>
710
         /// <summary>
695
-        /// 内部员工入库
711
+        /// PC内部员工入库
696
         /// </summary>
712
         /// </summary>
697
         /// <param name="archive"></param>
713
         /// <param name="archive"></param>
698
         /// <returns></returns>
714
         /// <returns></returns>
699
-        public ActionResult insideOperationRK(string archivesids)
715
+        public ActionResult insideOperationRK(string archivesids, string openid)
700
         {
716
         {
701
             var model = new CallCenterApi.Model.insideOperation();
717
             var model = new CallCenterApi.Model.insideOperation();
702
 
718
 
707
             {
723
             {
708
                 stateid = archivesbll.GetStateid("在库");
724
                 stateid = archivesbll.GetStateid("在库");
709
             }
725
             }
726
+            //获取用户名称
727
+            var customername = "";
728
+            if(openid!=null)
729
+            { 
730
+                if (archivesbll.GetCustomerName(openid) != "")
731
+                {
732
+                    customername = archivesbll.GetCustomerName(openid);
733
+                }
734
+            }
735
+            else
736
+            {
737
+                customername = CurrentUser.UserData.F_UserCode;
738
+            }
739
+            if(archivesids==null)
740
+                return Error("编号为空" + ",操作人:" + customername);
710
             //将多个物品id数据转成数据格式
741
             //将多个物品id数据转成数据格式
711
             string[] arrStr = archivesids.Split(',');
742
             string[] arrStr = archivesids.Split(',');
712
             foreach (var item in arrStr)
743
             foreach (var item in arrStr)
717
                 model.archivesid = Convert.ToInt32(item);//物品编号
748
                 model.archivesid = Convert.ToInt32(item);//物品编号
718
                 model.Warehousing = "入库";//区分入库还是出库
749
                 model.Warehousing = "入库";//区分入库还是出库
719
                 model.WarehousingDate = DateTime.Now;//操作时间
750
                 model.WarehousingDate = DateTime.Now;//操作时间
720
-                model.Operator = CurrentUser.UserData.F_UserCode;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
751
+                model.Operator = customername;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
721
                 var arvichid = Convert.ToInt32(item);
752
                 var arvichid = Convert.ToInt32(item);
722
                 if (archivesbll.AddinsideOperation(model) > 0)
753
                 if (archivesbll.AddinsideOperation(model) > 0)
723
                 {
754
                 {
724
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
755
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
725
-                    Operationlogmodel.Operator = CurrentUser.UserData.F_UserCode;
756
+                    Operationlogmodel.Operator = customername;
726
                     Operationlogmodel.OperationDate = DateTime.Now;
757
                     Operationlogmodel.OperationDate = DateTime.Now;
727
                     Operationlogmodel.OperationContent = "添加了一条入库信息";
758
                     Operationlogmodel.OperationContent = "添加了一条入库信息";
728
                     Operationlogmodel.archivesid = arvichid;
759
                     Operationlogmodel.archivesid = arvichid;
730
                 }
761
                 }
731
                 else
762
                 else
732
                 {
763
                 {
733
-                    return Error("失败" + ",操作人:" + CurrentUser.UserData.F_UserCode);
764
+                    return Error("失败" + ",操作人:" + customername);
734
                 }
765
                 }
735
 
766
 
736
             }
767
             }
737
-            return Success("入库成功" + ",操作人:" + CurrentUser.UserData.F_UserCode);
768
+            return Success("入库成功" + ",操作人:" + customername);
738
         }
769
         }
770
+    
739
         /// <summary>
771
         /// <summary>
740
-        /// 内部员工出库
772
+        /// PC内部员工出库
741
         /// </summary>
773
         /// </summary>
742
         /// <param name="archive"></param>
774
         /// <param name="archive"></param>
743
         /// <returns></returns>
775
         /// <returns></returns>
744
-        public ActionResult insideOperationCk(string archivesids)
776
+        public ActionResult insideOperationCk(string archivesids, string openid)
745
         {
777
         {
746
             var model = new CallCenterApi.Model.insideOperation();
778
             var model = new CallCenterApi.Model.insideOperation();
747
-            
748
-             ///修改物资状态为已出库
749
-             //根据状态名称 已出库 获取状态id
750
-             var stateid = 1;
751
-            if (archivesbll.GetStateid("已出库") !=0)
779
+
780
+            ///修改物资状态为已出库
781
+            //根据状态名称 已出库 获取状态id
782
+            var stateid = 1;
783
+            if (archivesbll.GetStateid("已出库") != 0)
752
             {
784
             {
753
                 stateid = archivesbll.GetStateid("已出库");
785
                 stateid = archivesbll.GetStateid("已出库");
754
             }
786
             }
787
+            //获取用户名称
788
+            var customername = "";
789
+            if (openid != null)
790
+            {
791
+                if (archivesbll.GetCustomerName(openid) != "")
792
+                {
793
+                    customername = archivesbll.GetCustomerName(openid);
794
+                }
795
+            }
796
+            else
797
+            {
798
+                customername = CurrentUser.UserData.F_UserCode;
799
+            }
800
+            if (archivesids == null)
801
+                return Error("编号为空" + ",操作人:" + customername);
755
             //将多个物品id数据转成数据格式
802
             //将多个物品id数据转成数据格式
756
             string[] arrStr = archivesids.Split(',');
803
             string[] arrStr = archivesids.Split(',');
757
             foreach (var item in arrStr)
804
             foreach (var item in arrStr)
761
                 model.archivesid = Convert.ToInt32(item);//物品编号
808
                 model.archivesid = Convert.ToInt32(item);//物品编号
762
                 model.Warehousing = "出库";//区分入库还是出库
809
                 model.Warehousing = "出库";//区分入库还是出库
763
                 model.WarehousingDate = DateTime.Now;//操作时间
810
                 model.WarehousingDate = DateTime.Now;//操作时间
764
-                model.Operator = CurrentUser.UserData.F_UserCode;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
811
+                model.Operator = customername;// CurrentUser.UserData.F_UserCode; //操作人insideOperation.Operator
765
                 var arvichid = Convert.ToInt32(item);
812
                 var arvichid = Convert.ToInt32(item);
766
                 if (archivesbll.AddinsideOperation(model) > 0)
813
                 if (archivesbll.AddinsideOperation(model) > 0)
767
                 {
814
                 {
768
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
815
                     var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
769
-                    Operationlogmodel.Operator = CurrentUser.UserData.F_UserCode;
816
+                    Operationlogmodel.Operator = customername;
770
                     Operationlogmodel.OperationDate = DateTime.Now;
817
                     Operationlogmodel.OperationDate = DateTime.Now;
771
                     Operationlogmodel.OperationContent = "添加了一条出库信息";
818
                     Operationlogmodel.OperationContent = "添加了一条出库信息";
772
                     Operationlogmodel.archivesid = arvichid;
819
                     Operationlogmodel.archivesid = arvichid;
775
                 }
822
                 }
776
                 else
823
                 else
777
                 {
824
                 {
778
-                    return Error("失败" + ",操作人:" + CurrentUser.UserData.F_UserCode);
825
+                    return Error("失败" + ",操作人:" + customername);
779
                 }
826
                 }
780
             }
827
             }
781
-            return Success("出库成功" + ",操作人:" + CurrentUser.UserData.F_UserCode);
828
+            return Success("出库成功" + ",操作人:" + customername);
782
         }
829
         }
783
         /// <summary>
830
         /// <summary>
784
         /// 删除一条内部员工出入库信息
831
         /// 删除一条内部员工出入库信息