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

2024-12-06 22:17:50 +08:00
parent 77fbdb946d
commit f4f7f93835
24 changed files with 850 additions and 323 deletions
@@ -82,6 +82,7 @@ namespace BLL
                        AuditManName = auditperson.PersonName,
                        AuditDate = x.AuditDate,
                        Remark = x.Remark,
+                        AuditMan2 = x.AuditMan2,
                        AuditManName2 = auditperson2.PersonName,
                        AuditDate2 = x.AuditDate2,
                        WarehouseMan = x.WarehouseMan,
@@ -139,6 +140,7 @@ namespace BLL
                       AuditManName = x.AuditManName,
                       AuditDate = x.AuditDate,
                       Remark = x.Remark,
+                       AuditMan2=x.AuditMan2,
                       AuditManName2 = x.AuditManName2,
                       AuditDate2 = x.AuditDate2,
                       WarehouseMan = x.WarehouseMan,
@@ -187,9 +189,10 @@ namespace BLL
                       AuditManName = x.AuditManName,
                       AuditDate = x.AuditDate,
                       Remark = x.Remark,
+                       AuditMan2 = x.AuditMan2,
                       AuditManName2 = x.AuditManName2,
                       AuditDate2 = x.AuditDate2, 
-                      WarehouseMan = x.WarehouseMan,
+                       WarehouseMan = x.WarehouseMan,
                       WarehouseDate = x.WarehouseDate, 
                       WarehouseManName= x.WarehouseManName
                   };