lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/InvoiceManage/PhtglInvoiceService .cs
+121 -127
View File
@@ -1,20 +1,11 @@
using EmitMapper;
using FineUIPro;
using MiniExcelLibs;
using MiniExcelLibs.Attributes;
using Model;
using NPOI.SS.Formula.Eval;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Security;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;
using System.Text;
using WIA;
namespace BLL
@@ -58,9 +49,9 @@ namespace BLL
public static string GetState(object invoiceId)
{
string result = "";
if (invoiceId!=null && !string.IsNullOrEmpty(invoiceId.ToString()) )
if (invoiceId != null && !string.IsNullOrEmpty(invoiceId.ToString()))
{
var InvoiceId=invoiceId.ToString();
var InvoiceId = invoiceId.ToString();
var model = GetPHTGL_InvoiceById(InvoiceId);
var approveModel = PHTGL_ApproveService.GetPHTGL_ApproveByContractId(InvoiceId);
@@ -74,7 +65,7 @@ namespace BLL
result = "已创建入库订单";
break;
case 1:
result = "入库审核中"+",当前节点-"+BLL.Person_PersonsService.getPersonsNamesPersonIds(string.Join(",",approveModel.Select(x => x.ApproveMan)));
result = "入库审核中" + ",当前节点-" + BLL.Person_PersonsService.getPersonsNamesPersonIds(string.Join(",", approveModel.Select(x => x.ApproveMan)));
break;
case 2:
result = "入库审核拒绝";
@@ -121,13 +112,13 @@ namespace BLL
(string.IsNullOrEmpty(table.SellerTaxNumber) || x.SellerTaxNumber.Contains(table.SellerTaxNumber)) &&
(string.IsNullOrEmpty(table.ApproveManJson) || x.ApproveManJson.Contains(table.ApproveManJson)) &&
(string.IsNullOrEmpty(table.CreateUser) || x.CreateUser.Contains(table.CreateUser)) &&
(table.State==null ||x.State==table.State)
(table.State == null || x.State == table.State)
select x
;
return q.ToList();
}
/// <summary>
/// 获取分页列表
/// </summary>
@@ -144,60 +135,61 @@ namespace BLL
}
q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return (from x in q
join y in Funs.DB.PHTGL_Contract on x.ContractId equals y.ContractId into g
from c in g.DefaultIfEmpty()
select new
{
c?.ContractName,
c?.ContractNum,
c?.Parties,
c?.ContractAmount,
x.InvoiceId,
x.ProjectId,
x.ContractId,
x.State,
x.InvoiceCode,
x.InvoiceNumber,
x.SellerName,
x.InvoiceDate,
x.AmountExcludingTax,
x.TotalTax,
x.Remark,
x.ImagePath,
x.SellerTaxNumber,
x.InvoiceAmount,
x.ApproveManJson,
x.CreateDate,
x.CreateUser,
x.OrderInDate,
x.OrderOutDate,
x.OrderCode,
x.MaterialRequisitionUnit
});
return (from x in q
join y in Funs.DB.PHTGL_Contract on x.ContractId equals y.ContractId into g
from c in g.DefaultIfEmpty()
select new
{
c?.ContractName,
c?.ContractNum,
c?.Parties,
c?.ContractAmount,
x.InvoiceId,
x.ProjectId,
x.ContractId,
x.State,
x.InvoiceCode,
x.InvoiceNumber,
x.SellerName,
x.InvoiceDate,
x.AmountExcludingTax,
x.TotalTax,
x.Remark,
x.ImagePath,
x.SellerTaxNumber,
x.InvoiceAmount,
x.ApproveManJson,
x.CreateDate,
x.CreateUser,
x.OrderInDate,
x.OrderOutDate,
x.OrderCode,
x.MaterialRequisitionUnit
});
}
public static IEnumerable GetOrderInListData(Model.PHTGL_Invoice table, Grid grid1,string state)
public static IEnumerable GetOrderInListData(Model.PHTGL_Invoice table, Grid grid1, string state)
{
var q = GetPHTGL_InvoiceByModle(table);
switch (state)
{
case "0": q = q.Where(x => x.State > StateDataIn); //全部
case "0":
q = q.Where(x => x.State > StateDataIn); //全部
break;
case "1":
q = q.Where(x => x.State > StateDataIn &&x.State< StateInPutApproveSuccess); //未入库
break;
case "2":
q = q.Where(x => x.State >= StateInPutApproveSuccess ); //已入库
break;
case "3":
q = q.Where(x => x.State >=StateInPutApproveSuccess && x.State < StateOutPutApproveSuccess);//未出库
break;
case "4":
case "1":
q = q.Where(x => x.State > StateDataIn && x.State < StateInPutApproveSuccess); //未入库
break;
case "2":
q = q.Where(x => x.State >= StateInPutApproveSuccess); //已入库
break;
case "3":
q = q.Where(x => x.State >= StateInPutApproveSuccess && x.State < StateOutPutApproveSuccess);//未出库
break;
case "4":
q = q.Where(x => x.State == StateOutPutApproveSuccess);//已出库
break;
break;
}
Count = q.Count();
@@ -208,37 +200,37 @@ namespace BLL
q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return (from x in q
join y in Funs.DB.PHTGL_Contract on x.ContractId equals y.ContractId into g
from c in g.DefaultIfEmpty()
where x.State>StateDataIn
select new
{
c?.ContractName,
c?.ContractNum,
c?.Parties,
c?.ContractAmount,
x.InvoiceId,
x.ProjectId,
x.ContractId,
x.State,
x.InvoiceCode,
x.InvoiceNumber,
x.SellerName,
x.InvoiceDate,
x.AmountExcludingTax,
x.TotalTax,
x.Remark,
x.ImagePath,
x.SellerTaxNumber,
x.InvoiceAmount,
x.ApproveManJson,
x.CreateDate,
x.CreateUser,
x.OrderInDate,
x.OrderOutDate,
x.OrderCode,
x.MaterialRequisitionUnit
}).ToList();
join y in Funs.DB.PHTGL_Contract on x.ContractId equals y.ContractId into g
from c in g.DefaultIfEmpty()
where x.State > StateDataIn
select new
{
c?.ContractName,
c?.ContractNum,
c?.Parties,
c?.ContractAmount,
x.InvoiceId,
x.ProjectId,
x.ContractId,
x.State,
x.InvoiceCode,
x.InvoiceNumber,
x.SellerName,
x.InvoiceDate,
x.AmountExcludingTax,
x.TotalTax,
x.Remark,
x.ImagePath,
x.SellerTaxNumber,
x.InvoiceAmount,
x.ApproveManJson,
x.CreateDate,
x.CreateUser,
x.OrderInDate,
x.OrderOutDate,
x.OrderCode,
x.MaterialRequisitionUnit
}).ToList();
}
#endregion
@@ -256,17 +248,17 @@ namespace BLL
OrderApproveOut orderApproveOut = new OrderApproveOut();
var invoiceModel = GetPHTGL_InvoiceById(InvoiceId);
var invoiceDetail = PhtglInvoicedetailService.GetPHTGL_InvoiceDetailByInvoiceId(InvoiceId);
var invoiceDetail = PhtglInvoicedetailService.GetPHTGL_InvoiceDetailByInvoiceId(InvoiceId);
var approveManModels = GetInvoiceApproveManEntity(InvoiceId);
//将invoiceModel 映射到order
var mapper = EmitMapper.ObjectMapperManager.DefaultInstance.GetMapper<PHTGL_Invoice, Order>();
order=mapper.Map(invoiceModel);
order.ProjectName=ProjectService.GetProjectNameByProjectId(invoiceModel.ProjectId);
order.ContractCode=ContractService.GetContractById(invoiceModel.ContractId)?.ContractNum;
order = mapper.Map(invoiceModel);
order.ProjectName = ProjectService.GetProjectNameByProjectId(invoiceModel.ProjectId);
order.ContractCode = ContractService.GetContractById(invoiceModel.ContractId)?.ContractNum;
//invoiceDetail 映射到orderDetails
var mapper2 = EmitMapper.ObjectMapperManager.DefaultInstance.GetMapper<List<PHTGL_InvoiceDetail>, List<OrderDetail>>();
orderDetails = mapper2.Map(invoiceDetail);
orderDetails= orderDetails.Select(x => new OrderDetail
orderDetails = orderDetails.Select(x => new OrderDetail
{
GoodsOrServicesName = x.GoodsOrServicesName,
SpecificationModel = x.SpecificationModel,
@@ -274,11 +266,11 @@ namespace BLL
Quantity = x.Quantity,
UnitPrice = x.UnitPrice,
NoTaxPrice = x.Amount - x.Tax,
TaxRate = string.Format("{0:P0}", Convert.ToDecimal(x.TaxRate) ),
Tax =x.Tax ,
TaxRate = string.Format("{0:P0}", Convert.ToDecimal(x.TaxRate)),
Tax = x.Tax,
Amount = x.Amount,
}).ToList();
if (approveManModels!=null)
if (approveManModels != null)
{
orderApproveIn.ProjectManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProjectManager) : "";
orderApproveIn.ControlManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ControlManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ControlManager) : "";
@@ -395,10 +387,10 @@ namespace BLL
{
Model.PHTGL_InvoiceApproveManEntity list = new Model.PHTGL_InvoiceApproveManEntity();
Model.PHTGL_Invoice data = Funs.DB.PHTGL_Invoice.FirstOrDefault(e => e.InvoiceId == InvoiceId);
if (data != null && !string .IsNullOrEmpty(data.ApproveManJson))
if (data != null && !string.IsNullOrEmpty(data.ApproveManJson))
{
list = Newtonsoft.Json.JsonConvert.DeserializeObject<Model.PHTGL_InvoiceApproveManEntity>(data.ApproveManJson);
}
}
return list;
}
/// <summary>
@@ -527,33 +519,35 @@ namespace BLL
return responeData;
}
/// <summary>
/// 获取审批人员
/// </summary>
/// <param name="invoiceId">主键id</param>
/// <param name="type">0 入库 1出库</param>
/// <returns></returns>
public static List<ApproveManModel> GetApproveManModels(string invoiceId ,int type)
public static List<ApproveManModel> GetApproveManModels(string invoiceId, int type)
{
List<ApproveManModel> approveManModels = new List<ApproveManModel>();
var table = GetInvoiceApproveManEntity(invoiceId);
if (type==0) //入库
if (type == 0) //入库
{
approveManModels.Add(new ApproveManModel { Number = 1, userid = table.InputApproveMan.ProfessionalEngineer, Rolename = "专业工程师" });
approveManModels.Add(new ApproveManModel { Number = 2, userid = table.InputApproveMan.ConstructionManager, Rolename = "施工经理" });
approveManModels.Add(new ApproveManModel { Number = 3, userid = table.InputApproveMan.ControlManager, Rolename = "控制经理" });
approveManModels.Add(new ApproveManModel { Number = 4, userid = table.InputApproveMan.ProjectManager, Rolename = "项目经理" }); }
else {
approveManModels.Add(new ApproveManModel { Number = 5, userid = table.OutputApproveMan.PurchasingMan, Rolename = "采购员" });
approveManModels.Add(new ApproveManModel { Number = 6, userid = table.OutputApproveMan.ControlManager, Rolename = "控制经理" });
approveManModels.Add(new ApproveManModel { Number = 7, userid = table.OutputApproveMan.ProjectManager, Rolename = "项目经理" });
approveManModels.Add(new ApproveManModel { Number = 8, userid = table.OutputApproveMan.ConUnitMaterialOfficer, Rolename = "施工单位材料经理" });
approveManModels.Add(new ApproveManModel { Number = 9, userid = table.OutputApproveMan.ConUnitProjectManager, Rolename = "施工单位项目经理" });
approveManModels.Add(new ApproveManModel { Number = 4, userid = table.InputApproveMan.ProjectManager, Rolename = "项目经理" });
}
else
{
approveManModels.Add(new ApproveManModel { Number = 5, userid = table.OutputApproveMan.PurchasingMan, Rolename = "采购员" });
approveManModels.Add(new ApproveManModel { Number = 6, userid = table.OutputApproveMan.ControlManager, Rolename = "控制经理" });
approveManModels.Add(new ApproveManModel { Number = 7, userid = table.OutputApproveMan.ProjectManager, Rolename = "项目经理" });
approveManModels.Add(new ApproveManModel { Number = 8, userid = table.OutputApproveMan.ConUnitMaterialOfficer, Rolename = "施工单位材料经理" });
approveManModels.Add(new ApproveManModel { Number = 9, userid = table.OutputApproveMan.ConUnitProjectManager, Rolename = "施工单位项目经理" });
}
return approveManModels;
}
@@ -561,22 +555,22 @@ namespace BLL
/// 开启审批流程
/// </summary>
/// <param name="invoiceId"></param>
public static void StartApprovalProcess(string invoiceId )
public static void StartApprovalProcess(string invoiceId)
{
var model = GetPHTGL_InvoiceById(invoiceId);
if (model.State ==StateCreate || model.State == StateInPutApproveRefuse)
{
if (model.State == StateCreate || model.State == StateInPutApproveRefuse)
{
CreateFirstApprove(invoiceId, 0);
model.State = StateInPutApprove;
UpdatePHTGL_Invoice(model);
}
}
else if (model.State == StateInPutApproveSuccess || model.State == StateOutPutApproveRefuse)
{
CreateFirstApprove(invoiceId, 1);
model.State = StateOutPutApprove;
UpdatePHTGL_Invoice(model);
}
}
}
/// <summary>
@@ -585,8 +579,8 @@ namespace BLL
/// <param name="invoiceId">主键</param>
/// <param name="type">0 入库 1出库</param>
public static void CreateFirstApprove(string invoiceId, int type)
{
var approveManModels = GetApproveManModels(invoiceId, type).OrderBy(x=>x.Number).FirstOrDefault();
{
var approveManModels = GetApproveManModels(invoiceId, type).OrderBy(x => x.Number).FirstOrDefault();
Model.PHTGL_Approve _Approve = new Model.PHTGL_Approve();
_Approve.ApproveId = SQLHelper.GetNewID(typeof(Model.PHTGL_Approve));
_Approve.ContractId = invoiceId;
@@ -597,7 +591,7 @@ namespace BLL
_Approve.ApproveIdea = "";
_Approve.IsPushOa = 0;
_Approve.ApproveType = approveManModels.Rolename;
_Approve.ApproveForm =(type==0? "Invoice_Input": "Invoice_Output");
_Approve.ApproveForm = (type == 0 ? "Invoice_Input" : "Invoice_Output");
BLL.PHTGL_ApproveService.AddPHTGL_Approve(_Approve);
}
@@ -617,7 +611,7 @@ namespace BLL
var thisApproveTypeNumber = approveManModels.Find(x => x.userid == userid && x.Rolename == thisApprovemodel.ApproveType).Number; //当前审批人员序号
int nextApproveTypeNumber = thisApproveTypeNumber + 1; //下一个审批人员序号
int maxApproveTypeNumber = approveManModels.Max(x => x.Number); //最大审批人员序号
thisApprovemodel.ApproveDate = Funs.GetNewDateTimeOrNow("").ToString();
thisApprovemodel.IsAgree = isAgree ? 2 : 1;
@@ -626,7 +620,7 @@ namespace BLL
PHTGL_ApproveService.UpdatePHTGL_Approve(thisApprovemodel);
if (isAgree)
{
if (PHTGL_ApproveService.GetPHTGL_ApproveByContractId(invoiceId).Count==0) //当前节点是否全部审批结束
if (PHTGL_ApproveService.GetPHTGL_ApproveByContractId(invoiceId).Count == 0) //当前节点是否全部审批结束
{
if (thisApproveTypeNumber < maxApproveTypeNumber) //是否最末节点
{
@@ -647,8 +641,8 @@ namespace BLL
{
//流程走完结束
var model = GetPHTGL_InvoiceById(invoiceId);
model.State = (type == 0 ? StateInPutApproveSuccess:StateOutPutApproveSuccess);
UpdatePHTGL_Invoice(model);
model.State = (type == 0 ? StateInPutApproveSuccess : StateOutPutApproveSuccess);
UpdatePHTGL_Invoice(model);
}
}
}
@@ -656,7 +650,7 @@ namespace BLL
{ //审批拒绝-流程结束
var model = GetPHTGL_InvoiceById(invoiceId);
model.State = (type == 0 ? StateInPutApproveRefuse : StateOutPutApproveRefuse);
UpdatePHTGL_Invoice(model);
UpdatePHTGL_Invoice(model);
}
OAWebSevice.Pushoa();
OAWebSevice.DoneRequest(thisApprovemodel.ApproveId);