MES.Service/DB/DbContext.cs
@@ -1,4 +1,5 @@ using SqlSugar; using MES.Service.util; using SqlSugar; namespace MES.Service.DB; @@ -12,7 +13,7 @@ //mesQaItemXj02Context.Db.Queryable<MesQaItemXj02>().ToList(); private static readonly string connectionString = "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev"; // è¿éæ¿æ¢æä½ çå®é è¿æ¥å符串; AppsettingsUtility.Settings.DataBaseConn; // è¿éæ¿æ¢æä½ çå®é è¿æ¥å符串; /// <summary> /// 注æï¼ä¸è½åæéæç //ç¨æ¥å¤çäºå¡å¤è¡¨æ¥è¯¢å夿çæä½ MES.Service/DB/OracleSQLHelper.cs
@@ -1,4 +1,5 @@ using System.Data; using MES.Service.util; using Oracle.ManagedDataAccess.Client; namespace MES.Service.DB; @@ -8,11 +9,11 @@ /// </summary> public class OracleSQLHelper { public const string ConnectionString = "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev"; private readonly string _connectionString; public readonly string ConnectionString = AppsettingsUtility.Settings.DataBaseConn; //public static string connectionString = "Data Source = 192.168.1.19; Persist Security Info=True;User ID = abtdev; Password=abt_dev"; public string connectionString = "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev"; // è¿éæ¿æ¢æä½ çå®é è¿æ¥å符串 MES.Service/DB/Repository.cs
@@ -1,4 +1,5 @@ using SqlSugar; using MES.Service.util; using SqlSugar; namespace MES.Service.DB; @@ -7,8 +8,7 @@ public static SqlSugarScope Db = new(new ConnectionConfig { DbType = DbType.Oracle, ConnectionString = @"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev", ConnectionString = AppsettingsUtility.Settings.DataBaseConn, IsAutoCloseConnection = true }, db => MES.Service/DB/SqlSugarHelper.cs
@@ -1,11 +1,12 @@ using SqlSugar; using MES.Service.util; using SqlSugar; namespace MES.Service.DB; public class SqlSugarHelper { private static readonly string _connectionString = "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev"; // è¿éæ¿æ¢æä½ çå®é è¿æ¥å符串 AppsettingsUtility.Settings.DataBaseConn; // è¿éæ¿æ¢æä½ çå®é è¿æ¥å符串 public static SqlSugarClient GetInstance() { MES.Service/Dto/webApi/ErpCAA.cs
@@ -4,6 +4,8 @@ { public string Id { get; set; } public string? Type { get; set; } public string? FBILLTYPE { get; set; } public string? FBillNo { get; set; } public string? FWorkShopID0 { get; set; } public string? FRoutingId { get; set; } @@ -36,4 +38,8 @@ public string? FCloseType { get; set; } public string? FSrcSplitBillNo { get; set; } public string? FMemoItem { get; set; } public string? planId { get; set; } public string? planSeq { get; set; } public string? planNum { get; set; } } MES.Service/Dto/webApi/ErpCAB.cs
@@ -20,5 +20,7 @@ public string? FNumerator { get; set; } public string? FDenominator { get; set; } public string ID { get; set; } public string PID { get; set; } public string? PID { get; set; } public string? FSeq { get; set; } } MES.Service/Modes/MesInvItemIns.cs
@@ -1,5 +1,3 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; namespace MES.Service.Modes; @@ -7,404 +5,311 @@ /// <summary> /// ç©æå ¥åºä¸»è¡¨ /// </summary> [Table("MES_INV_ITEM_INS")] [SugarTable("MES_INV_ITEM_INS")] //ç¨äºSqlSugar [SugarTable("MES_INV_ITEM_INS")] public class MesInvItemIns { /// <summary> /// ID(SEQ_INV_ID) /// </summary> [Key] [Column("ID")] [SugarColumn(ColumnName = "ID")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// å ¥åºåå· /// </summary> [Column("BILL_NO")] [SugarColumn(ColumnName = "BILL_NO")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "å ¥åºåå·é¿åº¦ä¸è½è¶ åº100")] [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// åæ®ç±»åID /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// </summary> [Column("BILL_TYPE_ID")] [SugarColumn(ColumnName = "BILL_TYPE_ID")] //ç¨äºSqlSugar public decimal? BillTypeId { get; set; } [SugarColumn(ColumnName = "STATUS")] public short? Status { get; set; } /// <summary> /// å°è´§åå·/计ååå· /// ä»åº /// </summary> [Column("CBILL_NO")] [SugarColumn(ColumnName = "CBILL_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å°è´§åå·/计ååå·é¿åº¦ä¸è½è¶ åº50")] public string CbillNo { get; set; } [SugarColumn(ColumnName = "DEPOTS_ID")] public decimal? DepotsId { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// åå /// </summary> [Column("CHECK_DATE")] [SugarColumn(ColumnName = "CHECK_DATE")] //ç¨äºSqlSugar public DateTime? CheckDate { get; set; } /// <summary> /// å·²æ¡æ°é /// </summary> [Column("CHECK_QTY")] [SugarColumn(ColumnName = "CHECK_QTY")] //ç¨äºSqlSugar public decimal? CheckQty { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [Column("CHECK_RES")] [SugarColumn(ColumnName = "CHECK_RES")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "æ£éªç»æé¿åº¦ä¸è½è¶ åº50")] public string CheckRes { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [Column("CHECK_USER")] [SugarColumn(ColumnName = "CHECK_USER")] //ç¨äºSqlSugar [StringLength(32, ErrorMessage = "å®¡æ ¸äººé¿åº¦ä¸è½è¶ åº32")] public string CheckUser { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [Column("COMPANY")] [SugarColumn(ColumnName = "COMPANY")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "å ¬å¸ä»£ç é¿åº¦ä¸è½è¶ åº20")] public string Company { get; set; } [SugarColumn(ColumnName = "REASON")] public string Reason { get; set; } /// <summary> /// å建人 /// </summary> [Column("CREATE_BY")] [SugarColumn(ColumnName = "CREATE_BY")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "å建人é¿åº¦ä¸è½è¶ åº30")] [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [Column("CREATE_DATE")] [SugarColumn(ColumnName = "CREATE_DATE")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 客æ·åç§° /// </summary> [Column("CUST_NAME")] [SugarColumn(ColumnName = "CUST_NAME")] //ç¨äºSqlSugar [StringLength(300, ErrorMessage = "客æ·åç§°é¿åº¦ä¸è½è¶ åº300")] public string CustName { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [Column("CUST_NO")] [SugarColumn(ColumnName = "CUST_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "客æ·ç¼å·é¿åº¦ä¸è½è¶ åº50")] public string CustNo { get; set; } /// <summary> /// ä»åºç¼ç /// </summary> [Column("DEPOTS_CODE")] [SugarColumn(ColumnName = "DEPOTS_CODE")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "ä»åºç¼ç é¿åº¦ä¸è½è¶ åº30")] public string DepotsCode { get; set; } /// <summary> /// ä»åº /// </summary> [Column("DEPOTS_ID")] [SugarColumn(ColumnName = "DEPOTS_ID")] //ç¨äºSqlSugar public decimal? DepotsId { get; set; } /// <summary> /// SAPéè´è®¢åå· /// </summary> [Column("EBELN")] [SugarColumn(ColumnName = "EBELN")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "SAPéè´è®¢åå·é¿åº¦ä¸è½è¶ åº50")] public string Ebeln { get; set; } /// <summary> /// å·¥åç¼ç /// </summary> [Column("FACTORY")] [SugarColumn(ColumnName = "FACTORY")] //ç¨äºSqlSugar [StringLength(10, ErrorMessage = "å·¥åç¼ç é¿åº¦ä¸è½è¶ åº10")] public string Factory { get; set; } /// <summary> /// ææåè¡å· /// </summary> [Column("FBILL_LINO")] [SugarColumn(ColumnName = "FBILL_LINO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ææåè¡å·é¿åº¦ä¸è½è¶ åº50")] public string FbillLino { get; set; } /// <summary> /// ææéç¥ååå· /// </summary> [Column("FBILLNO")] [SugarColumn(ColumnName = "FBILLNO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ææéç¥ååå·é¿åº¦ä¸è½è¶ åº50")] public string Fbillno { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ¥æ /// </summary> [Column("FCHECK_DATE")] [SugarColumn(ColumnName = "FCHECK_DATE")] //ç¨äºSqlSugar public DateTime? FcheckDate { get; set; } /// <summary> /// å ¥åºå®¡æ ¸äºº /// </summary> [Column("FCHECK_USER")] [SugarColumn(ColumnName = "FCHECK_USER")] //ç¨äºSqlSugar [StringLength(10, ErrorMessage = "å ¥åºå®¡æ ¸äººé¿åº¦ä¸è½è¶ åº10")] public string FcheckUser { get; set; } /// <summary> /// å ¥åºç¶æ /// </summary> [Column("FSTATUS")] [SugarColumn(ColumnName = "FSTATUS")] //ç¨äºSqlSugar public decimal? Fstatus { get; set; } /// <summary> /// å®¡æ ¸å ¥åºäºº /// </summary> [Column("INSBY")] [SugarColumn(ColumnName = "INSBY")] //ç¨äºSqlSugar [StringLength(32, ErrorMessage = "å®¡æ ¸å ¥åºäººé¿åº¦ä¸è½è¶ åº32")] public string Insby { get; set; } /// <summary> /// ç¡®è®¤å ¥åºæ¥æ /// </summary> [Column("INSDATE")] [SugarColumn(ColumnName = "INSDATE")] //ç¨äºSqlSugar public DateTime? Insdate { get; set; } /// <summary> /// å ¥åºæ¥æ /// </summary> [Column("INS_DATE")] [SugarColumn(ColumnName = "INS_DATE")] //ç¨äºSqlSugar public DateTime? InsDate { get; set; } /// <summary> /// IQCæ£éªåå· /// </summary> [Column("IQC_RELEASE_NO")] [SugarColumn(ColumnName = "IQC_RELEASE_NO")] //ç¨äºSqlSugar [StringLength(300, ErrorMessage = "IQCæ£éªåå·é¿åº¦ä¸è½è¶ åº300")] public string IqcReleaseNo { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [Column("ISCHECK")] [SugarColumn(ColumnName = "ISCHECK")] //ç¨äºSqlSugar public decimal? Ischeck { get; set; } /// <summary> /// æ¯å¦æ¾ç¤º /// </summary> [Column("IS_VISUAL")] [SugarColumn(ColumnName = "IS_VISUAL")] //ç¨äºSqlSugar public decimal? IsVisual { get; set; } /// <summary> /// åæåç¼å· /// </summary> [Column("ITEM_NO")] [SugarColumn(ColumnName = "ITEM_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "åæåç¼å·é¿åº¦ä¸è½è¶ åº50")] public string ItemNo { get; set; } /// <summary> /// æåæ´æ°äºº /// </summary> [Column("LASTUPDATE_BY")] [SugarColumn(ColumnName = "LASTUPDATE_BY")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "æåæ´æ°äººé¿åº¦ä¸è½è¶ åº30")] [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ /// </summary> [Column("LASTUPDATE_DATE")] [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// éè´åè¡å· /// åæ®ç±»åID /// </summary> [Column("LINE_NO")] [SugarColumn(ColumnName = "LINE_NO")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "éè´åè¡å·é¿åº¦ä¸è½è¶ åº20")] public string LineNo { get; set; } /// <summary> /// é¢æå·¥æ®µ /// </summary> [Column("MMLIST")] [SugarColumn(ColumnName = "MMLIST")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "é¢æå·¥æ®µé¿åº¦ä¸è½è¶ åº30")] public string Mmlist { get; set; } /// <summary> /// ç产订å /// </summary> [Column("MOCODE")] [SugarColumn(ColumnName = "MOCODE")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ç产订åé¿åº¦ä¸è½è¶ åº50")] public string Mocode { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [Column("MTTRANSCTION_NO")] [SugarColumn(ColumnName = "MTTRANSCTION_NO")] //ç¨äºSqlSugar public decimal? MttransctionNo { get; set; } /// <summary> /// éè´§åå· /// </summary> [Column("PAPER_BILL_NO")] [SugarColumn(ColumnName = "PAPER_BILL_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "éè´§åå·é¿åº¦ä¸è½è¶ åº50")] public string PaperBillNo { get; set; } /// <summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// </summary> [Column("PICK_INS")] [SugarColumn(ColumnName = "PICK_INS")] //ç¨äºSqlSugar public decimal? PickIns { get; set; } /// <summary> /// åå /// </summary> [Column("REASON")] [SugarColumn(ColumnName = "REASON")] //ç¨äºSqlSugar [StringLength(1000, ErrorMessage = "åå é¿åº¦ä¸è½è¶ åº1000")] public string Reason { get; set; } /// <summary> /// éæåå /// </summary> [Column("REM")] [SugarColumn(ColumnName = "REM")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "éæåå é¿åº¦ä¸è½è¶ åº50")] public string Rem { get; set; } /// <summary> /// 夿³¨ /// </summary> [Column("REMARK")] [SugarColumn(ColumnName = "REMARK")] //ç¨äºSqlSugar [StringLength(255, ErrorMessage = "夿³¨é¿åº¦ä¸è½è¶ åº255")] public string Remark { get; set; } /// <summary> /// SAPè¿ååæ® /// </summary> [Column("SAPNO")] [SugarColumn(ColumnName = "SAPNO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "SAPè¿ååæ®é¿åº¦ä¸è½è¶ åº50")] public string Sapno { get; set; } /// <summary> /// æ¯å¦å·²ååSAP /// </summary> [Column("SAPSTATUS")] [SugarColumn(ColumnName = "SAPSTATUS")] //ç¨äºSqlSugar public decimal? Sapstatus { get; set; } /// <summary> /// SAPè¿åä¿¡æ¯ /// </summary> [Column("SAPTEXT")] [SugarColumn(ColumnName = "SAPTEXT")] //ç¨äºSqlSugar [StringLength(200, ErrorMessage = "SAPè¿åä¿¡æ¯é¿åº¦ä¸è½è¶ åº200")] public string Saptext { get; set; } /// <summary> /// SAPè¿å年份 /// </summary> [Column("SAPYEAR")] [SugarColumn(ColumnName = "SAPYEAR")] //ç¨äºSqlSugar public decimal? Sapyear { get; set; } /// <summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// </summary> [Column("STATUS")] [SugarColumn(ColumnName = "STATUS")] //ç¨äºSqlSugar public decimal? Status { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [Column("SUPP_NO")] [SugarColumn(ColumnName = "SUPP_NO")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "ä¾åºåç¼ç é¿åº¦ä¸è½è¶ åº30")] public string SuppNo { get; set; } /// <summary> /// å·¥åè¡å· /// </summary> [Column("TASK_LINO")] [SugarColumn(ColumnName = "TASK_LINO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å·¥åè¡å·é¿åº¦ä¸è½è¶ åº50")] public string TaskLino { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [Column("TASK_NO")] [SugarColumn(ColumnName = "TASK_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ä»»å¡åå·é¿åº¦ä¸è½è¶ åº50")] public string TaskNo { get; set; } [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»åID /// </summary> [Column("TRANSACTION_ID")] [SugarColumn(ColumnName = "TRANSACTION_ID")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> /// äºå¡ç±»åç¼ç /// 夿³¨ /// </summary> [Column("TRANSCTION_NO")] [SugarColumn(ColumnName = "TRANSCTION_NO")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "äºå¡ç±»åç¼ç é¿åº¦ä¸è½è¶ åº30")] public string TransctionNo { get; set; } [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// æ¥ææ è¯ /// éè´§åå· /// </summary> [Column("URGENT_FLAG")] [SugarColumn(ColumnName = "URGENT_FLAG")] //ç¨äºSqlSugar public decimal? UrgentFlag { get; set; } [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string PaperBillNo { get; set; } /// <summary> /// éæäººå·¥å· /// </summary> [Column("USER_NO_BACK")] [SugarColumn(ColumnName = "USER_NO_BACK")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "éæäººå·¥å·é¿åº¦ä¸è½è¶ åº20")] [SugarColumn(ColumnName = "USER_NO_BACK")] public string UserNoBack { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// ç产订åå· /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// å ¥åºæ¥æ /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string CheckRes { get; set; } /// <summary> /// å·²æ¡æ°é /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } /// <summary> /// é¢æå·¥æ®µ /// </summary> [SugarColumn(ColumnName = "MMLIST")] public string Mmlist { get; set; } /// <summary> /// SAPéè´è®¢åå· /// </summary> [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } /// <summary> /// ä»åºç¼ç /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] public string DepotsCode { get; set; } /// <summary> /// äºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] public string TransctionNo { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// å ¥åºç¶æ /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public short? Fstatus { get; set; } /// <summary> /// å·¥åç¼ç /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// æ¯å¦å·²ååSAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> /// SAPè¿ååæ® /// </summary> [SugarColumn(ColumnName = "SAPNO")] public string Sapno { get; set; } /// <summary> /// SAPè¿å年份 /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// SAPè¿åä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] public string Saptext { get; set; } /// <summary> /// ç¡®è®¤å ¥åºæ¥æ /// </summary> [SugarColumn(ColumnName = "INSDATE")] public DateTime? InsdateA { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> /// å®¡æ ¸å ¥åºäºº /// </summary> [SugarColumn(ColumnName = "INSBY")] public string Insby { get; set; } /// <summary> /// æ¯å¦æ¾ç¤º /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// æ¥ææ è¯ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// éè´åè¡å· /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public decimal? MttransctionNo { get; set; } /// <summary> /// å·¥åè¡å· /// </summary> [SugarColumn(ColumnName = "TASK_LINO")] public string TaskLino { get; set; } /// <summary> /// ææéç¥ååå· /// </summary> [SugarColumn(ColumnName = "FBILLNO")] public string Fbillno { get; set; } /// <summary> /// ææåè¡å· /// </summary> [SugarColumn(ColumnName = "FBILL_LINO")] public string FbillLino { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> /// 客æ·åç§° /// </summary> [SugarColumn(ColumnName = "CUST_NAME")] public string CustName { get; set; } /// <summary> /// IQCæ£éªåå· /// </summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] public string IqcReleaseNo { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } /// <summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// </summary> [SugarColumn(ColumnName = "PICK_INS")] public decimal? PickIns { get; set; } /// <summary> /// å ¥åºå®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "FCHECK_USER")] public string FcheckUser { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } /// <summary> /// 任塿±æ¥å /// </summary> [SugarColumn(ColumnName = "RBILL_NO")] public string RbillNo { get; set; } //卿°æ®åºæ¥è¯¢æ¶å¿½ç¥è¿ä¸ªå段 [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; } [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; } } MES.Service/Modes/MesItems.cs
@@ -216,7 +216,7 @@ /// éè´åä½ /// </summary> [SugarColumn(ColumnName = "FPURCHASEUNITID")] public string? Fpurchaseunitid { get; set; } public decimal? Fpurchaseunitid { get; set; } /// <summary> /// èªå®ä¹å段1 MES.Service/Modes/MessageCenter.cs
@@ -105,6 +105,21 @@ [SugarColumn(ColumnName = "ROUTE")] public string? Route { get; set; } /// <summary> /// åæ°ç±»å /// </summary> [SugarColumn(ColumnName = "Content_Type")] public string? ContentType { get; set; } // /// <summary> /// æ¯å¦æ¯æ¶æ¯ 0为æ¨é失败 1ä¸ºæ¶æ¯,é»è®¤ä¸º0 /// </summary> [SugarColumn(ColumnName = "is_message")] public short? IsMessage { get; set; } [SugarColumn(IsIgnore = true)] public int? isShow { get; set; } [SugarColumn(IsIgnore = true)] public decimal? Count { get; set; } } MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/BasicData/MesItemsManager.cs
@@ -136,7 +136,7 @@ Fissuetype = item.FIssueType, Fisbatchmanage = item.FIsBatchManage, Fpurchaserid = item.FPurchaserId, Fpurchaseunitid = item.FPurchaseUnitId, Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId), Storeunit = item.FStoreUnitID, Saleunit = item.FSaleUnitId, Fforbidstatus = item.FForbidStatus, MES.Service/service/MessageCenterManager.cs
@@ -1,5 +1,6 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service; @@ -7,25 +8,54 @@ { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ public List<MessageCenter> getPushFailedPage(MessageCenter query) public List<MessageCenter> GetPushFailedPage(MessageCenter query) { return Context.Queryable<MessageCenter>() .Where(it => it.Result == 0 && it.Status == 1 && it.Seq == 1 && it.CreateBy == query.CreateBy) it.Seq == 1 && it.Title != null) .WhereIF(query.isShow == 1, it => it.DealWith == 0) .OrderByDescending(it => it.CreateDate) .ToPageList(1, 20); } public bool save(MessageCenter entity) public int save(MessageCenter entity) { entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); entity.Method = "POST"; return Db.Insertable(entity).ExecuteReturnIdentity(); } public bool SetError(MessageCenter entity) { entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); entity.Method = "POST"; entity.Result = 0; entity.DealWith = 0; entity.Status = 1; return base.Insert(entity); } //è·åæææ²¡ææåçè¯·æ± public List<MessageCenter> ErrorMsg() { return Context.Queryable<MessageCenter>() .GroupBy(a => new { a.TableName, a.Pid, a.Title, a.PageName }) .Where(a => a.DealWith == 0 && a.Status == 0 && a.Result == 0 && a.Title == null) .Select<MessageCenter>(a => new MessageCenter { TableName = a.TableName, Pid = a.Pid, Title = a.Title, PageName = a.PageName, Count = SqlFunc.AggregateCount(a.Id) }).ToList(); } //æ ¹æ®å ç§æ 嵿´æ° ä¿æé¡µé¢idæ¯åºå®ç MES.Service/service/QC/XJService.cs
@@ -64,7 +64,7 @@ BoardModel = b.BoardModel, PlanQty = c.PlanQty, Mocode = a.Mocode, BoardStyle = c.BoardStyle, // BoardStyle = c.BoardStyle, Id = a.Id }) .ToList(); @@ -156,7 +156,7 @@ CatQty = a.CatQty, MoidNum = s.MoidNum, Daa020 = a.LineNo, DetailMem = a.DetailMem, // DetailMem = a.DetailMem, TaskNo = a.TaskNo, Id = s.Id, CreateBy = s.CreateBy, @@ -169,9 +169,9 @@ FcheckResu = s.FcheckResu, Remarks = s.Remarks, BoardModel = b.BoardModel, PlanQty = c.PlanQty, Mocode = a.Mocode, BoardStyle = c.BoardStyle PlanQty = c.PlanQty // Mocode = a.Mocode, // BoardStyle = c.BoardStyle }).OrderBy(s => s.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit); } MES.Service/service/WomcaaManager.cs
@@ -74,12 +74,13 @@ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto) { return new Womcaa var entity = new Womcaa { Erpid = Convert.ToDecimal(dto.Id), Caa001 = dto.FBillNo, WorkShopId = dto.FWorkShopID0, Caa021 = dto.FWorkShopID0, RoutingId = dto.FRoutingId, WorkShopId = dto.FREMWorkShopId, DepotCode = dto.FStockId, CreateDate = dto.FDate, Caa004 = dto.FBillType, @@ -109,8 +110,16 @@ ForceCloserid = dto.FForceCloserId, CloseType = dto.FCloseType, SrcSplitBillno = dto.FSrcSplitBillNo, Caa016 = dto.FMemoItem Caa016 = dto.FMemoItem, Caa018 = Convert.ToDecimal(dto.planId), Caa019 = Convert.ToDecimal(dto.planSeq), Caa020 = dto.planNum }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); if (single != null) entity.Id = single.Id; return entity; } private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList) @@ -123,6 +132,7 @@ { Erpid = Convert.ToDecimal(dto.ID), Cab001 = dto.FBillNo, Cab002 = dto.FSeq, Cab003 = dto.FMaterialID2, Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2) ? Convert.ToDecimal(dto.FNeedQty2) @@ -148,6 +158,10 @@ Eid = Convert.ToDecimal(dto.PID) }; var entity = Db.Queryable<Womcab>() .Where(s => s.Erpid == womcab.Erpid).Single(); if (entity != null) womcab.Id = entity.Id; womcabList.Add(womcab); } MESApplication/Controllers/Base/DemoController.cs
ÎļþÃû´Ó MESApplication/Controllers/DemoController.cs ÐÞ¸Ä @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.Base; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/Base/LoginController.cs
ÎļþÃû´Ó MESApplication/Controllers/LoginController.cs ÐÞ¸Ä @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.Base; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/Base/MessageCenterController.cs
ÎļþÃû´Ó MESApplication/Controllers/MessageCenterController.cs ÐÞ¸Ä @@ -3,13 +3,15 @@ using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.Base; [ApiController] [Route("api/[controller]")] public class MessageCenterController : ControllerBase { private readonly GetErpParametersServer ErpParametersServer = new(); private readonly MessageCenterManager m = new(); @@ -34,13 +36,60 @@ } } [HttpPost("GetByPid")] public ResponseResult ResetUpdate(int pid) //Resend [HttpPost("Resend")] public ResponseResult Resend(MessageCenter data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetList(it => it.Pid == pid); resultInfos.tbBillList = ErpParametersServer.Resend(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //saveError [HttpPost("SetError")] public ResponseResult SetError([FromBody] MessageCenter data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.SetError(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("GetByPid")] public ResponseResult ResetUpdate([FromBody] JObject data) { var pid = Convert.ToDecimal(data["pid"].ToString()); try { dynamic resultInfos = new ExpandoObject(); var messageCenter = m.GetById(pid); var messageCenters = m.GetList(it => it.Pid == pid); messageCenters.Add(messageCenter); resultInfos.tbBillList = messageCenters; return new ResponseResult { status = 0, @@ -60,7 +109,7 @@ try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.getPushFailedPage(query); resultInfos.tbBillList = m.GetPushFailedPage(query); return new ResponseResult { status = 0, @@ -106,8 +155,9 @@ /// </summary> /// <returns></returns> [HttpPost("GetById")] public ResponseResult GetById(int id) public ResponseResult GetById([FromBody] JObject data) { var id = Convert.ToDecimal(data["id"].ToString()); try { dynamic resultInfos = new ExpandoObject(); MESApplication/Controllers/BasicData/MesItemsController.cs
@@ -32,6 +32,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); MESApplication/Controllers/QC/BaseController.cs
ÎļþÃû´Ó MESApplication/Controllers/BaseController.cs ÐÞ¸Ä @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/QC/MesLineUserController.cs
ÎļþÃû´Ó MESApplication/Controllers/MesLineUserController.cs ÐÞ¸Ä @@ -4,7 +4,7 @@ using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [ApiController] [Route("api/[controller]")] MESApplication/Controllers/QC/RKJController.cs
ÎļþÃû´Ó MESApplication/Controllers/RKJController.cs ÐÞ¸Ä @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/QC/SJController.cs
ÎļþÃû´Ó MESApplication/Controllers/SJController.cs ÐÞ¸Ä @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/QC/SuspendController.cs
ÎļþÃû´Ó MESApplication/Controllers/SuspendController.cs ÐÞ¸Ä @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/QC/XJController.cs
ÎļþÃû´Ó MESApplication/Controllers/XJController.cs ÐÞ¸Ä @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers; namespace MESApplication.Controllers.QC; [Route("api/[controller]")] [ApiController] MESApplication/Controllers/WomcaaController.cs
@@ -12,9 +12,8 @@ [Route("api/[controller]")] public class WomcaaController : ControllerBase { private readonly WomcaaManager m = new(); private readonly MessageCenterManager _manager = new(); private readonly WomcaaManager m = new(); private readonly string METHOD = "POST"; @@ -41,9 +40,13 @@ resultInfos.tbBillList = save; entity.Result = 0; if (save) entity.Result = 1; entity.DealWith = 0; if (save) { entity.Result = 1; entity.DealWith = 1; } entity.DealWith = 1; _manager.save(entity); return new ResponseResult MESApplication/Startup.cs
@@ -1,4 +1,6 @@ using Microsoft.OpenApi.Models; using MES.Service.Dto.@base; using MES.Service.util; using Microsoft.OpenApi.Models; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Swashbuckle.AspNetCore.SwaggerUI; @@ -13,6 +15,8 @@ public Startup(IConfiguration configuration) { Configuration = configuration; new AppsettingsUtility().Initial(configuration); } public IConfiguration Configuration { get; } @@ -21,11 +25,16 @@ public void ConfigureServices(IServiceCollection services) { services.AddControllers(); // 读å ç³»ç» è®¾ç½®å¹¶æ³¨å ¥å°æå¡ä¸ services.Configure<AppSettings>( Configuration.GetSection("AppSettings")); services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "WebFirst.Api", Version = "v1" }); { Title = "MESApplication.Api", Version = "v1" }); }); //é ç½®JSON.NET @@ -42,6 +51,9 @@ // 设置å½åçç¥ä¸ºé©¼å³°å½å opt.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); //è¿åç»åç«¯çæ¶é´æ ¼å¼å opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; }); //é ç½®å¯ä»¥è·¨å MESApplication/appsettings.json
@@ -6,5 +6,10 @@ "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" "AllowedHosts": "*", "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd" } } MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Debug/net8.0/appsettings.json
@@ -6,5 +6,10 @@ "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" "AllowedHosts": "*", "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd" } } MESApplication/bin/Release/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/appsettings.json
@@ -6,5 +6,10 @@ "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" "AllowedHosts": "*", "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd" } } MESApplication/bin/Release/net8.0/publish/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/appsettings.json
@@ -6,5 +6,10 @@ "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" "AllowedHosts": "*", "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd" } }