From 70e8a5aec5d49a95483d4c0e066ccdcc45a02e79 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期日, 09 二月 2025 21:51:37 +0800
Subject: [PATCH] 采购订单接口
---
StandardPda/MES.Service/Modes/MesUnit.cs | 102 +-
StandardPda/MES.Service/Modes/EmployeeItem.cs | 61
StandardPda/MES.Service/Modes/MesInvBusiness2.cs | 288 +++---
StandardPda/MES.Service/Modes/MesRohInData.cs | 56
StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs | 447 +++++------
StandardPda/MES.Service/service/BasicData/MesProjectManager.cs | 7
StandardPda/MES.Service/Modes/MesItems.cs | 351 ++++----
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs | 3
StandardPda/MES.Service/Modes/MesRohIn.cs | 107 +-
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 94 -
StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs | 3
StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs | 193 ++--
StandardPda/MES.Service/Dto/webApi/ErpProject.cs | 20
StandardPda/MES.Service/service/BasicData/MesUnitManager.cs | 2
StandardPda/MES.Service/Modes/MesItemType.cs | 66
StandardPda/MES.Service/Modes/SysDepartment.cs | 1
StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs | 7
/dev/null | 42 -
StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs | 89 -
StandardPda/MES.Service/Modes/MesDepots.cs | 120 +-
StandardPda/MES.Service/Dto/webApi/ErpDepots.cs | 6
StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs | 5
StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs | 47
StandardPda/MES.Service/Modes/EmployeeInfo.cs | 97 +-
25 files changed, 1,035 insertions(+), 1,181 deletions(-)
diff --git a/.idea/WR_API.iml b/.idea/WR_API.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/WR_API.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/libraries/publish.xml b/.idea/libraries/publish.xml
deleted file mode 100644
index 4b44725..0000000
--- a/.idea/libraries/publish.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="publish">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/StandardPda/MESApplication/bin/Release/net8.0/publish.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 639900d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e343ce2..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/WR_API.iml" filepath="$PROJECT_DIR$/.idea/WR_API.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 1f5ed36..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ChangeListManager">
- <list default="true" id="c40d5f83-9166-4d55-bea8-ffbec48d0157" name="鏇存敼" comment="">
- <change beforePath="$PROJECT_DIR$/StandardPda/MESApplication/appsettings.json" beforeDir="false" afterPath="$PROJECT_DIR$/StandardPda/MESApplication/appsettings.json" afterDir="false" />
- </list>
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="ProjectColorInfo"><![CDATA[{
- "associatedIndex": 4
-}]]></component>
- <component name="ProjectId" id="2qbrxy3BAUvJfn1JMouQKgHwTro" />
- <component name="ProjectViewState">
- <option name="hideEmptyMiddlePackages" value="true" />
- <option name="showLibraryContents" value="true" />
- </component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "git-widget-placeholder": "master",
- "kotlin-language-version-configured": "true",
- "last_opened_file_path": "E:/01GIT_NEW/02娌冨皵/WR_API"
- }
-}]]></component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="搴旂敤绋嬪簭绾�" UseSingleDictionary="true" transferred="true" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="榛樿浠诲姟">
- <changelist id="c40d5f83-9166-4d55-bea8-ffbec48d0157" name="鏇存敼" comment="" />
- <created>1734942366489</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1734942366489</updated>
- </task>
- <servers />
- </component>
-</project>
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs b/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs
index e3c3d10..d074616 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs
@@ -7,7 +7,7 @@
public string? FNumber { get; set; }
public string? FName { get; set; }
-
+
public string? FAllowMinusQty { get; set; }
public string? FPrincipal { get; set; }
@@ -15,10 +15,10 @@
public string? FStockProperty { get; set; }
public string? FForbidStatus { get; set; }
-
+
public string? FDocumentStatus { get; set; }
public string? IsLot { get; set; }
-
+
public string? FUseOrgId { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpProject.cs b/StandardPda/MES.Service/Dto/webApi/ErpProject.cs
index 766f109..0a11140 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpProject.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpProject.cs
@@ -4,22 +4,22 @@
{
//ERPID
public string? ID { get; set; }
-
- public string? Type { get; set; }//鎿嶄綔绫诲瀷
-
+
+ public string? Type { get; set; } //鎿嶄綔绫诲瀷
+
public string? Code { get; set; } //椤圭洰缂栫爜
-
+
public string? Name { get; set; } //椤圭洰鍚嶇О
-
+
public string? ProjectType { get; set; } //椤圭洰鍒嗙被
-
+
public string? Description { get; set; } //椤圭洰浠撳偍璐熻矗浜�
-
+
public string? OperatorsID { get; set; } //椤圭洰閲囪喘璐熻矗浜�
-
+
public string? FDocumentStatus { get; set; } //鍗曟嵁鐘舵��
-
+
public string? FForbidStatus { get; set; } //鏄惁绂佺敤
-
+
public List<ErpDetail>? FUseOrgId { get; set; } //涓嬪彂缁勭粐
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs b/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs
index 25c1d6d..2a4f5bf 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -4,43 +4,34 @@
{
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? FBillTypeId { get; set; }
+ public string? FBillNo { 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? FDate { 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? FPurchaseDeptId { get; set; }
+ public string? FSrcDocType { get; set; }
+ public string? FSrcDoc { get; set; }
+ public string? FTradePathName { get; set; }
+ public string? FSubType { get; set; }
+ public string? FBusinessType { get; set; }
+ public string? FIsReDo { get; set; }
+ public string? PubDescSeg2 { get; set; }
public string? Remarks { get; set; }
- public string? FCancelStatus { get; set; }
- public string? FCancellerId { get; set; }
- public string? FCancelDate { get; set; }
+ public string? PrivateDescSeg1 { get; set; }
+ public string? FCloseStatus { get; set; }
+ public string? FVersion { get; set; }
+ public string? FPurchaseOrgId { get; set; }
+ public string? FReceiveOrgId { 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? FProviderId { get; set; }
-
- //public string? FTContact { get; set; }
- //public string? Fmobilephone { get; set; }
-
- //public string? FixedTelephone { get; set; }
-
- //public string? Address { get; set; }
+ // public string? FCancelStatus { get; set; }
+ // public string? FCancellerId { get; set; }
+ // public string? FCancelDate { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs b/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs
index 35fb174..fe5f185 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,71 +5,32 @@
public string id { get; set; }
public string Eid { get; set; }
public string? FBillNo { 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; }
-
- // start
- 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; }
-
- // end
- 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? FBaseStockInQty { get; set; }
- public string? FStockInQty { get; set; } //绱鍏ュ簱鏁�
- public string? FRemainStockINQty { 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? FStatus { 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_XHA { get; set; }
- public string? F_XIFG_Text_apv { get; set; }
+ public string? FSeq { get; set; }
+ public string? FMaterialId { get; set; }
+ public string? RdProject { get; set; }
+ public string? Project { get; set; }
+ public string? ProjectPurchaser { get; set; }
+ public string? FUnitId { get; set; }
+ public string? FQty { get; set; }
+ public string? FPriceUnitId { get; set; }
+ public string? FPriceUnitQty { get; set; }
+ public string? FRequireOrgId { get; set; }
+ public string? FReceiveOrgId { get; set; }
+ public string? FReceiveDeptId { get; set; }
+ public string? FGiveAway { get; set; }
+ public string? FSrcBillTypeId { get; set; }
+ public string? FSrcBillNo { get; set; }
+ public string? FLot { get; set; }
+ public string? FReceiveQty { get; set; }
+ public string? FRemainReceiveQty { get; set; }
+ public string? FStockInQty { get; set; } //绱鍏ュ簱鏁�
+ public string? FRemainStockINQty { get; set; }
+ public string? FMrbQty { get; set; }
+ public string? FCHECKRETQTY { get; set; } //鏀舵枡鍙��鏁�
+ public string? FSTOCKRETQTY { get; set; } //搴撳瓨鍙��鏁�
+ public string? FEntryNote { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/EmployeeInfo.cs b/StandardPda/MES.Service/Modes/EmployeeInfo.cs
index a1f8b4b..68369b7 100644
--- a/StandardPda/MES.Service/Modes/EmployeeInfo.cs
+++ b/StandardPda/MES.Service/Modes/EmployeeInfo.cs
@@ -1,62 +1,57 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
+锘縰sing SqlSugar;
-namespace MES.Service.Modes
+namespace MES.Service.Modes;
+
+/// <summary>
+/// </summary>
+[SugarTable("EMPLOYEE_INFO")]
+public class EmployeeInfo
{
/// <summary>
- ///
- ///</summary>
- [SugarTable("EMPLOYEE_INFO")]
- public class EmployeeInfo
- {
- /// <summary>
- /// SEQ_EMP
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ /// SEQ_EMP
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// 鑱屽伐宸ュ彿
- ///</summary>
- [SugarColumn(ColumnName = "EMPLOYEE_NO")]
- public string? EmployeeNo { get; set; }
+ /// <summary>
+ /// 鑱屽伐宸ュ彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EMPLOYEE_NO")]
+ public string? EmployeeNo { get; set; }
- /// <summary>
- /// 鑱屽伐濮撳悕
- ///</summary>
- [SugarColumn(ColumnName = "EMPLOYEE_NAME")]
- public string? EmployeeName { get; set; }
+ /// <summary>
+ /// 鑱屽伐濮撳悕
+ /// </summary>
+ [SugarColumn(ColumnName = "EMPLOYEE_NAME")]
+ public string? EmployeeName { get; set; }
- /// <summary>
- /// 閮ㄩ棬缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
- public string? DepartmentCode { get; set; }
+ /// <summary>
+ /// 閮ㄩ棬缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
+ public string? DepartmentCode { get; set; }
- /// <summary>
- /// 涓氬姟鍛樼被鍨�
- ///</summary>
- [SugarColumn(ColumnName = "SALESMAN_TYPE")]
- public string? SalesmanType { get; set; }
+ /// <summary>
+ /// 涓氬姟鍛樼被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALESMAN_TYPE")]
+ public string? SalesmanType { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
- public string? DocumentStatus { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
- /// <summary>
- /// 鏄惁绂佺敤
- ///</summary>
- [SugarColumn(ColumnName = "IS_DISABLED")]
- public string? IsDisabled { get; set; }
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_DISABLED")]
+ public string? IsDisabled { get; set; }
- /// <summary>
- /// 缁勭粐
- ///</summary>
- [SugarColumn(ColumnName = "ORGANIZATION")]
- public string? Organization { get; set; }
- }
+ /// <summary>
+ /// 缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ORGANIZATION")]
+ public string? Organization { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/EmployeeItem.cs b/StandardPda/MES.Service/Modes/EmployeeItem.cs
index b91263e..0688c2b 100644
--- a/StandardPda/MES.Service/Modes/EmployeeItem.cs
+++ b/StandardPda/MES.Service/Modes/EmployeeItem.cs
@@ -1,40 +1,35 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
+锘縰sing SqlSugar;
-namespace MES.Service.Modes
+namespace MES.Service.Modes;
+
+/// <summary>
+/// </summary>
+[SugarTable("EMPLOYEE_ITEM")]
+public class EmployeeItem
{
/// <summary>
- ///
- ///</summary>
- [SugarTable("EMPLOYEE_ITEM")]
- public class EmployeeItem
- {
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ID",
- OracleSequenceName = "SEQ_EMP",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ /// </summary>
+ [SugarColumn(ColumnName = "ID",
+ OracleSequenceName = "SEQ_EMP",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// info鐨刬d
- ///</summary>
- [SugarColumn(ColumnName = "EID")]
- public decimal? Eid { get; set; }
+ /// <summary>
+ /// info鐨刬d
+ /// </summary>
+ [SugarColumn(ColumnName = "EID")]
+ public decimal? Eid { get; set; }
- /// <summary>
- /// 0=閲囪喘涓氬姟鍛�, 1=閿�鍞笟鍔″憳, 2=搴撶鍛�, 3=鎷ｈ揣鍛�, 4=鐞嗚揣鍛�, 5=璁捐鍛�, 6=璁″垝鍛�, 7=鐢熶骇绠＄悊鍛�, 8=缁熻鍛�, 9=璐ㄦ鍛�, 10=鎴愭湰浼氳, 11=鏀舵鍛�, 12=璧勪骇绠＄悊鍛�, 13=鍏朵粬, 14=璁惧绠＄悊鍛�
- ///</summary>
- [SugarColumn(ColumnName = "E_TYPE")]
- public string? EType { get; set; }
+ /// <summary>
+ /// 0=閲囪喘涓氬姟鍛�, 1=閿�鍞笟鍔″憳, 2=搴撶鍛�, 3=鎷ｈ揣鍛�, 4=鐞嗚揣鍛�, 5=璁捐鍛�, 6=璁″垝鍛�, 7=鐢熶骇绠＄悊鍛�, 8=缁熻鍛�, 9=璐ㄦ鍛�,
+ /// 10=鎴愭湰浼氳, 11=鏀舵鍛�, 12=璧勪骇绠＄悊鍛�, 13=鍏朵粬, 14=璁惧绠＄悊鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "E_TYPE")]
+ public string? EType { get; set; }
- /// <summary>
- /// 鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
- }
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public string? CreateDate { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesDepots.cs b/StandardPda/MES.Service/Modes/MesDepots.cs
index 5583bdd..dd895b3 100644
--- a/StandardPda/MES.Service/Modes/MesDepots.cs
+++ b/StandardPda/MES.Service/Modes/MesDepots.cs
@@ -9,135 +9,135 @@
public class MesDepots
{
/// <summary>
- /// ID(SEQ_INV_ID)
- ///</summary>
+ /// ID(SEQ_INV_ID)
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_ID",
IsPrimaryKey = true)]
public decimal DepotId { get; set; }
/// <summary>
- /// 浠撳簱绫诲埆缂栫爜
- ///</summary>
+ /// 浠撳簱绫诲埆缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
public string? DepotCode { get; set; }
/// <summary>
- /// 浠撳簱绫诲埆鍚嶇О
- ///</summary>
+ /// 浠撳簱绫诲埆鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_NAME")]
public string? DepotName { get; set; }
/// <summary>
- /// 澶囨敞
- ///</summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
- /// 浠撳簱璐熻矗浜�
- ///</summary>
+ /// 浠撳簱璐熻矗浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 浠撳簱绫诲瀷 0=鏅�氫粨,1=闇插ぉ浠�,2=瀵勫浠�,3=澶栧瘎浠�, 4=鍦ㄥ埗鍝侊紝5=鎶ュ簾
- ///</summary>
+ /// 浠撳簱绫诲瀷 0=鏅�氫粨,1=闇插ぉ浠�,2=瀵勫浠�,3=澶栧瘎浠�, 4=鍦ㄥ埗鍝侊紝5=鎶ュ簾
+ /// </summary>
[SugarColumn(ColumnName = "DEPOTTYPE")]
public string? Depottype { get; set; }
/// <summary>
- /// 鍒嗗巶缂栫爜
- ///</summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 鐗╂枡浣跨敤
- ///</summary>
+ /// 鐗╂枡浣跨敤
+ /// </summary>
[SugarColumn(ColumnName = "TYPE_1")]
public decimal? Type1 { get; set; }
/// <summary>
- /// 鎴愬搧浣跨敤
- ///</summary>
+ /// 鎴愬搧浣跨敤
+ /// </summary>
[SugarColumn(ColumnName = "TYPE_2")]
public decimal? Type2 { get; set; }
/// <summary>
- /// 浠撳簱绫诲瀷缂栫爜
- ///</summary>
+ /// 浠撳簱绫诲瀷缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "DEPOTTYPECODE")]
public decimal? Depottypecode { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- ///</summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 鐪嬫澘鍥炬爣鏍峰紡
- ///</summary>
+ /// 鐪嬫澘鍥炬爣鏍峰紡
+ /// </summary>
[SugarColumn(ColumnName = "ICON_TYPE")]
public decimal? IconType { get; set; }
/// <summary>
- /// 鏄惁濮斿浠撳簱
- ///</summary>
+ /// 鏄惁濮斿浠撳簱
+ /// </summary>
[SugarColumn(ColumnName = "IS_WY")]
public decimal? IsWy { get; set; }
/// <summary>
- /// 鏄惁涓嶈壇鍝佷粨
- ///</summary>
+ /// 鏄惁涓嶈壇鍝佷粨
+ /// </summary>
[SugarColumn(ColumnName = "IS_NG")]
public string? IsNg { get; set; }
/// <summary>
- /// 浠撳簱鍦板潃
- ///</summary>
+ /// 浠撳簱鍦板潃
+ /// </summary>
[SugarColumn(ColumnName = "CWHADDRESS")]
public string? Cwhaddress { get; set; }
/// <summary>
- /// 鐪嬫澘鏄剧ず鍖哄煙缂栧彿
- ///</summary>
+ /// 鐪嬫澘鏄剧ず鍖哄煙缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "PI_TYPE")]
public string? PiType { get; set; }
/// <summary>
- /// 鍒嗙粍
- ///</summary>
+ /// 鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "ZUID")]
public string? Zuid { get; set; }
/// <summary>
- /// 鍏佽鍗虫椂搴撳瓨璐熷簱瀛�
- ///</summary>
+ /// 鍏佽鍗虫椂搴撳瓨璐熷簱瀛�
+ /// </summary>
[SugarColumn(ColumnName = "IS_FKC")]
public string? IsFkc { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- ///</summary>
+ /// 鐢熶骇杞﹂棿
+ /// </summary>
[SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
public string? ProductionWorkshop { get; set; }
@@ -148,50 +148,50 @@
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- ///</summary>
+ /// 鍒涘缓缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_ORG")]
public decimal? CreateOrg { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- ///</summary>
+ /// 浣跨敤缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "USE_ORG")]
public decimal? UseOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
- ///</summary>
+ /// 鑷畾涔夊瓧娈�3
+ /// </summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- ///</summary>
+ /// 鑷畾涔夊瓧娈�4
+ /// </summary>
[SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- ///</summary>
+ /// 鑷畾涔夊瓧娈�5
+ /// </summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 0 =涓嶇敓鏁堬紝 1=鐢熸晥
- ///</summary>
+ /// 0 =涓嶇敓鏁堬紝 1=鐢熸晥
+ /// </summary>
[SugarColumn(ColumnName = "FORBID_STATUS")]
public string? ForbidStatus { get; set; }
/// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
/// <summary>
- /// 鎵瑰彿绠＄悊
- ///</summary>
+ /// 鎵瑰彿绠＄悊
+ /// </summary>
[SugarColumn(ColumnName = "IS_LOT")]
public string? IsLot { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesInvBusiness2.cs b/StandardPda/MES.Service/Modes/MesInvBusiness2.cs
index 89ddce5..20d3f47 100644
--- a/StandardPda/MES.Service/Modes/MesInvBusiness2.cs
+++ b/StandardPda/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>
- /// 鍗曟嵁琛孖D
- /// </summary>
- [SugarColumn(ColumnName = "BILL_LINE_ID")]
+ /// <summary>
+ /// 鍗曟嵁琛孖D
+ /// </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>
- /// 婧愬瓙搴揅ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 婧愬瓙搴揅ODE
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
public string FromInvDepotsCode { get; set; }
- /// <summary>
- /// 婧愯揣浣岰ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 婧愯揣浣岰ODE
+ /// </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>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesItemType.cs b/StandardPda/MES.Service/Modes/MesItemType.cs
index 9c8fb4d..0f552cb 100644
--- a/StandardPda/MES.Service/Modes/MesItemType.cs
+++ b/StandardPda/MES.Service/Modes/MesItemType.cs
@@ -9,104 +9,102 @@
public class MesItemType
{
/// <summary>
- /// ID
- ///</summary>
+ /// ID
+ /// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 绫诲瀷缂栫爜
- ///</summary>
+ /// 绫诲瀷缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "TCODE")]
public string? Tcode { get; set; }
/// <summary>
- /// 绫诲瀷鍚嶇О
- ///</summary>
+ /// 绫诲瀷鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "TNAME")]
public string? Tname { get; set; }
/// <summary>
- /// 澶囨敞
- ///</summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "REMARK")]
public string? Remark { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// IQC鍒嗙被
- ///</summary>
+ /// IQC鍒嗙被
+ /// </summary>
[SugarColumn(ColumnName = "IQC_TYPE")]
public string? IqcType { get; set; }
/// <summary>
- /// IQC鍒嗙被鍚嶇О
- ///</summary>
+ /// IQC鍒嗙被鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "IQC_TYPE_NAME")]
public string? IqcTypeName { get; set; }
/// <summary>
- /// 涓婄骇鍒嗙粍
- ///</summary>
+ /// 涓婄骇鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "PGROUP")]
public string? Pgroup { get; set; }
/// <summary>
- /// 鎻忚堪
- ///</summary>
+ /// 鎻忚堪
+ /// </summary>
[SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
- /// 璁￠噺鍗曚綅
- ///</summary>
+ /// 璁￠噺鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "UNIT")]
public string? Unit { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
- ///</summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
[SugarColumn(ColumnName = "FORBID_STATUS")]
public string? ForbidStatus { get; set; }
/// <summary>
- /// 涓嬪彂缁勭粐
- ///</summary>
+ /// 涓嬪彂缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "USE_ORG_ID")]
public string? UseOrgId { get; set; }
diff --git a/StandardPda/MES.Service/Modes/MesItems.cs b/StandardPda/MES.Service/Modes/MesItems.cs
index a5b2101..20bb6ab 100644
--- a/StandardPda/MES.Service/Modes/MesItems.cs
+++ b/StandardPda/MES.Service/Modes/MesItems.cs
@@ -9,518 +9,517 @@
public class MesItems
{
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 宸ュ巶
- ///</summary>
+ /// 宸ュ巶
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
+ /// 鍏徃缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
- ///</summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string? ItemNo { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_NAME")]
public string? ItemName { get; set; }
/// <summary>
- /// 鐗╂枡绠�绉�
- ///</summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_SNAME")]
public string? ItemSname { get; set; }
/// <summary>
- /// 瑙勬牸鍨嬪彿
- ///</summary>
+ /// 瑙勬牸鍨嬪彿
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_MODEL")]
public string? ItemModel { get; set; }
/// <summary>
- /// 鐗╂枡鎻忚堪
- ///</summary>
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
public string? ItemDescription { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
- ///</summary>
+ /// 鐗╂枡鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_UNIT")]
public string? ItemUnit { get; set; }
/// <summary>
- /// 鐗╂枡绫诲瀷
- ///</summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_TYPE")]
public string? ItemType { get; set; }
/// <summary>
- /// 浜у搧鐗堟湰
- ///</summary>
+ /// 浜у搧鐗堟湰
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_VERSION")]
public string? ItemVersion { get; set; }
/// <summary>
- /// 瀹㈡埛缂栧彿
- ///</summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
public string? CustNo { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�浣庡簱瀛�
- ///</summary>
+ /// 鏈�浣庡簱瀛�
+ /// </summary>
[SugarColumn(ColumnName = "LOWLIMIT")]
public double? Lowlimit { get; set; }
/// <summary>
- /// 瀹夊叏搴撳瓨閲�
- ///</summary>
+ /// 瀹夊叏搴撳瓨閲�
+ /// </summary>
[SugarColumn(ColumnName = "Safe_Stock")]
public double? SafeStock { get; set; }
/// <summary>
- /// 鏈�澶у簱瀛�
- ///</summary>
+ /// 鏈�澶у簱瀛�
+ /// </summary>
[SugarColumn(ColumnName = "HIGHLIMIT")]
public double? Highlimit { get; set; }
/// <summary>
- /// 鏈�灏忓寘瑁呮暟
- ///</summary>
+ /// 鏈�灏忓寘瑁呮暟
+ /// </summary>
[SugarColumn(ColumnName = "PRD_PACK")]
public double? PrdPack { get; set; }
/// <summary>
- /// 璁㈠崟鍗曚綅
- ///</summary>
+ /// 璁㈠崟鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "ORDERUNIT")]
public string? Orderunit { get; set; }
/// <summary>
- /// 閿�鍞崟浣�
- ///</summary>
+ /// 閿�鍞崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "SALEUNIT")]
public string? Saleunit { get; set; }
/// <summary>
- /// 搴撴埧鍗曚綅
- ///</summary>
+ /// 搴撴埧鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "STOREUNIT")]
public string? Storeunit { get; set; }
-
+
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "E_ITEM_ID")]
public decimal? EItemId { get; set; }
/// <summary>
- /// ERP鏂欏彿
- ///</summary>
+ /// ERP鏂欏彿
+ /// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
public string? ErpItemNo { get; set; }
/// <summary>
- /// 榛樿浠撳簱
- ///</summary>
+ /// 榛樿浠撳簱
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
public string? DepotCode { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙被缂栧彿
- ///</summary>
+ /// 鐗╂枡鍒嗙被缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "PPBOM00019124")]
public string? Ppbom00019124 { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
+ /// 鐗╂枡鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
/// <summary>
- /// 閲囪喘鍛�
- ///</summary>
+ /// 閲囪喘鍛�
+ /// </summary>
[SugarColumn(ColumnName = "FPURCHASERID")]
public string? Fpurchaserid { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
+ /// 绂佺敤鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
+ /// 鐗╂枡鍒嗙粍
+ /// </summary>
[SugarColumn(ColumnName = "FMATERIALGROUP")]
public string? Fmaterialgroup { get; set; }
/// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- ///</summary>
+ /// 瀹屽伐瓒呮敹姣斾緥
+ /// </summary>
[SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
public decimal? Ffinishreceiptoverrate { get; set; }
/// <summary>
- /// 鍙戞枡鏂瑰紡
- ///</summary>
+ /// 鍙戞枡鏂瑰紡
+ /// </summary>
[SugarColumn(ColumnName = "FISSUETYPE")]
public string? Fissuetype { get; set; }
/// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- ///</summary>
+ /// 鍚敤鎵瑰彿绠＄悊
+ /// </summary>
[SugarColumn(ColumnName = "FISBATCHMANAGE")]
public string? Fisbatchmanage { get; set; }
/// <summary>
- /// 閲囪喘鍗曚綅
- ///</summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "FPURCHASEUNITID")]
public string? Fpurchaseunitid { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- ///</summary>
+ /// 鍒涘缓缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_ORG")]
public decimal? CreateOrg { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- ///</summary>
+ /// 浣跨敤缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "USE_ORG")]
public string? UseOrg { get; set; }
/// <summary>
- /// 鎹熻�楃巼
- ///</summary>
+ /// 鎹熻�楃巼
+ /// </summary>
[SugarColumn(ColumnName = "LOSS_PERCENT")]
public string? LossPercent { get; set; }
/// <summary>
- /// 鍔╄鐮�
- ///</summary>
+ /// 鍔╄鐮�
+ /// </summary>
[SugarColumn(ColumnName = "MNEMONIC_CODE")]
public string? MnemonicCode { get; set; }
/// <summary>
- /// 淇濊川鏈�
- ///</summary>
+ /// 淇濊川鏈�
+ /// </summary>
[SugarColumn(ColumnName = "EXP_PERIOD")]
public string? ExpPeriod { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- ///</summary>
+ /// 鐢熶骇杞﹂棿
+ /// </summary>
[SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 鐗╂枡灞炴�� 0=妯″瀷锛�1=鎸夎鍗曟嫞璐э紝2=鎸夎鍗曡閰嶏紝3=鍙�夌被锛�4=濮斿鍔犲伐浠讹紝
- /// 5=宸ュ簭濮斿浠讹紝6=铏氭嫙锛�7=璁″垝锛�8=绯诲垪锛�9=閲囪喘浠讹紝10=鍒堕�犱欢锛�
- /// 11=鏈�缁堣閰嶄欢锛�12=濂椾欢锛�13=宸ヨ壓锛�14=浣庡�兼槗鑰楀搧锛�15=鍟嗗搧锛�
- /// 16=鏉傞」鏂欏搧锛�17=鏈嶅姟锛�18=璧勪骇锛�19=澶囦欢锛�20=閰嶆柟锛�
- /// 21=閲嶅锛�22=璐圭敤鎬ф枡鍝�
- ///</summary>
+ /// 鐗╂枡灞炴�� 0=妯″瀷锛�1=鎸夎鍗曟嫞璐э紝2=鎸夎鍗曡閰嶏紝3=鍙�夌被锛�4=濮斿鍔犲伐浠讹紝
+ /// 5=宸ュ簭濮斿浠讹紝6=铏氭嫙锛�7=璁″垝锛�8=绯诲垪锛�9=閲囪喘浠讹紝10=鍒堕�犱欢锛�
+ /// 11=鏈�缁堣閰嶄欢锛�12=濂椾欢锛�13=宸ヨ壓锛�14=浣庡�兼槗鑰楀搧锛�15=鍟嗗搧锛�
+ /// 16=鏉傞」鏂欏搧锛�17=鏈嶅姟锛�18=璧勪骇锛�19=澶囦欢锛�20=閰嶆柟锛�
+ /// 21=閲嶅锛�22=璐圭敤鎬ф枡鍝�
+ /// </summary>
[SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鐢熶骇鍗曚綅
- ///</summary>
+ /// 鐢熶骇鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "PRODUCE_UNIT")]
public string? ProduceUnit { get; set; }
/// <summary>
- /// 濮斿鍗曚綅
- ///</summary>
+ /// 濮斿鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "SUBCON_UNIT")]
public string? SubconUnit { get; set; }
/// <summary>
- /// 鍥剧墖1
- ///</summary>
+ /// 鍥剧墖1
+ /// </summary>
[SugarColumn(ColumnName = "BZ06")]
public string? Bz06 { get; set; }
/// <summary>
- /// 鍥剧墖2
- ///</summary>
+ /// 鍥剧墖2
+ /// </summary>
[SugarColumn(ColumnName = "BZ07")]
public string? Bz07 { get; set; }
/// <summary>
- /// 鍥剧墖3
- ///</summary>
+ /// 鍥剧墖3
+ /// </summary>
[SugarColumn(ColumnName = "BZ08")]
public string? Bz08 { get; set; }
/// <summary>
- /// 鍥剧墖4
- ///</summary>
+ /// 鍥剧墖4
+ /// </summary>
[SugarColumn(ColumnName = "BZ09")]
public string? Bz09 { get; set; }
/// <summary>
- /// 鍥剧墖5
- ///</summary>
+ /// 鍥剧墖5
+ /// </summary>
[SugarColumn(ColumnName = "BZ10")]
public string? Bz10 { get; set; }
/// <summary>
- /// QC鍒嗙粍ID
- ///</summary>
+ /// QC鍒嗙粍ID
+ /// </summary>
[SugarColumn(ColumnName = "QC_TEAMID")]
public string? QcTeamid { get; set; }
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { get; set; }
/// <summary>
- /// 棰滆壊
- ///</summary>
+ /// 棰滆壊
+ /// </summary>
[SugarColumn(ColumnName = "COLOR_NAME")]
public string? ColorName { get; set; }
/// <summary>
- /// 璁惧
- ///</summary>
+ /// 璁惧
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT8")]
public string? FWwcText8 { get; set; }
/// <summary>
- /// 鍔熺巼
- ///</summary>
+ /// 鍔熺巼
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL")]
public string? FWwcDecimal { get; set; }
/// <summary>
- /// 鍗曞皬鏃朵骇鑳�
- ///</summary>
+ /// 鍗曞皬鏃朵骇鑳�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL1")]
public string? FWwcDecimal1 { get; set; }
/// <summary>
- /// 浜烘暟
- ///</summary>
+ /// 浜烘暟
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL2")]
public string? FWwcDecimal2 { get; set; }
/// <summary>
- /// 浜哄伐灏忔椂宸ヨ祫
- ///</summary>
+ /// 浜哄伐灏忔椂宸ヨ祫
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL3")]
public string? FWwcDecimal3 { get; set; }
/// <summary>
- /// 浜哄伐瀹氶
- ///</summary>
+ /// 浜哄伐瀹氶
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_DECIMAL4")]
public string? FWwcDecimal4 { get; set; }
/// <summary>
- /// 鏍囧噯浜ц兘
- ///</summary>
+ /// 鏍囧噯浜ц兘
+ /// </summary>
[SugarColumn(ColumnName = "FBCN")]
public string? Fbcn { get; set; }
/// <summary>
- /// 閽㈢綉
- ///</summary>
+ /// 閽㈢綉
+ /// </summary>
[SugarColumn(ColumnName = "FGW")]
public string? Fgw { get; set; }
/// <summary>
- /// 娌诲叿
- ///</summary>
+ /// 娌诲叿
+ /// </summary>
[SugarColumn(ColumnName = "FYJ")]
public string? Fyj { get; set; }
/// <summary>
- /// 璁惧
- ///</summary>
+ /// 璁惧
+ /// </summary>
[SugarColumn(ColumnName = "FSB")]
public string? Fsb { get; set; }
/// <summary>
- /// 鍥惧彿
- ///</summary>
+ /// 鍥惧彿
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT1")]
public string? FWwcText1 { get; set; }
/// <summary>
- /// 妯″叿缂栧彿
- ///</summary>
+ /// 妯″叿缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT2")]
public string? FWwcText2 { get; set; }
/// <summary>
- /// 妯″叿鍑烘暟
- ///</summary>
+ /// 妯″叿鍑烘暟
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT3")]
public string? FWwcText3 { get; set; }
/// <summary>
- /// 娉ㄥ鍛ㄦ湡
- ///</summary>
+ /// 娉ㄥ鍛ㄦ湡
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT4")]
public string? FWwcText4 { get; set; }
/// <summary>
- /// 鍗曞弻鑹�
- ///</summary>
+ /// 鍗曞弻鑹�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT5")]
public string? FWwcText5 { get; set; }
/// <summary>
- /// 娉ㄥ浠跺惃浣�
- ///</summary>
+ /// 娉ㄥ浠跺惃浣�
+ /// </summary>
[SugarColumn(ColumnName = "F_WWC_TEXT6")]
public string? FWwcText6 { get; set; }
/// <summary>
- /// 澶栭儴鏂欏彿
- ///</summary>
+ /// 澶栭儴鏂欏彿
+ /// </summary>
[SugarColumn(ColumnName = "CATALOG_NO")]
public string? CatalogNo { get; set; }
-
/// <summary>
- /// 棰嗘枡鍗曚綅
- ///</summary>
+ /// 棰嗘枡鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "MATERIAL_OUT_UOMID")]
public string? MaterialOutUomid { get; set; }
/// <summary>
- /// 鐢熶骇閮ㄩ棬
- ///</summary>
+ /// 鐢熶骇閮ㄩ棬
+ /// </summary>
[SugarColumn(ColumnName = "PUB_DESC_SEG38")]
public string? PubDescSeg38 { get; set; }
/// <summary>
- /// 椤圭洰锛堢爺鍙戯級
- ///</summary>
+ /// 椤圭洰锛堢爺鍙戯級
+ /// </summary>
[SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
- /// 椤圭洰锛堟姤琛級
- ///</summary>
+ /// 椤圭洰锛堟姤琛級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG4")]
public string? PrivateDescSeg4 { get; set; }
/// <summary>
- /// 鎶ヨ〃椤圭洰锛堟眹鎬伙級
- ///</summary>
+ /// 鎶ヨ〃椤圭洰锛堟眹鎬伙級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG9")]
public string? PrivateDescSeg9 { get; set; }
/// <summary>
- /// 鍙屾暟閲�
- ///</summary>
+ /// 鍙屾暟閲�
+ /// </summary>
[SugarColumn(ColumnName = "IS_DUAL_QUANTITY")]
public string? IsDualQuantity { get; set; }
/// <summary>
- /// 鍙屽崟浣�
- ///</summary>
+ /// 鍙屽崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "IS_DUAL_UOM")]
public string? IsDualUom { get; set; }
/// <summary>
- /// 澶氬崟浣�
- ///</summary>
+ /// 澶氬崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "IS_MULTY_UOM")]
public string? IsMultyUom { get; set; }
/// <summary>
- /// 鍥哄畾杞崲鐜�
- ///</summary>
+ /// 鍥哄畾杞崲鐜�
+ /// </summary>
[SugarColumn(ColumnName = "IS_VAR_RATIO")]
public string? IsVarRatio { get; set; }
/// <summary>
- /// 杞崲鐜囩瓥鐣�
- ///</summary>
+ /// 杞崲鐜囩瓥鐣�
+ /// </summary>
[SugarColumn(ColumnName = "CONVER_RATIO_RULE")]
public string? ConverRatioRule { get; set; }
/// <summary>
- /// 鏍囧噯搴撳懆
- ///</summary>
+ /// 鏍囧噯搴撳懆
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG11")]
public string? PrivateDescSeg11 { get; set; }
/// <summary>
- /// 鍝佺墝鍒嗙被
- ///</summary>
+ /// 鍝佺墝鍒嗙被
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG7")]
public string? PrivateDescSeg7 { get; set; }
/// <summary>
- /// BU锛堜笟鍔″崟鍏冿級
- ///</summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG2")]
public string? PrivateDescSeg2 { get; set; }
/// <summary>
- /// BU锛堜笟鍔″崟鍏冿級
- ///</summary>
+ /// BU锛堜笟鍔″崟鍏冿級
+ /// </summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
/// <summary>
- /// 鏄惁鐢熸晥
- ///</summary>
+ /// 鏄惁鐢熸晥
+ /// </summary>
[SugarColumn(ColumnName = "FORBID_STATUS")]
public string? ForbidStatus { get; set; }
/// <summary>
- /// 鏃х墿鏂欑紪鐮�
- ///</summary>
+ /// 鏃х墿鏂欑紪鐮�
+ /// </summary>
[SugarColumn(ColumnName = "Old_ITEM_NO")]
public string? OldItemNo { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesRohIn.cs b/StandardPda/MES.Service/Modes/MesRohIn.cs
index 71427aa..659b5a9 100644
--- a/StandardPda/MES.Service/Modes/MesRohIn.cs
+++ b/StandardPda/MES.Service/Modes/MesRohIn.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_BASEINFO_ID
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
+ [SugarColumn(ColumnName = "ID",
+ OracleSequenceName = "SEQ_BASEINFO_ID",
IsPrimaryKey = true)]
public decimal Id { get; set; }
@@ -52,7 +53,7 @@
public string? Supplier { get; set; }
/// <summary>
- /// 鍏抽棴鐘舵��
+ /// 鍙栦笟鍔″叧闂瓧娈� 0==鏈叧闂� 1==涓氬姟鍏抽棴
/// </summary>
[SugarColumn(ColumnName = "CLOSE_STATUS")]
public string? CloseStatus { get; set; }
@@ -92,36 +93,6 @@
/// </summary>
[SugarColumn(ColumnName = "QUALITY_REQ")]
public string? QualityReq { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗚仈绯讳汉
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? SupplierContact { get; set; }
-
- /// <summary>
- /// 鑱旂郴浜虹數璇�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? ContactPhone { get; set; }
-
- /// <summary>
- /// 鑱屽姟
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? Position { get; set; }
-
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? OfficePhone { get; set; }
-
- /// <summary>
- /// 渚涜揣鏂瑰湴鍧�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? SupplierAddress { get; set; }
/// <summary>
/// 缁撶畻鏂�
@@ -178,33 +149,37 @@
public DateTime? CancellationDate { 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 = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
+ /// 鏈�鍚庝慨鏀逛汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// ERP瀹℃牳浜�
+ /// 瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "ERP_CHECK_BY")]
public string? ErpCheckBy { get; set; }
/// <summary>
- /// ERP瀹℃牳鏃ユ湡
+ /// 瀹℃牳鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "ERP_CHECK_DATE")]
public string? ErpCheckDate { get; set; }
@@ -219,7 +194,7 @@
/// 瀹℃牳鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
- public string? CheckDate { get; set; }
+ public DateTime? CheckDate { get; set; }
/// <summary>
/// 瀹℃牳浜�
@@ -232,12 +207,6 @@
/// </summary>
[SugarColumn(ColumnName = "CHECK_FALG")]
public short? CheckFalg { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�1
- /// </summary>
- [SugarColumn(ColumnName = "changereason")]
- public string? Changereason { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�1
@@ -270,7 +239,13 @@
public string? Remark5 { get; set; }
/// <summary>
- /// 涓氬姟绫诲瀷
+ /// 鍙樻洿鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "CHANGEREASON")]
+ public string? Changereason { get; set; }
+
+ /// <summary>
+ /// 棰勮鍒拌揪鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "ARRIVE_DATE")]
public DateTime? ArriveDate { get; set; }
@@ -282,8 +257,50 @@
public decimal? ReceiveOrg { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
+ /// 瀹℃壒鎰忚
/// </summary>
- [SugarColumn(ColumnName = "ACCTYPE")]
- public string? ACCTYPE { get; set; }
+ [SugarColumn(ColumnName = "F_WWC_TEXT")]
+ public string? FWwcText { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮绫诲埆,0=鎵嬪伐 1=璇疯喘鍗� 3=闇�姹傛帴鍙ｈ〃 4=閲囪喘鍚堝悓 6=閲囪喘璁㈠崟 7=閿�鍞鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_DOC_TYPE")]
+ public string? SrcDocType { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_DOC")]
+ public string? SrcDoc { get; set; }
+
+ /// <summary>
+ /// 璐告槗璺緞
+ /// </summary>
+ [SugarColumn(ColumnName = "TRADE_PATH_NAME")]
+ public string? TradePathName { get; set; }
+
+ /// <summary>
+ /// 濮斿绫诲瀷瀛楁鏆傛湭浣跨敤锛岄粯璁ゅ��-1
+ /// </summary>
+ [SugarColumn(ColumnName = "SUB_TYPE")]
+ public string? SubType { get; set; }
+
+ /// <summary>
+ /// 杩斿伐璁㈠崟 鏄惁鍕鹃�夐」 0==涓嶅嬀閫� 1==鍕鹃�夛紝榛樿涓嶅嬀閫�
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_RE_DO")]
+ public short? IsReDo { get; set; }
+
+ /// <summary>
+ /// 椤圭洰閲囪喘璐熻矗浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "PRIVATE_DESC_SEG1")]
+ public string? PrivateDescSeg1 { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐗堟湰
+ /// </summary>
+ [SugarColumn(ColumnName = "VERSION")]
+ public string? Version { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesRohInData.cs b/StandardPda/MES.Service/Modes/MesRohInData.cs
index 4451e75..a38371b 100644
--- a/StandardPda/MES.Service/Modes/MesRohInData.cs
+++ b/StandardPda/MES.Service/Modes/MesRohInData.cs
@@ -33,20 +33,6 @@
public string? ItemId { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- // [SugarColumn(ColumnName = "ITEM_NAME")]
- [SugarColumn(IsIgnore = true)]
- public string? ItemName { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- // [SugarColumn(ColumnName = "ITEM_SPEC")]
- [SugarColumn(IsIgnore = true)]
- public string? ItemSpec { get; set; }
-
- /// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "PURCHASE_UNIT")]
@@ -287,26 +273,31 @@
public decimal? EbelnK3id { get; set; }
/// <summary>
+ /// 鑷畾涔夊瓧娈�1
/// </summary>
[SugarColumn(ColumnName = "REMARK1")]
public string? Remark1 { get; set; }
/// <summary>
+ /// 鑷畾涔夊瓧娈�2
/// </summary>
[SugarColumn(ColumnName = "REMARK2")]
public string? Remark2 { get; set; }
/// <summary>
+ /// 鑷畾涔夊瓧娈�3
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
+ /// 鑷畾涔夊瓧娈�4
/// </summary>
[SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
+ /// 鑷畾涔夊瓧娈�5
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
@@ -314,7 +305,8 @@
/// <summary>
/// SEQ_BASEINFO_ID
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
+ [SugarColumn(ColumnName = "ID",
+ OracleSequenceName = "SEQ_BASEINFO_ID",
IsPrimaryKey = true)]
public decimal Id { get; set; }
@@ -327,7 +319,7 @@
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
/// </summary>
- [SugarColumn(ColumnName = "purchase_order_line_number")]
+ [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
public string? PurchaseOrderLineNumber { get; set; }
/// <summary>
@@ -343,16 +335,16 @@
public string? Receiving { get; set; }
/// <summary>
- /// 鏀舵枡閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
- public string? ReceivingDepartment { get; set; }
-
- /// <summary>
/// 缁撶畻缁勭粐
/// </summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
+
+ /// <summary>
+ /// 宸蹭氦璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "CGB014")]
+ public decimal? Cgb014 { get; set; }
/// <summary>
/// 闇�姹傞儴闂�
@@ -361,7 +353,7 @@
public string? DemandDept { get; set; }
/// <summary>
- /// 闇�姹傞儴闂�
+ /// 鏀舵枡閮ㄩ棬
/// </summary>
[SugarColumn(ColumnName = "RECEIVING_DEPT")]
public string? ReceivingDept { get; set; }
@@ -373,20 +365,20 @@
public DateTime? ArriveDate { get; set; }
/// <summary>
- /// 鐢熶骇閫氱煡鍗�
+ /// 椤圭洰锛堢爺鍙戯級
/// </summary>
- [SugarColumn(ColumnName = "F_CGDD_SCTZDA")]
- public string? FCGDDSctzda { get; set; }
+ [SugarColumn(ColumnName = "RD_PROJECT")]
+ public string? RdProject { get; set; }
/// <summary>
- /// 鍨嬪彿
+ /// 椤圭洰
/// </summary>
- [SugarColumn(ColumnName = "F_CGDD_XHA")]
- public string? FCGDDXHA { get; set; }
+ [SugarColumn(ColumnName = "PROJECT")]
+ public string? Project { get; set; }
/// <summary>
- /// BOM澶囨敞
+ /// 椤圭洰閲囪喘浜�
/// </summary>
- [SugarColumn(ColumnName = "F_XIFG_TEXT_APV")]
- public string? FXifgTextApv { get; set; }
+ [SugarColumn(ColumnName = "PROJECT_PURCHASER")]
+ public string? ProjectPurchaser { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesUnit.cs b/StandardPda/MES.Service/Modes/MesUnit.cs
index 45ab51e..2e414e2 100644
--- a/StandardPda/MES.Service/Modes/MesUnit.cs
+++ b/StandardPda/MES.Service/Modes/MesUnit.cs
@@ -9,158 +9,156 @@
public class MesUnit
{
/// <summary>
- /// BASEINFO
- ///</summary>
+ /// BASEINFO
+ /// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 鍘熷崟浣�
- ///</summary>
+ /// 鍘熷崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "OLDUNIT")]
public string? Oldunit { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅
- ///</summary>
+ /// 鐩殑鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "NEWUNIT")]
public string? Newunit { get; set; }
/// <summary>
- /// 鍘熷崟浣嶆暟閲�
- ///</summary>
+ /// 鍘熷崟浣嶆暟閲�
+ /// </summary>
[SugarColumn(ColumnName = "OLDQTY")]
public decimal? Oldqty { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅鏁伴噺
- ///</summary>
+ /// 鐩殑鍗曚綅鏁伴噺
+ /// </summary>
[SugarColumn(ColumnName = "NEWQTY")]
public decimal? Newqty { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 缂栫爜
- ///</summary>
+ /// 缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "FNUMBER")]
public string? Fnumber { get; set; }
/// <summary>
- /// 鍚嶇О
- ///</summary>
+ /// 鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "FNAME")]
public string? Fname { get; set; }
/// <summary>
- /// 鎵�灞炵粍鍒�
- ///</summary>
+ /// 鎵�灞炵粍鍒�
+ /// </summary>
[SugarColumn(ColumnName = "FUNITGROUPID")]
public string? Funitgroupid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗘瘝
- ///</summary>
+ /// 鎹㈢畻鍒嗘瘝
+ /// </summary>
[SugarColumn(ColumnName = "FCONVERTDENOMINATOR")]
public decimal? Fconvertdenominator { get; set; }
/// <summary>
- /// 褰撳墠鍗曚綅
- ///</summary>
+ /// 褰撳墠鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "FCURRENTUNITID")]
public string? Fcurrentunitid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗗瓙
- ///</summary>
+ /// 鎹㈢畻鍒嗗瓙
+ /// </summary>
[SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
public decimal? Fconvertnumerator { get; set; }
/// <summary>
- /// 鍩哄噯鍗曚綅
- ///</summary>
+ /// 鍩哄噯鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "FBASEUNIT")]
public string? Fbaseunit { get; set; }
/// <summary>
- /// 鑸嶅叆绫诲瀷
- ///</summary>
+ /// 鑸嶅叆绫诲瀷
+ /// </summary>
[SugarColumn(ColumnName = "FROUNDTYPE")]
public string? Froundtype { get; set; }
/// <summary>
- /// 绮惧害
- ///</summary>
+ /// 绮惧害
+ /// </summary>
[SugarColumn(ColumnName = "FPRECISION")]
public decimal? Fprecision { get; set; }
/// <summary>
- /// 鎻忚堪
- ///</summary>
+ /// 鎻忚堪
+ /// </summary>
[SugarColumn(ColumnName = "FDESCRIPTION")]
public string? Fdescription { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
+ /// 绂佺敤鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鍓崟浣�
- ///</summary>
+ /// 鍓崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "BASE_UOMID")]
public string? BaseUomid { get; set; }
/// <summary>
- /// 涓诲壇鍗曚綅杞崲鐜�
- ///</summary>
+ /// 涓诲壇鍗曚綅杞崲鐜�
+ /// </summary>
[SugarColumn(ColumnName = "RATIO_TO_BASE")]
public string? RatioToBase { get; set; }
/// <summary>
- /// 鑸嶅叆鍊�
- ///</summary>
+ /// 鑸嶅叆鍊�
+ /// </summary>
[SugarColumn(ColumnName = "ROUND_VALUE")]
public string? RoundValue { get; set; }
/// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
diff --git a/StandardPda/MES.Service/Modes/SysDepartment.cs b/StandardPda/MES.Service/Modes/SysDepartment.cs
index 223e0e4..35ad899 100644
--- a/StandardPda/MES.Service/Modes/SysDepartment.cs
+++ b/StandardPda/MES.Service/Modes/SysDepartment.cs
@@ -165,5 +165,4 @@
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs b/StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs
index 1146417..8c31a54 100644
--- a/StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs
@@ -1,110 +1,107 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
-using MES.Service.util;
+using SqlSugar;
-namespace MES.Service.service
+namespace MES.Service.service.BasicData;
+
+public class EmployeeInfoManager : Repository<EmployeeInfo>
{
- public class EmployeeInfoManager : Repository<EmployeeInfo>
+ public bool Save(ErpEmployeeInfo unit)
{
- public bool Save(ErpEmployeeInfo unit)
- {
- var entity = GetMesItems(unit); // 灏� ErpStaff 杞崲涓� MesStaff
+ var entity = GetMesItems(unit); // 灏� ErpStaff 杞崲涓� MesStaff
- return UseTransaction(db =>
+ return UseTransaction(db =>
+ {
+ switch (unit.Type)
{
- switch (unit.Type)
- {
- case "2":
- case "4":
- if (InsertOrUpdateEmp(db, entity.employeeInfo,
- entity.employeeItems)) // 鎻掑叆鎴栨洿鏂板憳宸�
- return 1;
- break;
- case "3":
- if (DeleteEmp(db, entity.employeeInfo,
- entity.employeeItems)) // 鍒犻櫎鍛樺伐
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpEmployeeInfo> departments)
- {
- var result = departments.Select(Save).ToList();
- return result.All(b => b);
- }
-
- private bool InsertOrUpdateEmp(SqlSugarScope db,
- EmployeeInfo entityEmployeeInfo,
- List<EmployeeItem> entityEmployeeItems)
- {
- db.Deleteable<EmployeeInfo>().Where(
- s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
-
- db.Deleteable<EmployeeItem>()
- .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
-
- var executeCommand =
- db.Insertable(entityEmployeeInfo).ExecuteCommand();
- var command = db.Insertable(entityEmployeeItems).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
-
- return executeCommand > 0 && command > 0;
- }
-
- private bool DeleteEmp(SqlSugarScope db,
- EmployeeInfo entityEmployeeInfo,
- List<EmployeeItem> entityEmployeeItems)
- {
- var command = db.Deleteable<EmployeeInfo>().Where(
- s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
-
- var executeCommand = db.Deleteable<EmployeeItem>()
- .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
-
- return executeCommand > 0 && command > 0;
- }
-
-
- private (EmployeeInfo employeeInfo, List<EmployeeItem> employeeItems)
- GetMesItems(
- ErpEmployeeInfo item)
- {
- var items = new EmployeeInfo
- {
- Id = Convert.ToDecimal(item.Id),
- EmployeeNo = item.fNumber,
- EmployeeName = item.fName,
- DepartmentCode = item.fPostDeptid,
- DocumentStatus = item.FDocumentStatus,
- IsDisabled = item.FForbidStatus,
- Organization = item.FUseOrgId
- };
-
- var employeeItems = new List<EmployeeItem>();
-
- foreach (var erpEmployeeInfoDto in item.OperatorTypes)
- {
- var employee = new EmployeeItem
- {
- Eid = items.Id,
- EType = erpEmployeeInfoDto.OperatorType,
- CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
- };
-
- employeeItems.Add(employee);
+ case "2":
+ case "4":
+ if (InsertOrUpdateEmp(db, entity.employeeInfo,
+ entity.employeeItems)) // 鎻掑叆鎴栨洿鏂板憳宸�
+ return 1;
+ break;
+ case "3":
+ if (DeleteEmp(db, entity.employeeInfo,
+ entity.employeeItems)) // 鍒犻櫎鍛樺伐
+ return 1;
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
}
- return (items, employeeItems);
+ throw new NotImplementedException("鎿嶄綔澶辫触");
+ }) > 0;
+ }
+
+ public bool SaveList(List<ErpEmployeeInfo> departments)
+ {
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private bool InsertOrUpdateEmp(SqlSugarScope db,
+ EmployeeInfo entityEmployeeInfo,
+ List<EmployeeItem> entityEmployeeItems)
+ {
+ db.Deleteable<EmployeeInfo>().Where(
+ s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
+
+ db.Deleteable<EmployeeItem>()
+ .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
+
+ var executeCommand =
+ db.Insertable(entityEmployeeInfo).ExecuteCommand();
+ var command = db.Insertable(entityEmployeeItems).PageSize(1)
+ .IgnoreColumnsNull().ExecuteCommand();
+
+ return executeCommand > 0 && command > 0;
+ }
+
+ private bool DeleteEmp(SqlSugarScope db,
+ EmployeeInfo entityEmployeeInfo,
+ List<EmployeeItem> entityEmployeeItems)
+ {
+ var command = db.Deleteable<EmployeeInfo>().Where(
+ s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
+
+ var executeCommand = db.Deleteable<EmployeeItem>()
+ .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
+
+ return executeCommand > 0 && command > 0;
+ }
+
+
+ private (EmployeeInfo employeeInfo, List<EmployeeItem> employeeItems)
+ GetMesItems(
+ ErpEmployeeInfo item)
+ {
+ var items = new EmployeeInfo
+ {
+ Id = Convert.ToDecimal(item.Id),
+ EmployeeNo = item.fNumber,
+ EmployeeName = item.fName,
+ DepartmentCode = item.fPostDeptid,
+ DocumentStatus = item.FDocumentStatus,
+ IsDisabled = item.FForbidStatus,
+ Organization = item.FUseOrgId
+ };
+
+ var employeeItems = new List<EmployeeItem>();
+
+ foreach (var erpEmployeeInfoDto in item.OperatorTypes)
+ {
+ var employee = new EmployeeItem
+ {
+ Eid = items.Id,
+ EType = erpEmployeeInfoDto.OperatorType,
+ CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ };
+
+ employeeItems.Add(employee);
}
+
+ return (items, employeeItems);
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs b/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
index ba7765d..7adff42 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,5 +1,4 @@
锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
@@ -148,7 +147,7 @@
UseOrg = erpDetail.FUseOrgId,
CreateDate = DateTime.Now,
Company = "1000",
- Factory = "1000",
+ Factory = "1000"
};
list.Add(items);
}
diff --git a/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs b/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs
index f6e43cc..865a836 100644
--- a/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs
@@ -140,7 +140,7 @@
OperatorsId = supplier.OperatorsID,
DocumentStatus = supplier.FDocumentStatus,
ForbidStatus = supplier.FForbidStatus,
- UseOrgId = se.FUseOrgId,
+ UseOrgId = se.FUseOrgId
};
list.Add(mesSupplier);
@@ -152,8 +152,9 @@
private bool InsertOrUpdate(SqlSugarScope db, List<MesProject> entity)
{
DeleteSupplier(entity);
-
- var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
+
+ var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull()
+ .ExecuteCommand();
return insert > 0;
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 8e84976..234d234 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -25,7 +25,7 @@
mesRohInDatas)
? 1
: 0,
- "3" => UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
+ "3" => DeleteData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
_ => throw new NotImplementedException(
$"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷")
};
@@ -33,7 +33,7 @@
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
+ private bool DeleteData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
@@ -88,7 +88,7 @@
}
// 灏� ErpRohIn 瀵硅薄杞崲涓� MesRohIn 瀵硅薄鐨勬柟娉�
- public MesRohIn GetMesRohIn(ErpRohIn rohIn)
+ private MesRohIn GetMesRohIn(ErpRohIn rohIn)
{
var eid = Convert.ToDecimal(rohIn.id);
var mesRohIn = new MesRohIn();
@@ -99,7 +99,7 @@
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
- mesRohIn.DocumentType = rohIn.FBillTypeID;
+ mesRohIn.DocumentType = rohIn.FBillTypeId;
mesRohIn.BusinessType = rohIn.FBusinessType;
if (rohIn.FDate != null)
mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
@@ -108,22 +108,7 @@
mesRohIn.CloseStatus = rohIn.FCloseStatus;
mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
- mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
mesRohIn.Purchaser = rohIn.FPurchaserId;
-
- //鏂板 楠屾敹鏂瑰紡
- mesRohIn.ACCTYPE = rohIn.Acctype;
-
- mesRohIn.SettlementParty = rohIn.FSettleId;
- mesRohIn.PaymentParty = rohIn.FChargeId;
- //mesRohIn.Email = rohIn.FProviderEMail;
- mesRohIn.CancellationStatus = rohIn.FCancelStatus;
- mesRohIn.CancellationPerson = rohIn.FCancellerId;
-
- if (rohIn.FCancelDate != null)
- mesRohIn.CancellationDate =
- DateTime.ParseExact(rohIn.FCancelDate,
- "yyyy-MM-dd HH:mm:ss", null);
mesRohIn.CreateBy = rohIn.FCreatorId;
@@ -137,22 +122,34 @@
mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate,
"yyyy-MM-dd HH:mm:ss", null);
-
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
- mesRohIn.Changereason = rohIn.FChangeReason;
-
- //if (rohIn.Prearrivaldate != null)
- // mesRohIn.Prearrivaldate = DateTime.ParseExact(rohIn.Prearrivaldate,
- // "yyyy-MM-dd HH:mm:ss", null);
-
+ mesRohIn.Changereason = rohIn.PubDescSeg2;
mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
+ mesRohIn.Remarks = rohIn.Remarks;
+
+ mesRohIn.SrcDocType = rohIn.FSrcDocType;
+ mesRohIn.SrcDoc = rohIn.FSrcDoc;
+ mesRohIn.TradePathName = rohIn.FTradePathName;
+ mesRohIn.SubType = rohIn.FSubType;
+ mesRohIn.IsReDo = short.Parse(rohIn.FIsReDo ?? "0");
+ mesRohIn.PrivateDescSeg1 = rohIn.PrivateDescSeg1;
+ mesRohIn.Version = rohIn.FVersion;
+
+ //浣滃簾鐨勭浉鍏冲瓧娈�
+ // mesRohIn.CancellationStatus = rohIn.FCancelStatus;
+ // mesRohIn.CancellationPerson = rohIn.FCancellerId;
+ //
+ // if (rohIn.FCancelDate != null)
+ // mesRohIn.CancellationDate =
+ // DateTime.ParseExact(rohIn.FCancelDate,
+ // "yyyy-MM-dd HH:mm:ss", null);
return mesRohIn;
}
// 灏� ErpRohinData 瀵硅薄杞崲涓� MesRohInData 瀵硅薄鐨勬柟娉�
- public List<MesRohInData> GetMesRohInDatas(
+ private List<MesRohInData> GetMesRohInDatas(
List<ErpRohinData> erpRohinDatas, string type)
{
return erpRohinDatas.Select(s =>
@@ -168,47 +165,16 @@
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
- InventoryUnit = s.FStockUnitID,
PricingUnit = s.FPriceUnitId,
PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
- DeliveryDate = s.FDeliveryDate != null
- ? DateTime.ParseExact(s.FDeliveryDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- EarliestDeliveryDate = s.FDeliveryEarlyDate != null
- ? DateTime.ParseExact(s.FDeliveryEarlyDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- LatestDeliveryDate = s.FDeliveryLastDate != null
- ? DateTime.ParseExact(s.FDeliveryLastDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
Demand = s.FRequireOrgId,
Receiving = s.FReceiveOrgId,
- ReceivingDepartment = s.FReceiveDeptId,
- Settlement = s.FEntrySettleOrgId,
+ ReceivingDept = s.FReceiveDeptId,
DemandOrg = s.FRequireOrgId,
ReceivingOrg = s.FReceiveOrgId,
- SettlementOrg = s.FEntrySettleOrgId,
IsGift = s.FGiveAway,
Remarks = s.FEntryNote,
- SupplierItemCode = s.FSupMatId,
- SupplierItemName = s.FSupMatName,
- OutsourcingOrderId = s.FSubreqBillNo,
BatchNumber = s.FLot,
- BusinessClose = s.FMRPCloseStatus,
- BusinessFreeze = s.FMRPFreezeStatus,
- Freezer = s.FFreezerId,
- FreezeTime = s.FFreezeDate != null
- ? DateTime.ParseExact(s.FFreezeDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- BusinessTerminate = s.FMRPTerminateStatus,
- Terminator = s.FTerminaterId,
- TerminateTime = s.FTerminateDate != null
- ? DateTime.ParseExact(s.FTerminateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
RemainingReceivedQty =
Convert.ToDecimal(s.FRemainReceiveQty),
@@ -220,16 +186,12 @@
ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //搴撳瓨鍙��鏁�
SourceDocumentType = s.FSrcBillTypeId,
SourceDocumentId = s.FSrcBillNo,
- DemandTrackingId = s.FReqTraceNo,
- PlanTrackingId = s.FMtoNo,
- ChangeFlag = s.FChangeFlag,
DemandSource = s.FDemandType,
DemandDocumentId = s.FDemandBillNo,
DemandDocumentLineId = s.FDemandBillEntrySeq,
- DemandDept = s.FRequireDeptId,
- FCGDDSctzda = s.F_CGDD_SCTZDA,
- FCGDDXHA = s.F_CGDD_XHA,
- FXifgTextApv = s.F_XIFG_Text_apv
+ RdProject = s.RdProject,
+ Project = s.Project,
+ ProjectPurchaser = s.ProjectPurchaser
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs b/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
index 9a6dc5a..8bac07c 100644
--- a/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -69,7 +69,7 @@
// 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
var ids = supplierId.Select(customer => customer.Id.ToString())
.ToList();
-
+
// 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
var u9Ids = Db.Queryable<MesLinkU9>()
.Where(u =>
@@ -200,8 +200,9 @@
private bool InsertOrUpdate(SqlSugarScope db, List<MesSupplier> entity)
{
DeleteSupplier(entity);
-
- var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
+
+ var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull()
+ .ExecuteCommand();
return insert > 0;
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs b/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
index e03adea..b4c77e3 100644
--- a/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
@@ -91,7 +91,7 @@
Factory = "1000"
};
}
-
+
///鏂颁唬鐮�
private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
diff --git a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
index 3219bff..328ff70 100644
--- a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -83,7 +83,7 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
}
-
+
///鏂颁唬鐮�
// 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
private bool InsertOrUpdateDepartment(SqlSugarScope db,
diff --git a/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs b/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
index fe68a86..ad17725 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
@@ -1,269 +1,262 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
+锘縰sing System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
+using MES.Service.service.BasicData;
using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
-namespace MESApplication.Controllers
+namespace MESApplication.Controllers.BasicData;
+
+[ApiController]
+[Route("api/[controller]")]
+public class EmployeeInfoController : ControllerBase
{
- [ApiController]
- [Route("api/[controller]")]
- public class EmployeeInfoController : ControllerBase
+ private readonly MessageCenterManager _manager = new();
+ private readonly EmployeeInfoManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "Employee_Info";
+
+ private readonly string
+ URL = "http://localhost:10054/api/EmployeeInfo/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpEmployeeInfo unit)
{
- private EmployeeInfoManager m = new EmployeeInfoManager();
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(unit);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ entity.Route = unit.fNumber;
- private readonly MessageCenterManager _manager = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "Employee_Info";
-
- private readonly string
- URL = "http://localhost:10054/api/EmployeeInfo/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpEmployeeInfo unit)
+ try
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- entity.Route = unit.fNumber;
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(unit);
+ resultInfos.tbBillList = save;
- try
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- resultInfos.tbBillList = save;
-
- entity.Result = 0;
- if (save) entity.Result = 1;
-
- entity.DealWith = 1;
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
-
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
- [HttpPost("SaveList")]
- public ResponseResult SaveList(List<ErpEmployeeInfo> units)
+ catch (Exception ex)
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveList";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(units);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- entity.Route = units.Select(it => it.fNumber).Join(",");
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.SaveList(units);
- resultInfos.tbBillList = save;
+ entity.Result = 0;
- entity.Result = 0;
- if (save) entity.Result = 1;
+ entity.DealWith = 0;
- entity.DealWith = 1;
- _manager.save(entity);
+ entity.ResultData = ex.Message;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
+ _manager.save(entity);
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
+ return ResponseResult.ResponseError(ex);
}
+ }
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpEmployeeInfo> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ entity.Route = units.Select(it => it.fNumber).Join(",");
+ try
{
- try
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
+ catch (Exception ex)
{
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
}
+ }
- /// <summary>
- /// 鏍规嵁涓婚敭鍒犻櫎
- /// </summary>
- /// <returns></returns>
- [HttpPost("DeleteByIds")]
- public ResponseResult DeleteByIds([FromBody] object[] ids)
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
{
- try
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeleteByIds(ids);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
- /// <summary>
- /// 娣诲姞
- /// </summary>
- /// <returns></returns>
- [HttpPost("Insert")]
- public ResponseResult Add([FromBody] EmployeeInfo data)
+ catch (Exception ex)
{
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ return ResponseResult.ResponseError(ex);
}
+ }
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] EmployeeInfo data)
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
{
- try
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] EmployeeInfo data)
+ catch (Exception ex)
{
- try
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] EmployeeInfo data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
{
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] EmployeeInfo data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] EmployeeInfo data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
}
}
}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
index 05acb5e..5c4d4d5 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
@@ -1,6 +1,5 @@
锘縰sing System.Dynamic;
using Masuit.Tools;
-using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -23,7 +22,7 @@
private readonly string TableName = "MES_ITEMS";
private readonly string URL = "http://localhost:10054/api/MesItems/";
-
+
[HttpPost("Save")]
public ResponseResult Save(ErpItems unit)
{
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
index 1afe641..af34ef3 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
@@ -14,10 +14,9 @@
[Route("api/[controller]")]
public class MesProjectController : ControllerBase
{
- private readonly MesProjectManager m = new();
-
private readonly MessageCenterManager _manager = new();
-
+ private readonly MesProjectManager m = new();
+
private readonly string METHOD = "POST";
private readonly string TableName = "MES_SUPPLIER";
--
Gitblit v1.9.3