Merge remote-tracking branch 'origin/develop' into zxw

JmpModel/Model/DataContext/JunmppolicesqlContext.cs

@@ -4,6 +4,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using JmpModel.Model;
+using JmpModel.TempModel;
 
 namespace JmpModel.Model.DataContext
 {
@@ -23,6 +24,7 @@ namespace JmpModel.Model.DataContext
         public virtual DbSet<BaseCharge> BaseCharges { get; set; }
         public virtual DbSet<BaseJpBag> BaseJpBags { get; set; }
         public virtual DbSet<BaseJpBagMap> BaseJpBagMaps { get; set; }
+        public virtual DbSet<useCountResult> useCountResult { get; set; }
         public virtual DbSet<BaseJpCabinet> BaseJpCabinets { get; set; }
         public virtual DbSet<BaseJpCabinetInvErrorMsg> BaseJpCabinetInvErrorMsgs { get; set; }
         public virtual DbSet<BaseJpCabinetOutinlog> BaseJpCabinetOutinlogs { get; set; }
@@ -129,7 +131,7 @@ namespace JmpModel.Model.DataContext
             if (!optionsBuilder.IsConfigured)
             {
 #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings.
-                optionsBuilder.UseSqlServer("Data Source=192.168.3.188;Initial Catalog=junmppolicesqldev;Persist Security Info=True;User ID=sa;Password=Junmp123");
+                optionsBuilder.UseSqlServer("Data Source=192.168.3.188;Initial Catalog=junmppolicesql1115_3;Persist Security Info=True;User ID=sa;Password=Junmp123");
             }
         }
 
@@ -1091,7 +1093,10 @@ Smart:智能货架
 
                 entity.Property(e => e.ParentName).IsUnicode(false);
             });
-
+            modelBuilder.Entity<useCountResult>(entity =>
+            {
+                entity.HasNoKey();
+            });
             modelBuilder.Entity<ColumnConfig>(entity =>
             {
                 entity.Property(e => e.ColumnName).IsUnicode(false);
@@ -3548,8 +3553,6 @@ Warehouse：仓库");
 
                 entity.Property(e => e.Name).IsUnicode(false);
 
-                entity.Property(e => e.NameJc).IsUnicode(false);
-
                 entity.Property(e => e.OrgCode).IsUnicode(false);
 
                 entity.Property(e => e.OrgId).IsUnicode(false);
@@ -3560,8 +3563,6 @@ Warehouse：仓库");
 
                 entity.Property(e => e.SizeName).IsUnicode(false);
 
-                entity.Property(e => e.SortCode).IsUnicode(false);
-
                 entity.Property(e => e.TypeName).IsUnicode(false);
 
                 entity.Property(e => e.TypeOneId).IsUnicode(false);

JunmpPoliceStation/Controllers/CabinetController.cs

@@ -2889,7 +2889,7 @@ namespace JunmpPoliceStation.Controllers
                         }
                         if (rebind.Equals("true"))
                         {
-                            var CurrentBindEquipments = _unitOfWork.EquipmentInventoryRepository.GetList(t => t.InventoryState != "loss" && t.CabinetId.Equals(cabinet.Id), null, false, param);//单警柜的东西
+                            var CurrentBindEquipments = _unitOfWork.EquipmentInventoryRepository.GetList(t => t.InventoryState != "loss" &&(t.CabinetId.Equals(cabinet.Id)|| t.PoliceCode== cabinet.BaseJpPolicemen.FirstOrDefault().Id), null, false, param);//单警柜的东西
                             SendMsg equipmentDic = new SendMsg();
                             equipmentDic.State = "rebind";
                             equipmentDic.Msg = "";