政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
username@email.com
2022-08-29 c06eb4d284a80dbee4a2d040046c37bf73dcfcd5 
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs


@@ -91,34 +91,62 @@


            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            ViewData["curentuser"] = curentuser;


            List<ActionEntity> actionlist = new List<ActionEntity>();


            ActionEntity actionEntity = new ActionEntity();


            actionEntity.OpenType = 0;


            actionEntity.ActionUrl = "";


            actionEntity.ActionFun = "Search";


            actionEntity.PageIco = "fa fa-search";


            actionEntity.ActionName = "查询";


            actionlist.Add(actionEntity);


            ActionEntity actionEntity1 = new ActionEntity();


            actionEntity1.OpenType = 0;


            actionEntity1.ActionUrl = "";


            actionEntity1.ActionFun = "Add";


            actionEntity1.PageIco = "fa fa-plus";


            actionEntity1.ActionName = "新增";


            actionlist.Add(actionEntity1);


            //ActionEntity actionEntity = new ActionEntity();


            //actionEntity.OpenType = 0;


            //actionEntity.ActionUrl = "";


            //actionEntity.ActionFun = "Search";


            //actionEntity.PageIco = "fa fa-search";


            //actionEntity.ActionName = "查询";


            //actionlist.Add(actionEntity);


            //ActionEntity actionEntity1 = new ActionEntity();


            //actionEntity1.OpenType = 0;


            //actionEntity1.ActionUrl = "";


            //actionEntity1.ActionFun = "Add";


            //actionEntity1.PageIco = "fa fa-plus";


            //actionEntity1.ActionName = "新增";


            //actionlist.Add(actionEntity1);




            ActionEntity actionEntity3 = new ActionEntity();


            actionEntity3.OpenType = 0;


            actionEntity3.ActionUrl = "";


            actionEntity3.ActionFun = "Print";


            actionEntity3.PageIco = "fa fa-print";


            actionEntity3.ActionName = "打印";


            actionlist.Add(actionEntity3);


            //ActionEntity actionEntity3 = new ActionEntity();


            //actionEntity3.OpenType = 0;


            //actionEntity3.ActionUrl = "";


            //actionEntity3.ActionFun = "Print";


            //actionEntity3.PageIco = "fa fa-print";


            //actionEntity3.ActionName = "打印";


            //actionlist.Add(actionEntity3);




            ViewData["ActionInfo"] = actionlist;


            //ViewData["ActionInfo"] = actionlist;




            List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");




            ViewBag.pageEntities = pageEntities;




            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();


            if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)


            {


                ActionEntity actionEntity = new ActionEntity();


                actionEntity.OpenType = 0;


                actionEntity.ActionUrl = "";


                actionEntity.ActionFun = "Search";


                actionEntity.PageIco = "fa fa-search";


                actionEntity.ActionName = "查询";


                actionlist.Add(actionEntity);




                ViewData["Creater"] = curentuser.Id;


            }


            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();




            foreach (var pageEntity in pageEntities1)


            {


                ActionEntity actionEntity1 = new ActionEntity();


                actionEntity1.OpenType = pageEntity.OpenType;


                actionEntity1.ActionUrl = "";


                actionEntity1.ActionFun = pageEntity.PageShortcut;


                actionEntity1.PageIco = pageEntity.PageIco;


                actionEntity1.ActionName = pageEntity.PageName;


                actionlist.Add(actionEntity1);


            }


            ViewData["ActionInfo"] = actionlist;


            ViewData["ActionInfo2"] = pageEntities2;




            ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();


            ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();


@@ -422,7 +450,9 @@


        {


            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            ViewData["curentuser"] = curentuser;




            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");


            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();


            ViewData["ActionInfo2"] = pageEntities2;


            CooperOrderDTO dto = new CooperOrderDTO();


            if(dingdantype == "0")


            {


@@ -1294,9 +1324,10 @@


            //dto.Id = id;


            dto.Wangonger = curentuser.Id;


            dto.Wangongtime = DateTime.Now;


            dto.WangongStatus = "A";


            dto.ShouliStatus = "4";




            ResultEntity resultEntity = _cooperOrderService.save(dto);


            ResultEntity resultEntity = _cooperOrderService.Wangong(dto);




            return new JsonResult(resultEntity);


        }


@@ -1385,11 +1416,13 @@


                resultEntity = _cooperOrderService.chedan(dto);






                var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("订单收款"+dto.OrderNo);


                var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("订单收款"+dto.OrderNo, dto.OrderNo);


                if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)


                {


                    var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");


                    foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)


                    {


                       


                        CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);


                        FiAccountRecordDTO data1 = new FiAccountRecordDTO();


                        data1.RecStatus = "A";


@@ -1400,21 +1433,36 @@


                        data1.SubjectId = fiAccountRecordDTO.SubjectId;




                        data1.AccountId = fiAccountRecordDTO.AccountId;


                        data1.Money = fiAccountRecordDTO.Money;


                        data1.Money = -fiAccountRecordDTO.Money;


                        data1.PaymentUnit = cooperatecustomCustomerDTO.Name;


                        data1.OperationalMatters = "订单撤单" + dto.OrderNo;




                        var ssss = sysCodeDtls.Where(x => x.CodeSn == dto.OrderType).FirstOrDefault();


                        if (ssss!=null)


                        {


                            dto.OrderTypeName = ssss.Comments;


                        }


                        var book = _fiBookService.Get(dto.OrderType1);


                        var member = _fiMemberService.Get(dto.OrderType1);


                        if (book != null)


                        {


                            dto.OrderType1 = book.BookName;


                        }


                        if (member != null)


                        {


                            dto.OrderType1 = member.MemberType;


                        }


                        data1.OperationalMatters = dto.OrderTypeName + dto.OrderType1 + dto.OrderType2 + " 订单撤单退款"  ;


                        data1.Remark =  dto.OrderNo;






                        FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);






                        data1.RecordTypeId = "2";//退款


                        data1.RecordTypeId = "1";//退款


                        data1.Department = "";








                        firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + fiAccountRecordDTO.Money;


                        firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) - fiAccountRecordDTO.Money;


                        firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;




                        data1.AccountMoney = firmAccount.Balance;


@@ -1840,7 +1888,9 @@


            actionlist.Add(actionEntity);




            ViewData["ActionInfo"] = actionlist;




            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/selectWenshu");


            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();


            ViewData["ActionInfo2"] = pageEntities2;




            ViewBag.Wenshuleixing = _liaotianService.GetSYScode("t_challengeletter", "Wenshuleixing").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();


            ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();