材料管理修改

SGGL/BLL/CLGL/TwInputmasterService.cs

@@ -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.采购入库)
             {