材料管理修改

2024-11-07 16:22:03 +08:00
parent 693c914869
commit e5c44d6dc2
25 changed files with 434 additions and 111 deletions
@@ -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();
            }