From cd51e7e8180e1d4ebbaf9700ed78a27cd4b99891 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期五, 11 四月 2025 16:08:28 +0800
Subject: [PATCH] 基础资料
---
StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs | 9
StandardInterface/MES.Service/Modes/MesRohIn.cs | 2
StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs | 20 +
StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs | 36 +-
StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs | 4
StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs | 23 +-
StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs | 1
StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs | 23 +-
StandardInterface/MES.Service/Modes/Organize.cs | 13 +
StandardInterface/MES.Service/Modes/MesRohInData.cs | 4
StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs | 24 +-
StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs | 7
StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs | 35 +--
StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs | 27 +-
StandardInterface/MES.Service/Modes/MesItems.cs | 81 +++++++
StandardInterface/MESApplication/appsettings.json | 2
StandardInterface/MES.Service/Dto/webApi/ErpItems.cs | 99 +++++---
StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs | 25 +-
StandardInterface/MES.Service/Modes/MesStaff.cs | 7
StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs | 4
StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs | 2
StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs | 11
StandardInterface/MES.Service/Modes/MesSupplier.cs | 9
StandardInterface/MES.Service/Modes/MesDepots.cs | 10
StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs | 89 ++++----
StandardInterface/MES.Service/Dto/webApi/ErpRohIn.cs | 55 ++--
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 20 +
27 files changed, 399 insertions(+), 243 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs b/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs
index 7fd4a30..d9adcf1 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs
@@ -32,4 +32,5 @@
//public string? FDescription { get; set; }
public string? fremarks { get; set; }
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs b/StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs
index 959b2fe..3ba3d25 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs
@@ -3,15 +3,16 @@
public class ErpDepartment
{
public string Id { get; set; }
- public string? FNumber { get; set; }
- public string? FName { get; set; }
- public string? FDeptProperty { get; set; }
- public string? FGroup { get; set; }
- public string? FWIPStockID { get; set; }
- public string? FForbidStatus { get; set; }
- public string? Type { get; set; }
- public string? FParentID { get; set; }
- public string? FCreateOrgId { get; set; }
- public string? FUseOrgId { get; set; }
- public string? FDocumentStatus { get; set; }
+ public string? Type { get; set; }
+ public string? FNumber { get; set; } // 缂栫爜
+ public string? FName { get; set; } // 鍚嶇О
+ public string? FDeptProperty { get; set; } // 閮ㄩ棬灞炴��
+ public string? FGroup { get; set; } // 閮ㄩ棬鍒嗙粍
+ public string? FWIPStockID { get; set; } // WIP浠撳簱
+ public string? FDocumentStatus { get; set; } // 鏁版嵁鐘舵��
+ public string? FForbidStatus { get; set; } // 绂佺敤鐘舵��
+ public string? FParentID { get; set; } // 涓婄骇閮ㄩ棬
+ public string? FCreateOrgId { get; set; } // 鍒涘缓缁勭粐
+ public string? FUseOrgId { 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 a68e407..257c238 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs
@@ -4,9 +4,9 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FNumber { get; set; }
+ public string? FNumber { get; set; }//缂栫爜
- public string? FName { get; set; }
+ public string? FName { get; set; }//鍚嶇О
/// <summary>
/// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板渚涘簲鍟唅d銆佸鎴穒d銆佹暟鎹姸鎬併�佸簱瀛樼姸鎬佺被鍨嬪瓧娈点��
@@ -23,23 +23,19 @@
/// public string? FDocumentStatus { get; set; }
/// public string? FStockStatusType { get; set; }
/// </remarks>
- public string? FSupplierId { get; set; }
+ ///
+ public string? FAllowMinusQty { get; set; }//鍏佽鍗虫椂搴撳瓨璐熷簱瀛�
+ public string? FPrincipal { get; set; } //浠撳簱璐熻矗浜�
+ public string? FStockProperty { get; set; } //浠撳簱灞炴��
+ public string? FSupplierId { get; set; } //渚涘簲鍟�
+ public string? FCustomerId { get; set; } //瀹㈡埛
+ public string? FDocumentStatus { get; set; } //鏁版嵁鐘舵��
+ public string? FForbidStatus { get; set; } //绂佺敤鐘舵��
+ public string? FGroup { get; set; } //鍒嗙粍
+ public string? FCreateOrgId { get; set; } //鍒涘缓缁勭粐
+ public string? FUseOrgId { get; set; } //浣跨敤缁勭粐
+ public string? FStockStatusType { get; set; } //搴撳瓨鐘舵�佺被鍨�
+ public string? FZYC { get; set; } //鐩磋繍浠�
+ public string? FGYC { get; set; } //绠℃槗浠�
- public string? FCustomerId { get; set; }
- public string? FDocumentStatus { get; set; }
- public string? FStockStatusType { get; set; }
- public string? FAllowMinusQty { get; set; }
-
- public string? FPrincipal { get; set; }
-
- public string? FStockProperty { get; set; }
-
- public string? FForbidStatus { get; set; }
-
- public string? FGroup { get; set; }
-
-
- public string? FCreateOrgId { get; set; }
-
- public string? FUseOrgId { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
index 8eb4e79..460d8c3 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
@@ -4,16 +4,16 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FNumber { get; set; }
- public string? FOldNumber { get; set; }
- public string? FName { get; set; }
- public string? FSpecification { get; set; }
- public string? FBaseUnitId { get; set; }
- public double? FSafeStock { get; set; }
- public double? FMaxStock { get; set; }
- public double? FMinStock { get; set; }
- public double? FMinPackCount { get; set; }
- public string? FStockId { get; set; }
+ public string? FNumber { get; set; }//缂栫爜
+ public string? FOldNumber { get; set; }//鏃х墿鏂欑紪鐮�
+ public string? FName { get; set; }//鍚嶇О
+ public string? FSpecification { get; set; }//瑙勬牸鍨嬪彿
+ public string? FBaseUnitId { get; set; }//鍩烘湰鍗曚綅
+ public double? FSafeStock { get; set; }//瀹夊叏搴撳瓨
+ public double? FMaxStock { get; set; }//鏈�澶у簱瀛�
+ public double? FMinStock { get; set; }//鏈�灏忓簱瀛�
+ public double? FMinPackCount { get; set; }//鏈�灏忓寘瑁呮暟
+ public string? FStockId { get; set; }//浠撳簱
/// <summary>
/// 鎺ュ彛瀛楁璋冩暣锛氬凡鍒犻櫎鎴栦笉鍐嶄娇鐢≒PBOM00019124瀛楁銆�
@@ -25,36 +25,57 @@
/// 淇濈暀琚敞閲婄殑浠ｇ爜浠ヨ褰曚慨鏀瑰巻鍙层��
/// </remarks>
// public string? PPBOM00019124 { get; set; }
- public string? FMaterialGroup { get; set; }
+ public string? FMaterialGroup { get; set; }//鐗╂枡鍒嗙粍
+ public string? FDescription { get; set; }//鎻忚堪
+ public decimal? FFinishReceiptOverRate { get; set; }//鍏ュ簱瓒呮敹姣斾緥(%)
+ public decimal? FFinishReceiptShortRate { get; set; }//鍏ュ簱娆犳敹姣斾緥(%)
+ public string? FIssueType { get; set; }//鍙戞枡鏂瑰紡
+ public int? FIsBatchManage { get; set; }//鍚敤鎵瑰彿绠＄悊
+ public string? FPurchaserId { get; set; }//閲囪喘鍛�
+ public string? FDefaultVendor { get; set; }//榛樿渚涘簲鍟�
+ public string? FPurchaseUnitId { get; set; }//閲囪喘鍗曚綅
+ public string? FStoreUnitID { get; set; }//搴撳瓨鍗曚綅
+ public string? FSaleUnitId { get; set; }//閿�鍞崟浣�
+ public string? FDocumentStatus { get; set; } //鏁版嵁鐘舵��
- public string? FDescription { get; set; }
- public decimal? FFinishReceiptOverRate { get; set; }
- public decimal? FFinishReceiptShortRate { get; set; }
- public string? FIssueType { get; set; }
- public int? FIsBatchManage { get; set; }
- public string? FPurchaserId { get; set; }
- public string? FDefaultVendor { get; set; }
- public string? FPurchaseUnitId { get; set; }
- public string? FStoreUnitID { get; set; }
- public string? FSaleUnitId { get; set; }
- public string? FDocumentStatus { get; set; }
- public string? FForbidStatus { get; set; }
- public string? FErpClsID { get; set; }
- public string? FMfgPolicyId { get; set; }
- public string? FWorkShopId { get; set; }
- public string? FBOMUnitId { get; set; }
- public string? FPRODUCEUNITID { get; set; }
- public string? FIsKitting { get; set; }
- public string? FIsCoby { get; set; }
- public string? FOverControlMode { get; set; }
- public string? FSUBCONUNITID { get; set; }
- public string? FCreateOrgId { get; set; }
- public string? FUseOrgId { get; set; }
- public string? FLOSSPERCENT { get; set; }
- public string? FMnemonicCode { get; set; }
+ public string? FForbidStatus { get; set; } //绂佺敤鐘舵��
- public string? FExpPeriod { get; set; }
+ public string? FErpClsID { get; set; } //鐗╂枡灞炴��
- //public string? FColor { get; set; }
- public string? F_MJBH { get; set; }
+ public string? FMfgPolicyId { get; set; } //鍒堕�犵瓥鐣�
+
+ public string? FWorkShopId { get; set; } // 鐢熶骇杞﹂棿
+
+ public string? FBOMUnitId { get; set; } //瀛愰」鍗曚綅
+
+ public string? FPRODUCEUNITID { get; set; }//鐢熶骇鍗曚綅
+
+ public string? FIsKitting { get; set; } //鏄惁鍏抽敭浠�
+ public string? FIsCoby { get; set; } //鍙负鑱斿壇浜у搧
+ public string? FOverControlMode { get; set; }//瓒呭彂鎺у埗鏂瑰紡
+ public string? FSUBCONUNITID { get; set; } //濮斿鍗曚綅
+ public string? FCreateOrgId { get; set; } // 鍒涘缓缁勭粐
+ public string? FUseOrgId { get; set; } // 浣跨敤缁勭粐
+ public string? FLOSSPERCENT { get; set; } // 鎹熻�楃巼
+ public string? FMnemonicCode { get; set; } // 鍔╄鐮�
+ public string? FExpPeriod { get; set; } // 淇濊川鏈�
+ //public string? FColor { get; set; } //
+ public string? F_MJBH { get; set; } //妯″叿缂栧彿
+
+ //20250407 yhj 鐒曞獎鏂板瀛楁
+ public string? F_TJ { get; set; } //濂椾欢
+ public string? F_KZ { get; set; } //鎺у埗
+ public string? F_SC { get; set; } //璇曞埗or閲忎骇?
+ public string? F_HSFX { get; set; } //鎹㈢畻鏂瑰悜
+ public string? F_KCKZ { get; set; } //搴撳瓨鎺у埗
+ public string? F_XSKZ { get; set; } //閿�鍞帶鍒�
+ public string? F_CRM { get; set; } //CRM
+ public string? F_CGKZ { get; set; } //閲囪喘鎺у埗
+ public string? F_WWLX { get; set; } //濮斿绫诲瀷
+ public string? F_JYSZ { get; set; } //妫�楠岃缃�
+ public string? F_FJZQ { get; set; } //澶嶆鍛ㄦ湡锛堬級澶�
+ public string? F_SCLX { get; set; } //鐢熶骇绫诲瀷
+ public string? F_ZZSTLX { get; set; } //缁勭粐闂村彈鎵樼被鍨�
+ public string? F_DCSL { get; set; } //鍊掑啿鏁伴噺
+ public string? F_BZGS { get; set; } //鏍囧噯宸ユ椂
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs b/StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs
index 54270cd..5600107 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -4,12 +4,16 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FNumber { get; set; }
- public string? FName { get; set; }
- public string? FForbidStatus { get; set; }
- public string? FDescription { get; set; }
- public string? FParentID { get; set; }
- public string? fCreateDate { get; set; }
- public string? FForbidorid { get; set; }
- public string? FForbiddate { get; set; }
+ public string? FNumber { get; set; } //缂栫爜
+ public string? FName { get; set; } //鍚嶇О
+ public string? FParentID { get; set; } //鎵�灞炴硶浜�
+ public string? fCreateDate { get; set; } //鍒涘缓鏃ユ湡
+ public string? FForbidorid { get; set; } //绂佺敤浜�
+ public string? FForbiddate { get; set; } //绂佺敤鏃ユ湡
+ public string? FForbidStatus { get; set; } //绂佺敤鐘舵��
+// public string? FDescription { get; set; }
+
+
+
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs b/StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs
index fab1daf..465709b 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs
@@ -22,28 +22,15 @@
/// public string? FCreateOrgId { get; set; }
/// public string? FUseOrgId { get; set; }
/// </remarks>
- public string? FCreateOrgId { get; set; }
-
- public string? FUseOrgId { get; set; }
-
- public string? FNumber { get; set; }
-
- public string? FName { get; set; }
-
- public string? FDESCRIPTIONS { get; set; }
-
- public string? FDept { get; set; }
-
- public string? FCreateDate { get; set; }
-
- public string? FForbidderId { get; set; }
-
- public string? FForbidDate { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
- /// </summary>
- public string? FForbidStatus { get; set; }
-
- public string? FDocumentStatus { get; set; }
+ public string? FCreateOrgId { get; set; } //鍒涘缓缁勭粐
+ public string? FUseOrgId { get; set; } //浣跨敤缁勭粐
+ public string? FNumber { get; set; } //缂栫爜
+ public string? FName { get; set; } //鍚嶇О
+ public string? FDESCRIPTIONS { get; set; } //鎻忚堪
+ public string? FDept { get; set; } //鎵�灞為儴闂�
+ public string? FCreateDate { get; set; } //鍒涘缓鏃ユ湡
+ public string? FForbidderId { get; set; } //绂佺敤浜�
+ public string? FForbidDate { get; set; } //绂佺敤鏃ユ湡
+ public string? FForbidStatus { get; set; } //绂佺敤鐘舵��
+ public string? FDocumentStatus { get; set; } //鍗曟嵁鐘舵��
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpRohIn.cs b/StandardInterface/MES.Service/Dto/webApi/ErpRohIn.cs
index 25c1d6d..75579ca 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -4,37 +4,36 @@
{
public string id { get; set; }
public string? Type { get; set; }
- public string? FBillNo { get; set; }
- public string? FDocumentStatus { get; set; }
- public string? FBillTypeID { get; set; }
- public string? FBusinessType { get; set; }
- public string? FDate { get; set; }
- public string? FSupplierId { get; set; }
- public string? FCloseStatus { get; set; }
- public string? FPurchaseOrgId { get; set; }
- public string? FPurchaseDeptId { get; set; }
- public string? FPurchaserGroupId { get; set; }
- public string? FPurchaserId { get; set; }
- public string? Acctype { get; set; }
- public string? FSettleId { get; set; }
-
- public string? FChargeId { get; set; }
+ public string? FBillNo { get; set; }//鍗曟嵁缂栧彿
+ public string? FDocumentStatus { get; set; }//鍗曟嵁鐘舵��
+ public string? FBillTypeID { get; set; }//鍗曟嵁绫诲瀷
+ public string? FBusinessType { get; set; } //涓氬姟绫诲瀷
+ public string? FDate { get; set; } //閲囪喘鏃ユ湡
+ public string? FSupplierId { get; set; } //渚涘簲鍟�
+ public string? FCloseStatus { get; set; } //鍏抽棴鐘舵��
+ public string? FPurchaseOrgId { get; set; } //閲囪喘缁勭粐
+ public string? FPurchaseDeptId { get; set; } //閲囪喘閮ㄩ棬
+ public string? FPurchaserGroupId { get; set; } //閲囪喘缁�
+ public string? FPurchaserId { get; set; } //閲囪喘鍛�
+ public string? Acctype { get; set; } //楠屾敹鏂瑰紡
+ public string? FSettleId { get; set; } //缁撶畻鏂�
+ public string? FChargeId { get; set; } //鏀舵鏂�
//public string? FProviderEMail { get; set; }
- public string? Remarks { get; set; }
- public string? FCancelStatus { get; set; }
- public string? FCancellerId { get; set; }
- public string? FCancelDate { get; set; }
- public string? FCreatorId { get; set; }
- public string? FCreateDate { get; set; }
- public string? FModifierId { get; set; }
- public string? FModifyDate { get; set; }
- public string? FApproverId { get; set; }
- public string? FApproveDate { get; set; }
- public string? FChangeReason { get; set; }
- public string? Prearrivaldate { get; set; }
+ public string? Remarks { get; set; } //澶囨敞
+ public string? FCancelStatus { get; set; } //浣滃簾鐘舵��
+ public string? FCancellerId { get; set; } //浣滃簾浜�
+ public string? FCancelDate { get; set; } //浣滃簾鏃ユ湡
+ public string? FCreatorId { get; set; } //鍒涘缓浜�
+ public string? FCreateDate { get; set; } //鍒涘缓鏃ユ湡
+ public string? FModifierId { get; set; } //鏈�鍚庝慨鏀逛汉
+ public string? FModifyDate { get; set; } //鏈�鍚庝慨鏀规椂闂�
+ public string? FApproverId { get; set; } //瀹℃牳浜�
+ public string? FApproveDate { get; set; } //瀹℃牳鏃堕棿
+ public string? FChangeReason { get; set; } //鍙樻洿鍘熷洜
+ public string? Prearrivaldate { get; set; } //鍒拌揣鏃ユ湡
- public string? FReceiveOrgId { get; set; }
+ public string? FReceiveOrgId { get; set; } //鏀舵枡缁勭粐
//public string? FProviderId { get; set; }
//public string? FTContact { get; set; }
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs b/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
index 35fb174..033e323 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -4,72 +4,71 @@
{
public string id { get; set; }
public string Eid { get; set; }
- public string? FBillNo { get; set; }
+ public string? FBillNo { get; set; }//閲囪喘鍗曞彿
+ public string? SALES_ORDER_ID { get; set; }//閿�鍞鍗曞彿
- public string? FSeq { get; set; }
+ public string? FSeq { get; set; }//閲囪喘璁㈠崟琛屽彿
//娌℃湁瀵瑰簲琛ㄥ瓧娈� -姹犲崡楠� 2025-01-10
//public string? FXSHTH { get; set; }
- public string? FMaterialId { get; set; }
- public string? FUnitId { get; set; }
- public string? FQty { get; set; }
- public string? FStockUnitID { get; set; }
- public string? FPriceUnitId { get; set; }
- public string? FPriceUnitQty { get; set; }
- public string? FDeliveryDate { get; set; }
- public string? FDeliveryEarlyDate { get; set; }
-
- public string? FDeliveryLastDate { get; set; }
+ public string? FMaterialId { get; set; } //鐗╂枡缂栫爜
+ public string? FUnitId { get; set; } //閲囪喘鍗曚綅
+ public string? FQty { get; set; } //閲囪喘鏁伴噺
+ public string? FStockUnitID { get; set; } //搴撳瓨鍗曚綅
+ public string? FPriceUnitId { get; set; } //璁′环鍗曚綅
+ public string? FPriceUnitQty { get; set; } //璁′环鏁伴噺
+ public string? FDeliveryDate { get; set; } //浜よ揣鏃ユ湡
+ public string? FDeliveryEarlyDate { get; set; } //鏈�鏃╀氦璐ф棩鏈�
+ public string? FDeliveryLastDate { get; set; } //鏈�鏅氫氦璐ф棩鏈�
// start
- public string? FRequireOrgId { get; set; }
- public string? FRequireDeptId { get; set; }
- public string? FReceiveOrgId { get; set; }
- public string? FReceiveDeptId { get; set; }
+ public string? FRequireOrgId { get; set; } //闇�姹傜粍缁�
+ // public string? FRequireDeptId { get; set; }
+ public string? FReceiveOrgId { get; set; } //鏀舵枡缁勭粐
+ public string? FReceiveDeptId { get; set; } //鏀舵枡閮ㄩ棬
- public string? FEntrySettleOrgId { get; set; }
+ public string? FEntrySettleOrgId { get; set; } //缁撶畻缁勭粐
// end
- public string? FGiveAway { get; set; }
+ public string? FGiveAway { get; set; } //鏄惁璧犲搧
//public string? FNote { get; set; }
- public string? FEntryNote { get; set; }
- public string? FSupMatId { get; set; }
- public string? FSupMatName { get; set; }
- public string? FSubreqBillNo { get; set; }
- public string? FLot { get; set; }
- public string? FMRPCloseStatus { get; set; }
- public string? FMRPFreezeStatus { get; set; }
- public string? FFreezerId { get; set; }
- public string? FFreezeDate { get; set; }
- public string? FMRPTerminateStatus { get; set; }
- public string? FTerminaterId { get; set; }
- public string? FTerminateDate { get; set; }
- public string? FReceiveQty { get; set; }
-
- public string? FRemainReceiveQty { get; set; }
+ public string? FEntryNote { get; set; } // 澶囨敞
+ public string? FSupMatId { get; set; } // 渚涘簲鍟嗙墿鏂欑紪鐮�
+ public string? FSupMatName { get; set; } // 渚涘簲鍟嗙墿鏂欏悕绉�
+ public string? FSubreqBillNo { get; set; } // 濮斿璁㈠崟缂栧彿
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FMRPCloseStatus { get; set; } // 涓氬姟鍏抽棴
+ public string? FMRPFreezeStatus { get; set; } // 涓氬姟鍐荤粨
+ public string? FFreezerId { get; set; } // 鍐荤粨浜�
+ public string? FFreezeDate { get; set; } // 鍐荤粨鏃ユ湡
+ public string? FMRPTerminateStatus { get; set; } // 涓氬姟缁堟
+ public string? FTerminaterId { get; set; } // 缁堟浜�
+ public string? FTerminateDate { get; set; } // 缁堟鏃ユ湡
+ public string? FReceiveQty { get; set; } // 绱鏀舵枡鏁伴噺
+ public string? FRemainReceiveQty { get; set; } // 鍓╀綑鏀舵枡鏁伴噺
//public string? FBaseStockInQty { get; set; }
public string? FStockInQty { get; set; } //绱鍏ュ簱鏁�
- public string? FRemainStockINQty { get; set; }
+ public string? FRemainStockINQty { get; set; } //鍓╀綑鍏ュ簱鏁伴噺
- public string? FMrbQty { get; set; }
+ public string? FMrbQty { get; set; } //绱閫�鏂欐暟閲�
//public string? FBaseCheckRetQty { get; set; }
//public string? FBaseStockRetQty { get; set; }
public string? FCHECKRETQTY { get; set; } //鏀舵枡鍙��鏁�
public string? FSTOCKRETQTY { get; set; } //搴撳瓨鍙��鏁�
- public string? FSrcBillTypeId { get; set; }
- public string? FSrcBillNo { get; set; }
- public string? FReqTraceNo { get; set; }
- public string? FMtoNo { get; set; }
- public string? FChangeFlag { get; set; }
- public string? FDemandType { get; set; }
- public string? FDemandBillNo { get; set; }
- public string? FDemandBillEntrySeq { get; set; }
+ public string? FSrcBillTypeId { get; set; } //婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } //婧愬崟缂栧彿
+ public string? FReqTraceNo { get; set; } //闇�姹傝窡韪彿
+ public string? FMtoNo { get; set; } //璁″垝璺熻釜鍙�
+ public string? FChangeFlag { get; set; } //鍙樻洿鏍囧織
+ public string? FDemandType { get; set; } //闇�姹傛潵婧�
+ public string? FDemandBillNo { get; set; } //闇�姹傚崟鎹紪鍙�
+ public string? FDemandBillEntrySeq { get; set; } //闇�姹傚崟鎹鍙�
//鏂板 鐢熶骇閫氱煡鍗曘�佸瀷鍙枫�丅OM澶囨敞 涓変釜瀛楁 --2025-01-11 姹犲崡楠�
- public string? F_CGDD_SCTZDA { get; set; }
+/* public string? F_CGDD_SCTZDA { get; set; }
public string? F_CGDD_XHA { get; set; }
- public string? F_XIFG_Text_apv { get; set; }
+ public string? F_XIFG_Text_apv { get; set; }*/
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs b/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
index 9cf438f..23c6ef2 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs
@@ -4,9 +4,8 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FStaffNumber { get; set; }
-
- public string? FName { get; set; }
+ public string? FStaffNumber { get; set; } //鍛樺伐缂栧彿
+ public string? FName { get; set; }//鍛樺伐濮撳悕
//鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FPostDept { get; set; }
@@ -23,7 +22,7 @@
/// </remarks>
/// //鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FPostId { get; set; }
- public string? FMobile { get; set; }
+ public string? FMobile { get; set; }//绉诲姩鐢佃瘽
/// <summary>
/// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
@@ -37,17 +36,20 @@
/// - 淇敼鍚庯細
/// public string? FDocumentStatus { get; set; }
/// </remarks>
- public string? FDocumentStatus { get; set; }
+ ///
+ public string? FDescription { get; set; }//鎻忚堪
+ public string? FDocumentStatus { get; set; }//鏁版嵁鐘舵��
//鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FStaffStartDate { get; set; }
- public string? FDescription { get; set; }
- public string? FForbidStatus { get; set; }
- public string? FCreateOrgId { get; set; }
- public string? FUseOrgId { get; set; }
+
+ public string? FForbidStatus { get; set; }//绂佺敤鐘舵��
+ public string? FCreateOrgId { get; set; }//鍒涘缓缁勭粐
+ public string? FUseOrgId { get; set; }//浣跨敤缁勭粐
//鏂板涓�涓狿ostIdItem绫诲瀷鐨刲ist鏉ヨ幏鍙杄rp鐨勫矖浣峣d
public List<ErpStaffDetail>? ErpStaffDetails { get; set; }
+ public string? FGZZZ { get; set; }//宸ヤ綔缁勭粐
}
/// <summary>
@@ -60,9 +62,9 @@
/// </remarks>
public class ErpStaffDetail
{
- public string? fPostId { get; set; }
-
public string? fPostDeptid { get; set; }
+ public string? fPostId { get; set; }
+
public string? fStaffStartDate { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs b/StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs
index 2064ebd..43dfc98 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -4,12 +4,12 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FNumber { get; set; }
- public string? FShortName { get; set; }
- public string? FName { get; set; }
- public string? FContact { get; set; }
- public string? FTel { get; set; }
- public string? FStaffId { get; set; }
+ public string? FNumber { get; set; }//缂栫爜
+ public string? FShortName { get; set; }//绠�绉�
+ public string? FName { get; set; }//鍚嶇О
+ public string? FContact { get; set; }//鑱旂郴浜�
+ public string? FTel { get; set; }//鐢佃瘽
+ public string? FStaffId { get; set; }//璐熻矗浜�
/// <summary>
/// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
@@ -23,13 +23,18 @@
/// - 淇敼鍚庯細
/// public string? FDocumentStatus { get; set; }
/// </remarks>
- public string? FDocumentStatus { get; set; }
+ public string? FDocumentStatus { get; set; }//鏁版嵁鐘舵��
- public string? FForbidStatus { get; set; }
- public string? FCreateOrgId { get; set; }
+ public string? FForbidStatus { get; set; }//绂佺敤鐘舵��
+ public string? FCreateOrgId { get; set; }//鍒涘缓缁勭粐
- public string? FUseOrgId { get; set; }
+ public string? FUseOrgId { get; set; }//浣跨敤缁勭粐
//public string? FDescription { get; set; }
- public string? fremarks { get; set; }
+
+ public string? fremarks { get; set; } //澶囨敞
+
+
+ public string? FsuppCategory { get;set; } //渚涘簲绫诲埆
+ public string? GYSFZ { get; set; }//渚涘簲鍟嗗垎缁�
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs b/StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs
index 7f1f75c..7451dd7 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs
@@ -4,16 +4,16 @@
{
public string Id { get; set; }
public string? Type { get; set; }
- public string? FNumber { get; set; }
- public string? FName { get; set; }
- public string? FUnitGroupId { get; set; }
- public double? FConvertDenominator { get; set; }
- public string? FCurrentUnitId { get; set; }
- public double? FConvertNumerator { get; set; }
- public string? FBaseUnit { get; set; }
- public string? FRoundType { get; set; }
- public int? FPrecision { get; set; }
- public string? FDescription { get; set; }
+ public string? FNumber { get; set; } //缂栫爜
+ public string? FName { get; set; } //鍚嶇О
+ public string? FUnitGroupId { get; set; } //鎵�灞炵粍鍒�
+ public double? FConvertDenominator { get; set; } //鎹㈢畻鍒嗘瘝
+ public string? FCurrentUnitId { get; set; } //褰撳墠鍗曚綅
+ public double? FConvertNumerator { get; set; } //鎹㈢畻鍒嗗瓙
+ public string? FBaseUnit { get; set; } //鍩哄噯璁￠噺鍗曚綅
+ public string? FRoundType { get; set; } //鑸嶅叆绫诲瀷
+ public int? FPrecision { get; set; } //绮惧害
+ public string? FDescription { get; set; } //鎻忚堪
/// <summary>
/// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
@@ -27,7 +27,8 @@
/// - 淇敼鍚庯細
/// public string? FDocumentStatus { get; set; }
/// </remarks>
- public string? FDocumentStatus { get; set; }
+ public string? FDocumentStatus { get; set; }//鏁版嵁鐘舵��
- public string? FForbidStatus { get; set; }
+ public string? FForbidStatus { 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 2abdc10..f901737 100644
--- a/StandardInterface/MES.Service/Modes/MesDepots.cs
+++ b/StandardInterface/MES.Service/Modes/MesDepots.cs
@@ -213,4 +213,14 @@
/// </summary>
[SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
public string? FSTOCKSTATUSTYPE { get; set; }
+ /// <summary>
+ /// 鐩磋繍浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "FZYC")]
+ public string? FZYC { get; set; }
+ /// <summary>
+ /// 绠℃槗浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "FGYC")]
+ public string? FGYC { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesItems.cs b/StandardInterface/MES.Service/Modes/MesItems.cs
index d830cb6..281324b 100644
--- a/StandardInterface/MES.Service/Modes/MesItems.cs
+++ b/StandardInterface/MES.Service/Modes/MesItems.cs
@@ -398,4 +398,85 @@
/// </summary>
[SugarColumn(ColumnName = "F_MJBH")]
public string? F_MJBH { get; set; }
+
+
+ //20250407 yhj 鐒曞獎鏂板瀛楁
+ /// <summary>
+ /// 濂椾欢
+ /// </summary>
+ [SugarColumn(ColumnName = "F_TJ")]
+ public string? F_TJ { get; set; }
+
+ /// <summary>
+ /// 鎺у埗
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KZ")]
+ public string? F_KZ { get; set; }
+ /// <summary>
+ /// 璇曞埗or閲忎骇?
+ /// </summary>
+ [SugarColumn(ColumnName = "F_SC")]
+ public string? F_SC { get; set; }
+ /// <summary>
+ /// 鎹㈢畻鏂瑰悜
+ /// </summary>
+ [SugarColumn(ColumnName = "F_HSFX")]
+ public string? F_HSFX { get; set; }
+ /// <summary>
+ /// 搴撳瓨鎺у埗
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KCKZ")]
+ public string? F_KCKZ { get; set; }
+ /// <summary>
+ /// 閿�鍞帶鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_XSKZ")]
+ public string? F_XSKZ { get; set; }
+ /// <summary>
+ /// CRM
+ /// </summary>
+ [SugarColumn(ColumnName = "F_CRM")]
+ public string? F_CRM { get; set; }
+ /// <summary>
+ /// 閲囪喘鎺у埗
+ /// </summary>
+ [SugarColumn(ColumnName = "F_CGKZ")]
+ public string? F_CGKZ { get; set; }
+ /// <summary>
+ /// 濮斿绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "F_WWLX")]
+ public string? F_WWLX { get; set; }
+ /// <summary>
+ /// 妫�楠岃缃�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_JYSZ")]
+ public string? F_JYSZ { get; set; }
+ /// <summary>
+ /// 澶嶆鍛ㄦ湡锛堬級澶�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_FJZQ")]
+ public string? F_FJZQ { get; set; }
+ /// <summary>
+ /// 鐢熶骇绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "F_SCLX")]
+ public string? F_SCLX { get; set; }
+ /// <summary>
+ /// 缁勭粐闂村彈鎵樼被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "F_ZZSTLX")]
+ public string? F_ZZSTLX { get; set; }
+ /// <summary>
+ /// 鍊掑啿鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "F_DCSL")]
+ public string? F_DCSL { get; set; }
+ /// <summary>
+ /// 鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "F_BZGS")]
+ public string? F_BZGS { get; set; }
+
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesRohIn.cs b/StandardInterface/MES.Service/Modes/MesRohIn.cs
index 71427aa..e0f6b9a 100644
--- a/StandardInterface/MES.Service/Modes/MesRohIn.cs
+++ b/StandardInterface/MES.Service/Modes/MesRohIn.cs
@@ -282,7 +282,7 @@
public decimal? ReceiveOrg { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
+ /// 楠屾敹鏂瑰紡
/// </summary>
[SugarColumn(ColumnName = "ACCTYPE")]
public string? ACCTYPE { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/MesRohInData.cs b/StandardInterface/MES.Service/Modes/MesRohInData.cs
index 4451e75..7fd8dc6 100644
--- a/StandardInterface/MES.Service/Modes/MesRohInData.cs
+++ b/StandardInterface/MES.Service/Modes/MesRohInData.cs
@@ -14,12 +14,12 @@
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
+
/// <summary>
/// 閿�鍞鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string? SalesOrderId { get; set; }
-
+ public string? SALES_ORDER_ID { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
/// </summary>
diff --git a/StandardInterface/MES.Service/Modes/MesStaff.cs b/StandardInterface/MES.Service/Modes/MesStaff.cs
index 450ed0d..0076ecc 100644
--- a/StandardInterface/MES.Service/Modes/MesStaff.cs
+++ b/StandardInterface/MES.Service/Modes/MesStaff.cs
@@ -166,4 +166,11 @@
public string? FforbidStatus { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ /// <summary>
+ /// 宸ヤ綔缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "GZZZ")]
+ public string? FGZZZ { get; set; }
+
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/MesSupplier.cs b/StandardInterface/MES.Service/Modes/MesSupplier.cs
index e8ab78b..69b2d4d 100644
--- a/StandardInterface/MES.Service/Modes/MesSupplier.cs
+++ b/StandardInterface/MES.Service/Modes/MesSupplier.cs
@@ -172,7 +172,7 @@
public decimal? UseOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
+ /// 鑷畾涔夊瓧娈�3 渚涘簲绫诲埆
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
@@ -190,4 +190,11 @@
public string? Remark5 { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗗垎缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "GYS_FZ")]
+ public string? GYS_FZ { 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 1a6f4aa..159895d 100644
--- a/StandardInterface/MES.Service/Modes/Organize.cs
+++ b/StandardInterface/MES.Service/Modes/Organize.cs
@@ -37,7 +37,7 @@
public string? Type { get; set; }
/// <summary>
- /// 涓婄骇缁勭粐
+ /// 鎵�灞炴硶浜�
/// </summary>
[SugarColumn(ColumnName = "FPARENTID")]
public string? Fparentid { get; set; }
@@ -47,4 +47,15 @@
/// </summary>
[SugarColumn(ColumnName = "FCREATEDATE")]
public DateTime? Fcreatedate { get; set; }
+ /// <summary>
+ /// 绂佺敤浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FFORBIDORID")]
+ public string? FFORBIDORID { get; set; }
+ /// <summary>
+ /// 绂佺敤鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "FFORBIDDATE")]
+ public string? FFORBIDDATE { get; set; }
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
index 19ac0a6..ba11703 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
@@ -28,7 +28,6 @@
break;
case "2":
- case "4":
if (InsertOrUpdate(db, entity)) return 1;
break;
@@ -150,6 +149,8 @@
CreateOrg = Convert.ToDecimal(depots.FCreateOrgId),
UseOrg = Convert.ToDecimal(depots.FUseOrgId),
CreateDate = DateTime.Now,
+ FZYC= depots.FZYC,
+ FGYC= depots.FGYC,
Company = "1000",
Factory = "1000"
};
@@ -194,7 +195,6 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "2":
- case "4":
if (!InsertOrUpdateBatch(db,
depotsGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴�
throw new NotImplementedException("鍚屾澶辫触");
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
index 874ff1e..61975fb 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -44,6 +44,7 @@
case "2":
case "4":
case "5":
+
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -86,6 +87,7 @@
case "2":
case "4":
case "5":
+
if (!InsertOrUpdateBatch(db, itemGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
break;
@@ -196,7 +198,23 @@
FISKITTING = item.FIsKitting,
FISCOBY = item.FIsCoby,
FOVERCONTROLMODE = item.FOverControlMode,
- F_MJBH = item.F_MJBH
+ F_MJBH = item.F_MJBH,
+//20250407 yhj 鐒曞獎鏂板瀛楁
+ F_TJ =item.F_TJ,
+ F_KZ =item.F_KZ,
+ F_SC =item.F_SC,
+ F_HSFX =item.F_HSFX,
+ F_KCKZ =item.F_KCKZ,
+ F_XSKZ =item.F_XSKZ,
+ F_CRM =item.F_CRM,
+ F_CGKZ =item.F_CGKZ,
+ F_WWLX =item.F_WWLX,
+ F_JYSZ =item.F_JYSZ,
+ F_FJZQ =item.F_FJZQ,
+ F_SCLX =item.F_SCLX,
+ F_ZZSTLX =item.F_ZZSTLX,
+ F_DCSL =item.F_DCSL,
+ F_BZGS =item.F_BZGS,
};
}
diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
index 611a8ac..39938f7 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
@@ -228,13 +228,14 @@
/// - 浜屾淇敼锛屽垹闄�
/// </remarks>
//PositionCode = staff.FPostId,
- PhoneNumber = staff.FMobile,
- CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
- UseOrg = Convert.ToDecimal(staff.FUseOrgId),
+ PhoneNumber = staff.FMobile,
CreateDate = DateTime.Now,
Remark = staff.FDescription,
FDOCUMENTSTATUS = staff.FDocumentStatus,
- FforbidStatus = staff.FForbidStatus
+ FforbidStatus = staff.FForbidStatus,
+ CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
+ FGZZZ=staff.FGZZZ
};
//鍒犻櫎 2025-01-04 姹犲崡楠�
diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
index ba61bd8..7688ab6 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs
@@ -26,15 +26,12 @@
if (UpdateOrganizetatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
+
case "3":
if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
return 1;
break;
- case "4":
+ case "2":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -66,15 +63,15 @@
if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
+ /* case "2":
if (!InsertItemBatch(db, itemGroup.Value))
throw new NotImplementedException("鎻掑叆澶辫触");
- break;
+ break;*/
case "3":
if (!DeleteItemBatch(db, itemGroup.Value))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
- case "4":
+ case "2":
if (!InsertOrUpdateBatch(db, itemGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
break;
@@ -123,12 +120,16 @@
return new Organize
{
Id = Convert.ToDecimal(Organize.Id),
+ Type = Organize.Type,
Fnumber = Organize.FNumber,
Fname = Organize.FName,
- Fforbidstatus = Organize.FForbidStatus,
- Type = Organize.Type,
Fparentid = Organize.FParentID,
- Fcreatedate = DateTime.Now
+ Fcreatedate = DateTime.Now,
+ 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 a131eed..135b58d 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs
@@ -36,7 +36,6 @@
return 1;
break;
case "2":
- case "4":
if (InsertOrUpdateDepartment(db, entity)) // 鎻掑叆鎴栨洿鏂伴儴闂�
return 1;
break;
@@ -192,7 +191,6 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "2":
- case "4":
if (!InsertOrUpdateDepartmentBatch(db,
departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂�
throw new NotImplementedException("鍚屾澶辫触");
diff --git a/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs b/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs
index 6294cfb..5325ff6 100644
--- a/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs
@@ -15,20 +15,23 @@
{
switch (customer.Type)
{
+ //鍙嶇鐢�
case "0":
if (UpdateCustomerStatus(db, entity.Id, "A"))
return 1;
break;
+ //绂佺敤
case "1":
if (UpdateCustomerStatus(db, entity.Id, "B"))
return 1;
break;
+ //鍙嶅鏍�
case "3":
if (DeleteCustomer(db, entity.Id))
return 1;
break;
+ //瀹℃牳
case "2":
- case "4":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -67,7 +70,7 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "2":
- case "4":
+
if (!InsertOrUpdateBatch(db, customerGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
break;
diff --git a/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs b/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs
index 2d4259f..43c285c 100644
--- a/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs
@@ -28,7 +28,7 @@
return 1;
break;
case "2":
- case "4":
+
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -139,6 +139,8 @@
CreateOrg = Convert.ToDecimal(supplier.FCreateOrgId),
UseOrg = Convert.ToDecimal(supplier.FUseOrgId),
Remark = supplier.fremarks,
+ Remark3 = supplier.FsuppCategory,
+ GYS_FZ = supplier.GYSFZ,
Company = "1000",
Factory = "1000"
};
diff --git a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
index a981c09..49bb250 100644
--- a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
@@ -206,9 +206,9 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
+ SALES_ORDER_ID=s.SALES_ORDER_ID,
OrderLineId = s.FSeq,
- PurchaseOrderLineNumber = s.FSeq,
- SalesOrderId = s.FDemandBillEntrySeq,
+ PurchaseOrderLineNumber = s.FSeq,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
@@ -269,11 +269,12 @@
ChangeFlag = s.FChangeFlag,
DemandSource = s.FDemandType,
DemandDocumentId = s.FDemandBillNo,
- DemandDocumentLineId = s.FDemandBillEntrySeq,
- DemandDept = s.FRequireDeptId,
+
+ DemandDocumentLineId = s.FDemandBillEntrySeq
+ /* DemandDept = s.FRequireDeptId,
FCGDDSctzda = s.F_CGDD_SCTZDA,
FCGDDXHA = s.F_CGDD_XHA,
- FXifgTextApv = s.F_XIFG_Text_apv
+ FXifgTextApv = s.F_XIFG_Text_apv*/
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/StandardInterface/MESApplication/appsettings.json b/StandardInterface/MESApplication/appsettings.json
index b6f25b6..59a3601 100644
--- a/StandardInterface/MESApplication/appsettings.json
+++ b/StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"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.1.100)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = gs_dev; Password=gsdev"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
}
}
--
Gitblit v1.9.3