| MES.Service/Dto/webApi/ErpProductionOrderDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesStaff.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/SysDepartment.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/SysOrganization.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/Womcaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/Womcab.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInDataManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesStaffManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/OrganizeManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/WomcabManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MESApplication/Controllers/BasicData/ProductionOrderController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -39,6 +39,7 @@ public string? FPurOrderEntrySeq { get; set; } // 采购订单行号 public string? FBaseStockInQty { get; set; } // 入库数量 public string? FBaseNoStockInQty { get; set; } // 未入库数量 public string? FInStockOwnerId { get; set; } // 入库货主 // public string? FSUPPLIERID { get; set; } // 供应商ID } MES.Service/Modes/MesStaff.cs
@@ -9,148 +9,147 @@ public class MesStaff { /// <summary> /// /// 默认值: (newid()) ///</summary> /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ID ///</summary> /// ID /// </summary> [SugarColumn(ColumnName = "id")] public decimal Id { get; set; } /// <summary> /// 员工编码 ///</summary> /// 员工编码 /// </summary> [SugarColumn(ColumnName = "staff_no")] public string? StaffNo { get; set; } /// <summary> /// 员工姓名 ///</summary> /// 员工姓名 /// </summary> [SugarColumn(ColumnName = "staff_name")] public string? StaffName { get; set; } /// <summary> /// 部门编码 ///</summary> /// 部门编码 /// </summary> [SugarColumn(ColumnName = "department_no")] public string? DepartmentNo { get; set; } /// <summary> /// 部门名称 ///</summary> /// 部门名称 /// </summary> [SugarColumn(ColumnName = "department_name")] public string? DepartmentName { get; set; } /// <summary> /// 岗位编码 ///</summary> /// 岗位编码 /// </summary> [SugarColumn(ColumnName = "position_code")] public string? PositionCode { get; set; } /// <summary> /// 岗位名称 ///</summary> /// 岗位名称 /// </summary> [SugarColumn(ColumnName = "position_name")] public string? PositionName { get; set; } /// <summary> /// 手机号 ///</summary> /// 手机号 /// </summary> [SugarColumn(ColumnName = "phone_number")] public string? PhoneNumber { get; set; } /// <summary> /// 任岗开始日期 ///</summary> /// 任岗开始日期 /// </summary> [SugarColumn(ColumnName = "start_date")] public DateTime? StartDate { get; set; } /// <summary> /// 备注 ///</summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "remark")] public string? Remark { get; set; } /// <summary> /// 自定义字段3 ///</summary> /// 自定义字段3 /// </summary> [SugarColumn(ColumnName = "remark3")] public string? Remark3 { get; set; } /// <summary> /// 自定义字段4 ///</summary> /// 自定义字段4 /// </summary> [SugarColumn(ColumnName = "remark4")] public string? Remark4 { get; set; } /// <summary> /// 自定义字段5 ///</summary> /// 自定义字段5 /// </summary> [SugarColumn(ColumnName = "remark5")] public string? Remark5 { get; set; } /// <summary> /// 创建人 ///</summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "create_by")] public string? CreateBy { get; set; } /// <summary> /// 创建时间 ///</summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "create_date")] public DateTime? CreateDate { get; set; } /// <summary> /// 更新人 ///</summary> /// 更新人 /// </summary> [SugarColumn(ColumnName = "lastupdate_by")] public string? LastupdateBy { get; set; } /// <summary> /// 更新时间 ///</summary> /// 更新时间 /// </summary> [SugarColumn(ColumnName = "lastupdate_date")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 备注 ///</summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "memo")] public string? Memo { get; set; } /// <summary> /// 生产线 ///</summary> /// 生产线 /// </summary> [SugarColumn(ColumnName = "line_no")] public string? LineNo { get; set; } /// <summary> /// 生产员工标识 /// 默认值: ((1)) ///</summary> /// 生产员工标识 /// 默认值: ((1)) /// </summary> [SugarColumn(ColumnName = "work_mk")] public int? WorkMk { get; set; } /// <summary> /// 是否禁用 ///</summary> /// 是否禁用 /// </summary> [SugarColumn(ColumnName = "fforbid_status")] public string? FforbidStatus { get; set; } /// <summary> /// 创建组织 ///</summary> /// 创建组织 /// </summary> [SugarColumn(ColumnName = "Fumbrella")] public string? Fumbrella { get; set; } /// <summary> /// 使用组织 ///</summary> /// 使用组织 /// </summary> [SugarColumn(ColumnName = "FSubsidiary")] public string? FSubsidiary { get; set; }
@@ -138,7 +138,7 @@ [SugarColumn(ColumnName = "material_properti")] public string? MaterialProperti { get; set; } /// <summary> /// 自定义字段4 /// </summary> MES.Service/Modes/SysOrganization.cs
@@ -8,81 +8,78 @@ public class SysOrganization { /// <summary> /// 主键 ///</summary> /// 主键 /// </summary> [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// 名称 ///</summary> /// 名称 /// </summary> [SugarColumn(ColumnName = "NAME")] public string? Name { get; set; } /// <summary> /// 联系人 ///</summary> /// 联系人 /// </summary> [SugarColumn(ColumnName = "CON_PEOPLE")] public string? ConPeople { get; set; } /// <summary> /// 联系电话 ///</summary> /// 联系电话 /// </summary> [SugarColumn(ColumnName = "CON_TEL")] public string? ConTel { get; set; } /// <summary> /// 系统内置 ///</summary> /// 系统内置 /// </summary> [SugarColumn(ColumnName = "IS_SYS")] public int? IsSys { get; set; } /// <summary> /// 状态 ///</summary> /// 状态 /// </summary> [SugarColumn(ColumnName = "IS_STATUS")] public bool? IsStatus { get; set; } /// <summary> /// 编辑时间 ///</summary> /// 编辑时间 /// </summary> [SugarColumn(ColumnName = "EDT_TIME")] public DateTime? EdtTime { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "check_date")] public DateTime? CheckDate { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "check_by")] public string? CheckBy { get; set; } /// <summary> /// /// 默认值: ((0)) ///</summary> /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "check_status")] public bool? CheckStatus { get; set; } /// <summary> /// 组织ID ///</summary> /// 组织ID /// </summary> [SugarColumn(ColumnName = "FID")] public string? Fid { get; set; } /// <summary> /// 组织编号 ///</summary> /// 组织编号 /// </summary> [SugarColumn(ColumnName = "FNumber")] public string? FNumber { get; set; } /// <summary> /// 父级ID ///</summary> /// 父级ID /// </summary> [SugarColumn(ColumnName = "FParentlD")] public string? FParentlD { get; set; }
@@ -3,7 +3,7 @@ namespace MES.Service.Modes; /// <summary> /// 工单表 /// 生产任务单表 /// </summary> [SugarTable("WOMCAA")] public class Womcaa @@ -24,43 +24,43 @@ /// 单据编号 /// </summary> [SugarColumn(ColumnName = "CAA001")] public string? Caa001 { get; set; } public string Caa001 { get; set; } /// <summary> /// 单据类型("1、直接入库-普通生产 2、直接入库-返工生产 3、工序汇报-普通生产 4、工序汇报-返工生产") /// </summary> [SugarColumn(ColumnName = "CAA004")] public string? Caa004 { get; set; } public string Caa004 { get; set; } /// <summary> /// 计划下达日期 /// </summary> [SugarColumn(ColumnName = "CAA005")] public string? Caa005 { get; set; } public string Caa005 { get; set; } /// <summary> /// 产品编码 /// 产品ID /// </summary> [SugarColumn(ColumnName = "CAA006")] public string? Caa006 { get; set; } public string Caa006 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "CAA009")] public string? Caa009 { get; set; } public string Caa009 { get; set; } /// <summary> /// 预计开工时间 /// </summary> [SugarColumn(ColumnName = "CAA010")] public string? Caa010 { get; set; } public string Caa010 { get; set; } /// <summary> /// 预计完工时间 /// </summary> [SugarColumn(ColumnName = "CAA011")] public string? Caa011 { get; set; } public string Caa011 { get; set; } /// <summary> /// 工单数量 @@ -72,19 +72,19 @@ /// BOM版次 /// </summary> [SugarColumn(ColumnName = "CAA013")] public string? Caa013 { get; set; } public string Caa013 { get; set; } // /// <summary> // /// 销售订单号 // /// </summary> // [SugarColumn(ColumnName = "CAA015")] // public string? Caa015 { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "CAA015")] public string Caa015 { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "CAA016")] public string? Caa016 { get; set; } public string Caa016 { get; set; } /// <summary> /// 已排数量（弃用） @@ -108,13 +108,13 @@ /// ERP生产订单单号 /// </summary> [SugarColumn(ColumnName = "CAA020")] public string? Caa020 { get; set; } public string Caa020 { get; set; } /// <summary> /// 生产车间 /// </summary> [SugarColumn(ColumnName = "CAA021")] public string? Caa021 { get; set; } public string Caa021 { get; set; } /// <summary> /// 审核码 @@ -132,7 +132,7 @@ /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } public string CheckUser { get; set; } /// <summary> /// 未排数量（弃用） @@ -144,7 +144,7 @@ /// 业务状态("1，计划，2、计划确认 2、下达 4、开工 5、完工 6、结案，7、结算") /// </summary> [SugarColumn(ColumnName = "CAA023")] public string? Caa023 { get; set; } public string Caa023 { get; set; } /// <summary> /// 已入库数量 @@ -156,121 +156,121 @@ /// 工艺路线 /// </summary> [SugarColumn(ColumnName = "ROUTING_ID")] public string? RoutingId { get; set; } public string RoutingId { get; set; } /// <summary> /// 产线 /// </summary> [SugarColumn(ColumnName = "WORK_SHOP_ID")] public string? WorkShopId { get; set; } public string WorkShopId { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } public string DepotCode { get; set; } /// <summary> /// 单据日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public string? CreateDate { get; set; } public string CreateDate { get; set; } /// <summary> /// 计划组 /// </summary> [SugarColumn(ColumnName = "WORK_GROUP_ID")] public string? WorkGroupId { get; set; } public string WorkGroupId { get; set; } /// <summary> /// 计划员 /// </summary> [SugarColumn(ColumnName = "PLAN_ID")] public string? PlanId { get; set; } public string PlanId { get; set; } /// <summary> /// 入库上限 /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITH")] public string? StockInlimith { get; set; } public string StockInlimith { get; set; } /// <summary> /// 入库下限 /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITL")] public string? StockInlimitl { get; set; } public string StockInlimitl { get; set; } /// <summary> /// 主车间调度单 /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } public string Mtono { get; set; } /// <summary> /// 批次 /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } public string Lot { get; set; } // /// <summary> // /// 引用单号 // /// </summary> // [SugarColumn(ColumnName = "CAA015_HEAD")] // public string? Caa015Head { get; set; } /// <summary> /// 引用单号 /// </summary> [SugarColumn(ColumnName = "CAA015_HEAD")] public string Caa015Head { get; set; } /// <summary> /// 制单类型 /// </summary> [SugarColumn(ColumnName = "CREATE_TYPE")] public string? CreateType { get; set; } public string CreateType { get; set; } /// <summary> /// 来源单据类型 /// </summary> [SugarColumn(ColumnName = "SRC_BILL_TYPE")] public string? SrcBillType { get; set; } public string SrcBillType { get; set; } /// <summary> /// 来源单号 /// </summary> [SugarColumn(ColumnName = "SRC_BILL_NO")] public string? SrcBillNo { get; set; } public string SrcBillNo { get; set; } /// <summary> /// 来源行号 /// </summary> [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")] public string? SrcBillentryseq { get; set; } public string SrcBillentryseq { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_NO")] public string? SaleOrderNo { get; set; } public string SaleOrderNo { get; set; } /// <summary> /// 销售订单行号 /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")] public string? SaleOrderEntryseq { get; set; } public string SaleOrderEntryseq { get; set; } /// <summary> /// 强制关闭人 /// </summary> [SugarColumn(ColumnName = "FORCE_CLOSERID")] public string? ForceCloserid { get; set; } public string ForceCloserid { get; set; } /// <summary> /// 关闭类型 /// </summary> [SugarColumn(ColumnName = "CLOSE_TYPE")] public string? CloseType { get; set; } public string CloseType { get; set; } /// <summary> /// 分单号 /// </summary> [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")] public string? SrcSplitBillno { get; set; } public string SrcSplitBillno { get; set; } /// <summary> /// 是否管控 @@ -284,45 +284,45 @@ [SugarColumn(ColumnName = "ERP_WTZZ")] public int? ErpWtzz { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")] // public string? MainProductNo { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")] public string MainProductNo { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] // public int? MainProductQty { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] public int? MainProductQty { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] // public string? CustomerItemNumber { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] public string CustomerItemNumber { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] // public string? PackingListNumber { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] public string PackingListNumber { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_NAME")] // public string? CustomerName { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "CUSTOMER_NAME")] public string CustomerName { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER")] // public string? Customer { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "CUSTOMER")] public string Customer { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "TYPE")] public string? Type { get; set; } public string Type { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "JA_BS")] public string? JaBs { get; set; } public string JaBs { get; set; } /// <summary> /// </summary> @@ -335,10 +335,9 @@ public int? YpNum { get; set; } /// <summary> /// 预计完工时间备份 /// </summary> [SugarColumn(ColumnName = "CAA011_1")] public string? Caa0111 { get; set; } public string Caa0111 { get; set; } /// <summary> /// </summary> @@ -390,17 +389,29 @@ /// 采购订单号 /// </summary> [SugarColumn(ColumnName = "FPURORDERNO")] public string? Fpurorderno { get; set; } public string Fpurorderno { get; set; } /// <summary> /// 采购订单行号 /// </summary> [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")] public string? Fpurorderentryseq { get; set; } public string Fpurorderentryseq { get; set; } /// <summary> /// 备注（表体） /// </summary> [SugarColumn(ColumnName = "Btbz")] public string? Btbz { get; set; } public string Btbz { get; set; } /// <summary> /// 源拆分订单编号 /// </summary> [SugarColumn(ColumnName = "fmoentryid")] public string Fmoentryid { get; set; } /// <summary> /// 排产线别 /// </summary> [SugarColumn(ColumnName = "prod_line")] public string ProdLine { get; set; } } MES.Service/Modes/Womcab.cs
@@ -3,247 +3,247 @@ namespace MES.Service.Modes; /// <summary> /// 任务单物料表 /// 任务单物料表bom /// </summary> [SugarTable("WOMCAB")] public class Womcab { /// <summary> /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] /// <summary> /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public int? Erpid { get; set; } /// <summary> /// 工单单号 /// </summary> [SugarColumn(ColumnName = "CAB001")] public string? Cab001 { get; set; } /// <summary> /// 工单单号 /// </summary> [SugarColumn(ColumnName = "CAB001")] public string Cab001 { get; set; } /// <summary> /// 序号 /// </summary> [SugarColumn(ColumnName = "CAB002")] /// <summary> /// 序号 /// </summary> [SugarColumn(ColumnName = "CAB002")] public int? Cab002 { get; set; } /// <summary> /// 材料编码 /// </summary> [SugarColumn(ColumnName = "CAB003")] public string? Cab003 { get; set; } /// <summary> /// 材料编码 /// </summary> [SugarColumn(ColumnName = "CAB003")] public string Cab003 { get; set; } /// <summary> /// 需领用量 /// </summary> [SugarColumn(ColumnName = "CAB006")] /// <summary> /// 需领用量 /// </summary> [SugarColumn(ColumnName = "CAB006")] public decimal? Cab006 { get; set; } /// <summary> /// 已领用量 /// </summary> [SugarColumn(ColumnName = "CAB007")] /// <summary> /// 已领用量 /// </summary> [SugarColumn(ColumnName = "CAB007")] public decimal? Cab007 { get; set; } /// <summary> /// 工艺 /// </summary> [SugarColumn(ColumnName = "CAB008")] public string? Cab008 { get; set; } /// <summary> /// 工艺 /// </summary> [SugarColumn(ColumnName = "CAB008")] public string Cab008 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "CAB009")] public string? Cab009 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "CAB009")] public string Cab009 { get; set; } /// <summary> /// 组成用量 /// </summary> [SugarColumn(ColumnName = "CAB012")] /// <summary> /// 组成用量 /// </summary> [SugarColumn(ColumnName = "CAB012")] public decimal? Cab012 { get; set; } /// <summary> /// 是否替料 /// </summary> [SugarColumn(ColumnName = "CAB014")] public string? Cab014 { get; set; } /// <summary> /// 是否替料 /// </summary> [SugarColumn(ColumnName = "CAB014")] public string Cab014 { get; set; } /// <summary> /// PID /// </summary> [SugarColumn(ColumnName = "PID")] /// <summary> /// PID /// </summary> [SugarColumn(ColumnName = "PID")] public int? Pid { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "EID")] /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "EID")] public int? Eid { get; set; } /// <summary> /// 位置号 /// </summary> [SugarColumn(ColumnName = "POSITION_NO")] public string? PositionNo { get; set; } /// <summary> /// 位置号 /// </summary> [SugarColumn(ColumnName = "POSITION_NO")] public string PositionNo { get; set; } /// <summary> /// 发料组织 /// </summary> [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")] public string? IssuingOrganization { get; set; } /// <summary> /// 发料组织 /// </summary> [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")] public string IssuingOrganization { get; set; } /// <summary> /// 供应组织 /// </summary> [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")] public string? SupplyOrganization { get; set; } /// <summary> /// 供应组织 /// </summary> [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")] public string SupplyOrganization { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string? OwnerId { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string OwnerId { get; set; } /// <summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } /// <summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "MTONO")] public string Mtono { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "LOT")] public string Lot { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// 发料方式 /// </summary> [SugarColumn(ColumnName = "ISSUE_TYPE")] public string? IssueType { get; set; } /// <summary> /// 发料方式 /// </summary> [SugarColumn(ColumnName = "ISSUE_TYPE")] public string IssueType { get; set; } /// <summary> /// 供应类型(C采购 Z自制 W委外) /// </summary> [SugarColumn(ColumnName = "SUPPLY_TYPE")] public string? SupplyType { get; set; } /// <summary> /// 供应类型(C采购 Z自制 W委外) /// </summary> [SugarColumn(ColumnName = "SUPPLY_TYPE")] public string SupplyType { get; set; } /// <summary> /// 分子 /// </summary> [SugarColumn(ColumnName = "NUMERATOR")] public string? Numerator { get; set; } /// <summary> /// 分子 /// </summary> [SugarColumn(ColumnName = "NUMERATOR")] public string Numerator { get; set; } /// <summary> /// 分母 /// </summary> [SugarColumn(ColumnName = "DENOMINATOR")] public string? Denominator { get; set; } /// <summary> /// 分母 /// </summary> [SugarColumn(ColumnName = "DENOMINATOR")] public string Denominator { get; set; } /// <summary> /// 固定损耗 /// </summary> [SugarColumn(ColumnName = "SCRAPQTY")] public string? Scrapqty { get; set; } /// <summary> /// 固定损耗 /// </summary> [SugarColumn(ColumnName = "SCRAPQTY")] public string Scrapqty { get; set; } /// <summary> /// 变动损耗率 /// </summary> [SugarColumn(ColumnName = "SCRAPRATE")] public string? Scraprate { get; set; } /// <summary> /// 变动损耗率 /// </summary> [SugarColumn(ColumnName = "SCRAPRATE")] public string Scraprate { get; set; } // /// <summary> // /// 客户货号 // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] // public string? CustomerItemNumber { get; set; } /// <summary> /// 客户货号 /// </summary> [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] public string CustomerItemNumber { get; set; } // /// <summary> // /// 包装单号 // /// </summary> // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] // public string? PackingListNumber { get; set; } /// <summary> /// 包装单号 /// </summary> [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] public string PackingListNumber { get; set; } // /// <summary> // /// 主产品 // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT")] // public string? MainProduct { get; set; } /// <summary> /// 主产品 /// </summary> [SugarColumn(ColumnName = "MAIN_PRODUCT")] public string MainProduct { get; set; } // /// <summary> // /// 主产品数量 // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] // public int? MainProductQty { get; set; } /// <summary> /// 主产品数量 /// </summary> [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] public int? MainProductQty { get; set; } // /// <summary> // /// 父项物料名称 // /// </summary> // [SugarColumn(ColumnName = "PARENT_ITEM_NAME")] // public string? ParentItemName { get; set; } /// <summary> /// 父项物料名称 /// </summary> [SugarColumn(ColumnName = "PARENT_ITEM_NAME")] public string ParentItemName { get; set; } // /// <summary> // /// 销售订单 // /// </summary> // [SugarColumn(ColumnName = "FSALEORDERNO")] // public string? Fsaleorderno { get; set; } /// <summary> /// 销售订单 /// </summary> [SugarColumn(ColumnName = "FSALEORDERNO")] public string Fsaleorderno { get; set; } /// <summary> /// 货主类型 /// </summary> [SugarColumn(ColumnName = "FOWNERTYPEID")] public string? Fownertypeid { get; set; } /// <summary> /// 货主类型 /// </summary> [SugarColumn(ColumnName = "FOWNERTYPEID")] public string Fownertypeid { get; set; } /// <summary> /// 项次号 /// </summary> [SugarColumn(ColumnName = "FREPLACEGROUP")] /// <summary> /// 项次号 /// </summary> [SugarColumn(ColumnName = "FREPLACEGROUP")] public int? Freplacegroup { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "ERP_XSDDH")] public string? ErpXsddh { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "ERP_XSDDH")] public string ErpXsddh { get; set; } /// <summary> /// 子项类型 /// </summary> [SugarColumn(ColumnName = "FMATERIALTYPE")] public string? Fmaterialtype { get; set; } /// <summary> /// 子项类型 /// </summary> [SugarColumn(ColumnName = "FMATERIALTYPE")] public string Fmaterialtype { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FUNITID")] public string? Funitid { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FUNITID")] public string Funitid { get; set; } /// <summary> /// 应发数量 /// </summary> [SugarColumn(ColumnName = "Must_Qty")] /// <summary> /// 应发数量 /// </summary> [SugarColumn(ColumnName = "Must_Qty")] public decimal? MustQty { get; set; } /// <summary> /// 使用比例（%） /// </summary> [SugarColumn(ColumnName = "Use_Rate")] /// <summary> /// 使用比例（%） /// </summary> [SugarColumn(ColumnName = "Use_Rate")] public decimal? UseRate { get; set; } /// <summary> /// 子项类型 1标准件 2返还件 3替代件 /// </summary> [SugarColumn(ColumnName = "Material_Type")] public string? MaterialType { get; set; } /// <summary> /// 子项类型 1标准件 2返还件 3替代件 /// </summary> [SugarColumn(ColumnName = "Material_Type")] public string MaterialType { get; set; } } MES.Service/service/BasicData/MesRohInDataManager.cs
@@ -1,6 +1,5 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; @@ -9,5 +8,4 @@ //当前类已经继承了 Repository 增、删、查、改的方法 //这里面写的代码不会给覆盖,如果要重新生成请删除 MesRohInDataManager.cs } MES.Service/service/BasicData/MesRohInManager.cs
@@ -72,7 +72,7 @@ var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1) .IgnoreColumnsNull() .ExecuteCommand() > 0; if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("插入或更新失败"); } @@ -118,14 +118,10 @@ mesRohIn.CancellationPerson = rohIn.FCancellerId; if (rohIn.FCancelDate != null) { if (!mesRohIn.CancellationPerson.IsNullOrEmpty()) { mesRohIn.CancellationDate = DateTime.ParseExact(rohIn.FCancelDate, "yyyy-MM-dd HH:mm:ss", null); } } mesRohIn.CreateBy = rohIn.FCreatorId;
@@ -232,6 +232,9 @@ private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList, List<MesStaff> staffList) { return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any(); return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any(); } } MES.Service/service/BasicData/OrganizeManager.cs
@@ -119,7 +119,7 @@ FNumber = organize.FNumber, FParentlD = organize.FParentID, IsStatus = organize.FForbidStatus.Equals("A"), Fid = organize.Id, Fid = organize.Id }; }
@@ -1,78 +1,79 @@ using SqlSugar; using System; using System.Collections.Generic; using MES.Service.DB; using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service { namespace MES.Service.service; public class WomcabManager : Repository<Womcab> { //当前类已经继承了 Repository 增、删、查、改的方法 //这里面写的代码不会给覆盖,如果要重新生成请删除 WomcabManager.cs #region 教学方法 /// <summary> /// 仓储方法满足不了复杂业务需求，业务代码请在这里面定义方法 /// 仓储方法满足不了复杂业务需求，业务代码请在这里面定义方法 /// </summary> public void Study() { /*********查询*********/ /*********查询*********/ var data1 = base.GetById(1);//根据ID查询 var data2 = base.GetList();//查询所有 var data3 = base.GetList(it => 1 == 1); //根据条件查询 var data1 = base.GetById(1); //根据ID查询 var data2 = base.GetList(); //查询所有 var data3 = base.GetList(it => 1 == 1); //根据条件查询 //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错 var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 分页查询 var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 分页查询 var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount);//返回总数 Console.Write(p.TotalCount); //返回总数 var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 分页查询加排序 Console.Write(p.TotalCount);//返回总数 List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 分页查询加排序 conModels.Add(new ConditionalModel() { FieldName= typeof(Womcab).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc); var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // 分页查询加排序 Console.Write(p.TotalCount); //返回总数 base.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能 List<IConditionalModel> conModels = new(); //组装条件查询作为条件实现 分页查询加排序 conModels.Add(new ConditionalModel { FieldName = typeof(Womcab).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); base.AsQueryable().Where(x => 1 == 1) .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能 /*********插入*********/ var insertData = new Womcab() { };//测试参数 var insertArray = new Womcab[] { insertData }; base.Insert(insertData);//插入 base.InsertRange(insertArray);//批量插入 var id = base.InsertReturnIdentity(insertData);//插入返回自增列 base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入 var insertData = new Womcab(); //测试参数 var insertArray = new[] { insertData }; base.Insert(insertData); //插入 base.InsertRange(insertArray); //批量插入 var id = base.InsertReturnIdentity(insertData); //插入返回自增列 base.AsInsertable(insertData) .ExecuteCommand(); //我们可以转成 Insertable实现复杂插入 /*********更新*********/ var updateData = new Womcab() { };//测试参数 var updateArray = new Womcab[] { updateData };//测试参数 base.Update(updateData);//根据实体更新 base.UpdateRange(updateArray);//批量更新 /*********更新*********/ var updateData = new Womcab(); //测试参数 var updateArray = new[] { updateData }; //测试参数 base.Update(updateData); //根据实体更新 base.UpdateRange(updateArray); //批量更新 //base.Update(it => new Womcab() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 只更新ClassName列和CreateTime列，其它列不更新，条件id=1 base.AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入 base.AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入 /*********删除*********/ var deldata = new Womcab(); //测试参数 base.Delete(deldata); //根据实体删除 base.DeleteById(1); //根据主键删除 base.DeleteById(new[] { 1, 2 }); //根据主键数组删除 base.Delete(it => 1 == 2); //根据条件删除 base.AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转成Deleteable实现复杂的操作 } /*********删除*********/ var deldata = new Womcab() { };//测试参数 base.Delete(deldata);//根据实体删除 base.DeleteById(1);//根据主键删除 base.DeleteById(new int[] { 1,2});//根据主键数组删除 base.Delete(it=>1==2);//根据条件删除 base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作 } #endregion } } MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -22,7 +22,7 @@ private readonly string TableName = "PRODUCTION_ORDER"; private readonly string URL = "http://localhost:10054/api/ProductionOrder/"; "http://localhost:10054/api/ProductionOrder/"; // [HttpPost("Save")]
