MES.Service/Dto/service/MovesDto.cs
@@ -8,8 +8,8 @@ public List<MesInvItemMoves>? FromList { get; set; } public List<MesInvItemOutItems>? OutItems { get; set; } public List<MesInvItemMovesCDetails>? BarcodeList { get; set; } //入库单 public bool? InAudit{ get; set; } public MesInvItemBarcodes? BarcodesInfo{ get; set; } public bool? InAudit { get; set; } public MesInvItemBarcodes? BarcodesInfo { get; set; } } MES.Service/Dto/service/OutItemDto.cs
@@ -7,7 +7,7 @@ public MesInvItemOuts? Form { get; set; } public List<MesInvItemOutItems>? SaveItems { get; set; } public List<MESInvItemOutItems>? SelectItems { get; set; } public string? ItemNo { get; set; } public decimal? Quantity { get; set; } MES.Service/Dto/service/SJPageResult.cs
@@ -1,4 +1,4 @@ using MES.Service.Dto.@base; using MES.Service.Dto.@base; using SqlSugar; namespace MES.Service.Dto.service; @@ -56,7 +56,7 @@ [SugarColumn(ColumnName = "DAA001")] //用于SqlSugar public string? daa001 { get; set; } //LINE [SugarColumn(ColumnName = "LINE")] //用于SqlSugar public string? line { get; set; } @@ -64,23 +64,22 @@ [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar public string? Remarks { get; set; } /// <summary> /// 产品名称 ///</summary> /// 产品名称 /// </summary> [SugarColumn(ColumnName = "DAA003")] public string? Daa003 { get; set; } /// <summary> /// 产品规格 ///</summary> /// 产品规格 /// </summary> [SugarColumn(ColumnName = "DAA004")] public string? Daa004 { get; set; } /// <summary> /// 工单数量 ///</summary> /// 工单数量 /// </summary> [SugarColumn(ColumnName = "DAA008")] public decimal? Daa008 { get; set; } } MES.Service/Modes/MesInvBusiness2.cs
@@ -8,220 +8,220 @@ [SugarTable("MES_INV_BUSINESS2")] public class MesInvBusiness2 { /// <summary> /// ID(seq_inv_id) /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID", /// <summary> /// ID(seq_inv_id) /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 状态|0-未交易1-已交易 /// </summary> [SugarColumn(ColumnName = "STATUS")] /// <summary> /// 状态|0-未交易1-已交易 /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSACTION_CODE")] /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSACTION_CODE")] public string TransactionCode { get; set; } /// <summary> /// 交易类型|1-入库0-转库-1出库 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] /// <summary> /// 交易类型|1-入库0-转库-1出库 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] public decimal? BusinessType { get; set; } /// <summary> /// 单据ID /// </summary> [SugarColumn(ColumnName = "BILL_ID")] /// <summary> /// 单据ID /// </summary> [SugarColumn(ColumnName = "BILL_ID")] public decimal? BillId { get; set; } /// <summary> /// 单据编码 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] /// <summary> /// 单据编码 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// 生产订单号 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] /// <summary> /// 生产订单号 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// 客户编号 /// </summary> [SugarColumn(ColumnName = "CUSTOMER_NO")] /// <summary> /// 客户编号 /// </summary> [SugarColumn(ColumnName = "CUSTOMER_NO")] public string CustomerNo { get; set; } /// <summary> /// 单据行ID /// </summary> [SugarColumn(ColumnName = "BILL_LINE_ID")] /// <summary> /// 单据行ID /// </summary> [SugarColumn(ColumnName = "BILL_LINE_ID")] public decimal? BillLineId { get; set; } /// <summary> /// 物料条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] /// <summary> /// 物料条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string ItemBarcode { get; set; } /// <summary> /// 本司物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] /// <summary> /// 本司物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// 客户物料编码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] /// <summary> /// 客户物料编码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string CItemCode { get; set; } /// <summary> /// 厂家批次 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] /// <summary> /// 厂家批次 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// 是否环保(0:否,1:是) /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] /// <summary> /// 是否环保(0:否,1:是) /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] public short? EpFlag { get; set; } /// <summary> /// 数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] /// <summary> /// 数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// 源子库CODE /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")] /// <summary> /// 源子库CODE /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")] public string FromInvDepotsCode { get; set; } /// <summary> /// 源货位CODE /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")] /// <summary> /// 源货位CODE /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")] public string FromInvDepotSectionsCode { get; set; } /// <summary> /// 目的子库CODE /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")] /// <summary> /// 目的子库CODE /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")] public string ToInvDepotsCode { get; set; } /// <summary> /// 目的货位CODE /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")] /// <summary> /// 目的货位CODE /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")] public string ToInvDepotSectionsCode { get; set; } /// <summary> /// 交易异常信息 /// </summary> [SugarColumn(ColumnName = "DESCRIPTION")] /// <summary> /// 交易异常信息 /// </summary> [SugarColumn(ColumnName = "DESCRIPTION")] public string Description { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 超损统计标识 /// </summary> [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")] /// <summary> /// 超损统计标识 /// </summary> [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")] public short? UllageStatFlag { get; set; } /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// 箱号条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE2")] /// <summary> /// 箱号条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE2")] public string ItemBarcode2 { get; set; } /// <summary> /// 卡板条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE3")] /// <summary> /// 卡板条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE3")] public string ItemBarcode3 { get; set; } /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// 任务单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] /// <summary> /// 任务单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// 生产线 /// </summary> [SugarColumn(ColumnName = "LINE_NO")] /// <summary> /// 生产线 /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// 采购订单id /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] /// <summary> /// 采购订单id /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> /// 采购订单行id /// </summary> [SugarColumn(ColumnName = "LINE_K3ID")] /// <summary> /// 采购订单行id /// </summary> [SugarColumn(ColumnName = "LINE_K3ID")] public decimal? LineK3id { get; set; } } MES.Service/Modes/MesInvItemArn.cs
@@ -8,232 +8,232 @@ [SugarTable("MES_INV_ITEM_ARN")] public class MesInvItemArn { /// <summary> /// ID(SEQ_INV_ID) /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// ID(SEQ_INV_ID) /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// 状态|0-未审核1-审核入库\结案 /// </summary> [SugarColumn(ColumnName = "STATUS")] /// <summary> /// 状态|0-未审核1-审核入库\结案 /// </summary> [SugarColumn(ColumnName = "STATUS")] public short? Status { get; set; } /// <summary> /// 原因 /// </summary> [SugarColumn(ColumnName = "REASON")] /// <summary> /// 原因 /// </summary> [SugarColumn(ColumnName = "REASON")] public string Reason { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// 事务类型ID /// </summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] /// <summary> /// 事务类型ID /// </summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARK")] /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// 送货单号 /// </summary> [SugarColumn(ColumnName = "PAPER_BILL_NO")] /// <summary> /// 送货单号 /// </summary> [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string PaperBillNo { get; set; } /// <summary> /// 退料人工号 /// </summary> [SugarColumn(ColumnName = "USER_NO_BACK")] /// <summary> /// 退料人工号 /// </summary> [SugarColumn(ColumnName = "USER_NO_BACK")] public string UserNoBack { get; set; } /// <summary> /// 提交人 /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] /// <summary> /// 提交人 /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } /// <summary> /// 提交日期 /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] /// <summary> /// 提交日期 /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 入库日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] /// <summary> /// 入库日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string CheckRes { get; set; } /// <summary> /// 已捡数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] /// <summary> /// 已捡数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } /// <summary> /// 仓库编码 /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] /// <summary> /// 仓库编码 /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] public string DepotsCode { get; set; } /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] public string TransctionNo { get; set; } /// <summary> /// 供应商编码 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] /// <summary> /// 供应商编码 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// 提交状态 /// </summary> [SugarColumn(ColumnName = "FSTATUS")] /// <summary> /// 提交状态 /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public short? Fstatus { get; set; } /// <summary> /// 工厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// 工厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 是否已回写SAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] /// <summary> /// 是否已回写SAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> /// 确认入库日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] /// <summary> /// 确认入库日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? Insdate { get; set; } /// <summary> /// 是否检验 /// </summary> [SugarColumn(ColumnName = "ISCHECK")] /// <summary> /// 是否检验 /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> /// 审核入库人 /// </summary> [SugarColumn(ColumnName = "INSBY")] /// <summary> /// 审核入库人 /// </summary> [SugarColumn(ColumnName = "INSBY")] public string Insby { get; set; } /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// 急料标识 /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] /// <summary> /// 急料标识 /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// 冲销事务类型编码 /// </summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] /// <summary> /// 冲销事务类型编码 /// </summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public decimal? MttransctionNo { get; set; } /// <summary> /// IQC检验单号 /// </summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] /// <summary> /// IQC检验单号 /// </summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] public string IqcReleaseNo { get; set; } /// <summary> /// 是否显示 /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] /// <summary> /// 是否显示 /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } /// <summary> /// 0=采购，1=委外 /// </summary> [SugarColumn(ColumnName = "F_TYPE")] /// <summary> /// 0=采购，1=委外 /// </summary> [SugarColumn(ColumnName = "F_TYPE")] public decimal? FType { get; set; } /// <summary> /// ERP到货单ID /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] /// <summary> /// ERP到货单ID /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public string EbelnK3id { get; set; } /// <summary> /// 条码条印进度 /// </summary> [SugarColumn(ColumnName = "BARCODE_RATIO")] /// <summary> /// 条码条印进度 /// </summary> [SugarColumn(ColumnName = "BARCODE_RATIO")] public decimal? BarcodeRatio { get; set; } /// <summary> /// ERP单号 /// </summary> [SugarColumn(ColumnName = "ERPNO")] /// <summary> /// ERP单号 /// </summary> [SugarColumn(ColumnName = "ERPNO")] public string Erpno { get; set; } /// <summary> /// 是否已退货0-未退货，1-退货 /// </summary> [SugarColumn(ColumnName = "THSTATUS")] /// <summary> /// 是否已退货0-未退货，1-退货 /// </summary> [SugarColumn(ColumnName = "THSTATUS")] public short? Thstatus { get; set; } /// <summary> /// ERP退货单号 /// </summary> [SugarColumn(ColumnName = "ERPTHNO")] /// <summary> /// ERP退货单号 /// </summary> [SugarColumn(ColumnName = "ERPTHNO")] public string Erpthno { get; set; }
@@ -8,453 +8,453 @@ [SugarTable("MES_INV_ITEM_BARCODES")] public class MesInvItemBarcodes { /// <summary> /// SEQ_BARCODE_PSN_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// SEQ_BARCODE_PSN_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 物料条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] /// <summary> /// 物料条码 /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string ItemBarcode { get; set; } /// <summary> /// 客户成品编码 /// </summary> [SugarColumn(ColumnName = "C_PRODUCT_CODE")] /// <summary> /// 客户成品编码 /// </summary> [SugarColumn(ColumnName = "C_PRODUCT_CODE")] public string CProductCode { get; set; } /// <summary> /// 客户物料条码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_BARCODE")] /// <summary> /// 客户物料条码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_BARCODE")] public string CItemBarcode { get; set; } /// <summary> /// 客户物料编码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] /// <summary> /// 客户物料编码 /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string CItemCode { get; set; } /// <summary> /// 本司物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] /// <summary> /// 本司物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// 厂家批次 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] /// <summary> /// 厂家批次 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// 数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] /// <summary> /// 数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// 是否环保(0:否,1:是) /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] /// <summary> /// 是否环保(0:否,1:是) /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] public short? EpFlag { get; set; } /// <summary> /// 生产工单 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] /// <summary> /// 生产工单 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 客户编号 /// </summary> [SugarColumn(ColumnName = "CUST_NO")] /// <summary> /// 客户编号 /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> /// 物料条码注释行[冗余，条码重打使用] /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")] /// <summary> /// 物料条码注释行[冗余，条码重打使用] /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")] public string ItemBarcodeText { get; set; } /// <summary> /// 原PSN物料条码 /// </summary> [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")] /// <summary> /// 原PSN物料条码 /// </summary> [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")] public string OldItemBarcode { get; set; } /// <summary> /// SAP收货物料凭证号 --采购单号 /// </summary> [SugarColumn(ColumnName = "MBLNR")] /// <summary> /// SAP收货物料凭证号 --采购单号 /// </summary> [SugarColumn(ColumnName = "MBLNR")] public string Mblnr { get; set; } /// <summary> /// SAP收货物料凭证行号 --采购单行号 /// </summary> [SugarColumn(ColumnName = "ZEILE")] /// <summary> /// SAP收货物料凭证行号 --采购单行号 /// </summary> [SugarColumn(ColumnName = "ZEILE")] public decimal? Zeile { get; set; } /// <summary> /// 收料表ID /// </summary> [SugarColumn(ColumnName = "ROH_IN_ID")] /// <summary> /// 收料表ID /// </summary> [SugarColumn(ColumnName = "ROH_IN_ID")] public decimal? RohInId { get; set; } /// <summary> /// 0为有效条码；1为无效条码 /// </summary> [SugarColumn(ColumnName = "BARCODESTATUS")] /// <summary> /// 0为有效条码；1为无效条码 /// </summary> [SugarColumn(ColumnName = "BARCODESTATUS")] public short? Barcodestatus { get; set; } /// <summary> /// 原始数量 /// </summary> [SugarColumn(ColumnName = "OLDQTY")] /// <summary> /// 原始数量 /// </summary> [SugarColumn(ColumnName = "OLDQTY")] public decimal? Oldqty { get; set; } /// <summary> /// 使用数量 /// </summary> [SugarColumn(ColumnName = "USEQTY")] /// <summary> /// 使用数量 /// </summary> [SugarColumn(ColumnName = "USEQTY")] public decimal? Useqty { get; set; } /// <summary> /// 0在库，1在线，2作废 /// </summary> [SugarColumn(ColumnName = "LOCATION")] /// <summary> /// 0在库，1在线，2作废 /// </summary> [SugarColumn(ColumnName = "LOCATION")] public short? Location { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "UNIT")] /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// 重量（单位：公斤） /// </summary> [SugarColumn(ColumnName = "WEIGHT_UNIT")] /// <summary> /// 重量（单位：公斤） /// </summary> [SugarColumn(ColumnName = "WEIGHT_UNIT")] public decimal? WeightUnit { get; set; } /// <summary> /// 单价 /// </summary> [SugarColumn(ColumnName = "PRICE")] /// <summary> /// 单价 /// </summary> [SugarColumn(ColumnName = "PRICE")] public decimal? Price { get; set; } /// <summary> /// 原条码数量 /// </summary> [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")] /// <summary> /// 原条码数量 /// </summary> [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")] public decimal? OldBarQuantity { get; set; } /// <summary> /// 汇总条码 /// </summary> [SugarColumn(ColumnName = "SUM_BARCODE")] /// <summary> /// 汇总条码 /// </summary> [SugarColumn(ColumnName = "SUM_BARCODE")] public string SumBarcode { get; set; } /// <summary> /// 生产日期 /// </summary> [SugarColumn(ColumnName = "LOT_DATE")] /// <summary> /// 生产日期 /// </summary> [SugarColumn(ColumnName = "LOT_DATE")] public string LotDate { get; set; } /// <summary> /// 模号 /// </summary> [SugarColumn(ColumnName = "MOCODE")] /// <summary> /// 模号 /// </summary> [SugarColumn(ColumnName = "MOCODE")] public string Mocode { get; set; } /// <summary> /// 来源 /// </summary> [SugarColumn(ColumnName = "MEMO")] /// <summary> /// 来源 /// </summary> [SugarColumn(ColumnName = "MEMO")] public string Memo { get; set; } /// <summary> /// 供应商编码 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] /// <summary> /// 供应商编码 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// 档位低值 /// </summary> [SugarColumn(ColumnName = "SPOSTION")] /// <summary> /// 档位低值 /// </summary> [SugarColumn(ColumnName = "SPOSTION")] public string Spostion { get; set; } /// <summary> /// 档位高值 /// </summary> [SugarColumn(ColumnName = "EPOSTION")] /// <summary> /// 档位高值 /// </summary> [SugarColumn(ColumnName = "EPOSTION")] public string Epostion { get; set; } /// <summary> /// 物料简称 /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] /// <summary> /// 物料简称 /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] public string ItemSname { get; set; } /// <summary> /// 是否已冻结,1冻结 /// </summary> [SugarColumn(ColumnName = "VISABLE")] /// <summary> /// 是否已冻结,1冻结 /// </summary> [SugarColumn(ColumnName = "VISABLE")] public short? Visable { get; set; } /// <summary> /// 供应商批次 /// </summary> [SugarColumn(ColumnName = "TR_LOTNO")] /// <summary> /// 供应商批次 /// </summary> [SugarColumn(ColumnName = "TR_LOTNO")] public string TrLotno { get; set; } /// <summary> /// 冻结时间 /// </summary> [SugarColumn(ColumnName = "FLEZZ_DATE")] /// <summary> /// 冻结时间 /// </summary> [SugarColumn(ColumnName = "FLEZZ_DATE")] public DateTime? FlezzDate { get; set; } /// <summary> /// 冻结原因 /// </summary> [SugarColumn(ColumnName = "FLEZZ_REASON")] /// <summary> /// 冻结原因 /// </summary> [SugarColumn(ColumnName = "FLEZZ_REASON")] public string FlezzReason { get; set; } /// <summary> /// 冻结人 /// </summary> [SugarColumn(ColumnName = "FLEZZ_BY")] /// <summary> /// 冻结人 /// </summary> [SugarColumn(ColumnName = "FLEZZ_BY")] public string FlezzBy { get; set; } /// <summary> /// 延长保质期 /// </summary> [SugarColumn(ColumnName = "DELANY_MONTH")] /// <summary> /// 延长保质期 /// </summary> [SugarColumn(ColumnName = "DELANY_MONTH")] public decimal? DelanyMonth { get; set; } /// <summary> /// 最小包装标识 /// </summary> [SugarColumn(ColumnName = "MINPACK_FLAG")] /// <summary> /// 最小包装标识 /// </summary> [SugarColumn(ColumnName = "MINPACK_FLAG")] public short? MinpackFlag { get; set; } /// <summary> /// 打印ID，用来区分打印次数 /// </summary> [SugarColumn(ColumnName = "PRINT_ID")] /// <summary> /// 打印ID，用来区分打印次数 /// </summary> [SugarColumn(ColumnName = "PRINT_ID")] public string PrintId { get; set; } /// <summary> /// 环保项目 /// </summary> [SugarColumn(ColumnName = "EP_ITEM")] /// <summary> /// 环保项目 /// </summary> [SugarColumn(ColumnName = "EP_ITEM")] public string EpItem { get; set; } /// <summary> /// 工厂编号 /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// 工厂编号 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 公司编号 /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// 公司编号 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// 卡板编码 /// </summary> [SugarColumn(ColumnName = "CB_NO")] /// <summary> /// 卡板编码 /// </summary> [SugarColumn(ColumnName = "CB_NO")] public string CbNo { get; set; } /// <summary> /// 厂家生产线 /// </summary> [SugarColumn(ColumnName = "LINFLINE")] /// <summary> /// 厂家生产线 /// </summary> [SugarColumn(ColumnName = "LINFLINE")] public string Linfline { get; set; } /// <summary> /// 有效期 /// </summary> [SugarColumn(ColumnName = "VALID_TIME")] /// <summary> /// 有效期 /// </summary> [SugarColumn(ColumnName = "VALID_TIME")] public DateTime? ValidTime { get; set; } /// <summary> /// 质检结果 /// </summary> [SugarColumn(ColumnName = "IQC_STATUS")] /// <summary> /// 质检结果 /// </summary> [SugarColumn(ColumnName = "IQC_STATUS")] public string IqcStatus { get; set; } /// <summary> /// 小车条码 /// </summary> [SugarColumn(ColumnName = "FCAR")] /// <summary> /// 小车条码 /// </summary> [SugarColumn(ColumnName = "FCAR")] public string Fcar { get; set; } /// <summary> /// 毛重 /// </summary> [SugarColumn(ColumnName = "GWEIGHT")] /// <summary> /// 毛重 /// </summary> [SugarColumn(ColumnName = "GWEIGHT")] public string Gweight { get; set; } /// <summary> /// 净重 /// </summary> [SugarColumn(ColumnName = "NWEIGHT")] /// <summary> /// 净重 /// </summary> [SugarColumn(ColumnName = "NWEIGHT")] public string Nweight { get; set; } /// <summary> /// 保质期 /// </summary> [SugarColumn(ColumnName = "EXT_DATE")] /// <summary> /// 保质期 /// </summary> [SugarColumn(ColumnName = "EXT_DATE")] public decimal? ExtDate { get; set; } /// <summary> /// 供应商、赠品、客供料、委外 /// </summary> [SugarColumn(ColumnName = "BARCODETYPE")] /// <summary> /// 供应商、赠品、客供料、委外 /// </summary> [SugarColumn(ColumnName = "BARCODETYPE")] public string Barcodetype { get; set; } /// <summary> /// 供应商名称 /// </summary> [SugarColumn(ColumnName = "SUPP_NAME")] /// <summary> /// 供应商名称 /// </summary> [SugarColumn(ColumnName = "SUPP_NAME")] public string SuppName { get; set; } /// <summary> /// 到货单号/入库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] /// <summary> /// 到货单号/入库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// 急料标识 /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] /// <summary> /// 急料标识 /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// 颜色 /// </summary> [SugarColumn(ColumnName = "COLOR_NAME")] /// <summary> /// 颜色 /// </summary> [SugarColumn(ColumnName = "COLOR_NAME")] public string ColorName { get; set; } /// <summary> /// 产品型号 /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] /// <summary> /// 产品型号 /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } /// <summary> /// 来料日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] /// <summary> /// 来料日期 /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// 到货单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] /// <summary> /// 到货单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// 不良原因 /// </summary> [SugarColumn(ColumnName = "MEMO_BAD")] /// <summary> /// 不良原因 /// </summary> [SugarColumn(ColumnName = "MEMO_BAD")] public string MemoBad { get; set; } /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// 条码来源标识，0-初期物料,1-采购入库，2、生产退料，3、其它入库，4-客供料,5-在库分料，6-制程条码 /// </summary> [SugarColumn(ColumnName = "COME_FLG")] /// <summary> /// 条码来源标识，0-初期物料,1-采购入库，2、生产退料，3、其它入库，4-客供料,5-在库分料，6-制程条码 /// </summary> [SugarColumn(ColumnName = "COME_FLG")] public short? ComeFlg { get; set; } /// <summary> /// 生产线体 /// </summary> [SugarColumn(ColumnName = "LINE_NO")] /// <summary> /// 生产线体 /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// 丝印次数 /// </summary> [SugarColumn(ColumnName = "SILK_PQTY")] /// <summary> /// 丝印次数 /// </summary> [SugarColumn(ColumnName = "SILK_PQTY")] public decimal? SilkPqty { get; set; } /// <summary> /// 丝印次数比 /// </summary> [SugarColumn(ColumnName = "SILK")] /// <summary> /// 丝印次数比 /// </summary> [SugarColumn(ColumnName = "SILK")] public string Silk { get; set; } /// <summary> /// 丝印派工从表ID /// </summary> [SugarColumn(ColumnName = "SILK_ID")] /// <summary> /// 丝印派工从表ID /// </summary> [SugarColumn(ColumnName = "SILK_ID")] public decimal? SilkId { get; set; } /// <summary> /// 已报工标识 /// </summary> [SugarColumn(ColumnName = "WORK_FLG")] /// <summary> /// 已报工标识 /// </summary> [SugarColumn(ColumnName = "WORK_FLG")] public decimal? WorkFlg { get; set; } /// <summary> /// 最后工序 /// </summary> [SugarColumn(ColumnName = "WORK_LAST")] /// <summary> /// 最后工序 /// </summary> [SugarColumn(ColumnName = "WORK_LAST")] public decimal? WorkLast { get; set; } /// <summary> /// 0-未合并打印，1-合并打印 /// </summary> [SugarColumn(ColumnName = "HBDY")] /// <summary> /// 0-未合并打印，1-合并打印 /// </summary> [SugarColumn(ColumnName = "HBDY")] public decimal? Hbdy { get; set; } /// <summary> /// 0-有效条码，1-合并拆分的条码，无效 /// </summary> [SugarColumn(ColumnName = "HBDYTM")] /// <summary> /// 0-有效条码，1-合并拆分的条码，无效 /// </summary> [SugarColumn(ColumnName = "HBDYTM")] public decimal? Hbdytm { get; set; } /// <summary> /// 报工时间 /// </summary> [SugarColumn(ColumnName = "WORK_FLGTIME")] /// <summary> /// 报工时间 /// </summary> [SugarColumn(ColumnName = "WORK_FLGTIME")] public string WorkFlgtime { get; set; } } MES.Service/Modes/MesInvItemInCItems.cs
@@ -8,141 +8,141 @@ [SugarTable("MES_INV_ITEM_IN_C_ITEMS")] public class MesInvItemInCItems { /// <summary> /// SEQ_OUT /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// SEQ_OUT /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 入库单id /// </summary> [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)] /// <summary> /// 入库单id /// </summary> [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)] public decimal ItemInId { get; set; } /// <summary> /// 验收数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] /// <summary> /// 验收数量 /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// 仓库编码 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] /// <summary> /// 仓库编码 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// 货位编码 /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] /// <summary> /// 货位编码 /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } /// <summary> /// 特记事项 /// </summary> [SugarColumn(ColumnName = "REMARK")] /// <summary> /// 特记事项 /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// 物料简称 /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] /// <summary> /// 物料简称 /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] public string ItemSname { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "UNIT")] /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// 采购订单 /// </summary> [SugarColumn(ColumnName = "EBELN")] /// <summary> /// 采购订单 /// </summary> [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } /// <summary> /// 入库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] /// <summary> /// 入库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// 行号 /// </summary> [SugarColumn(ColumnName = "EBELN_LINE_NO")] /// <summary> /// 行号 /// </summary> [SugarColumn(ColumnName = "EBELN_LINE_NO")] public decimal? EbelnLineNo { get; set; } /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } /// <summary> /// 任务单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] /// <summary> /// 任务单行号 /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// 生产工单 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] /// <summary> /// 生产工单 /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } } MES.Service/Modes/MesInvItemMoves.cs
@@ -8,171 +8,171 @@ [SugarTable("MES_INV_ITEM_MOVES")] public class MesInvItemMoves { /// <summary> /// SEQ_INV_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// SEQ_INV_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 移库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] /// <summary> /// 移库单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// 移入子库id /// </summary> [SugarColumn(ColumnName = "INV_DEPOTS_ID")] /// <summary> /// 移入子库id /// </summary> [SugarColumn(ColumnName = "INV_DEPOTS_ID")] public decimal? InvDepotsId { get; set; } /// <summary> /// 移入货位id /// </summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")] /// <summary> /// 移入货位id /// </summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")] public decimal? InvDepotSectionsId { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 最后更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 最后更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 状态|0-制单1-过账 /// </summary> [SugarColumn(ColumnName = "STATUS")] /// <summary> /// 状态|0-制单1-过账 /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARK")] /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] /// <summary> /// 单据类型ID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// 事务类型ID /// </summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] /// <summary> /// 事务类型ID /// </summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECKUSER")] /// <summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECKUSER")] public string Checkuser { get; set; } /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "CHECKDATE")] /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "CHECKDATE")] public DateTime? Checkdate { get; set; } /// <summary> /// 移入子库code /// </summary> [SugarColumn(ColumnName = "INV_DEPOTS_CODE")] /// <summary> /// 移入子库code /// </summary> [SugarColumn(ColumnName = "INV_DEPOTS_CODE")] public string InvDepotsCode { get; set; } /// <summary> /// 移入货位code /// </summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")] /// <summary> /// 移入货位code /// </summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")] public string InvDepotSectionsCode { get; set; } /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSACTION_NO")] /// <summary> /// 事务类型编码 /// </summary> [SugarColumn(ColumnName = "TRANSACTION_NO")] public decimal? TransactionNo { get; set; } /// <summary> /// 移出子库code /// </summary> [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")] /// <summary> /// 移出子库code /// </summary> [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")] public string FromDepotsCode { get; set; } /// <summary> /// 工厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY_CODE")] /// <summary> /// 工厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY_CODE")] public string FactoryCode { get; set; } /// <summary> /// SAP返回单据 /// </summary> [SugarColumn(ColumnName = "SAPNO")] /// <summary> /// SAP返回单据 /// </summary> [SugarColumn(ColumnName = "SAPNO")] public string Sapno { get; set; } /// <summary> /// 已回写SAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] /// <summary> /// 已回写SAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> /// SAP返回年份 /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] /// <summary> /// SAP返回年份 /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// SAP返回信息 /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] /// <summary> /// SAP返回信息 /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] public string Saptext { get; set; } /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// 分厂编码 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// 公司代码 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// 反审核事务类型编码 /// </summary> [SugarColumn(ColumnName = "MTRANSACTION_NO")] /// <summary> /// 反审核事务类型编码 /// </summary> [SugarColumn(ColumnName = "MTRANSACTION_NO")] public decimal? MtransactionNo { get; set; } /// <summary> /// 自动保存字段 /// </summary> [SugarColumn(ColumnName = "ZD_NUM")] /// <summary> /// 自动保存字段 /// </summary> [SugarColumn(ColumnName = "ZD_NUM")] public decimal? ZdNum { get; set; } /// <summary> /// 是否推送ERP1-是，2-否 /// </summary> [SugarColumn(ColumnName = "TS")] /// <summary> /// 是否推送ERP1-是，2-否 /// </summary> [SugarColumn(ColumnName = "TS")] public decimal? Ts { get; set; } } MES.Service/Modes/MesLine.cs
@@ -1,173 +1,167 @@ using SqlSugar; namespace MES.Service.Modes namespace MES.Service.Modes; /// <summary> /// 线体 /// </summary> [SugarTable("MES_LINE")] public class MesLine { /// <summary> /// 线体 ///</summary> [SugarTable("MES_LINE")] public class MesLine { /// <summary> /// 主键 ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// 主键 /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 线体编号 ///</summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// 线体编号 /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// 线体名称 ///</summary> [SugarColumn(ColumnName = "LINE_NAME")] public string LineName { get; set; } /// <summary> /// 线体名称 /// </summary> [SugarColumn(ColumnName = "LINE_NAME")] public string LineName { get; set; } /// <summary> /// 工作中心编号 ///</summary> [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] public string WorkshopCenterCode { get; set; } /// <summary> /// 工作中心编号 /// </summary> [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] public string WorkshopCenterCode { get; set; } /// <summary> /// 备注 ///</summary> [SugarColumn(ColumnName = "MEMO")] public string Memo { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "MEMO")] public string Memo { get; set; } /// <summary> /// 创建人 ///</summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建日期 ///</summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 创建日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 最后修改人 ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后修改人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 最后修改日期 ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 最后修改日期 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 卡板分类 ///</summary> [SugarColumn(ColumnName = "BK01")] public string Bk01 { get; set; } /// <summary> /// 卡板分类 /// </summary> [SugarColumn(ColumnName = "BK01")] public string Bk01 { get; set; } /// <summary> /// 标签显示值 ///</summary> [SugarColumn(ColumnName = "LABEL")] public string Label { get; set; } /// <summary> /// 标签显示值 /// </summary> [SugarColumn(ColumnName = "LABEL")] public string Label { get; set; } /// <summary> /// 车间简码 ///</summary> [SugarColumn(ColumnName = "WORKHOMEJM")] public string Workhomejm { get; set; } /// <summary> /// 车间简码 /// </summary> [SugarColumn(ColumnName = "WORKHOMEJM")] public string Workhomejm { get; set; } /// <summary> /// 线简码 ///</summary> [SugarColumn(ColumnName = "LINEJM")] public string Linejm { get; set; } /// <summary> /// 线简码 /// </summary> [SugarColumn(ColumnName = "LINEJM")] public string Linejm { get; set; } /// <summary> /// 条码类型 ///</summary> [SugarColumn(ColumnName = "BARTYPE")] public string Bartype { get; set; } /// <summary> /// 条码类型 /// </summary> [SugarColumn(ColumnName = "BARTYPE")] public string Bartype { get; set; } /// <summary> /// 微信显示值 ///</summary> [SugarColumn(ColumnName = "WX_LABLE")] public string WxLable { get; set; } /// <summary> /// 微信显示值 /// </summary> [SugarColumn(ColumnName = "WX_LABLE")] public string WxLable { get; set; } /// <summary> /// 区分锂锰锂亚 ///</summary> [SugarColumn(ColumnName = "WORKCENTERTYPE")] public string Workcentertype { get; set; } /// <summary> /// 区分锂锰锂亚 /// </summary> [SugarColumn(ColumnName = "WORKCENTERTYPE")] public string Workcentertype { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "SIMPLENAME")] public string Simplename { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "SIMPLENAME")] public string Simplename { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "SHOW_INDEX")] public decimal? ShowIndex { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "SHOW_INDEX")] public decimal? ShowIndex { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { 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 = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } /// <summary> /// 默认库位 /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } /// <summary> /// 报工方式（0、离散报工，1、整线报工） ///</summary> [SugarColumn(ColumnName = "WORK_TYPE")] public decimal? WorkType { get; set; } /// <summary> /// 报工方式（0、离散报工，1、整线报工） /// </summary> [SugarColumn(ColumnName = "WORK_TYPE")] public decimal? WorkType { get; set; } /// <summary> /// 部门编号 ///</summary> [SugarColumn(ColumnName = "DEPARTMENTCODE")] public string Departmentcode { get; set; } /// <summary> /// 部门编号 /// </summary> [SugarColumn(ColumnName = "DEPARTMENTCODE")] public string Departmentcode { get; set; } /// <summary> /// 所属工序 ///</summary> [SugarColumn(ColumnName = "PROC_NO")] public string ProcNo { get; set; } /// <summary> /// 所属工序 /// </summary> [SugarColumn(ColumnName = "PROC_NO")] public string ProcNo { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "LINE_STYLE")] public string LineStyle { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "LINE_STYLE")] public string LineStyle { get; set; } /// <summary> /// 组长编号 ///</summary> [SugarColumn(ColumnName = "L_CODE")] public string LCode { get; set; } } /// <summary> /// 组长编号 /// </summary> [SugarColumn(ColumnName = "L_CODE")] public string LCode { get; set; } } MES.Service/Modes/MesQaItemsDetect01.cs
@@ -8,324 +8,324 @@ [SugarTable("MES_QA_ITEMS_DETECT_01")] public class MesQaItemsDetect01 { /// <summary> /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 检验单号 /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] /// <summary> /// 检验单号 /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string ReleaseNo { get; set; } /// <summary> /// 检验日期 /// </summary> [SugarColumn(ColumnName = "FCHECK_DATE")] /// <summary> /// 检验日期 /// </summary> [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } /// <summary> /// 检验人员 /// </summary> [SugarColumn(ColumnName = "FCHECK_BY")] /// <summary> /// 检验人员 /// </summary> [SugarColumn(ColumnName = "FCHECK_BY")] public string FcheckBy { get; set; } /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// 来料数量 /// </summary> [SugarColumn(ColumnName = "FBATCH_QTY")] /// <summary> /// 来料数量 /// </summary> [SugarColumn(ColumnName = "FBATCH_QTY")] public decimal? FbatchQty { get; set; } /// <summary> /// 判定结果 /// </summary> [SugarColumn(ColumnName = "FRECE_QTY")] /// <summary> /// 判定结果 /// </summary> [SugarColumn(ColumnName = "FRECE_QTY")] public string FreceQty { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] /// <summary> /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FNG_DESC")] /// <summary> /// </summary> [SugarColumn(ColumnName = "FNG_DESC")] public string FngDesc { get; set; } /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string FcheckResu { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FREVIEW")] /// <summary> /// </summary> [SugarColumn(ColumnName = "FREVIEW")] public string Freview { get; set; } /// <summary> /// 检验水准 /// </summary> [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] /// <summary> /// 检验水准 /// </summary> [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] public string SampleSizeNo { get; set; } /// <summary> /// 检验水平 /// </summary> [SugarColumn(ColumnName = "FCHECK_LEVEL")] /// <summary> /// 检验水平 /// </summary> [SugarColumn(ColumnName = "FCHECK_LEVEL")] public string FcheckLevel { get; set; } /// <summary> /// 拒收水平 /// </summary> [SugarColumn(ColumnName = "FAC_LEVEL")] /// <summary> /// 拒收水平 /// </summary> [SugarColumn(ColumnName = "FAC_LEVEL")] public string FacLevel { get; set; } /// <summary> /// 抽检数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] /// <summary> /// 抽检数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public string CheckQty { get; set; } /// <summary> /// 批次号 --到货单号 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] /// <summary> /// 批次号 --到货单号 /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// 是否推送 /// </summary> [SugarColumn(ColumnName = "FMOVE")] /// <summary> /// 是否推送 /// </summary> [SugarColumn(ColumnName = "FMOVE")] public string Fmove { get; set; } /// <summary> /// 是否处理 /// </summary> [SugarColumn(ColumnName = "FHANDLE")] /// <summary> /// 是否处理 /// </summary> [SugarColumn(ColumnName = "FHANDLE")] public string Fhandle { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// 创建日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] /// <summary> /// 创建日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 更新日期 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 更新日期 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 是否审核 /// </summary> [SugarColumn(ColumnName = "MODIFY1_FLAG")] /// <summary> /// 是否审核 /// </summary> [SugarColumn(ColumnName = "MODIFY1_FLAG")] public decimal? Modify1Flag { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "MODIFY1_BY")] /// <summary> /// </summary> [SugarColumn(ColumnName = "MODIFY1_BY")] public string Modify1By { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "MODIFY1_DATE")] /// <summary> /// </summary> [SugarColumn(ColumnName = "MODIFY1_DATE")] public DateTime? Modify1Date { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// XRF测试报告编号 /// </summary> [SugarColumn(ColumnName = "FCHECK_REPNO")] /// <summary> /// XRF测试报告编号 /// </summary> [SugarColumn(ColumnName = "FCHECK_REPNO")] public string FcheckRepno { get; set; } /// <summary> /// 第三方报告 /// </summary> [SugarColumn(ColumnName = "FTHIRD_REP")] /// <summary> /// 第三方报告 /// </summary> [SugarColumn(ColumnName = "FTHIRD_REP")] public string FthirdRep { get; set; } /// <summary> /// 是否作废 /// </summary> [SugarColumn(ColumnName = "FCANCEL")] /// <summary> /// 是否作废 /// </summary> [SugarColumn(ColumnName = "FCANCEL")] public decimal? Fcancel { get; set; } /// <summary> /// 提交标识 /// </summary> [SugarColumn(ColumnName = "FSUBMIT")] /// <summary> /// 提交标识 /// </summary> [SugarColumn(ColumnName = "FSUBMIT")] public decimal? Fsubmit { get; set; } /// <summary> /// 检验依据 /// </summary> [SugarColumn(ColumnName = "FCHECK_ACCORD")] /// <summary> /// 检验依据 /// </summary> [SugarColumn(ColumnName = "FCHECK_ACCORD")] public string FcheckAccord { get; set; } /// <summary> /// 类型(0 来料 1 在库) /// </summary> [SugarColumn(ColumnName = "FTYPE")] /// <summary> /// 类型(0 来料 1 在库) /// </summary> [SugarColumn(ColumnName = "FTYPE")] public short? Ftype { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "ITEM_UNIT")] /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "ITEM_UNIT")] public string ItemUnit { get; set; } /// <summary> /// 出货日期 /// </summary> [SugarColumn(ColumnName = "OUT_DATE")] /// <summary> /// 出货日期 /// </summary> [SugarColumn(ColumnName = "OUT_DATE")] public string OutDate { get; set; } /// <summary> /// 是否免检 /// </summary> [SugarColumn(ColumnName = "FEXEMPTION")] /// <summary> /// 是否免检 /// </summary> [SugarColumn(ColumnName = "FEXEMPTION")] public decimal? Fexemption { get; set; } /// <summary> /// 档位标准 /// </summary> [SugarColumn(ColumnName = "FGEAR_STAND")] /// <summary> /// 档位标准 /// </summary> [SugarColumn(ColumnName = "FGEAR_STAND")] public string FgearStand { get; set; } /// <summary> /// 不良处理方法 /// </summary> [SugarColumn(ColumnName = "FNG_HANDLE")] /// <summary> /// 不良处理方法 /// </summary> [SugarColumn(ColumnName = "FNG_HANDLE")] public string FngHandle { get; set; } /// <summary> /// 管理编号 /// </summary> [SugarColumn(ColumnName = "FMANAGE_NO")] /// <summary> /// 管理编号 /// </summary> [SugarColumn(ColumnName = "FMANAGE_NO")] public string FmanageNo { get; set; } /// <summary> /// 转换数量 /// </summary> [SugarColumn(ColumnName = "FCOVERT_QTY")] /// <summary> /// 转换数量 /// </summary> [SugarColumn(ColumnName = "FCOVERT_QTY")] public string FcovertQty { get; set; } /// <summary> /// 版本 /// </summary> [SugarColumn(ColumnName = "FVERSION")] /// <summary> /// 版本 /// </summary> [SugarColumn(ColumnName = "FVERSION")] public decimal? Fversion { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FSECOND_RESU")] /// <summary> /// </summary> [SugarColumn(ColumnName = "FSECOND_RESU")] public string FsecondResu { get; set; } /// <summary> /// 最大抽检数 /// </summary> [SugarColumn(ColumnName = "MAX_CHECK_QTY")] /// <summary> /// 最大抽检数 /// </summary> [SugarColumn(ColumnName = "MAX_CHECK_QTY")] public decimal? MaxCheckQty { get; set; } /// <summary> /// 特定修改是否审核 /// </summary> [SugarColumn(ColumnName = "MODIFY1_FLAG1")] /// <summary> /// 特定修改是否审核 /// </summary> [SugarColumn(ColumnName = "MODIFY1_FLAG1")] public decimal? Modify1Flag1 { get; set; } /// <summary> /// 特定修改审核人 /// </summary> [SugarColumn(ColumnName = "MODIFY1_BY1")] /// <summary> /// 特定修改审核人 /// </summary> [SugarColumn(ColumnName = "MODIFY1_BY1")] public string Modify1By1 { get; set; } /// <summary> /// 特定修改审核时间 /// </summary> [SugarColumn(ColumnName = "MODIFY1_DATE1")] /// <summary> /// 特定修改审核时间 /// </summary> [SugarColumn(ColumnName = "MODIFY1_DATE1")] public DateTime? Modify1Date1 { get; set; } /// <summary> /// 小批次号 /// </summary> [SugarColumn(ColumnName = "LOT_NO1")] /// <summary> /// 小批次号 /// </summary> [SugarColumn(ColumnName = "LOT_NO1")] public string LotNo1 { get; set; } /// <summary> /// 采购单号 /// </summary> [SugarColumn(ColumnName = "LOT_NO2")] /// <summary> /// 采购单号 /// </summary> [SugarColumn(ColumnName = "LOT_NO2")] public string LotNo2 { get; set; } /// <summary> /// 产品型号 /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] /// <summary> /// 产品型号 /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] /// <summary> /// 任务单号 /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// 到货时间 /// </summary> [SugarColumn(ColumnName = "DHA018")] /// <summary> /// 到货时间 /// </summary> [SugarColumn(ColumnName = "DHA018")] public string Dha018 { get; set; } /// <summary> /// 行号 /// </summary> [SugarColumn(ColumnName = "DHB002")] /// <summary> /// 行号 /// </summary> [SugarColumn(ColumnName = "DHB002")] public decimal? Dhb002 { get; set; } /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "DHB001")] /// <summary> /// 到货单号 /// </summary> [SugarColumn(ColumnName = "DHB001")] public string Dhb001 { get; set; } /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "LIFNR")] /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "LIFNR")] public string Lifnr { get; set; } /// <summary> /// 退料方式 /// </summary> [SugarColumn(ColumnName = "FMRMODE")] /// <summary> /// 退料方式 /// </summary> [SugarColumn(ColumnName = "FMRMODE")] public string Fmrmode { get; set; } } MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -8,167 +8,167 @@ [SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")] public class MesQaItemsDetectDetail5 { /// <summary> /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] /// <summary> /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 标准值类型 /// </summary> [SugarColumn(ColumnName = "FTEXT_TYPE")] /// <summary> /// 标准值类型 /// </summary> [SugarColumn(ColumnName = "FTEXT_TYPE")] public string FtextType { get; set; } /// <summary> /// 标准值 /// </summary> [SugarColumn(ColumnName = "FSTAND")] /// <summary> /// 标准值 /// </summary> [SugarColumn(ColumnName = "FSTAND")] public decimal? Fstand { get; set; } /// <summary> /// 上公差 /// </summary> [SugarColumn(ColumnName = "FUP_ALLOW")] /// <summary> /// 上公差 /// </summary> [SugarColumn(ColumnName = "FUP_ALLOW")] public string FupAllow { get; set; } /// <summary> /// 下公差 /// </summary> [SugarColumn(ColumnName = "FDOWN_ALLOW")] /// <summary> /// 下公差 /// </summary> [SugarColumn(ColumnName = "FDOWN_ALLOW")] public string FdownAllow { get; set; } /// <summary> /// 检验水准 /// </summary> [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] /// <summary> /// 检验水准 /// </summary> [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] public string SampleSizeNo { get; set; } /// <summary> /// 检验水平 /// </summary> [SugarColumn(ColumnName = "FCHECK_LEVEL")] /// <summary> /// 检验水平 /// </summary> [SugarColumn(ColumnName = "FCHECK_LEVEL")] public string FcheckLevel { get; set; } /// <summary> /// 拒收水平 /// </summary> [SugarColumn(ColumnName = "FAC_LEVEL")] /// <summary> /// 拒收水平 /// </summary> [SugarColumn(ColumnName = "FAC_LEVEL")] public string FacLevel { get; set; } /// <summary> /// 检验项目 /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM")] /// <summary> /// 检验项目 /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM")] public string FcheckItem { get; set; } /// <summary> /// 规格要求 /// </summary> [SugarColumn(ColumnName = "FSPEC_REQU")] /// <summary> /// 规格要求 /// </summary> [SugarColumn(ColumnName = "FSPEC_REQU")] public string FspecRequ { get; set; } /// <summary> /// 抽检数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QYT")] /// <summary> /// 抽检数量 /// </summary> [SugarColumn(ColumnName = "CHECK_QYT")] public decimal? CheckQyt { get; set; } /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] /// <summary> /// 检验结果 /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string FcheckResu { get; set; } /// <summary> /// AC数量 /// </summary> [SugarColumn(ColumnName = "FAC_QTY")] /// <summary> /// AC数量 /// </summary> [SugarColumn(ColumnName = "FAC_QTY")] public decimal? FacQty { get; set; } /// <summary> /// RE数量 /// </summary> [SugarColumn(ColumnName = "FRE_QTY")] /// <summary> /// RE数量 /// </summary> [SugarColumn(ColumnName = "FRE_QTY")] public decimal? FreQty { get; set; } /// <summary> /// 不合格数 /// </summary> [SugarColumn(ColumnName = "FNG_QTY")] /// <summary> /// 不合格数 /// </summary> [SugarColumn(ColumnName = "FNG_QTY")] public decimal? FngQty { get; set; } /// <summary> /// 不良率 /// </summary> [SugarColumn(ColumnName = "FNG_RATE")] /// <summary> /// 不良率 /// </summary> [SugarColumn(ColumnName = "FNG_RATE")] public decimal? FngRate { get; set; } /// <summary> /// 已录入数量 /// </summary> [SugarColumn(ColumnName = "FENTER_QTY")] /// <summary> /// 已录入数量 /// </summary> [SugarColumn(ColumnName = "FENTER_QTY")] public decimal? FenterQty { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] /// <summary> /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string ReleaseNo { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// 检验项目描述 /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")] /// <summary> /// 检验项目描述 /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")] public string FcheckItemDesc { get; set; } /// <summary> /// 工序号 /// </summary> [SugarColumn(ColumnName = "PROC_NO")] /// <summary> /// 工序号 /// </summary> [SugarColumn(ColumnName = "PROC_NO")] public string ProcNo { get; set; } /// <summary> /// 工作中心编码 /// </summary> [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] /// <summary> /// 工作中心编码 /// </summary> [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] public string WorkshopCenterCode { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "FUNIT")] /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "FUNIT")] public string Funit { get; set; } /// <summary> /// 特定修改 /// </summary> [SugarColumn(ColumnName = "GIVEN_MODIFY")] /// <summary> /// 特定修改 /// </summary> [SugarColumn(ColumnName = "GIVEN_MODIFY")] public short? GivenModify { get; set; } /// <summary> /// 检验工具 /// </summary> [SugarColumn(ColumnName = "FCHECK_TOOL")] /// <summary> /// 检验工具 /// </summary> [SugarColumn(ColumnName = "FCHECK_TOOL")] public string FcheckTool { get; set; } /// <summary> /// 更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] /// <summary> /// 更新人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// 更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] /// <summary> /// 更新时间 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } } MES.Service/Modes/Purdhb.cs
@@ -8,267 +8,267 @@ [SugarTable("PURDHB")] public class Purdhb { /// <summary> /// 单号 /// </summary> [SugarColumn(ColumnName = "DHB001")] /// <summary> /// 单号 /// </summary> [SugarColumn(ColumnName = "DHB001")] public string Dhb001 { get; set; } /// <summary> /// 序号 /// </summary> [SugarColumn(ColumnName = "DHB002")] /// <summary> /// 序号 /// </summary> [SugarColumn(ColumnName = "DHB002")] public string Dhb002 { get; set; } /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "DHB003")] /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "DHB003")] public string Dhb003 { get; set; } /// <summary> /// 物料名称 /// </summary> [SugarColumn(ColumnName = "DHB004")] /// <summary> /// 物料名称 /// </summary> [SugarColumn(ColumnName = "DHB004")] public string Dhb004 { get; set; } /// <summary> /// 物料规格 /// </summary> [SugarColumn(ColumnName = "DHB005")] /// <summary> /// 物料规格 /// </summary> [SugarColumn(ColumnName = "DHB005")] public string Dhb005 { get; set; } /// <summary> /// 交货数量 /// </summary> [SugarColumn(ColumnName = "DHB006")] /// <summary> /// 交货数量 /// </summary> [SugarColumn(ColumnName = "DHB006")] public decimal? Dhb006 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "DHB007")] /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "DHB007")] public string Dhb007 { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DHB008")] /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DHB008")] public string Dhb008 { get; set; } /// <summary> /// 仓库名称 /// </summary> [SugarColumn(ColumnName = "DHB009")] /// <summary> /// 仓库名称 /// </summary> [SugarColumn(ColumnName = "DHB009")] public string Dhb009 { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "DHB010")] /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "DHB010")] public string Dhb010 { get; set; } /// <summary> /// 来源单号 /// </summary> [SugarColumn(ColumnName = "DHB011")] /// <summary> /// 来源单号 /// </summary> [SugarColumn(ColumnName = "DHB011")] public string Dhb011 { get; set; } /// <summary> /// 来源序号 /// </summary> [SugarColumn(ColumnName = "DHB012")] /// <summary> /// 来源序号 /// </summary> [SugarColumn(ColumnName = "DHB012")] public decimal? Dhb012 { get; set; } /// <summary> /// 清点数量 /// </summary> [SugarColumn(ColumnName = "DHB013")] /// <summary> /// 清点数量 /// </summary> [SugarColumn(ColumnName = "DHB013")] public decimal? Dhb013 { get; set; } /// <summary> /// 到厂日期 /// </summary> [SugarColumn(ColumnName = "DHB014")] /// <summary> /// 到厂日期 /// </summary> [SugarColumn(ColumnName = "DHB014")] public string Dhb014 { get; set; } /// <summary> /// 验收数量 /// </summary> [SugarColumn(ColumnName = "DHB015")] /// <summary> /// 验收数量 /// </summary> [SugarColumn(ColumnName = "DHB015")] public decimal? Dhb015 { get; set; } /// <summary> /// 验退数量 /// </summary> [SugarColumn(ColumnName = "DHB016")] /// <summary> /// 验退数量 /// </summary> [SugarColumn(ColumnName = "DHB016")] public decimal? Dhb016 { get; set; } /// <summary> /// 进货单价 /// </summary> [SugarColumn(ColumnName = "DHB017")] /// <summary> /// 进货单价 /// </summary> [SugarColumn(ColumnName = "DHB017")] public decimal? Dhb017 { get; set; } /// <summary> /// 进货金额 /// </summary> [SugarColumn(ColumnName = "DHB018")] /// <summary> /// 进货金额 /// </summary> [SugarColumn(ColumnName = "DHB018")] public decimal? Dhb018 { get; set; } /// <summary> /// 客户料号 /// </summary> [SugarColumn(ColumnName = "DHB019")] /// <summary> /// 客户料号 /// </summary> [SugarColumn(ColumnName = "DHB019")] public string Dhb019 { get; set; } /// <summary> /// 部门编号 /// </summary> [SugarColumn(ColumnName = "DHB020")] /// <summary> /// 部门编号 /// </summary> [SugarColumn(ColumnName = "DHB020")] public string Dhb020 { get; set; } /// <summary> /// 赠品数 /// </summary> [SugarColumn(ColumnName = "DHB021")] /// <summary> /// 赠品数 /// </summary> [SugarColumn(ColumnName = "DHB021")] public decimal? Dhb021 { get; set; } /// <summary> /// 更新ERP /// </summary> [SugarColumn(ColumnName = "DHB022")] /// <summary> /// 更新ERP /// </summary> [SugarColumn(ColumnName = "DHB022")] public string Dhb022 { get; set; } /// <summary> /// 检验状态 /// </summary> [SugarColumn(ColumnName = "DHB023")] /// <summary> /// 检验状态 /// </summary> [SugarColumn(ColumnName = "DHB023")] public string Dhb023 { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "DHB024")] /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "DHB024")] public string Dhb024 { get; set; } /// <summary> /// 审核 /// </summary> [SugarColumn(ColumnName = "AUDITING")] /// <summary> /// 审核 /// </summary> [SugarColumn(ColumnName = "AUDITING")] public decimal? Auditing { get; set; } /// <summary> /// ERP采购单号ID /// </summary> [SugarColumn(ColumnName = "DHB026")] /// <summary> /// ERP采购单号ID /// </summary> [SugarColumn(ColumnName = "DHB026")] public decimal? Dhb026 { get; set; } /// <summary> /// ERP采购序号ID /// </summary> [SugarColumn(ColumnName = "DHB027")] /// <summary> /// ERP采购序号ID /// </summary> [SugarColumn(ColumnName = "DHB027")] public decimal? Dhb027 { get; set; } /// <summary> /// ERP物料ID /// </summary> [SugarColumn(ColumnName = "DHB028")] /// <summary> /// ERP物料ID /// </summary> [SugarColumn(ColumnName = "DHB028")] public decimal? Dhb028 { get; set; } /// <summary> /// 待检数量 /// </summary> [SugarColumn(ColumnName = "DHB029")] /// <summary> /// 待检数量 /// </summary> [SugarColumn(ColumnName = "DHB029")] public decimal? Dhb029 { get; set; } /// <summary> /// 检验日期 /// </summary> [SugarColumn(ColumnName = "DHB030")] /// <summary> /// 检验日期 /// </summary> [SugarColumn(ColumnName = "DHB030")] public string Dhb030 { get; set; } /// <summary> /// 检验员 /// </summary> [SugarColumn(ColumnName = "DHB031")] /// <summary> /// 检验员 /// </summary> [SugarColumn(ColumnName = "DHB031")] public string Dhb031 { get; set; } /// <summary> /// 入库数量 /// </summary> [SugarColumn(ColumnName = "DHB032")] /// <summary> /// 入库数量 /// </summary> [SugarColumn(ColumnName = "DHB032")] public decimal? Dhb032 { get; set; } /// <summary> /// 入库人 /// </summary> [SugarColumn(ColumnName = "DHB033")] /// <summary> /// 入库人 /// </summary> [SugarColumn(ColumnName = "DHB033")] public string Dhb033 { get; set; } /// <summary> /// 入库时间 /// </summary> [SugarColumn(ColumnName = "DHB034")] /// <summary> /// 入库时间 /// </summary> [SugarColumn(ColumnName = "DHB034")] public string Dhb034 { get; set; } /// <summary> /// 退货数量 /// </summary> [SugarColumn(ColumnName = "DHB035")] /// <summary> /// 退货数量 /// </summary> [SugarColumn(ColumnName = "DHB035")] public decimal? Dhb035 { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "DHB037")] /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "DHB037")] public decimal? Dhb037 { get; set; } /// <summary> /// 退货人 /// </summary> [SugarColumn(ColumnName = "DHB036")] /// <summary> /// 退货人 /// </summary> [SugarColumn(ColumnName = "DHB036")] public string Dhb036 { get; set; } /// <summary> /// ERP原分录号 /// </summary> [SugarColumn(ColumnName = "DHB038")] /// <summary> /// ERP原分录号 /// </summary> [SugarColumn(ColumnName = "DHB038")] public decimal? Dhb038 { get; set; } /// <summary> /// ERP源单内码 /// </summary> [SugarColumn(ColumnName = "DHB039")] /// <summary> /// ERP源单内码 /// </summary> [SugarColumn(ColumnName = "DHB039")] public decimal? Dhb039 { get; set; } /// <summary> /// ERP源单类型 /// </summary> [SugarColumn(ColumnName = "DHB040")] /// <summary> /// ERP源单类型 /// </summary> [SugarColumn(ColumnName = "DHB040")] public decimal? Dhb040 { get; set; } /// <summary> /// ERP订单内码 /// </summary> [SugarColumn(ColumnName = "DHB041")] /// <summary> /// ERP订单内码 /// </summary> [SugarColumn(ColumnName = "DHB041")] public decimal? Dhb041 { get; set; } /// <summary> /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID")] /// <summary> /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// 是否检验，1为已检 /// </summary> [SugarColumn(ColumnName = "ISCHECK")] /// <summary> /// 是否检验，1为已检 /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DHB042")] /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DHB042")] public string Dhb042 { get; set; } } MES.Service/Modes/Purdka.cs
@@ -8,123 +8,123 @@ [SugarTable("PURDKA")] public class Purdka { /// <summary> /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID")] /// <summary> /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// 创建人员 /// </summary> [SugarColumn(ColumnName = "CREATEUSER")] /// <summary> /// 创建人员 /// </summary> [SugarColumn(ColumnName = "CREATEUSER")] public string Createuser { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATETIME")] /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "CREATETIME")] public string Createtime { get; set; } /// <summary> /// 修改时间 /// </summary> [SugarColumn(ColumnName = "MODIFYTIME")] /// <summary> /// 修改时间 /// </summary> [SugarColumn(ColumnName = "MODIFYTIME")] public string Modifytime { get; set; } /// <summary> /// 修改人员 /// </summary> [SugarColumn(ColumnName = "MODIFYUSER")] /// <summary> /// 修改人员 /// </summary> [SugarColumn(ColumnName = "MODIFYUSER")] public string Modifyuser { get; set; } /// <summary> /// 审核 /// </summary> [SugarColumn(ColumnName = "AUDITING")] /// <summary> /// 审核 /// </summary> [SugarColumn(ColumnName = "AUDITING")] public string Auditing { get; set; } /// <summary> /// 退货单号 /// </summary> [SugarColumn(ColumnName = "DKA001")] /// <summary> /// 退货单号 /// </summary> [SugarColumn(ColumnName = "DKA001")] public string Dka001 { get; set; } /// <summary> /// 退货类型 /// </summary> [SugarColumn(ColumnName = "DKA002")] /// <summary> /// 退货类型 /// </summary> [SugarColumn(ColumnName = "DKA002")] public string Dka002 { get; set; } /// <summary> /// 退货日期 /// </summary> [SugarColumn(ColumnName = "DKA003")] /// <summary> /// 退货日期 /// </summary> [SugarColumn(ColumnName = "DKA003")] public string Dka003 { get; set; } /// <summary> /// 退货时间 /// </summary> [SugarColumn(ColumnName = "DKA004")] /// <summary> /// 退货时间 /// </summary> [SugarColumn(ColumnName = "DKA004")] public string Dka004 { get; set; } /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "DKA005")] /// <summary> /// 供应商 /// </summary> [SugarColumn(ColumnName = "DKA005")] public string Dka005 { get; set; } /// <summary> /// 供应商名称 /// </summary> [SugarColumn(ColumnName = "DKA006")] /// <summary> /// 供应商名称 /// </summary> [SugarColumn(ColumnName = "DKA006")] public string Dka006 { get; set; } /// <summary> /// 部门 /// </summary> [SugarColumn(ColumnName = "DKA007")] /// <summary> /// 部门 /// </summary> [SugarColumn(ColumnName = "DKA007")] public string Dka007 { get; set; } /// <summary> /// 审核者 /// </summary> [SugarColumn(ColumnName = "DKA008")] /// <summary> /// 审核者 /// </summary> [SugarColumn(ColumnName = "DKA008")] public string Dka008 { get; set; } /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "DKA009")] /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "DKA009")] public string Dka009 { get; set; } /// <summary> /// 退货状态，0或空为未退货，1为已退完 /// </summary> [SugarColumn(ColumnName = "DKA010")] /// <summary> /// 退货状态，0或空为未退货，1为已退完 /// </summary> [SugarColumn(ColumnName = "DKA010")] public string Dka010 { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } /// <summary> /// 保管员编码 /// </summary> [SugarColumn(ColumnName = "DKA011")] /// <summary> /// 保管员编码 /// </summary> [SugarColumn(ColumnName = "DKA011")] public string Dka011 { get; set; } /// <summary> /// 验收员编码 /// </summary> [SugarColumn(ColumnName = "DKA012")] /// <summary> /// 验收员编码 /// </summary> [SugarColumn(ColumnName = "DKA012")] public string Dka012 { get; set; } /// <summary> /// 是否推送红字入库1-推送，0-未推送 /// </summary> [SugarColumn(ColumnName = "DKA013")] /// <summary> /// 是否推送红字入库1-推送，0-未推送 /// </summary> [SugarColumn(ColumnName = "DKA013")] public decimal? Dka013 { get; set; } } MES.Service/Modes/Womdaa.cs
@@ -1,320 +1,316 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; using SqlSugar; namespace MES.Service.Modes namespace MES.Service.Modes; /// <summary> /// 工单指令表 /// </summary> [SugarTable("WOMDAA")] public class Womdaa { /// <summary> /// 工单指令表 ///</summary> [SugarTable("WOMDAA")] public class Womdaa { /// <summary> /// 自增列 ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal? Id { get; set; } /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal? Id { get; set; } /// <summary> /// 排产ID ///</summary> [SugarColumn(ColumnName = "PID")] public decimal? Pid { get; set; } /// <summary> /// 排产ID /// </summary> [SugarColumn(ColumnName = "PID")] public decimal? Pid { get; set; } /// <summary> /// 单号 ///</summary> [SugarColumn(ColumnName = "DAA001")] public string? Daa001 { get; set; } /// <summary> /// 单号 /// </summary> [SugarColumn(ColumnName = "DAA001")] public string? Daa001 { get; set; } /// <summary> /// 产品ID ///</summary> [SugarColumn(ColumnName = "DAA002")] public string? Daa002 { get; set; } /// <summary> /// 产品ID /// </summary> [SugarColumn(ColumnName = "DAA002")] public string? Daa002 { get; set; } /// <summary> /// 产品名称 ///</summary> [SugarColumn(ColumnName = "DAA003")] public string? Daa003 { get; set; } /// <summary> /// 产品名称 /// </summary> [SugarColumn(ColumnName = "DAA003")] public string? Daa003 { get; set; } /// <summary> /// 产品规格 ///</summary> [SugarColumn(ColumnName = "DAA004")] public string? Daa004 { get; set; } /// <summary> /// 产品规格 /// </summary> [SugarColumn(ColumnName = "DAA004")] public string? Daa004 { get; set; } /// <summary> /// 单位 ///</summary> [SugarColumn(ColumnName = "DAA005")] public string? Daa005 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "DAA005")] public string? Daa005 { get; set; } /// <summary> /// ERP预计开工时间 ///</summary> [SugarColumn(ColumnName = "DAA006")] public DateTime? Daa006 { get; set; } /// <summary> /// ERP预计开工时间 /// </summary> [SugarColumn(ColumnName = "DAA006")] public DateTime? Daa006 { get; set; } /// <summary> /// ERP预计完工时间 ///</summary> [SugarColumn(ColumnName = "DAA007")] public DateTime? Daa007 { get; set; } /// <summary> /// ERP预计完工时间 /// </summary> [SugarColumn(ColumnName = "DAA007")] public DateTime? Daa007 { get; set; } /// <summary> /// 工单数量 ///</summary> [SugarColumn(ColumnName = "DAA008")] public decimal? Daa008 { get; set; } /// <summary> /// 工单数量 /// </summary> [SugarColumn(ColumnName = "DAA008")] public decimal? Daa008 { get; set; } /// <summary> /// 备注 ///</summary> [SugarColumn(ColumnName = "DAA009")] public string? Daa009 { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "DAA009")] public string? Daa009 { get; set; } /// <summary> /// 入库数量 ///</summary> [SugarColumn(ColumnName = "DAA010")] public decimal? Daa010 { get; set; } /// <summary> /// 入库数量 /// </summary> [SugarColumn(ColumnName = "DAA010")] public decimal? Daa010 { get; set; } /// <summary> /// 已生产量 ///</summary> [SugarColumn(ColumnName = "DAA011")] public decimal? Daa011 { get; set; } /// <summary> /// 已生产量 /// </summary> [SugarColumn(ColumnName = "DAA011")] public decimal? Daa011 { get; set; } /// <summary> /// 报废数量 ///</summary> [SugarColumn(ColumnName = "DAA012")] public decimal? Daa012 { get; set; } /// <summary> /// 报废数量 /// </summary> [SugarColumn(ColumnName = "DAA012")] public decimal? Daa012 { get; set; } /// <summary> /// 工作车间 ///</summary> [SugarColumn(ColumnName = "DAA013")] public string? Daa013 { get; set; } /// <summary> /// 工作车间 /// </summary> [SugarColumn(ColumnName = "DAA013")] public string? Daa013 { get; set; } /// <summary> /// 投料单单号 ///</summary> [SugarColumn(ColumnName = "DAA014")] public string? Daa014 { get; set; } /// <summary> /// 投料单单号 /// </summary> [SugarColumn(ColumnName = "DAA014")] public string? Daa014 { get; set; } /// <summary> /// 生产线别 ///</summary> [SugarColumn(ColumnName = "DAA015")] public string? Daa015 { get; set; } /// <summary> /// 生产线别 /// </summary> [SugarColumn(ColumnName = "DAA015")] public string? Daa015 { get; set; } /// <summary> /// 实际开工日 ///</summary> [SugarColumn(ColumnName = "DAA016")] public DateTime? Daa016 { get; set; } /// <summary> /// 实际开工日 /// </summary> [SugarColumn(ColumnName = "DAA016")] public DateTime? Daa016 { get; set; } /// <summary> /// 实际完工日 ///</summary> [SugarColumn(ColumnName = "DAA017")] public DateTime? Daa017 { get; set; } /// <summary> /// 实际完工日 /// </summary> [SugarColumn(ColumnName = "DAA017")] public DateTime? Daa017 { get; set; } /// <summary> /// 工单状态 ///</summary> [SugarColumn(ColumnName = "DAA018")] public string? Daa018 { get; set; } /// <summary> /// 工单状态 /// </summary> [SugarColumn(ColumnName = "DAA018")] public string? Daa018 { get; set; } /// <summary> /// 齐套状态 ///</summary> [SugarColumn(ColumnName = "DAA019")] public string? Daa019 { get; set; } /// <summary> /// 齐套状态 /// </summary> [SugarColumn(ColumnName = "DAA019")] public string? Daa019 { get; set; } /// <summary> /// 审核码 ///</summary> [SugarColumn(ColumnName = "FSTATUS")] public decimal? Fstatus { get; set; } /// <summary> /// 审核码 /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public decimal? Fstatus { get; set; } /// <summary> /// 审核日期 ///</summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 审核人 ///</summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// 线别编码 ///</summary> [SugarColumn(ColumnName = "DAA020")] public string? Daa020 { get; set; } /// <summary> /// 线别编码 /// </summary> [SugarColumn(ColumnName = "DAA020")] public string? Daa020 { get; set; } /// <summary> /// 任务单单号 ///</summary> [SugarColumn(ColumnName = "DAA021")] public string? Daa021 { get; set; } /// <summary> /// 任务单单号 /// </summary> [SugarColumn(ColumnName = "DAA021")] public string? Daa021 { get; set; } /// <summary> /// 通知备料，0-未通知，1-通知 ///</summary> [SugarColumn(ColumnName = "DAA022")] public decimal? Daa022 { get; set; } /// <summary> /// 通知备料，0-未通知，1-通知 /// </summary> [SugarColumn(ColumnName = "DAA022")] public decimal? Daa022 { get; set; } /// <summary> /// 生产序号 ///</summary> [SugarColumn(ColumnName = "DAA023")] public decimal? Daa023 { get; set; } /// <summary> /// 生产序号 /// </summary> [SugarColumn(ColumnName = "DAA023")] public decimal? Daa023 { get; set; } /// <summary> /// 排产日期 ///</summary> [SugarColumn(ColumnName = "DAA024")] public string? Daa024 { get; set; } /// <summary> /// 排产日期 /// </summary> [SugarColumn(ColumnName = "DAA024")] public string? Daa024 { get; set; } /// <summary> /// 首件是否检验1-检验，0未检验 ///</summary> [SugarColumn(ColumnName = "DAA025")] public string? Daa025 { get; set; } /// <summary> /// 首件是否检验1-检验，0未检验 /// </summary> [SugarColumn(ColumnName = "DAA025")] public string? Daa025 { get; set; } /// <summary> /// 首件检验结果 ///</summary> [SugarColumn(ColumnName = "DAA026")] public string? Daa026 { get; set; } /// <summary> /// 首件检验结果 /// </summary> [SugarColumn(ColumnName = "DAA026")] public string? Daa026 { get; set; } /// <summary> /// 已报检，0-未报检，1-已报检 ///</summary> [SugarColumn(ColumnName = "IS_REPORTCHECK")] public decimal? IsReportcheck { get; set; } /// <summary> /// 已报检，0-未报检，1-已报检 /// </summary> [SugarColumn(ColumnName = "IS_REPORTCHECK")] public decimal? IsReportcheck { get; set; } /// <summary> /// 报检人 ///</summary> [SugarColumn(ColumnName = "USNAME")] public string? Usname { get; set; } /// <summary> /// 报检人 /// </summary> [SugarColumn(ColumnName = "USNAME")] public string? Usname { get; set; } /// <summary> /// 报检时间 ///</summary> [SugarColumn(ColumnName = "REPORTTIME")] public DateTime? Reporttime { get; set; } /// <summary> /// 报检时间 /// </summary> [SugarColumn(ColumnName = "REPORTTIME")] public DateTime? Reporttime { get; set; } /// <summary> /// 机台编号 ///</summary> [SugarColumn(ColumnName = "MACHINE_NO")] public string? MachineNo { get; set; } /// <summary> /// 机台编号 /// </summary> [SugarColumn(ColumnName = "MACHINE_NO")] public string? MachineNo { get; set; } /// <summary> /// 备料完成1-完成，0未完成 ///</summary> [SugarColumn(ColumnName = "DAA027")] public decimal? Daa027 { get; set; } /// <summary> /// 备料完成1-完成，0未完成 /// </summary> [SugarColumn(ColumnName = "DAA027")] public decimal? Daa027 { get; set; } /// <summary> /// 备料完成时间 ///</summary> [SugarColumn(ColumnName = "DAA028")] public string? Daa028 { get; set; } /// <summary> /// 备料完成时间 /// </summary> [SugarColumn(ColumnName = "DAA028")] public string? Daa028 { get; set; } /// <summary> /// 标准工时 ///</summary> [SugarColumn(ColumnName = "PROD_HOUR")] public decimal? ProdHour { get; set; } /// <summary> /// 标准工时 /// </summary> [SugarColumn(ColumnName = "PROD_HOUR")] public decimal? ProdHour { get; set; } /// <summary> /// 单人小时产能 ///</summary> [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")] public decimal? PersonHourCapacity { get; set; } /// <summary> /// 单人小时产能 /// </summary> [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")] public decimal? PersonHourCapacity { get; set; } /// <summary> /// 理论标产 ///</summary> [SugarColumn(ColumnName = "THE_CAPACITY")] public decimal? TheCapacity { get; set; } /// <summary> /// 理论标产 /// </summary> [SugarColumn(ColumnName = "THE_CAPACITY")] public decimal? TheCapacity { get; set; } /// <summary> /// 计划用人数 ///</summary> [SugarColumn(ColumnName = "PLAN_PERSONNEL")] public decimal? PlanPersonnel { get; set; } /// <summary> /// 计划用人数 /// </summary> [SugarColumn(ColumnName = "PLAN_PERSONNEL")] public decimal? PlanPersonnel { get; set; } /// <summary> /// 计划标准产能 ///</summary> [SugarColumn(ColumnName = "PLAN_CAPACITY")] public decimal? PlanCapacity { get; set; } /// <summary> /// 计划标准产能 /// </summary> [SugarColumn(ColumnName = "PLAN_CAPACITY")] public decimal? PlanCapacity { get; set; } /// <summary> /// 理论用时/M ///</summary> [SugarColumn(ColumnName = "THE_MIN")] public decimal? TheMin { get; set; } /// <summary> /// 理论用时/M /// </summary> [SugarColumn(ColumnName = "THE_MIN")] public decimal? TheMin { get; set; } /// <summary> /// 理论用时/H ///</summary> [SugarColumn(ColumnName = "THE_HOUR")] public decimal? TheHour { get; set; } /// <summary> /// 理论用时/H /// </summary> [SugarColumn(ColumnName = "THE_HOUR")] public decimal? TheHour { get; set; } /// <summary> /// 线体类别 ///</summary> [SugarColumn(ColumnName = "LINE_TYPE")] public string? LineType { get; set; } /// <summary> /// 线体类别 /// </summary> [SugarColumn(ColumnName = "LINE_TYPE")] public string? LineType { get; set; } /// <summary> /// 标准人数 ///</summary> [SugarColumn(ColumnName = "PERSONNEL")] public decimal? Personnel { get; set; } /// <summary> /// 标准人数 /// </summary> [SugarColumn(ColumnName = "PERSONNEL")] public decimal? Personnel { get; set; } /// <summary> /// 换线时间 ///</summary> [SugarColumn(ColumnName = "CHANGE_LINE_TIME")] public decimal? ChangeLineTime { get; set; } /// <summary> /// 换线时间 /// </summary> [SugarColumn(ColumnName = "CHANGE_LINE_TIME")] public decimal? ChangeLineTime { get; set; } /// <summary> /// 休息时间 ///</summary> [SugarColumn(ColumnName = "REST_TIME")] public decimal? RestTime { get; set; } /// <summary> /// 休息时间 /// </summary> [SugarColumn(ColumnName = "REST_TIME")] public decimal? RestTime { get; set; } /// <summary> /// 排产序号 ///</summary> [SugarColumn(ColumnName = "SCHEDULE_ORDER")] public decimal? ScheduleOrder { get; set; } /// <summary> /// 排产序号 /// </summary> [SugarColumn(ColumnName = "SCHEDULE_ORDER")] public decimal? ScheduleOrder { get; set; } /// <summary> /// MES预计开工时间 ///</summary> [SugarColumn(ColumnName = "MES_START_PROD")] public DateTime? MesStartProd { get; set; } /// <summary> /// MES预计开工时间 /// </summary> [SugarColumn(ColumnName = "MES_START_PROD")] public DateTime? MesStartProd { get; set; } /// <summary> /// MES预计完工时间 ///</summary> [SugarColumn(ColumnName = "MES_END_PROD")] public DateTime? MesEndProd { get; set; } } /// <summary> /// MES预计完工时间 /// </summary> [SugarColumn(ColumnName = "MES_END_PROD")] public DateTime? MesEndProd { get; set; } } MES.Service/service/QC/SuspendService.cs
@@ -15,7 +15,8 @@ return db .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>( (a, b, c, d) => new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(), new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(), JoinType.Inner, a.Daa001 == c.BillNo, JoinType.Left, b.Departmentcode == d.Departmentcode)) .Where((a, b, c, d) => b.LineName != null && @@ -36,7 +37,8 @@ var db = SqlSugarHelper.GetInstance(); var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>( (a, b, c) => new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(), new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(), JoinType.Inner, a.Daa001 == c.BillNo)) .Where((a, b, c) => b.LineName != null && statusArray.Contains(a.Daa018) MES.Service/service/QC/XJService.cs
@@ -147,7 +147,7 @@ BillNo = s.BillNo, FcheckBy = s.FcheckBy, FcheckResu = s.FcheckResu, Remarks = s.Remarks, Remarks = s.Remarks }).OrderBy(s => s.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit); } MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -15,12 +15,10 @@ public MovesDto ScanInBarcode(WarehouseQuery query) { if (string.IsNullOrEmpty(query.sectionCode)) { throw new Exception("请扫库位条码！"); } int pBillTypeId = 300; int pTransctionNo = 301; var pBillTypeId = 300; var pTransctionNo = 301; var depotQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) => new JoinQueryInfos( @@ -30,9 +28,7 @@ .First(); if (depotQuery == null) { throw new Exception($"002[库位编码 {query.sectionCode} 不存在，请确认！"); } var cDepotCode = depotQuery.DepotCode; @@ -48,10 +44,7 @@ .Select((a, b) => new { a.Id, a.BillNo, a.InvDepotsCode }) .First(); if (itemMoveQuery == null) { throw new Exception("条码未做调拔出库扫码，请核对！"); } if (itemMoveQuery == null) throw new Exception("条码未做调拔出库扫码，请核对！"); var cBillNo = itemMoveQuery.BillNo; var iDepotCode = itemMoveQuery.InvDepotsCode; @@ -66,14 +59,10 @@ .First(); if (depotValidationQuery == null) { throw new Exception($"002[库位编码 {query.sectionCode} 不存在，请确认！"); } if (iDepotCode != depotValidationQuery.DepotCode) { throw new Exception("实际仓库与申请调入仓库不符，请核对！"); } var barcodeCount = Db.Queryable<MesInvItemMovesCDetails>() .Where(b => @@ -81,19 +70,13 @@ b.ItemMoveId == itemMoveQuery.Id && b.MoveOk == 1) .Count(); if (barcodeCount > 0) { throw new Exception("条码调拔已完成，请核对！"); } if (barcodeCount > 0) throw new Exception("条码调拔已完成，请核对！"); var barcodeInfo = Db.Queryable<MesInvItemBarcodes>() .Where(t => t.ItemBarcode == query.barcode) .First(); if (barcodeInfo == null) { throw new Exception("条码不存在，请核对！"); } if (barcodeInfo == null) throw new Exception("条码不存在，请核对！"); var isAudit = UseTransaction(db => { @@ -140,15 +123,12 @@ .Where(a => a.ItemMoveId == itemMoveQuery.Id && a.MoveOk == 1) .Sum(a => SqlFunc.IsNull(a.Quantity, 0)); if (totalQuantity == scannedQuantity) { return 1; } if (totalQuantity == scannedQuantity) return 1; return 0; }); MovesDto dto = new MovesDto(); var dto = new MovesDto(); dto.InAudit = isAudit == 1; dto.BarcodesInfo = barcodeInfo; return dto; @@ -180,7 +160,7 @@ public MovesDto GetItems(WarehouseQuery query) { MovesDto dto = new MovesDto(); var dto = new MovesDto(); dto.BarcodeList = GetItemMovesCDetails(query); dto.OutItems = GetItemOutItems(query); @@ -287,7 +267,7 @@ if (sumqty > quantity) throw new Exception( "已扫条码数量或本次扫码数量：" + sumqty + " 大于申请数量：" + quantity + "，请核对！"); UseTransaction(db => { SaveMesInvItemMovesCDetails(db, query, mesInvItemMoves, MESApplication/Controllers/Base/DemoController.cs
@@ -3,6 +3,7 @@ using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers.Base; [Route("api/[controller]")] MESApplication/Controllers/Base/LoginController.cs
@@ -8,14 +8,14 @@ namespace MESApplication.Controllers.Base; /// <summary> /// 用户 /// 用户 /// </summary> [Route("api/[controller]")] [ApiController] public class LoginController : ControllerBase { /// <summary> /// 登录 /// 登录 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -43,7 +43,7 @@ } /// <summary> /// 重设密码 /// 重设密码 /// </summary> /// <param name="data"></param> /// <returns></returns> @@ -80,7 +80,7 @@ } /// <summary> /// 用户菜单 /// 用户菜单 /// </summary> /// <param name="data"></param> /// <returns></returns> MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
@@ -12,7 +12,7 @@ public class MesInvItemMovesController : ControllerBase { private readonly MesInvItemMovesManager m = new(); //ScanInBarcode [HttpPost("ScanInBarcode")] public ResponseResult ScanInBarcode(WarehouseQuery query) @@ -33,7 +33,7 @@ return ResponseResult.ResponseError(ex); } } [HttpPost("Audit")] public ResponseResult Audit(WarehouseQuery query) { @@ -53,7 +53,7 @@ return ResponseResult.ResponseError(ex); } } [HttpPost("SaveMessageCenter")] public ResponseResult SaveMessageCenter(WarehouseQuery entity) { @@ -94,7 +94,7 @@ return ResponseResult.ResponseError(ex); } } //GetItems [HttpPost("GetItems")] public ResponseResult GetItems(WarehouseQuery query) @@ -115,7 +115,7 @@ return ResponseResult.ResponseError(ex); } } //ScanMoveBarcode [HttpPost("ScanMoveBarcode")] public ResponseResult ScanMoveBarcode(WarehouseQuery query) @@ -157,7 +157,7 @@ return ResponseResult.ResponseError(ex); } } /// <summary> /// 获取所有 /// </summary> MESApplication/Filter/ActionFilter.cs
@@ -1,160 +1,163 @@ using Microsoft.AspNetCore.Mvc; using System.Diagnostics; using System.Text; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; using System.Diagnostics; using System.Text; namespace MESApplication namespace MESApplication; /// <summary> /// 方法过滤器 /// </summary> public class ActionFilter : IActionFilter { private Stopwatch _stopwatch; /// <summary> /// 方法过滤器 /// 监控日志 /// </summary> public class ActionFilter : IActionFilter public static ILogger LoggerMonitor { get; set; } /// <summary> /// 错误日志 /// </summary> public static ILogger LoggerError { get; set; } /// <summary> /// 方法执行前 /// </summary> /// <param name="context"></param> /// <exception cref="NotImplementedException"></exception> public async void OnActionExecuting(ActionExecutingContext context) { /// <summary> /// 监控日志 /// </summary> public static ILogger LoggerMonitor { get; set; } /// <summary> /// 错误日志 /// </summary> public static ILogger LoggerError { get; set; } private Stopwatch _stopwatch; /// <summary> /// 创建请求日志文本 /// </summary> /// <param name="method"></param> /// <param name="controllerName"></param> /// <param name="actionName"></param> /// <param name="actionArgs"></param> /// <returns></returns> private static string CreateRequestLogText(string method, string controllerName, string actionName, string requestHead, string requestBody) // ErrorLog.Write("=================================================================================================================================="); _stopwatch = new Stopwatch(); _stopwatch.Start(); //throw new NotImplementedException(); if (LoggerMonitor != null) { StringBuilder sb = new StringBuilder(); sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 请求{method}/{controllerName}/{actionName}接口，请求Head：{requestHead}\n"); sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 请求{method}/{controllerName}/{actionName}接口，请求Body：{requestBody}\n"); return sb.ToString(); } /// <summary> /// 创建响应日志文本 /// </summary> /// <param name="method"></param> /// <param name="controllerName"></param> /// <param name="actionName"></param> /// <param name="result"></param> /// <returns></returns> private static string CreateResponseLogText(string method, string controllerName, string actionName, object result) { StringBuilder sb = new StringBuilder(); sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 完成请求{method}/{controllerName}/{actionName}接口，返回结果："); if (result != null) //记录请求参数日志 var desc = context.ActionDescriptor as ControllerActionDescriptor; if (desc != null) { sb.Append($"{JsonConvert.SerializeObject(result)}"); } else { sb.Append($"无"); } return sb.ToString(); } var headers = new Dictionary<string, object>(); var requestHeaders = context.HttpContext.Request.Headers; // 访问请求中的 header 信息 foreach (var header in requestHeaders) headers.Add(header.Key, header.Value); var requestHead = JsonConvert.SerializeObject(headers); /// <summary> /// 方法执行前 /// </summary> /// <param name="context"></param> /// <exception cref="NotImplementedException"></exception> public async void OnActionExecuting(ActionExecutingContext context) { // ErrorLog.Write("=================================================================================================================================="); _stopwatch = new Stopwatch(); _stopwatch.Start(); //throw new NotImplementedException(); if (LoggerMonitor != null) { //记录请求参数日志 ControllerActionDescriptor desc = context.ActionDescriptor as ControllerActionDescriptor; if (desc != null) var bodys = new Dictionary<string, object>(); var actionArguments = context.ActionArguments; // 访问请求中的参数 foreach (var argument in actionArguments) { Dictionary<string, object> headers = new Dictionary<string, object>(); var requestHeaders = context.HttpContext.Request.Headers; // 访问请求中的 header 信息 foreach (var header in requestHeaders) { headers.Add(header.Key, header.Value); } var requestHead = JsonConvert.SerializeObject(headers); Dictionary<string, object> bodys = new Dictionary<string, object>(); var actionArguments = context.ActionArguments; // 访问请求中的参数 foreach (var argument in actionArguments) { //dic.Add(argument.Key, argument.Value); var parameter = JsonConvert.DeserializeObject<Dictionary<string, object>>(argument.Value.ToString()); foreach (var item in parameter) { bodys.Add(item.Key, item.Value); } } var requestBody = JsonConvert.SerializeObject(bodys); var logText = CreateRequestLogText(context.HttpContext.Request.Method, desc.ControllerName, desc.ActionName, requestHead, requestBody); //LoggerMonitor.LogDebug(logText); //ErrorLog.Write(logText); //dic.Add(argument.Key, argument.Value); var parameter = JsonConvert .DeserializeObject<Dictionary<string, object>>( argument.Value.ToString()); foreach (var item in parameter) bodys.Add(item.Key, item.Value); } var requestBody = JsonConvert.SerializeObject(bodys); var logText = CreateRequestLogText( context.HttpContext.Request.Method, desc.ControllerName, desc.ActionName, requestHead, requestBody); //LoggerMonitor.LogDebug(logText); //ErrorLog.Write(logText); } } public void OnActionExecuted(ActionExecutedContext context) { //throw new NotImplementedException(); _stopwatch.Stop(); long elaspsedMillisedconds = _stopwatch.ElapsedMilliseconds; string msg = ""; //string msg = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 接口执行时间：{elaspsedMillisedconds}毫秒"; //ErrorLog.Write(msg); if (context.Exception != null) { // 记录异常日志 if (LoggerError != null) { LoggerError.LogError(context.Exception, context.Exception.Message); ErrorLog.Write($@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 接口异常：{JsonConvert.SerializeObject(context.Exception)}"); ErrorLog.Write($@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 异常提示信息：{JsonConvert.SerializeObject(context.Exception.Message)}"); ErrorLog.Write("=================================================================================================================================="); } } if (LoggerMonitor != null) { // 记录请求结果日志 ControllerActionDescriptor desc = context.ActionDescriptor as ControllerActionDescriptor; if (desc != null) { ObjectResult rst = context.Result as ObjectResult; object rstValue = rst != null ? rst.Value : null; var logText = CreateResponseLogText( context.HttpContext.Request.Method, desc.ControllerName, desc.ActionName, rstValue); LoggerMonitor.LogDebug(logText); ErrorLog.Write(logText); } } // ErrorLog.Write(msg); // ErrorLog.Write("=================================================================================================================================="); } } } public void OnActionExecuted(ActionExecutedContext context) { //throw new NotImplementedException(); _stopwatch.Stop(); var elaspsedMillisedconds = _stopwatch.ElapsedMilliseconds; var msg = ""; //string msg = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 接口执行时间：{elaspsedMillisedconds}毫秒"; //ErrorLog.Write(msg); if (context.Exception != null) // 记录异常日志 if (LoggerError != null) { LoggerError.LogError(context.Exception, context.Exception.Message); ErrorLog.Write( $@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 接口异常：{JsonConvert.SerializeObject(context.Exception)}"); ErrorLog.Write( $@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 异常提示信息：{JsonConvert.SerializeObject(context.Exception.Message)}"); ErrorLog.Write( "=================================================================================================================================="); } if (LoggerMonitor != null) { // 记录请求结果日志 var desc = context.ActionDescriptor as ControllerActionDescriptor; if (desc != null) { var rst = context.Result as ObjectResult; var rstValue = rst != null ? rst.Value : null; var logText = CreateResponseLogText( context.HttpContext.Request.Method, desc.ControllerName, desc.ActionName, rstValue); LoggerMonitor.LogDebug(logText); ErrorLog.Write(logText); } } // ErrorLog.Write(msg); // ErrorLog.Write("=================================================================================================================================="); } /// <summary> /// 创建请求日志文本 /// </summary> /// <param name="method"></param> /// <param name="controllerName"></param> /// <param name="actionName"></param> /// <param name="actionArgs"></param> /// <returns></returns> private static string CreateRequestLogText(string method, string controllerName, string actionName, string requestHead, string requestBody) { var sb = new StringBuilder(); sb.Append( $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 请求{method}/{controllerName}/{actionName}接口，请求Head：{requestHead}\n"); sb.Append( $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 请求{method}/{controllerName}/{actionName}接口，请求Body：{requestBody}\n"); return sb.ToString(); } /// <summary> /// 创建响应日志文本 /// </summary> /// <param name="method"></param> /// <param name="controllerName"></param> /// <param name="actionName"></param> /// <param name="result"></param> /// <returns></returns> private static string CreateResponseLogText(string method, string controllerName, string actionName, object result) { var sb = new StringBuilder(); sb.Append( $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 完成请求{method}/{controllerName}/{actionName}接口，返回结果："); if (result != null) sb.Append($"{JsonConvert.SerializeObject(result)}"); else sb.Append("无"); return sb.ToString(); } } MESApplication/Filter/ErrorLog.cs
@@ -1,70 +1,67 @@ namespace MESApplication namespace MESApplication; public class ErrorLog { public class ErrorLog private static readonly string DirectoryPath = AppDomain.CurrentDomain.BaseDirectory; /// <summary> /// 写入操作日志到文件中 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="message">错误文本信息</param> /// <param name="ex">异常</param> public static void Write(string moduleName, string message, Exception ex) { //string directoryPath = $@"C:\至简科技\MyDemoData\.NetCore接口过滤器项目\FilterText\FilterText\Logger\{DateTime.Now.ToString("yyyyMMdd")}"; // 目标目录路径 var directoryPath = $@"{DirectoryPath}{"log"}"; // 目标目录路径 private static string DirectoryPath = AppDomain.CurrentDomain.BaseDirectory; if (!Directory.Exists(directoryPath)) // 如果目录不存在，则新建文件夹 Directory.CreateDirectory(directoryPath); /// <summary> /// 写入操作日志到文件中 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="message">错误文本信息</param> /// <param name="ex">异常</param> public static void Write(string moduleName, string message, Exception ex) { //string directoryPath = $@"C:\至简科技\MyDemoData\.NetCore接口过滤器项目\FilterText\FilterText\Logger\{DateTime.Now.ToString("yyyyMMdd")}"; // 目标目录路径 string directoryPath = $@"{DirectoryPath}{"log"}"; // 目标目录路径 var filePath = directoryPath + $@"\{DateTime.Now.ToString("yyyyMMddHH")}.log"; // 目标文件路径 if (!Directory.Exists(directoryPath)) if (!File.Exists(filePath)) // 如果文件不存在，则创建文件 using (File.Create(filePath)) { // 如果目录不存在，则新建文件夹 Directory.CreateDirectory(directoryPath); //Console.WriteLine("文件已创建"); } string filePath = directoryPath + $@"\{DateTime.Now.ToString("yyyyMMddHH")}.log"; // 目标文件路径 LogToFile(filePath, message); } if (!File.Exists(filePath)) { // 如果文件不存在，则创建文件 using (File.Create(filePath)) { //Console.WriteLine("文件已创建"); } } LogToFile(filePath, message); } /// <summary> /// 写入操作日志到文件中 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="ex">异常</param> public static void Write(string moduleName, Exception ex) { Write(moduleName, moduleName, ex); } /// <summary> /// 写入操作日志到文件中 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="ex">异常</param> public static void Write(string moduleName, Exception ex) /// <summary> /// 写入过程数据或说明到文件中，以便跟踪 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="ex">异常</param> public static void Write(string message) { Write(string.Empty, message, null); } /// <summary> /// 文本写入 /// </summary> /// <param name="logMessage"></param> private static void LogToFile(string logFilePath, string logMessage) { using (var sw = File.AppendText(logFilePath)) { Write(moduleName, moduleName, ex); } /// <summary> /// 写入过程数据或说明到文件中，以便跟踪 /// </summary> /// <param name="moduleName">模块名字</param> /// <param name="ex">异常</param> public static void Write(string message) { Write(String.Empty, message, null); } /// <summary> /// 文本写入 /// </summary> /// <param name="logMessage"></param> private static void LogToFile(string logFilePath, string logMessage) { using (StreamWriter sw = File.AppendText(logFilePath)) { sw.WriteLine($"{logMessage}"); } sw.WriteLine($"{logMessage}"); } } } } MESApplication/MESApplication.csproj
@@ -9,7 +9,7 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> @@ -18,12 +18,12 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" /> <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121"/> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/> </ItemGroup> <ItemGroup> <ProjectReference Include="..\MES.Service\MES.Service.csproj" /> <ProjectReference Include="..\MES.Service\MES.Service.csproj"/> </ItemGroup> </Project> MESApplication/Startup.cs
@@ -1,10 +1,10 @@ using MES.Service.Dto.@base; using System.Reflection; using MES.Service.Dto.@base; using MES.Service.util; using Microsoft.OpenApi.Models; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Swashbuckle.AspNetCore.SwaggerUI; using System.Reflection; namespace MESApplication; @@ -36,7 +36,8 @@ c.SwaggerDoc("v1", new OpenApiInfo { Title = "MESApplication.Api", Version = "v1" }); var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); c.IncludeXmlComments(xmlPath, true); }); @@ -72,11 +73,15 @@ }); #region 接口行动过滤器 services.AddControllers(options => { services.AddControllers(options => { options.Filters.Add(new ActionFilter()); }); var serviceProvider = services.BuildServiceProvider(); ActionFilter.LoggerError = serviceProvider.GetRequiredService<ILogger<ActionFilter>>(); ActionFilter.LoggerError = serviceProvider.GetRequiredService<ILogger<ActionFilter>>(); #endregion } @@ -108,6 +113,5 @@ ////////////////////////// /////////////////////////// } }
