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

材料管理修改（打印修改，出库单已审核已完成不计算匹配率）材料匹配修改，焊接任务单修改

Browse Source
This commit is contained in:
李鹏飞
2024-12-06 22:17:50 +08:00
parent 77fbdb946d
commit f4f7f93835
24 changed files with 850 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwOutputmasterService.cs
+20 -1
View File
@@ -34,6 +34,8 @@ namespace BLL
from person in persons.DefaultIfEmpty()
join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
from auditperson in auditpersons.DefaultIfEmpty()
join auditperson2 in Funs.DB.Person_Persons on x.AuditMan2 equals auditperson2.PersonId into auditpersons2
from auditperson2 in auditpersons2.DefaultIfEmpty()
join warehouseperson in Funs.DB.Person_Persons on x.WarehouseMan equals warehouseperson.PersonId into warehousepersons
from warehouseperson in warehousepersons.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units
@@ -70,6 +72,9 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
AuditMan2 = x.AuditMan2,
AuditManName2 = auditperson2.PersonName,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName = warehouseperson.PersonName
@@ -118,6 +123,9 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
AuditMan2 = x.AuditMan2,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseManName = x.WarehouseManName,
WarehouseDate = x.WarehouseDate
@@ -159,6 +167,9 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
AuditMan2 = x.AuditMan2,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseManName = x.WarehouseManName,
WarehouseDate = x.WarehouseDate
@@ -192,6 +203,8 @@ namespace BLL
ReqUnitId = newtable.ReqUnitId,
AuditMan = newtable.AuditMan,
AuditDate = newtable.AuditDate,
AuditMan2 = newtable.AuditMan2,
AuditDate2 = newtable.AuditDate2,
WarehouseMan = newtable.WarehouseMan,
WarehouseDate = newtable.WarehouseDate,
};
@@ -219,6 +232,8 @@ namespace BLL
table.ReqUnitId = newtable.ReqUnitId;
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
table.AuditMan2 = newtable.AuditMan2;
table.AuditDate2 = newtable.AuditDate2;
table.WarehouseMan = newtable.WarehouseMan;
table.WarehouseDate = newtable.WarehouseDate;
Funs.DB.SubmitChanges();
@@ -276,6 +291,8 @@ namespace BLL
ReqUnitId = plan.ReqUnitId,
AuditMan = plan.AuditMan,
AuditDate = plan.AuditDate,
AuditMan2 = plan.AuditMan2,
AuditDate2 = plan.AuditDate2,
WarehouseMan = plan.WarehouseMan,
WarehouseDate = plan.WarehouseDate
};
@@ -325,7 +342,9 @@ namespace BLL
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detail.ActNum);
}
var planModel= TwInOutplanmasterService.GetById(planId);
planModel.State= (int)TwConst.State.已审核;
planModel.State= (int)TwConst.State.已审核;
planModel.WarehouseMan = null;
planModel.WarehouseDate = null;
TwInOutplanmasterService.Update(planModel);
return result;
}