入库单修改，增加入库明细序号，修改入库单打印模板。

2024-11-14 16:27:15 +08:00
parent 02ebf92623
commit edb2e10e69
16 changed files with 198 additions and 157 deletions
@@ -330,9 +330,9 @@ namespace FineUIPro.Web.CLGL
            List<Model.Tw_PrintMaster> tw_PrintMasters = new List<Model.Tw_PrintMaster>();
            List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
            Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
-            {
+            { 

-                ReqUnitName = result.ReqUnitName,
+                ReqUnitName = UnitService.GetUnitNameByUnitId(Person_PersonsService.GetPerson_PersonsById(result.CreateMan).UnitId),
                CusBillCode = result.CusBillCode,
                CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
                ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
@@ -382,6 +382,7 @@ namespace FineUIPro.Web.CLGL
            var tw_PrintDetail = (from x in Funs.DB.Tw_InputDetail
                                  join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                  where x.InputMasterId == Id
+                                  orderby x.SortIndex
                                  select new Model.Tw_PrintDetail
                                  {
                                      SortIndex = 0,