Skip to content

J
JunmpPoliceStation
Commit 1bf10ca3 by zxw
Options

消息提醒

parent eb52b136
正在显示 包含 40 行增加 和 40 行删除
JmpModel/Model/BaseJpMessageReminderLogDetail.cs
......@@ -19,6 +19,7 @@ namespace JmpModel.Model
/// <summary>
/// 提醒记录id
/// </summary>
[Required]
[Column("logId")]
[StringLength(36)]
public string LogId { get; set; }
......@@ -83,17 +84,17 @@ namespace JmpModel.Model
[StringLength(255)]
public string BorrowPoliceName { get; set; }
/// <summary>
/// 错误入库仓库id（非本仓库装备）
/// 原入库仓库id（非本仓库装备）
/// </summary>
[Column("failWarehouseId")]
[Column("originalWarehouseId")]
[StringLength(36)]
public string FailWarehouseId { get; set; }
public string OriginalWarehouseId { get; set; }
/// <summary>
/// 错误入库仓库名称（非本仓库装备）
/// 原入库仓库名称（非本仓库装备）
/// </summary>
[Column("failWarehouseName")]
[Column("originalWarehouseName")]
[StringLength(255)]
public string FailWarehouseName { get; set; }
public string OriginalWarehouseName { get; set; }
[ForeignKey(nameof(BorrowPoliceId))]
[InverseProperty(nameof(BaseJpPoliceman.BaseJpMessageReminderLogDetails))]
......@@ -104,15 +105,15 @@ namespace JmpModel.Model
[ForeignKey(nameof(EquipmentSizeId))]
[InverseProperty(nameof(BaseJpEquipmentSize.BaseJpMessageReminderLogDetails))]
public virtual BaseJpEquipmentSize EquipmentSize { get; set; }
[ForeignKey(nameof(FailWarehouseId))]
[InverseProperty(nameof(BaseJpWarehouse.BaseJpMessageReminderLogDetailFailWarehouses))]
public virtual BaseJpWarehouse FailWarehouse { get; set; }
[ForeignKey(nameof(InventoryId))]
[InverseProperty(nameof(CommonJpEquipmentInventory.BaseJpMessageReminderLogDetails))]
public virtual CommonJpEquipmentInventory Inventory { get; set; }
[ForeignKey(nameof(LogId))]
[InverseProperty(nameof(BaseJpMessageReminderLog.BaseJpMessageReminderLogDetails))]
public virtual BaseJpMessageReminderLog Log { get; set; }
[ForeignKey(nameof(OriginalWarehouseId))]
[InverseProperty(nameof(BaseJpWarehouse.BaseJpMessageReminderLogDetailOriginalWarehouses))]
public virtual BaseJpWarehouse OriginalWarehouse { get; set; }
[ForeignKey(nameof(WarehouseId))]
[InverseProperty(nameof(BaseJpWarehouse.BaseJpMessageReminderLogDetailWarehouses))]
public virtual BaseJpWarehouse Warehouse { get; set; }
......
JmpModel/Model/BaseJpWarehouse.cs
......@@ -12,7 +12,7 @@ namespace JmpModel.Model
{
public BaseJpWarehouse()
{
BaseJpMessageReminderLogDetailFailWarehouses = new HashSet<BaseJpMessageReminderLogDetail>();
BaseJpMessageReminderLogDetailOriginalWarehouses = new HashSet<BaseJpMessageReminderLogDetail>();
BaseJpMessageReminderLogDetailWarehouses = new HashSet<BaseJpMessageReminderLogDetail>();
BaseJpShelfInfos = new HashSet<BaseJpShelfInfo>();
BaseJpWarehouseDevHistories = new HashSet<BaseJpWarehouseDevHistory>();
......@@ -105,8 +105,8 @@ namespace JmpModel.Model
[ForeignKey(nameof(OrgizationId))]
[InverseProperty(nameof(BaseJpOrganization.BaseJpWarehouses))]
public virtual BaseJpOrganization Orgization { get; set; }
[InverseProperty(nameof(BaseJpMessageReminderLogDetail.FailWarehouse))]
public virtual ICollection<BaseJpMessageReminderLogDetail> BaseJpMessageReminderLogDetailFailWarehouses { get; set; }
[InverseProperty(nameof(BaseJpMessageReminderLogDetail.OriginalWarehouse))]
public virtual ICollection<BaseJpMessageReminderLogDetail> BaseJpMessageReminderLogDetailOriginalWarehouses { get; set; }
[InverseProperty(nameof(BaseJpMessageReminderLogDetail.Warehouse))]
public virtual ICollection<BaseJpMessageReminderLogDetail> BaseJpMessageReminderLogDetailWarehouses { get; set; }
[InverseProperty(nameof(BaseJpShelfInfo.Warehouse))]
......
JmpModel/Model/DataContext/JunmppolicesqlContext.cs
......@@ -4,7 +4,6 @@ using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using JmpModel.Model;
using JmpModel.TempModel;
namespace JmpModel.Model.DataContext
{
......@@ -24,7 +23,6 @@ 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; }
......@@ -131,7 +129,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=junmppolicesql1115_3;Persist Security Info=True;User ID=sa;Password=Junmp123");
optionsBuilder.UseSqlServer("Data Source=192.168.3.188;Initial Catalog=junmppolicesqldev;Persist Security Info=True;User ID=sa;Password=Junmp123");
}
}
......@@ -577,14 +575,6 @@ namespace JmpModel.Model.DataContext
.IsUnicode(false)
.HasComment("装备号型名称");
entity.Property(e => e.FailWarehouseId)
.IsUnicode(false)
.HasComment("错误入库仓库id（非本仓库装备）");
entity.Property(e => e.FailWarehouseName)
.IsUnicode(false)
.HasComment("错误入库仓库名称（非本仓库装备）");
entity.Property(e => e.InventoryId)
.IsUnicode(false)
.HasComment("装备id");
......@@ -593,6 +583,14 @@ namespace JmpModel.Model.DataContext
.IsUnicode(false)
.HasComment("提醒记录id");
entity.Property(e => e.OriginalWarehouseId)
.IsUnicode(false)
.HasComment("原入库仓库id（非本仓库装备）");
entity.Property(e => e.OriginalWarehouseName)
.IsUnicode(false)
.HasComment("原入库仓库名称（非本仓库装备）");
entity.Property(e => e.WarehouseId)
.IsUnicode(false)
.HasComment("仓库id");
......@@ -616,11 +614,6 @@ namespace JmpModel.Model.DataContext
.HasForeignKey(d => d.EquipmentSizeId)
.HasConstraintName("FK__base_jp_m__equip__316D4A39");
entity.HasOne(d => d.FailWarehouse)
.WithMany(p => p.BaseJpMessageReminderLogDetailFailWarehouses)
.HasForeignKey(d => d.FailWarehouseId)
.HasConstraintName("FK__base_jp_m__failW__3449B6E4");
entity.HasOne(d => d.Inventory)
.WithMany(p => p.BaseJpMessageReminderLogDetails)
.HasForeignKey(d => d.InventoryId)
......@@ -631,6 +624,11 @@ namespace JmpModel.Model.DataContext
.HasForeignKey(d => d.LogId)
.HasConstraintName("FK__base_jp_m__logId__2E90DD8E");
entity.HasOne(d => d.OriginalWarehouse)
.WithMany(p => p.BaseJpMessageReminderLogDetailOriginalWarehouses)
.HasForeignKey(d => d.OriginalWarehouseId)
.HasConstraintName("FK__base_jp_m__failW__3449B6E4");
entity.HasOne(d => d.Warehouse)
.WithMany(p => p.BaseJpMessageReminderLogDetailWarehouses)
.HasForeignKey(d => d.WarehouseId)
......@@ -1093,10 +1091,7 @@ 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);
......@@ -3553,6 +3548,8 @@ 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);
......@@ -3563,6 +3560,8 @@ 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);
......
JmpModel/efpt.config.json
......@@ -435,7 +435,7 @@
"ObjectType": 3
}
],
"UiHint": "PC.junmppolicesqldev",
"UiHint": "pc.junmppolicesqldev.dbo",
"UseBoolPropertiesWithoutDefaultSql": false,
"UseDatabaseNames": false,
"UseDbContextSplitting": false,
......
JunmpPoliceStation/Controllers/InventoryController.cs
......@@ -7235,7 +7235,7 @@ namespace JunmpPoliceStation.Controllers
"EquipmentSizecodeNavigation",
"WarehouseCodeNavigation",
"Org",
});
}).ToList();
BaseJpPoliceman police = null;
if (!string.IsNullOrEmpty(policeId))
{
......
JunmpPoliceStation/Extensions/CronJob.cs
......@@ -168,7 +168,7 @@ namespace JunmpPoliceStation.Extensions
if (view.ExpectedTime < DateTime.Now.AddDays(-equConfigSingle.OverdueBorrowDay))
{
//超期
borrowLog.EquCount += reality.InsideRealCount ?? 0 - reality.RealCount ?? 0;
borrowLog.EquCount += Convert.ToInt32(reality.RealCount) - Convert.ToInt32(reality.InsideRealCount);
}
}
}
......@@ -198,7 +198,7 @@ namespace JunmpPoliceStation.Extensions
_dbContext.SaveChanges();
}
var failWarehouse = _dbContext.CommonJpEquipmentFailWarehouseStates
.Where(x => x.TrueOrgId == config.OrgId && x.IsCompleted == false)
.Where(x => x.FailOrgId == config.OrgId && x.IsCompleted == false)
.ToList();
failWarehouseLog.BaseJpMessageReminderLogDetails.Clear();
if (failWarehouse.Count > 0)
......@@ -216,10 +216,10 @@ namespace JunmpPoliceStation.Extensions
EquipmentDetailName = state.EquipmentDetailName,
EquipmentSizeId = state.EquipmentSizeId,
EquipmentSizeName = state.EquipmentSizeName,
WarehouseId = state.TrueWarehouseId,
WarehouseName = state.TrueWarehouseName,
FailWarehouseId = state.FailWarehouseId,
FailWarehouseName = state.FailWarehouseName
WarehouseId = state.FailWarehouseId,
WarehouseName = state.FailWarehouseName,
OriginalWarehouseId = state.TrueWarehouseId,
OriginalWarehouseName = state.TrueWarehouseName
});
}
failWarehouseLog.EquCount = failWarehouseLog.BaseJpMessageReminderLogDetails.Count;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论