Merge branch 'hotFix' of http://gitlab.sothing.top/zxw/JunmpPoliceStation into hotFix

JmpModel/Model/DataContext/JunmppolicesqlContext.cs

@@ -3540,6 +3540,8 @@ Warehouse：仓库");
 
                 entity.Property(e => e.EquipmentCode).IsUnicode(false);
 
+                entity.Property(e => e.EquipmentCode1).IsUnicode(false);
+
                 entity.Property(e => e.EquipmentName).IsUnicode(false);
 
                 entity.Property(e => e.EquipmentSizecode).IsUnicode(false);

JmpModel/Model/ViewEquipment.cs

@@ -47,6 +47,9 @@ namespace JmpModel.Model
         [Column("equipment_name")]
         [StringLength(64)]
         public string EquipmentName { get; set; }
+        [Column("equipmentCode")]
+        [StringLength(36)]
+        public string EquipmentCode1 { get; set; }
         [Column("equipment_sizecode")]
         [StringLength(36)]
         public string EquipmentSizecode { get; set; }

JmpModel/efpt.config.json

@@ -435,7 +435,7 @@
          "ObjectType": 3
       }
    ],
-   "UiHint": "pc.junmppolicesqldev.dbo",
+   "UiHint": "PC.junmppolicesqldev",
    "UseBoolPropertiesWithoutDefaultSql": false,
    "UseDatabaseNames": false,
    "UseDbContextSplitting": false,

JunmpPoliceStation/Controllers/InventoryController.cs

@@ -9191,7 +9191,6 @@ namespace JunmpPoliceStation.Controllers
                        "EquipmentSizecodeNavigation.Detail" ,
                        "EquipmentCodeNavigation" ,
                        "WarehouseCodeNavigation" ,
-                       "WarehouseCodeNavigation.Orgization",
                        "CommonJpEquipmentStates",
                        "SupplierCodeNavigation",
                        "Cabinet",
@@ -9345,10 +9344,7 @@ namespace JunmpPoliceStation.Controllers
                         }
 
                         var EquipmentList = _unitOfWork.EquipmentInventoryRepository.GetList(expression, c => c.CreateTime, false, param)
-                            .OrderBy(x => x.EquipmentCode)
-                            .ThenBy(x => x.EquipmentSizecode)
-                            .ThenBy(x => x.WarehouseCodeNavigation.Orgization.Code)
-                            .ThenBy(x => x.WarehouseCode)
+                        .OrderBy(x=>x.EquipmentCodeNavigation.Code)
                             .ToList();
 
                         var datas = EquipmentList.Select(equipment => new