zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改字段类型

master
赵新宇 5 days ago
parent
19ad6398a6
commit
5f417b2acd
5 changed files with 151 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 140
      API/TaskManager.Contracts/Dtos/Dtos.cs
  2. 56
      API/TaskManager.Entity/Entity.cs
  3. 2
      API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
  4. 2
      API/Wood.Admin.WebApi/appsettings.json
  5. 1
      API/Wood.Admin.WebApi/看板配送单.json

140
API/TaskManager.Contracts/Dtos/Dtos.cs
View File

@ -952,7 +952,7 @@ namespace TaskManager.Contracts.Dtos
public string ProductionLineName { get; set; } public string ProductionLineName { get; set; }
public string MaterialCode { get; set; } public string MaterialCode { get; set; }
public string MaterialDescription { get; set; } public string MaterialDescription { get; set; }
public string SortDate { get; set; } public string? SortDate { get; set; }
public string SortTime { get; set; } public string SortTime { get; set; }
public string OnLineDate { get; set; } public string OnLineDate { get; set; }
public string OnLineTime { get; set; } public string OnLineTime { get; set; }
@ -978,25 +978,125 @@ namespace TaskManager.Contracts.Dtos
public class SUPPLIER_DEL_STATE_DETAIL_DTO : CherryReadBaseEntityDto public class SUPPLIER_DEL_STATE_DETAIL_DTO : CherryReadBaseEntityDto
{ {
public string DeliveryNumber { get; set; }
public string SerialNumber { get; set; } /// <summary>
public string SerialSrate { get; set; } // Matches input, may check for typo (e.g. SerialState?) /// 配送单号
public string MaterialCode { get; set; } /// </summary>
public string MaterialDescription { get; set; } [MaxLength(50)]
public string PlantId { get; set; } [ExporterHeader(DisplayName = "配送单号")]
public string ReceivingCrossings { get; set; } public string? DeliveryNumber { get; set; }
public decimal? QuantityDelivery { get; set; }
public string DataCreateTime { get; set; } /// <summary>
public string SupplierReceiveTime { get; set; } /// 行项目号
public string RoadShippedTime { get; set; } /// </summary>
public string RoadReceiveTime { get; set; } [MaxLength(50)]
public string CreateByUser { get; set; } [ExporterHeader(DisplayName = "行项目号")]
public DateTime CreateTime { get; set; } public string? SerialNumber { get; set; }
public string UpdateByUser { get; set; }
public DateTime UpdateTime { get; set; } /// <summary>
public int IsDelete { get; set; } /// 配送单状态
public int Version { get; set; } /// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "配送单状态")]
public string? SerialSrate { get; set; }
/// <summary>
/// 零件号
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "零件号")]
public string? MaterialCode { get; set; }
/// <summary>
/// 零件名称
/// </summary>
[MaxLength(100)]
[ExporterHeader(DisplayName = "零件名称")]
public string? MaterialDescription { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "工厂代码")]
public string? PlantId { get; set; }
/// <summary>
/// 收货道口
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "收货道口")]
public string? ReceivingCrossings { get; set; }
/// <summary>
/// 数量
/// </summary>
[ExporterHeader(DisplayName = "数量")]
public decimal? QuantityDelivery { get; set; } = 0;
/// <summary>
/// 创建时间
/// </summary>
[ExporterHeader(DisplayName = "数据创建时间")]
public string? DataCreateTime { get; set; }
/// <summary>
/// 供应商接收时间
/// </summary>
[ExporterHeader(DisplayName = "供应商接收时间")]
public string? SupplierReceiveTime { get; set; }
/// <summary>
/// 道口发货时间
/// </summary>
[ExporterHeader(DisplayName = "道口发货时间")]
public string? RoadShippedTime { get; set; }
/// <summary>
/// 道口收货时间
/// </summary>
[ExporterHeader(DisplayName = "道口收货时间")]
public string? RoadReceiveTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "创建人")]
public string? CreateByUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[ExporterHeader(DisplayName = "创建时间")]
public string? CreateTime { get; set; } = DateTime.Now.ToString();
/// <summary>
/// 修改人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "修改人")]
public string? UpdateByUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
[ExporterHeader(DisplayName = "修改时间")]
public string? UpdateTime { get; set; } = DateTime.Now.ToString();
/// <summary>
/// 删除标记(0:未删除,1:已删除)
/// </summary>
[ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 0;
/// <summary>
/// 数据版本号
/// </summary>
[ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 0;
} }
public class SUPPLIER_DEL_STATE_DTO : PAGE_OUT_DTO public class SUPPLIER_DEL_STATE_DTO : PAGE_OUT_DTO

56
API/TaskManager.Entity/Entity.cs
View File

@ -1555,8 +1555,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 排序日期 /// 排序日期
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "排序日期", Format = "yyyy-MM-dd")] [ExporterHeader(DisplayName = "排序日期")]
public DateTime? SortDate { get; set; } public string? SortDate { get; set; }
/// <summary> /// <summary>
/// 排序时间 /// 排序时间
@ -1711,26 +1711,26 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "数据创建时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "数据创建时间")]
public DateTime? DataCreateTime { get; set; } public string? DataCreateTime { get; set; }
/// <summary> /// <summary>
/// 供应商接收时间 /// 供应商接收时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "供应商接收时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "供应商接收时间")]
public DateTime? SupplierReceiveTime { get; set; } public string? SupplierReceiveTime { get; set; }
/// <summary> /// <summary>
/// 道口发货时间 /// 道口发货时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "道口发货时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "道口发货时间")]
public DateTime? RoadShippedTime { get; set; } public string? RoadShippedTime { get; set; }
/// <summary> /// <summary>
/// 道口收货时间 /// 道口收货时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "道口收货时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "道口收货时间")]
public DateTime? RoadReceiveTime { get; set; } public string? RoadReceiveTime { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
@ -1742,8 +1742,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "创建时间")]
public DateTime CreateTime { get; set; } = DateTime.Now; public string? CreateTime { get; set; } = DateTime.Now.ToString();
/// <summary> /// <summary>
/// 修改人 /// 修改人
@ -1755,8 +1755,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 修改时间 /// 修改时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "修改时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "修改时间")]
public DateTime UpdateTime { get; set; } = DateTime.Now; public string? UpdateTime { get; set; } = DateTime.Now.ToString();
/// <summary> /// <summary>
/// 删除标记(0:未删除,1:已删除) /// 删除标记(0:未删除,1:已删除)
@ -3446,8 +3446,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 排序日期 /// 排序日期
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "排序日期", Format = "yyyy-MM-dd")] [ExporterHeader(DisplayName = "排序日期")]
public DateTime? SortDate { get; set; } public string? SortDate { get; set; }
/// <summary> /// <summary>
/// 排序时间 /// 排序时间
@ -3602,26 +3602,26 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "数据创建时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "数据创建时间")]
public DateTime? DataCreateTime { get; set; } public string? DataCreateTime { get; set; }
/// <summary> /// <summary>
/// 供应商接收时间 /// 供应商接收时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "供应商接收时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "供应商接收时间")]
public DateTime? SupplierReceiveTime { get; set; } public string? SupplierReceiveTime { get; set; }
/// <summary> /// <summary>
/// 道口发货时间 /// 道口发货时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "道口发货时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "道口发货时间")]
public DateTime? RoadShippedTime { get; set; } public string? RoadShippedTime { get; set; }
/// <summary> /// <summary>
/// 道口收货时间 /// 道口收货时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "道口收货时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "道口收货时间")]
public DateTime? RoadReceiveTime { get; set; } public string? RoadReceiveTime { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
@ -3633,8 +3633,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "创建时间")]
public DateTime CreateTime { get; set; } = DateTime.Now; public string? CreateTime { get; set; } = DateTime.Now.ToString();
/// <summary> /// <summary>
/// 修改人 /// 修改人
@ -3646,8 +3646,8 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 修改时间 /// 修改时间
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "修改时间", Format = "yyyy-MM-dd HH:mm:ss")] [ExporterHeader(DisplayName = "修改时间")]
public DateTime UpdateTime { get; set; } = DateTime.Now; public string? UpdateTime { get; set; } = DateTime.Now.ToString();
/// <summary> /// <summary>
/// 删除标记(0:未删除,1:已删除) /// 删除标记(0:未删除,1:已删除)

2
API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -3,7 +3,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
<History>True|2025-07-23T05:22:16.5102002Z||;True|2025-07-23T13:21:32.7756431+08:00||;True|2025-07-23T13:07:08.2385667+08:00||;True|2025-07-23T11:40:00.2171512+08:00||;True|2025-07-22T09:42:45.6864831+08:00||;True|2025-07-16T10:56:51.1743874+08:00||;True|2025-07-16T10:10:16.1423887+08:00||;True|2025-07-16T09:39:41.5264925+08:00||;True|2025-07-15T11:43:41.1216193+08:00||;True|2025-07-14T17:27:09.0814705+08:00||;True|2025-07-10T13:41:17.5416106+08:00||;True|2025-07-10T09:53:47.6480408+08:00||;True|2025-07-08T11:09:12.4661351+08:00||;True|2025-07-08T10:48:35.1871554+08:00||;False|2025-07-08T10:47:14.6770264+08:00||;True|2025-07-04T13:12:49.8129504+08:00||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History> <History>True|2025-07-24T01:23:01.6293022Z||;True|2025-07-24T09:08:14.4338892+08:00||;True|2025-07-23T17:00:25.6410882+08:00||;True|2025-07-23T13:22:16.5102002+08:00||;True|2025-07-23T13:21:32.7756431+08:00||;True|2025-07-23T13:07:08.2385667+08:00||;True|2025-07-23T11:40:00.2171512+08:00||;True|2025-07-22T09:42:45.6864831+08:00||;True|2025-07-16T10:56:51.1743874+08:00||;True|2025-07-16T10:10:16.1423887+08:00||;True|2025-07-16T09:39:41.5264925+08:00||;True|2025-07-15T11:43:41.1216193+08:00||;True|2025-07-14T17:27:09.0814705+08:00||;True|2025-07-10T13:41:17.5416106+08:00||;True|2025-07-10T09:53:47.6480408+08:00||;True|2025-07-08T11:09:12.4661351+08:00||;True|2025-07-08T10:48:35.1871554+08:00||;False|2025-07-08T10:47:14.6770264+08:00||;True|2025-07-04T13:12:49.8129504+08:00||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
API/Wood.Admin.WebApi/appsettings.json
View File

@ -20,7 +20,7 @@
"DBEnableDiffLog": true, //是否开启差异化日志 "DBEnableDiffLog": true, //是否开启差异化日志
"LogDays": 90, //系统日志保存的天数 "LogDays": 90, //系统日志保存的天数
"RunAutoJob": true, //是否执行自动job "RunAutoJob": true, //是否执行自动job
"CustomerDb": "Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True" "CustomerDb": "Server = 192.168.1.228; Database = TaskManager; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"
}, },
"JwtConfig": { "JwtConfig": {
"SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16 "SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16

1
API/Wood.Admin.WebApi/看板配送单.json
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save