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

材料管理修改

Browse Source
This commit is contained in:
李鹏飞
2024-11-07 16:22:03 +08:00
parent 693c914869
commit e5c44d6dc2
25 changed files with 434 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+15
View File
@@ -39,6 +39,8 @@ namespace BLL
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
from unit in units.DefaultIfEmpty()
where
@@ -80,6 +82,9 @@ namespace BLL
Remark = x.Remark,
AuditManName2 = auditperson2.PersonName,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName= warehouseperson.PersonName
}
;
@@ -134,6 +139,9 @@ namespace BLL
Remark = x.Remark,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName= x.WarehouseManName
}).ToList();
}
@@ -178,6 +186,9 @@ namespace BLL
Remark = x.Remark,
AuditManName2 = x.AuditManName2,
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName= x.WarehouseManName
};
}
@@ -325,6 +336,8 @@ namespace BLL
Remark = newtable.Remark,
AuditMan2=newtable.AuditMan2,
AuditDate2=newtable.AuditDate2,
WarehouseMan = newtable.WarehouseMan,
WarehouseDate = newtable.WarehouseDate,
};
Funs.DB.Tw_InOutPlanMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -354,6 +367,8 @@ namespace BLL
table.Remark = newtable.Remark;
table.AuditMan2 = newtable.AuditMan2;
table.AuditDate2 = newtable.AuditDate2;
table.WarehouseMan = newtable.WarehouseMan;
table.WarehouseDate = newtable.WarehouseDate;
Funs.DB.SubmitChanges();
}
SGGL/BLL/CLGL/TwInputmasterService.cs
+24 -7
View File
@@ -28,6 +28,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 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
from unit in units.DefaultIfEmpty()
where
@@ -60,7 +62,10 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
Remark = x.Remark
Remark = x.Remark,
WarehouseMan = x.WarehouseMan,
WarehouseManName = warehouseperson.PersonName,
WarehouseDate = x.WarehouseDate
};
return q;
@@ -105,7 +110,10 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark=x.Remark
Remark=x.Remark,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName= x.WarehouseManName
};
}
@@ -142,7 +150,10 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
Remark = x.Remark
Remark = x.Remark,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName= x.WarehouseManName
}).ToList();
}
#endregion
@@ -172,7 +183,9 @@ namespace BLL
ReqUnitId = newtable.ReqUnitId,
AuditMan= newtable.AuditMan,
AuditDate = newtable.AuditDate,
Remark = newtable.Remark
Remark = newtable.Remark,
WarehouseMan= newtable.WarehouseMan,
WarehouseDate = newtable.WarehouseDate
};
Funs.DB.Tw_InputMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -199,6 +212,8 @@ namespace BLL
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
table.Remark = newtable.Remark;
table.WarehouseMan = newtable.WarehouseMan;
table.WarehouseDate = newtable.WarehouseDate;
Funs.DB.SubmitChanges();
}
@@ -250,11 +265,13 @@ namespace BLL
Category = plan.Category,
State = (int)TwConst.State.已完成,
CreateMan = plan.CreateMan,
CreateDate = DateTime.Now,
CreateDate = plan.CreateDate,
ReqUnitId = plan.ReqUnitId,
AuditMan = plan.CreateMan,
AuditMan = plan.AuditMan,
AuditDate = plan.AuditDate,
Remark= remark
Remark= remark,
WarehouseMan = plan.WarehouseMan,
WarehouseDate = plan.WarehouseDate
};
if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
{
SGGL/BLL/CLGL/TwOutputmasterService.cs
+23 -6
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 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
from unit in units.DefaultIfEmpty()
where
@@ -68,6 +70,9 @@ namespace BLL
AuditMan = x.AuditMan,
AuditManName = auditperson.PersonName,
AuditDate = x.AuditDate,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
WarehouseManName = warehouseperson.PersonName
};
return q;
@@ -112,7 +117,10 @@ namespace BLL
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate
AuditDate = x.AuditDate,
WarehouseMan = x.WarehouseMan,
WarehouseManName = x.WarehouseManName,
WarehouseDate = x.WarehouseDate
};
}
@@ -150,7 +158,10 @@ namespace BLL
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate
AuditDate = x.AuditDate,
WarehouseMan = x.WarehouseMan,
WarehouseManName = x.WarehouseManName,
WarehouseDate = x.WarehouseDate
}).ToList();
}
@@ -180,7 +191,9 @@ namespace BLL
CreateDate = newtable.CreateDate,
ReqUnitId = newtable.ReqUnitId,
AuditMan = newtable.AuditMan,
AuditDate = newtable.AuditDate
AuditDate = newtable.AuditDate,
WarehouseMan = newtable.WarehouseMan,
WarehouseDate = newtable.WarehouseDate,
};
Funs.DB.Tw_OutputMaster.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -206,6 +219,8 @@ namespace BLL
table.ReqUnitId = newtable.ReqUnitId;
table.AuditMan = newtable.AuditMan;
table.AuditDate = newtable.AuditDate;
table.WarehouseMan = newtable.WarehouseMan;
table.WarehouseDate = newtable.WarehouseDate;
Funs.DB.SubmitChanges();
}
@@ -257,10 +272,12 @@ namespace BLL
TypeInt = plan.TypeInt,
State = (int)TwConst.State.已完成,
CreateMan = plan.CreateMan,
CreateDate = DateTime.Now,
CreateDate = plan.CreateDate,
ReqUnitId = plan.ReqUnitId,
AuditMan = plan.CreateMan,
AuditDate = plan.AuditDate
AuditMan = plan.AuditMan,
AuditDate = plan.AuditDate,
WarehouseMan = plan.WarehouseMan,
WarehouseDate = plan.WarehouseDate
};
Add(master);
//生成出库单明细