Skip to content

J
JPSMysql
Commit d1103367 by zxw
Options

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

parent 1902a33d
正在显示 包含 277 行增加 和 3 行删除
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 0 → 100644
// <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/JmpSqlServerContext.cs
......@@ -29,6 +29,7 @@ namespace JmpSqlServerModel
public virtual DbSet<BaseJpSupplierEquipment> BaseJpSupplierEquipment { get; set; }
public virtual DbSet<BaseJpWarehouse> BaseJpWarehouse { get; set; }
public virtual DbSet<CommonJpChannelCfgV2> CommonJpChannelCfgV2 { get; set; }
public virtual DbSet<CommonJpEquipmentBoxMark> CommonJpEquipmentBoxMark { get; set; }
public virtual DbSet<CommonJpEquipmentInventory> CommonJpEquipmentInventory { get; set; }
public virtual DbSet<CommonJpEquipmentState> CommonJpEquipmentState { get; set; }
public virtual DbSet<CommonJpEquipmentThreshold> CommonJpEquipmentThreshold { get; set; }
......@@ -48,6 +49,9 @@ namespace JmpSqlServerModel
{
entity.ToTable("base_jp_cabinet");
entity.HasIndex(e => e.CabinetRealNum)
.HasName("IX_base_jp_cabinet");
entity.Property(e => e.Id)
.HasColumnName("id")
.HasMaxLength(36)
......@@ -256,6 +260,11 @@ namespace JmpSqlServerModel
.HasMaxLength(500)
.IsUnicode(false);
entity.Property(e => e.Price)
.HasColumnName("price")
.HasColumnType("decimal(11, 2)")
.HasComment("默认价格");
entity.Property(e => e.SizeCode).HasColumnName("size_code");
entity.Property(e => e.SizeName)
......@@ -336,6 +345,18 @@ namespace JmpSqlServerModel
.HasDefaultValueSql("((0))")
.HasComment("是否在地图上");
entity.Property(e => e.Latitude)
.HasColumnName("latitude")
.HasMaxLength(255)
.IsUnicode(false)
.HasComment("纬度");
entity.Property(e => e.Longitude)
.HasColumnName("longitude")
.HasMaxLength(255)
.IsUnicode(false)
.HasComment("经度");
entity.Property(e => e.Name)
.IsRequired()
.HasColumnName("name")
......@@ -405,6 +426,12 @@ namespace JmpSqlServerModel
.HasColumnName("finger_info2")
.HasColumnType("text");
entity.Property(e => e.IdCardNo)
.HasColumnName("idCardNo")
.HasMaxLength(255)
.IsUnicode(false)
.HasComment("身份证号");
entity.Property(e => e.IsCreatedAccount).HasComment("是否已创建账户");
entity.Property(e => e.Name)
......@@ -718,6 +745,11 @@ Smart:智能货架
.HasColumnName("create_time")
.HasColumnType("datetime");
entity.Property(e => e.IsDisabled)
.HasColumnName("is_disabled")
.HasDefaultValueSql("((0))")
.HasComment("是否停用仓库");
entity.Property(e => e.IsEnableChannelReadEqu)
.HasColumnName("is_enable_channel_read_equ")
.HasComment("是否启用通道读取指定类型装备");
......@@ -838,16 +870,112 @@ Smart:智能货架
.HasConstraintName("FK__common_jp__wareh__7B4643B2");
});
modelBuilder.Entity<CommonJpEquipmentBoxMark>(entity =>
{
entity.ToTable("common_jp_equipment_box_mark");
entity.Property(e => e.Id)
.HasColumnName("id")
.HasMaxLength(36)
.IsUnicode(false);
entity.Property(e => e.CreateTime)
.HasColumnName("create_time")
.HasColumnType("datetime")
.HasComment("创建时间");
entity.Property(e => e.CurrentState)
.HasColumnName("currentState")
.HasComment("状态");
entity.Property(e => e.Epc)
.HasColumnName("epc")
.HasMaxLength(128)
.IsUnicode(false)
.HasComment("epc");
entity.Property(e => e.EquipmentDetailId)
.HasColumnName("equipmentDetailId")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("装备详细类型id");
entity.Property(e => e.OldEpc)
.HasColumnName("oldEpc")
.HasMaxLength(255)
.IsUnicode(false)
.HasComment("旧版epc");
entity.Property(e => e.OneBoxNum)
.HasColumnName("oneBoxNum")
.HasComment("箱内数量");
entity.Property(e => e.ReloadBoxingState)
.HasColumnName("reloadBoxingState")
.HasComment(@"重装箱状态
0：未重装箱
1：未打印
2：已打印");
entity.Property(e => e.SizeId)
.HasColumnName("sizeId")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("装备型号id");
entity.Property(e => e.SupplierId)
.HasColumnName("supplierId")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("供应商id");
entity.Property(e => e.WarehouseId)
.HasColumnName("warehouseId")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("仓库id");
entity.HasOne(d => d.EquipmentDetail)
.WithMany(p => p.CommonJpEquipmentBoxMark)
.HasForeignKey(d => d.EquipmentDetailId)
.HasConstraintName("FK__common_jp__equip__7740A8A4");
entity.HasOne(d => d.Size)
.WithMany(p => p.CommonJpEquipmentBoxMark)
.HasForeignKey(d => d.SizeId)
.HasConstraintName("FK__common_jp__sizeI__7834CCDD");
entity.HasOne(d => d.Supplier)
.WithMany(p => p.CommonJpEquipmentBoxMark)
.HasForeignKey(d => d.SupplierId)
.HasConstraintName("FK__common_jp__suppl__7928F116");
entity.HasOne(d => d.Warehouse)
.WithMany(p => p.CommonJpEquipmentBoxMark)
.HasForeignKey(d => d.WarehouseId)
.HasConstraintName("FK__common_jp__wareh__7A1D154F");
});
modelBuilder.Entity<CommonJpEquipmentInventory>(entity =>
{
entity.HasKey(e => e.Id);
entity.ToTable("common_jp_equipment_inventory");
entity.HasIndex(e => e.CabinetId)
.HasName("IX_common_jp_equipment_inventory");
entity.HasIndex(e => e.Epc)
.HasName("ix_epc")
.IsUnique();
entity.HasIndex(e => e.Id)
.HasName("NonClusteredIndex-20200901-104052")
.IsUnique();
entity.HasIndex(e => e.ShelfId)
.HasName("ix_shelf");
entity.HasIndex(e => e.WarehouseCode)
.HasName("ClusteredIndex-20200901-100012");
......@@ -953,6 +1081,10 @@ Smart:智能货架
.HasColumnName("is_borrowed")
.HasDefaultValueSql("((0))");
entity.Property(e => e.IsFixed)
.HasColumnName("is_fixed")
.HasComment("是否已报废待销毁");
entity.Property(e => e.IsInBox)
.HasColumnName("isInBox")
.HasDefaultValueSql("((0))")
......@@ -962,6 +1094,12 @@ Smart:智能货架
.HasColumnName("lostFlag")
.HasDefaultValueSql("((0))");
entity.Property(e => e.OrgId)
.HasColumnName("org_id")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("组织机构id");
entity.Property(e => e.OutTime)
.HasColumnName("out_time")
.HasColumnType("datetime");
......@@ -1046,6 +1184,11 @@ Smart:智能货架
.HasMaxLength(36)
.IsUnicode(false);
entity.HasOne(d => d.BoxMark)
.WithMany(p => p.CommonJpEquipmentInventory)
.HasForeignKey(d => d.BoxMarkId)
.HasConstraintName("FK__common_jp__box_m__7187CF4E");
entity.HasOne(d => d.Cabinet)
.WithMany(p => p.CommonJpEquipmentInventory)
.HasForeignKey(d => d.CabinetId)
......@@ -1063,6 +1206,11 @@ Smart:智能货架
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("common_jp_equipment_inventory_ibfk_5");
entity.HasOne(d => d.Org)
.WithMany(p => p.CommonJpEquipmentInventory)
.HasForeignKey(d => d.OrgId)
.HasConstraintName("FK__common_jp__org_i__6C8E1007");
entity.HasOne(d => d.PoliceCodeNavigation)
.WithMany(p => p.CommonJpEquipmentInventory)
.HasForeignKey(d => d.PoliceCode)
......@@ -1090,6 +1238,12 @@ Smart:智能货架
entity.ToTable("common_jp_equipment_state");
entity.HasIndex(e => e.CabinetIdInto)
.HasName("IX_common_jp_equipment_state");
entity.HasIndex(e => e.CabinetIdOut)
.HasName("IX_common_jp_equipment_state_1");
entity.HasIndex(e => e.CreateTime)
.HasName("ClusteredIndex-20201113-135343");
......@@ -1103,9 +1257,6 @@ Smart:智能货架
entity.HasIndex(e => new { e.ActionState, e.State, e.OutTime, e.EqiupmentId, e.ErrorEpc, e.ParentId, e.OrgId })
.HasName("_dta_index_common_jp_equipment_state_8_1125579048__K19_K5_K15_K3");
entity.HasIndex(e => new { e.Id, e.Sort, e.EqiupmentId, e.OutInState, e.State, e.WarehouseId, e.OrgId, e.BorrowId, e.CabinetIdInto, e.CabinetIdOut, e.ErrorEpc, e.PurchaseId, e.TransferId, e.FixId, e.OutTime, e.PoliceId, e.IntoTime, e.CreateTime, e.ActionState, e.PicUrl, e.ParentId })
.HasName("_dta_index_common_jp_equipment_state_8_1125579048__col__");
entity.HasIndex(e => new { e.Sort, e.OutInState, e.State, e.WarehouseId, e.OrgId, e.BorrowId, e.CabinetIdInto, e.CabinetIdOut, e.ErrorEpc, e.PurchaseId, e.TransferId, e.FixId, e.OutTime, e.PoliceId, e.IntoTime, e.CreateTime, e.ActionState, e.PicUrl, e.ParentId, e.EqiupmentId, e.Id })
.HasName("_dta_index_common_jp_equipment_state_8_1125579048__K3_K1_2_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20_21");
......@@ -1232,6 +1383,12 @@ Smart:智能货架
.IsUnicode(false)
.HasComment("装备回库id");
entity.Property(e => e.ShiftJobsId)
.HasColumnName("shift_jobs_id")
.HasMaxLength(36)
.IsUnicode(false)
.HasComment("调岗id");
entity.Property(e => e.State).HasColumnName("state");
entity.Property(e => e.ThirdBaseOrgId)
......
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());
//阈值
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论