wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs
View File

@@ -9,7 +9,7 @@ namespace Tnb.BasicData
/// 物料签收编码
/// </summary>
public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
/// <summary>
/// 生产投料编码
/// </summary>
@@ -24,17 +24,17 @@ namespace Tnb.BasicData
/// 备件领用
/// </summary>
public const string SPAREPARTSREQUISITION_CODE = "SparePartsRequisition";
/// <summary>
/// 生产齐套领料
/// </summary>
public const string PRDKITTINGOUTSTOCK_CODE = "PrdKittingOutStocK";
/// <summary>
/// 设备维修单
/// </summary>
public const string EQPREPAIR_CODE = "EqpRepair";
}
}

2
BasicData/Tnb.BasicData.Entities/Consts/DbTimeFormat.cs
View File

@@ -6,7 +6,7 @@ namespace Tnb.BasicData
/// 2024-10-27 10:10
/// </summary>
public const string MM = "yyyy-MM-dd HH:mi";
/// <summary>
/// 2024-10-27 10:10:10
/// </summary>

12
BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs
View File

@@ -76,7 +76,7 @@ public static class DictConst
/// 工单状态-code
/// </summary>
public const string MoTaskStatusCode = "OrderStatus";
/// <summary>
/// 工单状态 已下发字典Id
/// </summary>
@@ -137,12 +137,12 @@ public static class DictConst
/// 任务单状态key
/// </summary>
public const string TaskStatus = "TaskStatus";
/// <summary>
/// andon状态key
/// </summary>
public const string AndonStatus = "AndonStatus";
/// <summary>
/// andon状态呼叫中
/// </summary>
@@ -168,17 +168,17 @@ public static class DictConst
/// 产成品入库单
/// </summary>
public const string CHANCHENGPINRUKUDAN = "40";
/// <summary>
/// 生产领料单
/// </summary>
public const string SHENGCHANLINGLIAO = "23";
/// <summary>
/// 生产补料单
/// </summary>
public const string SHENGCHANBULIAO = "24";
#endregion

2
BasicData/Tnb.BasicData.Entities/Consts/FactoryConfigConst.cs
View File

@@ -9,7 +9,7 @@ namespace Tnb.BasicData
/// 报工是否允许超过工单计划数 是：1 否 ：0
/// </summary>
public const string IS_SURPASS = "is_surpass";
/// <summary>
/// 报工允许超过工单计划数百分比 例：填写10就是10%
/// </summary>

8
BasicData/Tnb.BasicData.Entities/Consts/ModuleConst.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData;
namespace Tnb.BasicData;
public class ModuleConst
{

16
BasicData/Tnb.BasicData.Entities/Consts/WebApiConst.cs
View File

@@ -5,17 +5,17 @@ namespace Tnb.BasicData
#region wms
//mes生产入库接口
public const string MES_CREATE_INSTOCK = "/api/wms/wms-in-stock/mes-create-instock";
public const string MES_CREATE_INSTOCK = "/api/wms/wms-in-stock/mes-create-instock";
//载具签收接口
public const string MES_CARRY_SIGN = "/api/wms/wms-sign-for-delivery/mes-carry-sign";
public const string MES_CARRY_SIGN = "/api/wms/wms-sign-for-delivery/mes-carry-sign";
//生产出库接口
public const string MES_CREATE_OUTSTOCK = "/api/wms/wms-out-stock/mes-create-outstock";
public const string MES_CREATE_OUTSTOCK = "/api/wms/wms-out-stock/mes-create-outstock";
//齐套出库接口
public const string MES_KITTING_OUT_STK = "/api/wms/wmskitting-out/mes-kitting-out-stk";
public const string MES_KITTING_OUT_STK = "/api/wms/wmskitting-out/mes-kitting-out-stk";
//物料标签查询接口
public const string MES_FETCH_IN_OUT_STOCK_INFO_BY_BAR_CODE = "/api/wms/wms-in-stock/mes-fetch-in-out-stock-info-by-bar-code";

12
BasicData/Tnb.BasicData.Entities/Dto/BasCalendar/CalendarInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entities.Dto
namespace Tnb.BasicData.Entities.Dto
{
public class CalendarInput
{
@@ -12,9 +6,9 @@ namespace Tnb.BasicData.Entities.Dto
public string? datetype { get; set; }
public string? workhour { get; set; }
public string? worktype { get; set; }
public int? calendartype { get; set;}
public int? calendartype { get; set; }
public string? content { get; set;}
public string? content { get; set; }
}
public class CalendarBatchInput
{

8
BasicData/Tnb.BasicData.Entities/Dto/BasCalendar/CalendarOut.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entities.Dto.BasCalendar
namespace Tnb.BasicData.Entities.Dto.BasCalendar
{
public class CalendarOut
{

4
BasicData/Tnb.BasicData.Entities/Dto/BasESop/EsopHistoryListQueryInput.cs
View File

@@ -4,7 +4,7 @@ namespace Tnb.BasicData.Entities.Dto
{
public string mbom_id { get; set; } = string.Empty;
public string mbom_process_id { get; set; } = string.Empty;
/// <summary>
/// 当前页码:pageIndex.
/// </summary>
@@ -14,7 +14,7 @@ namespace Tnb.BasicData.Entities.Dto
/// 每页行数.
/// </summary>
public virtual int pageSize { get; set; } = 50;
public string? queryJson { get; set; }
}
}

4
BasicData/Tnb.BasicData.Entities/Dto/BasESop/UploadNewVersionInput.cs
View File

@@ -25,9 +25,9 @@ namespace Tnb.BasicData.Entities.Dto
/// 附件对象.
/// </summary>
public string attachment { get; set; } = string.Empty;
public string version { get; set; } = string.Empty;
/// <summary>
/// 备注
/// </summary>

28
BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs
View File

@@ -30,54 +30,54 @@ namespace Tnb.BasicData.Entities.Dto
/// 是否有下级
/// </summary>
public bool hasChildren { get; set; }
/// <summary>
/// Desc:投料管控
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? feeding_control {get;set;}
public string? feeding_control { get; set; }
/// <summary>
/// Desc:损耗率
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? loss_rate {get;set;}
public string? loss_rate { get; set; }
/// </summary>
/// <summary>
/// 数量
/// </summary>
public decimal quantity { get; set; }
/// <summary>
/// Desc:需要称量
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? require_weight {get;set;}
public string? require_weight { get; set; }
/// <summary>
/// Desc:替代物料
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? substitute_material_id {get;set;}
public string? substitute_material_id { get; set; }
/// <summary>
/// Desc:工艺路线
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? route_name {get;set;}
public string? route_name { get; set; }
/// <summary>
/// Desc:版本号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? version {get;set;}
public string? version { get; set; }
}
}

6
BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs
View File

@@ -10,8 +10,8 @@ namespace Tnb.BasicData.Entities.Dto
/// 物料id
/// </summary>
public string? materialId { get; set; }
}
}

2
BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialQueryInput.cs
View File

@@ -12,7 +12,7 @@ namespace Tnb.BasicData.Entities.Dto
/// 物料类型
/// </summary>
public string types { get; set; } = string.Empty;
/// <summary>
/// 当前页码:pageIndex.
/// </summary>

12
BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs
View File

@@ -9,27 +9,27 @@ namespace Tnb.BasicData.Entities.Dto
/// 物料id
/// </summary>
public string? id { get; set; }
/// <summary>
/// 编码
/// </summary>
public string? code { get; set; }
/// <summary>
/// 名称
/// </summary>
public string? name { get; set; }
public string? name { get; set; }
/// <summary>
/// 描述
/// </summary>
public string? descrip { get; set; }
/// <summary>
/// 主单位id
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 主单位名称
/// </summary>

2
BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs
View File

@@ -11,7 +11,7 @@ namespace Tnb.BasicData.Entities.Dto
/// 物料编码名称查询
/// </summary>
public string material_info { get; set; } = string.Empty;
/// <summary>
/// 当前页码:pageIndex.
/// </summary>

42
BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs
View File

@@ -1,5 +1,3 @@
using Tnb.BasicData.Entities;
namespace Tnb.BasicData.Entities.Dto
{
public class MbomDataOutput
@@ -8,57 +6,57 @@ namespace Tnb.BasicData.Entities.Dto
/// 生产bomid
/// </summary>
public string? id { get; set; }
/// <summary>
/// 物料id
/// </summary>
public string? material_id { get; set; }
/// <summary>
/// 数量
/// </summary>
public int num { get; set; }
/// <summary>
/// 单位id
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 版本号
/// </summary>
public string? version { get; set; }
/// <summary>
/// 有效开始时间
/// </summary>
public DateTime? start_time { get; set; }
/// <summary>
/// 有效结束时间
/// </summary>
public DateTime? end_time { get; set; }
/// <summary>
/// 物料清单id
/// </summary>
public string? ebom_id { get; set; }
/// <summary>
/// 工艺路线id
/// </summary>
public string? route_id { get; set; }
/// <summary>
/// 物料均再首道工序投产
/// </summary>
public int? is_first { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
/// <summary>
/// 工序
/// </summary>
@@ -68,24 +66,24 @@ namespace Tnb.BasicData.Entities.Dto
public class MbomProcessOutDto
{
public string id { get; set; } = string.Empty;
/// <summary>
/// Desc:生产bomid
/// Default:
/// Nullable:False
/// </summary>
public string? mbom_id { get; set; }
/// <summary>
/// 工序编号
/// </summary>
public string? no { get; set; }
/// <summary>
/// 上道工序编号
/// </summary>
public string? last_process_no { get; set; }
/// <summary>
/// 下道工序编号
/// </summary>
@@ -111,26 +109,26 @@ namespace Tnb.BasicData.Entities.Dto
/// Nullable:True
/// </summary>
public string? station { get; set; }
/// <summary>
/// Desc:副产出管控 0 不启用 1 启用
/// Default:
/// Nullable:False
/// </summary>
public int byproduct_status { get; set; }
/// <summary>
/// Desc:投产方式
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? production_method {get;set;}
public string? production_method { get; set; }
/// <summary>
/// 投入物料
/// </summary>
public List<BasMbomInput>? inputs { get; set; }
/// <summary>
/// 产出物料
/// </summary>

44
BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs
View File

@@ -1,5 +1,3 @@
using Tnb.BasicData.Entities;
namespace Tnb.BasicData.Entities.Dto
{
public class MbomSaveDataInput
@@ -8,57 +6,57 @@ namespace Tnb.BasicData.Entities.Dto
/// 生产bomid
/// </summary>
public string id { get; set; } = string.Empty;
/// <summary>
/// 物料id
/// </summary>
public string material_id { get; set; } = string.Empty;
/// <summary>
/// 数量
/// </summary>
public int num { get; set; }
/// <summary>
/// 单位id
/// </summary>
public string unit_id { get; set; } = string.Empty;
/// <summary>
/// 版本号
/// </summary>
public string version { get; set; } = string.Empty;
/// <summary>
/// 有效开始时间
/// </summary>
public DateTime? start_time { get; set; }
/// <summary>
/// 有效结束时间
/// </summary>
public DateTime? end_time { get; set; }
/// <summary>
/// 物料清单id
/// </summary>
public string ebom_id { get; set; } = string.Empty;
/// <summary>
/// 工艺路线id
/// </summary>
public string route_id { get; set; } = string.Empty;
/// <summary>
/// 物料均再首道工序投产
/// </summary>
public int is_first { get; set; }
/// <summary>
/// 备注
/// </summary>
public string remark { get; set; } = string.Empty;
/// <summary>
/// 工序
/// </summary>
@@ -68,7 +66,7 @@ namespace Tnb.BasicData.Entities.Dto
public class MbomProcessDto
{
public string id { get; set; } = string.Empty;
/// <summary>
/// Desc:生产bomid
/// Default:
@@ -82,17 +80,17 @@ namespace Tnb.BasicData.Entities.Dto
/// Nullable:False
/// </summary>
public string? process_id { get; set; }
/// <summary>
/// 工序编号
/// </summary>
public string? no { get; set; }
/// <summary>
/// 上道工序编号
/// </summary>
public string? last_process_no { get; set; }
/// <summary>
/// 下道工序编号
/// </summary>
@@ -111,31 +109,31 @@ namespace Tnb.BasicData.Entities.Dto
/// Nullable:True
/// </summary>
public string? station { get; set; }
/// <summary>
/// Desc:副产出管控 0 不启用 1 启用
/// Default:
/// Nullable:False
/// </summary>
public int byproduct_status { get; set; }
/// <summary>
/// 工艺路线子表id
/// </summary>
public string route_detail_id { get; set; } = string.Empty;
/// <summary>
/// Desc:投产方式
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? production_method {get;set;}
public string? production_method { get; set; }
/// <summary>
/// 投入物料
/// </summary>
public List<BasMbomInput>? inputs { get; set; }
/// <summary>
/// 产出物料
/// </summary>

12
BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entitys.Dto.BasProcess
namespace Tnb.BasicData.Entitys.Dto.BasProcess
{
/// <summary>
/// 工序列表输出类
@@ -14,7 +8,7 @@ namespace Tnb.BasicData.Entitys.Dto.BasProcess
public string id { get; set; }
public string process_code { get; set; }
public string process_name { get; set; }
public string process_collection { get; set;}
public string process_collection { get; set; }
public string status { get; set; }
public string station { get; set; }
public string must_pass { get; set; }
@@ -27,6 +21,6 @@ namespace Tnb.BasicData.Entitys.Dto.BasProcess
public string org_id { get; set; }
public string create_id { get; set; }
public string modify_id { get; set; }
public DateTime? modify_time { get; set;}
public DateTime? modify_time { get; set; }
}
}

2
BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs
View File

@@ -6,7 +6,7 @@ namespace Tnb.BasicData.Entities.Dto
/// 工序id
/// </summary>
public string? process_id { get; set; }
/// <summary>
/// 工位id集合
/// </summary>

6
BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs
View File

@@ -3,13 +3,13 @@ namespace Tnb.BasicData.Entities.Dto
public class VaildRouteOutput
{
public string? id { get; set; }
public string? code { get; set; }
public string? name { get; set; }
public string start_time { get; set; } = string.Empty;
public string end_time { get; set; } = string.Empty;
}
}

4
BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs
View File

@@ -2,8 +2,8 @@ namespace Tnb.BasicData.Entitys
{
public class ElementSelectDto
{
public string?label { get; set; }
public string? label { get; set; }
public string? value { get; set; }
}
}

7
BasicData/Tnb.BasicData.Entities/Dto/ProcessManage/RouteLineTreeOutput.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
using JNPF.Common.Security;
namespace Tnb.BasicData.Entities.Dto
{

12
BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entities.Dto
namespace Tnb.BasicData.Entities.Dto
{
/// <summary>
/// 子工单列表
@@ -34,7 +28,7 @@ namespace Tnb.BasicData.Entities.Dto
/// <summary>
/// 数量
/// </summary>
public string num { get; set;}
public string num { get; set; }
/// <summary>
/// 单位id
/// </summary>
@@ -64,7 +58,7 @@ namespace Tnb.BasicData.Entities.Dto
/// 工序排序序号
/// </summary>
public long? ordinal { get; set; }
/// <summary>
/// 生产bom工序id
/// </summary>

7
BasicData/Tnb.BasicData.Entities/Entity/BasCalendar.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;

3
BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
View File

@@ -1,7 +1,6 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Tnb.BasicData.Entities;
@@ -44,7 +43,7 @@ public partial class BasLocation : BaseEntity<string>
/// 是否使用
/// </summary>
//[SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(CommonPropertyConvert))]
public string is_use { get; set; }
public string is_use { get; set; }
/// <summary>
/// 是否最小

2
BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
View File

@@ -248,7 +248,7 @@ public partial class BasMaterial : BaseEntity<string>
/// 是否包含入库数
/// </summary>
public int? is_contain_into_num { get; set; }
/// <summary>
/// 是否创建子工单
/// </summary>

2
BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs
View File

@@ -43,7 +43,7 @@ public partial class BasMbomInput : BaseEntity<string>
/// 数量
/// </summary>
public decimal num { get; set; }
/// <summary>
/// 单位id
/// </summary>

2
BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs
View File

@@ -43,7 +43,7 @@ public partial class BasMbomOutput : BaseEntity<string>
/// 产出数量(可小数分数)
/// </summary>
public string num { get; set; } = string.Empty;
/// <summary>
/// 单位id
/// </summary>

4
BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs
View File

@@ -53,7 +53,7 @@ public partial class BasMbomProcess : BaseEntity<string>
/// 工艺路线子表id
/// </summary>
public string route_detail_id { get; set; } = string.Empty;
/// <summary>
/// 是否时最后一道工序
/// </summary>
@@ -63,7 +63,7 @@ public partial class BasMbomProcess : BaseEntity<string>
/// 排序
/// </summary>
public int ordinal { get; set; }
/// <summary>
/// 工序编号
/// </summary>

2
BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs
View File

@@ -113,7 +113,7 @@ public partial class BasRouteD : BaseEntity<string>
/// 产出比
/// </summary>
public decimal? output_ratio { get; set; }
/// <summary>
/// 工序编号
/// </summary>

7
BasicData/Tnb.BasicData.Entities/Entity/BasShiftWorkgroup.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;

8
BasicData/Tnb.BasicData.Entities/Enums/EnumCalendarType.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entities.Enums
namespace Tnb.BasicData.Entities.Enums
{
public enum EnumCalendarType
{

8
BasicData/Tnb.BasicData.Entities/Enums/EnumLocationType.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entities.Enums
namespace Tnb.BasicData.Entities.Enums
{
/// <summary>
/// 库位类型

1
BasicData/Tnb.BasicData.Entities/Mapper/Mapper.cs
View File

@@ -1,5 +1,4 @@
using Mapster;
using SqlSugar;
using Tnb.BasicData.Entities.Dto;
namespace Tnb.BasicData.Entities

14
BasicData/Tnb.BasicData.Entities/Model/RouteModel.cs
View File

@@ -1,12 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.BasicData.Entitys.Model
namespace Tnb.BasicData.Entitys.Model
{
public class RouteTree
public class RouteTree
{
/// <summary>
/// 工艺路线类型
@@ -19,7 +13,7 @@ namespace Tnb.BasicData.Entitys.Model
}
public class RouteName
public class RouteName
{
public string Tag { get; set; }
/// <summary>
@@ -29,5 +23,5 @@ namespace Tnb.BasicData.Entitys.Model
}
}

1
BasicData/Tnb.BasicData.Entities/Tnb.BasicData.Entities.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>