导入主平台数据新增箱标表

JmpSqlServerModel/BaseJpEquipmentDetail.cs

@@ -11,6 +11,7 @@ namespace JmpSqlServerModel
         {
             BaseJpEquipmentSize = new HashSet<BaseJpEquipmentSize>();
             BaseJpSupplierEquipment = new HashSet<BaseJpSupplierEquipment>();
+            CommonJpEquipmentBoxMark = new HashSet<CommonJpEquipmentBoxMark>();
             CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
             CommonJpEquipmentThreshold = new HashSet<CommonJpEquipmentThreshold>();
         }
@@ -35,6 +36,7 @@ namespace JmpSqlServerModel
         public virtual BaseJpEquipmentInfo Equipment { get; set; }
         public virtual ICollection<BaseJpEquipmentSize> BaseJpEquipmentSize { get; set; }
         public virtual ICollection<BaseJpSupplierEquipment> BaseJpSupplierEquipment { get; set; }
+        public virtual ICollection<CommonJpEquipmentBoxMark> CommonJpEquipmentBoxMark { get; set; }
         public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
         public virtual ICollection<CommonJpEquipmentThreshold> CommonJpEquipmentThreshold { get; set; }
     }

JmpSqlServerModel/BaseJpEquipmentSize.cs

@@ -9,6 +9,7 @@ namespace JmpSqlServerModel
     {
         public BaseJpEquipmentSize()
         {
+            CommonJpEquipmentBoxMark = new HashSet<CommonJpEquipmentBoxMark>();
             CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
             CommonJpEquipmentThreshold = new HashSet<CommonJpEquipmentThreshold>();
         }
@@ -22,8 +23,13 @@ namespace JmpSqlServerModel
         public string Note { get; set; }
         public DateTime UpdateTime { get; set; }
         public int? EpcType { get; set; }
+        /// <summary>
+        /// 默认价格
+        /// </summary>
+        public decimal? Price { get; set; }
 
         public virtual BaseJpEquipmentDetail Detail { get; set; }
+        public virtual ICollection<CommonJpEquipmentBoxMark> CommonJpEquipmentBoxMark { get; set; }
         public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
         public virtual ICollection<CommonJpEquipmentThreshold> CommonJpEquipmentThreshold { get; set; }
     }

JmpSqlServerModel/BaseJpOrganization.cs

@@ -12,6 +12,7 @@ namespace JmpSqlServerModel
             BaseJpCabinet = new HashSet<BaseJpCabinet>();
             BaseJpPoliceman = new HashSet<BaseJpPoliceman>();
             BaseJpWarehouse = new HashSet<BaseJpWarehouse>();
+            CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
             CommonJpEquipmentState = new HashSet<CommonJpEquipmentState>();
             CommonJpEquipmentThreshold = new HashSet<CommonJpEquipmentThreshold>();
             CommonJpUser = new HashSet<CommonJpUser>();
@@ -40,10 +41,19 @@ namespace JmpSqlServerModel
         /// 打印单据数量
         /// </summary>
         public int? OrderCount { get; set; }
+        /// <summary>
+        /// 经度
+        /// </summary>
+        public string Longitude { get; set; }
+        /// <summary>
+        /// 纬度
+        /// </summary>
+        public string Latitude { get; set; }
 
         public virtual ICollection<BaseJpCabinet> BaseJpCabinet { get; set; }
         public virtual ICollection<BaseJpPoliceman> BaseJpPoliceman { get; set; }
         public virtual ICollection<BaseJpWarehouse> BaseJpWarehouse { get; set; }
+        public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
         public virtual ICollection<CommonJpEquipmentState> CommonJpEquipmentState { get; set; }
         public virtual ICollection<CommonJpEquipmentThreshold> CommonJpEquipmentThreshold { get; set; }
         public virtual ICollection<CommonJpUser> CommonJpUser { get; set; }

JmpSqlServerModel/BaseJpPoliceman.cs

@@ -38,6 +38,10 @@ namespace JmpSqlServerModel
         /// 卡号
         /// </summary>
         public string CardNo { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string IdCardNo { get; set; }
 
         public virtual BaseJpCabinet Cabinet { get; set; }
         public virtual BaseJpOrganization OrgizationCodeNavigation { get; set; }

JmpSqlServerModel/BaseJpSupplier.cs

@@ -10,6 +10,7 @@ namespace JmpSqlServerModel
         public BaseJpSupplier()
         {
             BaseJpSupplierEquipment = new HashSet<BaseJpSupplierEquipment>();
+            CommonJpEquipmentBoxMark = new HashSet<CommonJpEquipmentBoxMark>();
             CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
         }
 
@@ -25,6 +26,7 @@ namespace JmpSqlServerModel
         public string Phone { get; set; }
 
         public virtual ICollection<BaseJpSupplierEquipment> BaseJpSupplierEquipment { get; set; }
+        public virtual ICollection<CommonJpEquipmentBoxMark> CommonJpEquipmentBoxMark { get; set; }
         public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
     }
 }
\ No newline at end of file

JmpSqlServerModel/BaseJpWarehouse.cs

@@ -11,6 +11,7 @@ namespace JmpSqlServerModel
         {
             BaseJpShelfInfo = new HashSet<BaseJpShelfInfo>();
             CommonJpChannelCfgV2 = new HashSet<CommonJpChannelCfgV2>();
+            CommonJpEquipmentBoxMark = new HashSet<CommonJpEquipmentBoxMark>();
             CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
             CommonJpEquipmentState = new HashSet<CommonJpEquipmentState>();
             CommonJpEquipmentThreshold = new HashSet<CommonJpEquipmentThreshold>();
@@ -42,10 +43,15 @@ namespace JmpSqlServerModel
         /// 是否启用通道读取指定类型装备
         /// </summary>
         public bool? IsEnableChannelReadEqu { get; set; }
+        /// <summary>
+        /// 是否停用仓库
+        /// </summary>
+        public bool? IsDisabled { get; set; }
 
         public virtual BaseJpOrganization Orgization { get; set; }
         public virtual ICollection<BaseJpShelfInfo> BaseJpShelfInfo { get; set; }
         public virtual ICollection<CommonJpChannelCfgV2> CommonJpChannelCfgV2 { get; set; }
+        public virtual ICollection<CommonJpEquipmentBoxMark> CommonJpEquipmentBoxMark { get; set; }
         public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
         public virtual ICollection<CommonJpEquipmentState> CommonJpEquipmentState { get; set; }
         public virtual ICollection<CommonJpEquipmentThreshold> CommonJpEquipmentThreshold { get; set; }

JmpSqlServerModel/CommonJpEquipmentBoxMark.cs

+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+#nullable disable
+using System;
+using System.Collections.Generic;
+
+namespace JmpSqlServerModel
+{
+    public partial class CommonJpEquipmentBoxMark
+    {
+        public CommonJpEquipmentBoxMark()
+        {
+            CommonJpEquipmentInventory = new HashSet<CommonJpEquipmentInventory>();
+        }
+
+        public string Id { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// epc
+        /// </summary>
+        public string Epc { get; set; }
+        /// <summary>
+        /// 箱内数量
+        /// </summary>
+        public int? OneBoxNum { get; set; }
+        /// <summary>
+        /// 装备详细类型id
+        /// </summary>
+        public string EquipmentDetailId { get; set; }
+        /// <summary>
+        /// 装备型号id
+        /// </summary>
+        public string SizeId { get; set; }
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public string SupplierId { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? CurrentState { get; set; }
+        /// <summary>
+        /// 仓库id
+        /// </summary>
+        public string WarehouseId { get; set; }
+        /// <summary>
+        /// 重装箱状态
+        /// 0：未重装箱
+        /// 1：未打印
+        /// 2：已打印
+        /// </summary>
+        public int? ReloadBoxingState { get; set; }
+        /// <summary>
+        /// 旧版epc
+        /// </summary>
+        public string OldEpc { get; set; }
+
+        public virtual BaseJpEquipmentDetail EquipmentDetail { get; set; }
+        public virtual BaseJpEquipmentSize Size { get; set; }
+        public virtual BaseJpSupplier Supplier { get; set; }
+        public virtual BaseJpWarehouse Warehouse { get; set; }
+        public virtual ICollection<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
+    }
+}
\ No newline at end of file

JmpSqlServerModel/CommonJpEquipmentInventory.cs

@@ -90,10 +90,20 @@ namespace JmpSqlServerModel
         /// 装备包实例id
         /// </summary>
         public string BagInventoryId { get; set; }
+        /// <summary>
+        /// 组织机构id
+        /// </summary>
+        public string OrgId { get; set; }
+        /// <summary>
+        /// 是否已报废待销毁
+        /// </summary>
+        public bool IsFixed { get; set; }
 
+        public virtual CommonJpEquipmentBoxMark BoxMark { get; set; }
         public virtual BaseJpCabinet Cabinet { get; set; }
         public virtual BaseJpEquipmentDetail EquipmentCodeNavigation { get; set; }
         public virtual BaseJpEquipmentSize EquipmentSizecodeNavigation { get; set; }
+        public virtual BaseJpOrganization Org { get; set; }
         public virtual BaseJpPoliceman PoliceCodeNavigation { get; set; }
         public virtual BaseJpShelfInfo Shelf { get; set; }
         public virtual BaseJpSupplier SupplierCodeNavigation { get; set; }

JmpSqlServerModel/CommonJpEquipmentState.cs

@@ -62,6 +62,10 @@ namespace JmpSqlServerModel
         /// 自建平台基础orgid
         /// </summary>
         public string ThirdBaseOrgId { get; set; }
+        /// <summary>
+        /// 调岗id
+        /// </summary>
+        public string ShiftJobsId { get; set; }
 
         public virtual BaseJpCabinet CabinetIdIntoNavigation { get; set; }
         public virtual BaseJpCabinet CabinetIdOutNavigation { get; set; }

JmpSqlServerModel/efpt.config.json

@@ -62,6 +62,10 @@
          "ObjectType": 0
       },
       {
+         "Name": "[dbo].[common_jp_equipment_box_mark]",
+         "ObjectType": 0
+      },
+      {
          "Name": "[dbo].[common_jp_equipment_inventory]",
          "ObjectType": 0
       },

JunmpPoliceStation/Controllers/ThirdPartyInitController.cs

@@ -96,6 +96,7 @@ namespace JunmpPoliceStation.Controllers
                     //通道配置
                     _mysqlContext.BulkSynchronize<JmpModel.Model.CommonJpChannelCfgV2>(_sqlServerContext.CommonJpChannelCfgV2.Include(x => x.Warehouse).Where(x => orgList.Contains(x.Warehouse.OrgizationId)).ToList());
                     //装备
+                    _mysqlContext.BulkSynchronize<JmpModel.Model.CommonJpEquipmentBoxMark>(_sqlServerContext.CommonJpEquipmentBoxMark.Include(x => x.Warehouse).Where(x => orgList.Contains(x.Warehouse.OrgizationId)).ToList());
                     _mysqlContext.BulkSynchronize<JmpModel.Model.CommonJpEquipmentInventory>(_sqlServerContext.CommonJpEquipmentInventory.Include(x => x.WarehouseCodeNavigation).Where(x => orgList.Contains(x.WarehouseCodeNavigation.OrgizationId)).ToList());
                     //_unitOfWork.DbContext.BulkSynchronize<JmpModel.Model.CommonJpEquipmentState>(_sqlServerContext.CommonJpEquipmentState.Where(x => orgList.Contains(x.OrgId)).ToList());
                     //阈值