From 3501b604e6c756e59dba68a5ed3064e26cfd749f Mon Sep 17 00:00:00 2001 From: hao <1836460075@qq.com> Date: 星期三, 23 四月 2025 14:13:59 +0800 Subject: [PATCH] 2 --- StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs | 3 + StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs | 1 StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs | 1 StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs | 3 + StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs | 1 StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs | 1 StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs | 10 +++-- StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs | 1 StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs | 1 StandardInterface/MES.Service/Modes/MesCustomer.cs | 12 ++++++ StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs | 1 StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs | 2 + StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs | 2 StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs | 1 StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs | 4 + StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs | 3 + StandardInterface/MES.Service/Modes/MesDepots.cs | 5 ++ StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs | 1 StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs | 1 StandardInterface/MES.Service/Modes/Organize.cs | 3 + StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs | 1 StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 2 + StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs | 3 + 23 files changed, 53 insertions(+), 10 deletions(-) diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs b/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs index d9adcf1..0c13141 100644 --- a/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs +++ b/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs @@ -32,5 +32,7 @@ //public string? FDescription { get; set; } public string? fremarks { get; set; } + public string? CustType { get; set; } + public string? CustGroup { get; set; } } \ No newline at end of file diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs b/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs index 257c238..e83b538 100644 --- a/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs +++ b/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs @@ -37,5 +37,6 @@ public string? FStockStatusType { get; set; } //搴撳瓨鐘舵�佺被鍨� public string? FZYC { get; set; } //鐩磋繍浠� public string? FGYC { get; set; } //绠℃槗浠� + public string? FZMC { get; set; } //鍒嗙粍鍚嶇О } \ No newline at end of file diff --git a/StandardInterface/MES.Service/Modes/MesCustomer.cs b/StandardInterface/MES.Service/Modes/MesCustomer.cs index 7684eee..a34db2b 100644 --- a/StandardInterface/MES.Service/Modes/MesCustomer.cs +++ b/StandardInterface/MES.Service/Modes/MesCustomer.cs @@ -192,4 +192,16 @@ public string? Remark5 { get; set; } [SugarColumn(IsIgnore = true)] public string? Type { get; set; } + + + /// <summary> + /// 瀹㈡埛绫诲埆 + /// </summary> + [SugarColumn(ColumnName = "CUST_TYPE")] + public string? CustType { get; set; } + /// <summary> + /// 瀹㈡埛鍒嗙粍 + /// </summary> + [SugarColumn(ColumnName = "CUST_GROUP")] + public string? CustGroup { get; set; } } \ No newline at end of file diff --git a/StandardInterface/MES.Service/Modes/MesDepots.cs b/StandardInterface/MES.Service/Modes/MesDepots.cs index f901737..60de486 100644 --- a/StandardInterface/MES.Service/Modes/MesDepots.cs +++ b/StandardInterface/MES.Service/Modes/MesDepots.cs @@ -223,4 +223,9 @@ /// </summary> [SugarColumn(ColumnName = "FGYC")] public string? FGYC { get; set; } + /// <summary> + /// 鍒嗙粍鍚嶇О + /// </summary> + [SugarColumn(ColumnName = "FZMC")] + public string? FZMC { get; set; } } \ No newline at end of file diff --git a/StandardInterface/MES.Service/Modes/Organize.cs b/StandardInterface/MES.Service/Modes/Organize.cs index 159895d..1065b82 100644 --- a/StandardInterface/MES.Service/Modes/Organize.cs +++ b/StandardInterface/MES.Service/Modes/Organize.cs @@ -9,7 +9,8 @@ { /// <summary> /// </summary> - [SugarColumn(ColumnName = "ID")] + + [SugarColumn(IsPrimaryKey = true, ColumnName = "ID")] public decimal Id { get; set; } /// <summary> diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs index ba11703..bd963ae 100644 --- a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs @@ -151,8 +151,10 @@ CreateDate = DateTime.Now, FZYC= depots.FZYC, FGYC= depots.FGYC, + FZMC= depots.FZMC, Company = "1000", - Factory = "1000" + Factory = "1000", + Type=depots.Type, }; } diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs index 61975fb..dbc2f2a 100644 --- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs @@ -176,6 +176,8 @@ ExpPeriod = item.FExpPeriod, //ColorName = item.FColor, CreateDate = DateTime.Now, + Type=item.Type, + //20250412 鏄惁鏍规嵁宸ュ巶涓嶅悓淇敼涓嶅悓缂栫爜 Company = "1000", Factory = "1000", /// <summary> diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs index 8139921..2a8850a 100644 --- a/StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs @@ -139,7 +139,8 @@ Fforbidstatus = unit.FForbidStatus, CreateDate = DateTime.Now, Company = "1000", - Factory = "1000" + Factory = "1000" , + Type=unit.Type }; } diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs index c52fcf8..d439b5d 100644 --- a/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs @@ -18,11 +18,11 @@ switch (unit.Type) { case "0": - if (UpdatePositionStatus(db, entity.Id, "A")) // 鍚敤宀椾綅 + if (UpdatePositionStatus(db, entity.Id, "A", null, "")) // 鍚敤宀椾綅 return 1; break; case "1": - if (UpdatePositionStatus(db, entity.Id, "B")) // 绂佺敤宀椾綅 + if (UpdatePositionStatus(db, entity.Id, "B", entity.DisabledDate, entity.DisabledBy)) // 绂佺敤宀椾綅 return 1; break; //case "2": @@ -49,10 +49,11 @@ // 鏇存柊宀椾綅鐘舵�佺殑鏂规硶 private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId, - string status) + string status, DateTime? jytime, string jyr) { var result = db.Updateable<MesPosition>() .SetColumns(s => s.Fforbidstatus == status) + .SetColumns(s => s.DisabledDate == jytime) .Where(s => s.Id == positionId).ExecuteCommand(); if (result > 0) @@ -152,7 +153,8 @@ DisabledDate = position.FForbidDate != null ? DateTime.ParseExact(position.FForbidDate, "yyyy-MM-dd HH:mm:ss", null) - : null + : null, + Type=position.Type, }; } diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs index 39938f7..621e1d8 100644 --- a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs @@ -235,7 +235,8 @@ FforbidStatus = staff.FForbidStatus, CreateOrg = Convert.ToDecimal(staff.FCreateOrgId), UseOrg = Convert.ToDecimal(staff.FUseOrgId), - FGZZZ=staff.FGZZZ + FGZZZ=staff.FGZZZ, + Type = staff.Type, }; //鍒犻櫎 2025-01-04 姹犲崡楠� diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs index 7688ab6..23b8085 100644 --- a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs @@ -128,7 +128,7 @@ FFORBIDORID= Organize.FForbidorid, FFORBIDDATE = Organize.FForbiddate, Fforbidstatus = Organize.FForbidStatus - + }; } diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs index 135b58d..cd4ba3f 100644 --- a/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs @@ -147,7 +147,8 @@ ParentId = Convert.ToDecimal(department.FParentID), FDOCUMENTSTATUS = department.FDocumentStatus, Company = "1000", - Factory = "1000" + Factory = "1000", + Type=department.Type, }; } diff --git a/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs b/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs index 5325ff6..da0b3c1 100644 --- a/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs @@ -145,6 +145,9 @@ CreateDate = DateTime.Now, CreateOrg = Convert.ToDecimal(customer.FCreateOrgId), UseOrg = Convert.ToDecimal(customer.FUseOrgId), + CustType = customer.CustType, + CustGroup = customer.CustGroup, + Type= customer.Type, Company = "1000", Factory = "1000" }; diff --git a/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs b/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs index 43c285c..4ea912a 100644 --- a/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs @@ -141,6 +141,7 @@ Remark = supplier.fremarks, Remark3 = supplier.FsuppCategory, GYS_FZ = supplier.GYSFZ, + Type = supplier.Type, Company = "1000", Factory = "1000" }; diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs index 1786ed4..91f25d3 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs @@ -32,6 +32,7 @@ entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; + entity.Route =unit.FNumber; entity.CreateBy = "PL017"; try { diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs index 67a39b5..7f19452 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs @@ -33,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route=unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs index 37fd578..8f02ad0 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs @@ -57,6 +57,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route = unit.FNumber; try { diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs index cd8ea43..346031c 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs @@ -34,6 +34,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route=unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs index 5a6107c..2c0692f 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs @@ -33,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(staff); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route = staff.FStaffNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs index 69a421d..14fb66d 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs @@ -33,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route=unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs index d23db51..bde964c 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs @@ -33,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route = unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs b/StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs index 82ec070..427831e 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs @@ -34,6 +34,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route = unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); diff --git a/StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs b/StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs index 12614fd..39a54e2 100644 --- a/StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs +++ b/StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs @@ -33,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; + entity.Route=unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); -- Gitblit v1.9.3