From eb744ecfecc0f1b6d9c0999c65bc740d93e30eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 22 一月 2025 13:38:52 +0800
Subject: [PATCH] 新增接口
---
StandardPda/MES.Service/Modes/MesStaff.cs | 17
StandardPda/MES.Service/Modes/MesLinkU9.cs | 12
StandardPda/MES.Service/util/GetSeqUtil.cs | 11
StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs | 25
StandardPda/MES.Service/Modes/Purdhb.cs | 352 +-
StandardPda/MES.Service/Modes/MesDeliveryNoteBarcode.cs | 3
StandardPda/MES.Service/Modes/MesInvTransaction.cs | 96
StandardPda/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 2
StandardPda/MES.Service/Modes/MesDepTaskInfo.cs | 448 ++--
StandardPda/MES.Service/Modes/Womcaa.cs | 2
StandardPda/MES.Service/service/BasicData/MesProjectManager.cs | 155 +
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs | 12
StandardPda/MES.Service/Dto/webApi/ErpCAA.cs | 6
StandardPda/MES.Service/Dto/webApi/ErpDelivery.cs | 3
StandardPda/MES.Service/Modes/MesRohIn.cs | 1
StandardPda/MES.Service/Modes/Purdka.cs | 160
StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs | 230 -
StandardPda/MES.Service/Dto/webApi/ErpProject.cs | 25
StandardPda/MES.Service/service/BasicData/MesUnitManager.cs | 135 -
StandardPda/MESApplication/Filter/ActionFilter.cs | 2
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs | 216 +-
StandardPda/MES.Service/service/BasicData/MesStaffManager.cs | 109
StandardPda/MES.Service/Modes/MesDeliveryNote.cs | 3
StandardPda/MES.Service/Modes/SysDepartment.cs | 14
StandardPda/MES.Service/Modes/MesPosition.cs | 35
StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs | 20
StandardPda/MES.Service/Modes/MesSupplier.cs | 120
StandardPda/MES.Service/Dto/webApi/ErpPosition.cs | 21
StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs | 50
StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs | 11
StandardPda/MES.Service/Dto/webApi/ErpCAB.cs | 3
StandardPda/MES.Service/Modes/MesDeliveryNoteDetails.cs | 3
StandardPda/MES.Service/Modes/MesDepots.cs | 157
StandardPda/MES.Service/Dto/webApi/ErpDepots.cs | 29
StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs | 262 ++
StandardPda/MESApplication/Startup.cs | 1
StandardPda/MES.Service/Modes/Organize.cs | 8
StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 54
StandardPda/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs | 107
StandardPda/MES.Service/service/BasicData/MesDepotsManager.cs | 161 -
StandardPda/MES.Service/Modes/MesUnit.cs | 133
StandardPda/MES.Service/Modes/MesBarcodeType.cs | 320 +-
StandardPda/MES.Service/service/BasicData/MesPositionManager.cs | 5
StandardPda/MES.Service/Modes/MesInvBusiness2.cs | 288 +-
StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs | 6
StandardPda/MES.Service/Modes/MesCustomer.cs | 17
StandardPda/MES.Service/Dto/webApi/ErpBarcode.cs | 3
StandardPda/MES.Service/Modes/MesInvItemMoves.cs | 224 +-
StandardPda/MES.Service/service/BasicData/OrganizeManager.cs | 414 ++-
StandardPda/MES.Service/Modes/MesItems.cs | 18
StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs | 3
StandardPda/MES.Service/Dto/webApi/ErpProductionNotice.cs | 2
StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs | 422 ++--
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 12
StandardPda/MES.Service/Modes/MesInvItemInCItems.cs | 184
StandardPda/MES.Service/Dto/webApi/ErpDeliveryData.cs | 3
StandardPda/MES.Service/Dto/webApi/ErpItems.cs | 13
StandardPda/MES.Service/Modes/MesProject.cs | 63
StandardPda/MES.Service/Modes/MesInvItemArn.cs | 304 +-
StandardPda/MES.Service/Modes/MesItemType.cs | 72
StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs | 492 ++--
StandardPda/MES.Service/Dto/webApi/ErpItemType.cs | 5
StandardPda/MES.Service/Dto/webApi/ErpStaff.cs | 42
StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs | 3
StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs | 1
StandardPda/MESApplication/Filter/ErrorLog.cs | 2
StandardPda/MES.Service/Dto/webApi/ErpProductionOrderDto.cs | 5
StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs | 5
StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs | 73
StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs | 5
StandardPda/MES.Service/Dto/webApi/ErpUnit.cs | 18
72 files changed, 3,255 insertions(+), 2,985 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpBarcode.cs b/StandardPda/MES.Service/Dto/webApi/ErpBarcode.cs
index 4bf2677..398d99a 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpBarcode.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpBarcode.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpBarcode
{
public string? Type { get; set; }
@@ -8,4 +9,4 @@
public string? SmallBarcode { get; set; }
public string? IncludeQty { get; set; }
public string? SupplierId { get; set; }
-}
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs b/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
index 8c2391e..87fc63e 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpCAA.cs
@@ -24,7 +24,9 @@
public string? FStockInLimitL { get; set; }
public string? FMTONO { get; set; }
public string? FLot { get; set; }
+
public string? FBomId { get; set; }
+
//public string? FXSHTH { get; set; }
public string? FCreateType { get; set; }
public string? PLAN_ID { get; set; }
@@ -38,7 +40,7 @@
public string? FForceCloserId { get; set; }
public string? FCloseType { get; set; }
public string? FSrcSplitBillNo { get; set; }
-
+
//public string? erP_SCZZ { get; set; }
//public string? erP_WTZZ { get; set; }
//public string? F_ZJXF_YHRQ { get; set; }
@@ -46,6 +48,7 @@
public string? FDescription { get; set; }
public string? BTBZ { get; set; }
+
//public string? fsubentryid { get; set; }
//public string? FPurOrderNo { get; set; }
//public string? FPurOrderEntrySeq { get; set; }
@@ -65,5 +68,4 @@
//娌冨皵鏂板 鐢熶骇閫氱煡鍗� 銆� 鍨嬪彿
public string? F_SCDD_SCTZD { get; set; }
public string? F_SCDD_XH { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpCAB.cs b/StandardPda/MES.Service/Dto/webApi/ErpCAB.cs
index d9cf396..e68345b 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpCAB.cs
@@ -15,7 +15,9 @@
public string? FMTONO { get; set; }
public string? FLot { get; set; }
public string? FStockID { get; set; }
+
public string? FIssueType { get; set; }
+
//public string? BTBZ { get; set; }
public string? FUnitID { get; set; }
public string? FSupplyType { get; set; }
@@ -40,5 +42,4 @@
//public string? FXSHTBH { get; set; }
//public string? FOwnerTypeId { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpDelivery.cs b/StandardPda/MES.Service/Dto/webApi/ErpDelivery.cs
index 4aba2ee..8ee54b8 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpDelivery.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpDelivery.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpDelivery
{
public string? Type { get; set; }
@@ -8,4 +9,4 @@
public string? Remark { get; set; }
public string? SupplierId { get; set; }
public string? ErpId { get; set; }
-}
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpDeliveryData.cs b/StandardPda/MES.Service/Dto/webApi/ErpDeliveryData.cs
index a4a6030..9fdc924 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpDeliveryData.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpDeliveryData.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpDeliveryData
{
public string? LineNo { get; set; }
@@ -13,4 +14,4 @@
public string? InventoryUnit { get; set; }
public string? FXSHTH { get; set; }
public string? Remark { get; set; }
-}
+}
\ 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 b376646..e3c3d10 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpDepots.cs
@@ -7,25 +7,7 @@
public string? FNumber { get; set; }
public string? FName { get; set; }
-
- /// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板渚涘簲鍟唅d銆佸鎴穒d銆佹暟鎹姸鎬併�佸簱瀛樼姸鎬佺被鍨嬪瓧娈点��
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///public string? FSupplierId { get; set; }
- ///public string? FCustomerId { get; set; }
- ///public string? FDocumentStatus { get; set; }
- ///public string? FStockStatusType { get; set; }
- /// </remarks>
- public string? FSupplierId { 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; }
@@ -33,11 +15,10 @@
public string? FStockProperty { get; set; }
public string? FForbidStatus { get; set; }
+
+ public string? FDocumentStatus { get; set; }
- public string? FGroup { get; set; }
-
-
- public string? FCreateOrgId { 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/ErpItemType.cs b/StandardPda/MES.Service/Dto/webApi/ErpItemType.cs
index c3dfb32..a6a3e41 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpItemType.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpItemType.cs
@@ -7,5 +7,8 @@
public string? FParentId { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
- public string? FDescription { get; set; }
+ public string? Unit { get; set; }
+ public string? FForbidStatus { get; set; }
+ public string? IqcType { get; set; }
+ public List<ErpDetail>? FUseOrgId { get; set; } //涓嬪彂缁勭粐
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
index 2109a7b..8eb4e79 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
@@ -16,16 +16,17 @@
public string? FStockId { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氬凡鍒犻櫎鎴栦笉鍐嶄娇鐢≒PBOM00019124瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氬凡鍒犻櫎鎴栦笉鍐嶄娇鐢≒PBOM00019124瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-25
- /// 璇存槑锛氭瀛楁宸茶鍒犻櫎鎴栦笉鍐嶄娇鐢ㄤ簬褰撳墠鎺ュ彛涓��
- /// 淇濈暀琚敞閲婄殑浠ｇ爜浠ヨ褰曚慨鏀瑰巻鍙层��
+ /// 淇敼浜猴細姹犲崡楠�
+ /// 淇敼鏃ユ湡锛�2024-12-25
+ /// 璇存槑锛氭瀛楁宸茶鍒犻櫎鎴栦笉鍐嶄娇鐢ㄤ簬褰撳墠鎺ュ彛涓��
+ /// 淇濈暀琚敞閲婄殑浠ｇ爜浠ヨ褰曚慨鏀瑰巻鍙层��
/// </remarks>
// public string? PPBOM00019124 { get; set; }
public string? FMaterialGroup { get; set; }
+
public string? FDescription { get; set; }
public decimal? FFinishReceiptOverRate { get; set; }
public decimal? FFinishReceiptShortRate { get; set; }
@@ -51,7 +52,9 @@
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; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs b/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
index 3e30590..ad728c9 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -7,12 +7,11 @@
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? fCreateDate { get; set; }
+
public string? FForbidStatus { get; set; }
- // public string? FDescription { get; set; }
+ // public string? FDescription { get; set; }
//public string? FParentID { get; set; }
//public string? FForbidorid { get; set; }
//public string? FForbiddate { get; set; }
-
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpPosition.cs b/StandardPda/MES.Service/Dto/webApi/ErpPosition.cs
index 3802e12..fab1daf 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpPosition.cs
@@ -2,26 +2,28 @@
public class ErpPosition
{
-
public string Id { get; set; }
+
/// <summary>
/// 0 鍚敤 1绂佺敤 2 瀹℃牳 3鍙嶅鏍�
/// </summary>
public string? Type { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧炲垱寤虹粍缁噄d鍜屼娇鐢ㄧ粍缁噄d瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧炲垱寤虹粍缁噄d鍜屼娇鐢ㄧ粍缁噄d瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-25>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- /// public string? FCreateOrgId { get; set; }
- /// public string? FUseOrgId { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-25>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// 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; }
@@ -42,5 +44,6 @@
/// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
/// </summary>
public string? FForbidStatus { get; set; }
+
public string? FDocumentStatus { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpProductionNotice.cs b/StandardPda/MES.Service/Dto/webApi/ErpProductionNotice.cs
index 3c98b6d..704fdd3 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpProductionNotice.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpProductionNotice.cs
@@ -2,8 +2,8 @@
public class ErpProductionNotice
{
-
public string Id { get; set; }
+
/// <summary>
/// 0 鍚敤 1绂佺敤 2 瀹℃牳 3鍙嶅鏍�
/// </summary>
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderDto.cs b/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
index c644ff6..0b5f3e0 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -15,12 +15,14 @@
public string? FPlannerID { get; set; } // 璁″垝鍛�
public string? FPlanStartDate { get; set; } // 棰勮寮�宸ユ椂闂�
public string? FPlanFinishDate { get; set; } // 棰勮瀹屽伐鏃堕棿
- public string? PlanConfirmation{ get; set; } // 璁″垝纭鏃堕棿
+ public string? PlanConfirmation { get; set; } // 璁″垝纭鏃堕棿
public string? FStockInLimitH { get; set; } // 鍏ュ簱涓婇檺
public string? FStockInLimitL { get; set; } // 鍏ュ簱涓嬮檺
public string? FMTONO { get; set; } // 璁″垝璺熻釜鍙�
public string? FLot { get; set; } // 鎵瑰彿
+
public string? FBomId { get; set; } // BOM鐗堟
+
//public string? F_UNW_XSDDH { get; set; } // 閿�鍞鍗曞彿
public string? FCreateType { get; set; } // 鐢熸垚鏂瑰紡
public string? FSUBID { get; set; } // ERP鐢熶骇璁㈠崟ID
@@ -45,6 +47,7 @@
public string? FBaseNoStockInQty { get; set; } // 鏈叆搴撴暟閲�
public string? FInStockOwnerId { get; set; } // 鍏ュ簱璐т富
+
//public string? FReqSrc { get; set; }
public string? TypeA { get; set; }
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs b/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
index 58f4eb8..53ac681 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -38,7 +38,7 @@
public string? FNEEDDATE { get; set; }
public string? FRESERVETYPE { get; set; }
public string? FMEMO { get; set; }
-
+
public string? TypeB { get; set; }
public string? F_XIFG_Base_re5 { get; set; }
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpProject.cs b/StandardPda/MES.Service/Dto/webApi/ErpProject.cs
new file mode 100644
index 0000000..766f109
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/webApi/ErpProject.cs
@@ -0,0 +1,25 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpProject
+{
+ //ERPID
+ public string? ID { 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 f92179e..25c1d6d 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -17,7 +17,9 @@
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; }
@@ -31,6 +33,7 @@
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; }
@@ -40,6 +43,4 @@
//public string? FixedTelephone { get; set; }
//public string? Address { 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 9ee11d7..35fb174 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,7 +5,9 @@
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; }
@@ -16,15 +18,20 @@
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; }
@@ -39,11 +46,15 @@
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; } //鏀舵枡鍙��鏁�
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpStaff.cs b/StandardPda/MES.Service/Dto/webApi/ErpStaff.cs
index 9d756ef..9cf438f 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpStaff.cs
@@ -5,35 +5,40 @@
public string Id { get; set; }
public string? Type { get; set; }
public string? FStaffNumber { get; set; }
+
public string? FName { get; set; }
+
//鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FPostDept { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氬皢FPost瀛楁閲嶅懡鍚嶄负FPostId銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氬皢FPost瀛楁閲嶅懡鍚嶄负FPostId銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-25
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細`public string? FPost { get; set; }`
- /// - 淇敼鍚庯細`public string? FPostId { get; set; }`
- /// -2025-01-02 :浜屾淇敼鍒犻櫎銆�
+ /// 淇敼浜猴細姹犲崡楠�
+ /// 淇敼鏃ユ湡锛�2024-12-25
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細`public string? FPost { get; set; }`
+ /// - 淇敼鍚庯細`public string? FPostId { get; set; }`
+ /// -2025-01-02 :浜屾淇敼鍒犻櫎銆�
/// </remarks>
/// //鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FPostId { get; set; }
public string? FMobile { get; set; }
+
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-27>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///public string? FDocumentStatus { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-27>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// public string? FDocumentStatus { get; set; }
/// </remarks>
public string? FDocumentStatus { get; set; }
+
//鍒犻櫎锛氭斁鍏ュ崟鎹ご浣�--姹犲崡楠� 2025-01-02
//public string? FStaffStartDate { get; set; }
public string? FDescription { get; set; }
@@ -46,12 +51,12 @@
}
/// <summary>
-/// 鎺ュ彛瀛楁璋冩暣锛氬矖浣嶃�侀儴闂ㄣ�佷换宀楀紑濮嬫棩鏈� 淇℃伅鐢ㄤ竴涓狿ostIdItem绫诲瀷鏉ュ瓨鍌ㄣ��
+/// 鎺ュ彛瀛楁璋冩暣锛氬矖浣嶃�侀儴闂ㄣ�佷换宀楀紑濮嬫棩鏈� 淇℃伅鐢ㄤ竴涓狿ostIdItem绫诲瀷鏉ュ瓨鍌ㄣ��
/// </summary>
/// <remarks>
-/// 淇敼浜猴細姹犲崡楠�
-/// 淇敼鏃ユ湡锛�2025-01-02
-/// 淇敼璇存槑锛�
+/// 淇敼浜猴細姹犲崡楠�
+/// 淇敼鏃ユ湡锛�2025-01-02
+/// 淇敼璇存槑锛�
/// </remarks>
public class ErpStaffDetail
{
@@ -60,5 +65,4 @@
public string? fPostDeptid { get; set; }
public string? fStaffStartDate { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs b/StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs
index 41f69f3..1ae8bf5 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -10,23 +10,27 @@
public string? FContact { get; set; }
public string? FTel { get; set; }
public string? FStaffId { get; set; }
+
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-28>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///public string? FDocumentStatus { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-28>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// public string? FDocumentStatus { get; set; }
/// </remarks>
public string? FDocumentStatus { get; set; }
+
public string? FForbidStatus { get; set; }
// public string? FCreateOrgId { get; set; }
-
+
//鐢ㄥ弸鐗规畩鐐�
public List<ErpDetail>? FUseOrgId { get; set; }
+
//public string? FDescription { get; set; }
// public string? fremarks { get; set; }
public string? PrivateDescSeg { get; set; }
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpUnit.cs b/StandardPda/MES.Service/Dto/webApi/ErpUnit.cs
index faa1b16..512f2b0 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpUnit.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpUnit.cs
@@ -7,25 +7,13 @@
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鍗曟嵁鐘舵�� 瀛楁銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///public string? FDocumentStatus { get; set; }
- /// </remarks>
public string? FDocumentStatus { get; set; }
public string? FForbidStatus { get; set; }
+ public string? BaseUomid { get; set; }
+ public string? RatioToBase { get; set; }
+ public string? RoundValue { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesBarcodeType.cs b/StandardPda/MES.Service/Modes/MesBarcodeType.cs
index 2a8c96a..a48ca15 100644
--- a/StandardPda/MES.Service/Modes/MesBarcodeType.cs
+++ b/StandardPda/MES.Service/Modes/MesBarcodeType.cs
@@ -8,243 +8,243 @@
[SugarTable("MES_BARCODE_TYPE")]
public class MesBarcodeType
{
- /// <summary>
- /// 鏉＄爜绫诲瀷ID(seq_me_id)
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// 鏉＄爜绫诲瀷ID(seq_me_id)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 浣跨敤鍦烘墍
- /// </summary>
- [SugarColumn(ColumnName = "USE_SITE")]
+ /// <summary>
+ /// 浣跨敤鍦烘墍
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_SITE")]
public string UseSite { get; set; }
- /// <summary>
- /// 鏉＄爜绫诲瀷鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")]
+ /// <summary>
+ /// 鏉＄爜绫诲瀷鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")]
public string BarcodeTypeName { get; set; }
- /// <summary>
- /// 鐮佸埗
- /// </summary>
- [SugarColumn(ColumnName = "CODE")]
+ /// <summary>
+ /// 鐮佸埗
+ /// </summary>
+ [SugarColumn(ColumnName = "CODE")]
public string Code { get; set; }
- /// <summary>
- /// 鏉＄爜绾稿
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_WIDTH")]
+ /// <summary>
+ /// 鏉＄爜绾稿
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_WIDTH")]
public decimal? PaperWidth { get; set; }
- /// <summary>
- /// 鏉＄爜绾搁珮
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_HEIGHT")]
+ /// <summary>
+ /// 鏉＄爜绾搁珮
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_HEIGHT")]
public decimal? PaperHeight { get; set; }
- /// <summary>
- /// 鏉＄爜寮�濮嬩綅缃甔
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")]
+ /// <summary>
+ /// 鏉＄爜寮�濮嬩綅缃甔
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")]
public decimal? BarcodeBeginPositionX { get; set; }
- /// <summary>
- /// 鏉＄爜寮�濮嬩綅缃甕
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")]
+ /// <summary>
+ /// 鏉＄爜寮�濮嬩綅缃甕
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")]
public decimal? BarcodeBeginPositionY { get; set; }
- /// <summary>
- /// 涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁�
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_NUM")]
+ /// <summary>
+ /// 涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_NUM")]
public decimal? PaperNum { get; set; }
- /// <summary>
- /// 涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁�
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_ROW_NUM")]
+ /// <summary>
+ /// 涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_ROW_NUM")]
public decimal? PaperRowNum { get; set; }
- /// <summary>
- /// 涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁�
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")]
+ /// <summary>
+ /// 涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")]
public decimal? PaperColumnNum { get; set; }
- /// <summary>
- /// 鏉＄爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉＄爜娴佹按鍙�)
- /// </summary>
- [SugarColumn(ColumnName = "CYCLE_TYPE")]
+ /// <summary>
+ /// 鏉＄爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉＄爜娴佹按鍙�)
+ /// </summary>
+ [SugarColumn(ColumnName = "CYCLE_TYPE")]
public string CycleType { get; set; }
- /// <summary>
- /// 鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥)
- /// </summary>
- [SugarColumn(ColumnName = "AVAILABLE_FLAG")]
+ /// <summary>
+ /// 鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥)
+ /// </summary>
+ [SugarColumn(ColumnName = "AVAILABLE_FLAG")]
public decimal? AvailableFlag { get; set; }
- /// <summary>
- /// 鏉＄爜楂樺害
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_HEIGHT")]
+ /// <summary>
+ /// 鏉＄爜楂樺害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_HEIGHT")]
public decimal? BarcodeHeight { get; set; }
- /// <summary>
- /// 鏉＄爜瀛椾綋鏂瑰悜
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_ORIENTATION")]
+ /// <summary>
+ /// 鏉＄爜瀛椾綋鏂瑰悜
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_ORIENTATION")]
public string BarcodeOrientation { get; set; }
- /// <summary>
- /// 鏉＄爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�)
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")]
+ /// <summary>
+ /// 鏉＄爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")]
public decimal? BarcodeInterpretation { get; set; }
- /// <summary>
- /// 鏉＄爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉＄爜涓婃柟)
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")]
+ /// <summary>
+ /// 鏉＄爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉＄爜涓婃柟)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")]
public decimal? BarcodeInterpretationAbove { 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 = "BARCODE_WIDTH")]
+ /// <summary>
+ /// 鏉＄爜瀹藉害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_WIDTH")]
public decimal? BarcodeWidth { get; set; }
- /// <summary>
- /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹�
- /// </summary>
- [SugarColumn(ColumnName = "BY_W")]
+ /// <summary>
+ /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_W")]
public decimal? ByW { get; set; }
- /// <summary>
- /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉＄殑姣斾緥
- /// </summary>
- [SugarColumn(ColumnName = "BY_R")]
+ /// <summary>
+ /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉＄殑姣斾緥
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_R")]
public decimal? ByR { get; set; }
- /// <summary>
- /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]鏉＄爜楂樺害
- /// </summary>
- [SugarColumn(ColumnName = "BY_H")]
+ /// <summary>
+ /// [鏀瑰彉鏉＄爜榛樿鍙傛暟]鏉＄爜楂樺害
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_H")]
public decimal? ByH { get; set; }
- /// <summary>
- /// 鐐规暟/姣背
- /// </summary>
- [SugarColumn(ColumnName = "JM")]
+ /// <summary>
+ /// 鐐规暟/姣背
+ /// </summary>
+ [SugarColumn(ColumnName = "JM")]
public string Jm { get; set; }
- /// <summary>
- /// 铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁)
- /// </summary>
- [SugarColumn(ColumnName = "JVM_DATA_FLAG")]
+ /// <summary>
+ /// 铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁)
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_DATA_FLAG")]
public decimal? JvmDataFlag { get; set; }
- /// <summary>
- /// 铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁�
- /// </summary>
- [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")]
+ /// <summary>
+ /// 铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")]
public decimal? JvmSerialDigit { get; set; }
- /// <summary>
- /// 铏氭嫙鏁版嵁鏉＄爜闀垮害
- /// </summary>
- [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")]
+ /// <summary>
+ /// 铏氭嫙鏁版嵁鏉＄爜闀垮害
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")]
public decimal? JvmBarcodeLength { get; set; }
- /// <summary>
- /// 鎵撳嵃鍛戒护
- /// </summary>
- [SugarColumn(ColumnName = "PRINT_COMMAND")]
+ /// <summary>
+ /// 鎵撳嵃鍛戒护
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND")]
public string PrintCommand { get; set; }
- /// <summary>
- /// 鎵撳嵃鍛戒护寮�濮�
- /// </summary>
- [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")]
+ /// <summary>
+ /// 鎵撳嵃鍛戒护寮�濮�
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")]
public string PrintCommandBegin { get; set; }
- /// <summary>
- /// 鎵撳嵃鍛戒护缁撴潫
- /// </summary>
- [SugarColumn(ColumnName = "PRINT_COMMAND_END")]
+ /// <summary>
+ /// 鎵撳嵃鍛戒护缁撴潫
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND_END")]
public string PrintCommandEnd { get; set; }
- /// <summary>
- /// 鏉＄爜娉ㄩ噴琛屾暟
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")]
+ /// <summary>
+ /// 鏉＄爜娉ㄩ噴琛屾暟
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")]
public decimal? BarcodeInterpretationRow { get; set; }
- /// <summary>
- /// 鏉＄爜鍊煎甫鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_ITEM")]
+ /// <summary>
+ /// 鏉＄爜鍊煎甫鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_ITEM")]
public decimal? BarcodeItem { get; set; }
- /// <summary>
- /// 鏉＄爜绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TYPE_CODE")]
+ /// <summary>
+ /// 鏉＄爜绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPE_CODE")]
public decimal TypeCode { get; set; }
- /// <summary>
- /// 鏄惁浣跨敤
- /// </summary>
- [SugarColumn(ColumnName = "ISUSED")]
+ /// <summary>
+ /// 鏄惁浣跨敤
+ /// </summary>
+ [SugarColumn(ColumnName = "ISUSED")]
public short? Isused { get; set; }
- /// <summary>
- /// 鎵撳嵃妯℃澘
- /// </summary>
- [SugarColumn(ColumnName = "MBTYPE")]
+ /// <summary>
+ /// 鎵撳嵃妯℃澘
+ /// </summary>
+ [SugarColumn(ColumnName = "MBTYPE")]
public decimal? Mbtype { 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 = "ORDER_NUM")]
+ /// <summary>
+ /// 娴佹按鍙蜂綅鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_NUM")]
public decimal? OrderNum { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesCustomer.cs b/StandardPda/MES.Service/Modes/MesCustomer.cs
index 7503cc6..591af0e 100644
--- a/StandardPda/MES.Service/Modes/MesCustomer.cs
+++ b/StandardPda/MES.Service/Modes/MesCustomer.cs
@@ -16,16 +16,17 @@
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-27>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///[SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- ///public string? FDOCUMENTSTATUS { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-27>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
+ /// public string? FDOCUMENTSTATUS { get; set; }
/// </remarks>
/// <summary>
/// ERP鍗曟嵁鐘舵��
diff --git a/StandardPda/MES.Service/Modes/MesDeliveryNote.cs b/StandardPda/MES.Service/Modes/MesDeliveryNote.cs
index f0d7350..4460f1f 100644
--- a/StandardPda/MES.Service/Modes/MesDeliveryNote.cs
+++ b/StandardPda/MES.Service/Modes/MesDeliveryNote.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
diff --git a/StandardPda/MES.Service/Modes/MesDeliveryNoteBarcode.cs b/StandardPda/MES.Service/Modes/MesDeliveryNoteBarcode.cs
index 16b8478..aeb1e95 100644
--- a/StandardPda/MES.Service/Modes/MesDeliveryNoteBarcode.cs
+++ b/StandardPda/MES.Service/Modes/MesDeliveryNoteBarcode.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
diff --git a/StandardPda/MES.Service/Modes/MesDeliveryNoteDetails.cs b/StandardPda/MES.Service/Modes/MesDeliveryNoteDetails.cs
index 707c793..4f3bfd4 100644
--- a/StandardPda/MES.Service/Modes/MesDeliveryNoteDetails.cs
+++ b/StandardPda/MES.Service/Modes/MesDeliveryNoteDetails.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
diff --git a/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs b/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs
index 49b445b..f082e04 100644
--- a/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs
+++ b/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs
@@ -8,339 +8,339 @@
[SugarTable("MES_DEP_TASK_INFO")]
public class MesDepTaskInfo
{
- /// <summary>
- /// 閮ㄩ棬鐢熶骇璁㈠崟ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// 閮ㄩ棬鐢熶骇璁㈠崟ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 璁㈠崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 璁㈠崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// ERP鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ITEM_NO")]
+ /// <summary>
+ /// ERP鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ITEM_NO")]
public string ErpItemNo { get; set; }
- /// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_QTY")]
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_QTY")]
public decimal? PlanQty { get; set; }
- /// <summary>
- /// 宸茬敓浜ч噺
- /// </summary>
- [SugarColumn(ColumnName = "COMPLETE_QTY")]
+ /// <summary>
+ /// 宸茬敓浜ч噺
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPLETE_QTY")]
public decimal? CompleteQty { get; set; }
- /// <summary>
- /// 澶囨崯鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "BACKUP_QTY")]
+ /// <summary>
+ /// 澶囨崯鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "BACKUP_QTY")]
public decimal? BackupQty { get; set; }
- /// <summary>
- /// 涓嬭浇鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DOWN_TIME")]
+ /// <summary>
+ /// 涓嬭浇鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DOWN_TIME")]
public DateTime? DownTime { get; set; }
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")]
+ /// <summary>
+ /// 璁″垝寮�濮嬫椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")]
public DateTime? PlanBeginTime { get; set; }
- /// <summary>
- /// 璁″垝缁撴潫鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_FINISH_TIME")]
+ /// <summary>
+ /// 璁″垝缁撴潫鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_FINISH_TIME")]
public DateTime? PlanFinishTime { get; set; }
- /// <summary>
- /// 瀹為檯瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "REAL_FINISH_TIME")]
+ /// <summary>
+ /// 瀹為檯瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "REAL_FINISH_TIME")]
public DateTime? RealFinishTime { get; set; }
- /// <summary>
- /// 鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐)
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCE_STATE")]
+ /// <summary>
+ /// 鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐)
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCE_STATE")]
public string ProduceState { get; set; }
- /// <summary>
- /// 瀹為檯寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "REAL_BEGIN_TIME")]
+ /// <summary>
+ /// 瀹為檯寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "REAL_BEGIN_TIME")]
public DateTime? RealBeginTime { get; set; }
- /// <summary>
- /// 鏄惁鎸傝捣
- /// </summary>
- [SugarColumn(ColumnName = "HANG_UP")]
+ /// <summary>
+ /// 鏄惁鎸傝捣
+ /// </summary>
+ [SugarColumn(ColumnName = "HANG_UP")]
public string HangUp { get; set; }
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DISCARD_QTY")]
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DISCARD_QTY")]
public decimal? DiscardQty { get; set; }
- /// <summary>
- /// 濮嬫敹鏂欐椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")]
+ /// <summary>
+ /// 濮嬫敹鏂欐椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")]
public DateTime? FirstItemReceiptTime { get; set; }
- /// <summary>
- /// 濮嬮綈鏂欐椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")]
+ /// <summary>
+ /// 濮嬮綈鏂欐椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")]
public DateTime? FirstItemReadyTime { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUST_NO")]
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
public string CustNo { get; set; }
- /// <summary>
- /// 鍑鸿揣鍖呰鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "PACK_SHIP_TYPE")]
+ /// <summary>
+ /// 鍑鸿揣鍖呰鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "PACK_SHIP_TYPE")]
public string PackShipType { get; set; }
- /// <summary>
- /// 鍖呰娉ㄦ剰浜嬮」
- /// </summary>
- [SugarColumn(ColumnName = "PACK_SHIP_MEMO")]
+ /// <summary>
+ /// 鍖呰娉ㄦ剰浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "PACK_SHIP_MEMO")]
public string PackShipMemo { get; set; }
- /// <summary>
- /// 鏄惁宸叉帓浜�
- /// </summary>
- [SugarColumn(ColumnName = "ISSCHEME")]
+ /// <summary>
+ /// 鏄惁宸叉帓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSCHEME")]
public short? Isscheme { get; set; }
- /// <summary>
- /// 鏉＄爜绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_TYPE_ID")]
+ /// <summary>
+ /// 鏉＄爜绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_TYPE_ID")]
public decimal? BarcodeTypeId { get; set; }
- /// <summary>
- /// 鍙戝竷鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "ISSUE_STATUS")]
+ /// <summary>
+ /// 鍙戝竷鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUE_STATUS")]
public short? IssueStatus { get; set; }
- /// <summary>
- /// 鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛�
- /// </summary>
- [SugarColumn(ColumnName = "FLAG")]
+ /// <summary>
+ /// 鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FLAG")]
public short? Flag { get; set; }
- /// <summary>
- /// 棰嗘枡鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MAT_DATE")]
+ /// <summary>
+ /// 棰嗘枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MAT_DATE")]
public DateTime? MatDate { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- [SugarColumn(ColumnName = "WORKCENTER_NO")]
+ /// <summary>
+ /// 宸ヤ綔涓績
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKCENTER_NO")]
public string WorkcenterNo { get; set; }
- /// <summary>
- /// 宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞�
- /// </summary>
- [SugarColumn(ColumnName = "DOWN_FLAG")]
+ /// <summary>
+ /// 宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞�
+ /// </summary>
+ [SugarColumn(ColumnName = "DOWN_FLAG")]
public short? DownFlag { get; set; }
- /// <summary>
- /// 鐜繚浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "ROHSE_CODE")]
+ /// <summary>
+ /// 鐜繚浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ROHSE_CODE")]
public string RohseCode { get; set; }
- /// <summary>
- /// 瀹㈡埛PO
- /// </summary>
- [SugarColumn(ColumnName = "CUST_PO")]
+ /// <summary>
+ /// 瀹㈡埛PO
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_PO")]
public string CustPo { get; set; }
- /// <summary>
- /// 瀹㈡埛鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "CUST_STYLE")]
+ /// <summary>
+ /// 瀹㈡埛鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_STYLE")]
public string CustStyle { get; set; }
- /// <summary>
- /// 浜у搧鎵撳嵃鍥哄畾鍊�
- /// </summary>
- [SugarColumn(ColumnName = "PROC_PRINT_VALUE")]
+ /// <summary>
+ /// 浜у搧鎵撳嵃鍥哄畾鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_PRINT_VALUE")]
public string ProcPrintValue { 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 = "MEMO")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "MEMO")]
public string Memo { get; set; }
- /// <summary>
- /// 瀹℃壒鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_STATUS")]
+ /// <summary>
+ /// 瀹℃壒鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_STATUS")]
public string FcheckStatus { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
public string FcheckBy { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_DATE")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
public DateTime? FcheckDate { 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 = "DATA_FROM")]
+ /// <summary>
+ /// 鏁版嵁鏉ユ簮
+ /// </summary>
+ [SugarColumn(ColumnName = "DATA_FROM")]
public string DataFrom { get; set; }
- /// <summary>
- /// 鐢熶骇璁㈠崟琛ㄥごID
- /// </summary>
- [SugarColumn(ColumnName = "MOID")]
+ /// <summary>
+ /// 鐢熶骇璁㈠崟琛ㄥごID
+ /// </summary>
+ [SugarColumn(ColumnName = "MOID")]
public decimal? Moid { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "PARTID")]
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "PARTID")]
public decimal? Partid { get; set; }
- /// <summary>
- /// ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛�
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public string Status { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [SugarColumn(ColumnName = "MOCODE")]
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "MOCODE")]
public string Mocode { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATEDATE")]
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEDATE")]
public DateTime? Createdate { get; set; }
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [SugarColumn(ColumnName = "COLOR_NAME")]
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ [SugarColumn(ColumnName = "COLOR_NAME")]
public string ColorName { get; set; }
- /// <summary>
- /// 鍏抽棴鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CLOSETIME")]
+ /// <summary>
+ /// 鍏抽棴鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSETIME")]
public DateTime? Closetime { get; set; }
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 浠庤〃ID
- /// </summary>
- [SugarColumn(ColumnName = "MODID")]
+ /// <summary>
+ /// 浠庤〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "MODID")]
public decimal? Modid { get; set; }
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "UPDATE_FLG")]
+ /// <summary>
+ /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "UPDATE_FLG")]
public decimal? UpdateFlg { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "MOCODE_LINE")]
+ /// <summary>
+ /// 鐢熶骇宸ュ崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MOCODE_LINE")]
public decimal? MocodeLine { get; set; }
- /// <summary>
- /// 涓濆嵃鎬绘暟
- /// </summary>
- [SugarColumn(ColumnName = "SILK_QTY")]
+ /// <summary>
+ /// 涓濆嵃鎬绘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_QTY")]
public decimal? SilkQty { get; set; }
- /// <summary>
- /// 涓濆嵃鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "SILK_PRICE")]
+ /// <summary>
+ /// 涓濆嵃鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_PRICE")]
public decimal? SilkPrice { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { 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 15ef94c..79a27e7 100644
--- a/StandardPda/MES.Service/Modes/MesDepots.cs
+++ b/StandardPda/MES.Service/Modes/MesDepots.cs
@@ -9,134 +9,136 @@
public class MesDepots
{
/// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_ID", IsPrimaryKey = true)]
+ /// ID(SEQ_INV_ID)
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOT_ID",
+ OracleSequenceName = "SEQ_INV_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>
- /// 浠撳簱绫诲瀷
- /// </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>
- /// 浠撲綅缁処D
- /// </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; }
@@ -147,67 +149,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; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
+ /// <summary>
+ /// 0 =涓嶇敓鏁堬紝 1=鐢熸晥
+ ///</summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板渚涘簲鍟唅d銆佸鎴穒d銆佹暟鎹姸鎬併�佸簱瀛樼姸鎬佺被鍨嬪瓧娈点��
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- /// </remarks>
- /// <summary>
- /// 渚涘簲鍟唅d
- /// </summary>
- [SugarColumn(ColumnName = "FSUPPLIERID")]
- public string? FSUPPLIERID { get; set; }
- /// <summary>
- /// 瀹㈡埛id
- /// </summary>
- [SugarColumn(ColumnName = "FCUSTOMERID")]
- public string? FCUSTOMERID { get; set; }
- /// <summary>
- /// ERP鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- public string? FDOCUMENTSTATUS { get; set; }
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
- public string? FSTOCKSTATUSTYPE { get; set; }
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
+ /// <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 9ca8594..89ddce5 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/MesInvItemArn.cs b/StandardPda/MES.Service/Modes/MesInvItemArn.cs
index bf0d207..518f09f 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemArn.cs
+++ b/StandardPda/MES.Service/Modes/MesInvItemArn.cs
@@ -8,232 +8,232 @@
[SugarTable("MES_INV_ITEM_ARN")]
public class MesInvItemArn
{
- /// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// ID(SEQ_INV_ID)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public short? Status { get; set; }
- /// <summary>
- /// 鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "REASON")]
+ /// <summary>
+ /// 鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "REASON")]
public string Reason { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_ID")]
public decimal? TransactionId { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_BILL_NO")]
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_BILL_NO")]
public string PaperBillNo { get; set; }
- /// <summary>
- /// 閫�鏂欎汉宸ュ彿
- /// </summary>
- [SugarColumn(ColumnName = "USER_NO_BACK")]
+ /// <summary>
+ /// 閫�鏂欎汉宸ュ彿
+ /// </summary>
+ [SugarColumn(ColumnName = "USER_NO_BACK")]
public string UserNoBack { get; set; }
- /// <summary>
- /// 鎻愪氦浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
+ /// <summary>
+ /// 鎻愪氦浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
public string CheckUser { get; set; }
- /// <summary>
- /// 鎻愪氦鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
+ /// <summary>
+ /// 鎻愪氦鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
public DateTime? InsDate { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_RES")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
public string CheckRes { get; set; }
- /// <summary>
- /// 宸叉崱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QTY")]
+ /// <summary>
+ /// 宸叉崱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
public decimal? CheckQty { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOTS_CODE")]
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOTS_CODE")]
public string DepotsCode { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSCTION_NO")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSCTION_NO")]
public string TransctionNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// 鎻愪氦鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
+ /// <summary>
+ /// 鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTATUS")]
public short? Fstatus { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
+ /// <summary>
+ /// 鏄惁宸插洖鍐橲AP
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPSTATUS")]
public short? Sapstatus { get; set; }
- /// <summary>
- /// 纭鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
+ /// <summary>
+ /// 纭鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
public DateTime? Insdate { get; set; }
- /// <summary>
- /// 鏄惁妫�楠�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
+ /// <summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
public decimal? Ischeck { get; set; }
- /// <summary>
- /// 瀹℃牳鍏ュ簱浜�
- /// </summary>
- [SugarColumn(ColumnName = "INSBY")]
+ /// <summary>
+ /// 瀹℃牳鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "INSBY")]
public string Insby { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
public short? UrgentFlag { get; set; }
- /// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
+ /// <summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
public decimal? MttransctionNo { get; set; }
- /// <summary>
- /// IQC妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
+ /// <summary>
+ /// IQC妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
public string IqcReleaseNo { get; set; }
- /// <summary>
- /// 鏄惁鏄剧ず
- /// </summary>
- [SugarColumn(ColumnName = "IS_VISUAL")]
+ /// <summary>
+ /// 鏄惁鏄剧ず
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_VISUAL")]
public decimal? IsVisual { get; set; }
- /// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
+ /// <summary>
+ /// 0=閲囪喘锛�1=濮斿
+ /// </summary>
+ [SugarColumn(ColumnName = "F_TYPE")]
public decimal? FType { get; set; }
- /// <summary>
- /// ERP鍒拌揣鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
+ /// <summary>
+ /// ERP鍒拌揣鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
public string EbelnK3id { get; set; }
- /// <summary>
- /// 鏉＄爜鏉″嵃杩涘害
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_RATIO")]
+ /// <summary>
+ /// 鏉＄爜鏉″嵃杩涘害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_RATIO")]
public decimal? BarcodeRatio { get; set; }
- /// <summary>
- /// ERP鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ERPNO")]
+ /// <summary>
+ /// ERP鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPNO")]
public string Erpno { get; set; }
- /// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- /// </summary>
- [SugarColumn(ColumnName = "THSTATUS")]
+ /// <summary>
+ /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ /// </summary>
+ [SugarColumn(ColumnName = "THSTATUS")]
public short? Thstatus { get; set; }
- /// <summary>
- /// ERP閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "ERPTHNO")]
+ /// <summary>
+ /// ERP閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPTHNO")]
public string Erpthno { get; set; }
diff --git a/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs b/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs
index 9c3eb27..05e3293 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs
+++ b/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs
@@ -8,141 +8,141 @@
[SugarTable("MES_INV_ITEM_IN_C_ITEMS")]
public class MesInvItemInCItems
{
- /// <summary>
- /// SEQ_OUT
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// SEQ_OUT
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗昳d
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// 鍏ュ簱鍗昳d
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
public decimal ItemInId { get; set; }
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ /// <summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
public string DepotSectionCode { get; set; }
- /// <summary>
- /// 鐗硅浜嬮」
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 鐗硅浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_SNAME")]
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
public string ItemSname { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
public string Unit { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "EBELN")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
public string Ebeln { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_LINE_NO")]
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_LINE_NO")]
public decimal? EbelnLineNo { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CBILL_NO")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CBILL_NO")]
public string CbillNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
public decimal? WorkLine { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesInvItemMoves.cs b/StandardPda/MES.Service/Modes/MesInvItemMoves.cs
index 07b4ba6..b65928e 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemMoves.cs
+++ b/StandardPda/MES.Service/Modes/MesInvItemMoves.cs
@@ -8,171 +8,171 @@
[SugarTable("MES_INV_ITEM_MOVES")]
public class MesInvItemMoves
{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// SEQ_INV_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 绉诲簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 绉诲簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 绉诲叆瀛愬簱id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
+ /// <summary>
+ /// 绉诲叆瀛愬簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
public decimal? InvDepotsId { get; set; }
- /// <summary>
- /// 绉诲叆璐т綅id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
+ /// <summary>
+ /// 绉诲叆璐т綅id
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
public decimal? InvDepotSectionsId { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鍒跺崟1-杩囪处
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鍒跺崟1-杩囪处
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public decimal? Status { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_ID")]
public decimal? TransactionId { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECKUSER")]
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECKUSER")]
public string Checkuser { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECKDATE")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECKDATE")]
public DateTime? Checkdate { get; set; }
- /// <summary>
- /// 绉诲叆瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 绉诲叆瀛愬簱code
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
public string InvDepotsCode { get; set; }
- /// <summary>
- /// 绉诲叆璐т綅code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 绉诲叆璐т綅code
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
public string InvDepotSectionsCode { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NO")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NO")]
public decimal? TransactionNo { get; set; }
- /// <summary>
- /// 绉诲嚭瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
+ /// <summary>
+ /// 绉诲嚭瀛愬簱code
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
public string FromDepotsCode { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_CODE")]
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY_CODE")]
public string FactoryCode { get; set; }
- /// <summary>
- /// SAP杩斿洖鍗曟嵁
- /// </summary>
- [SugarColumn(ColumnName = "SAPNO")]
+ /// <summary>
+ /// SAP杩斿洖鍗曟嵁
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPNO")]
public string Sapno { get; set; }
- /// <summary>
- /// 宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
+ /// <summary>
+ /// 宸插洖鍐橲AP
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPSTATUS")]
public short? Sapstatus { get; set; }
- /// <summary>
- /// SAP杩斿洖骞翠唤
- /// </summary>
- [SugarColumn(ColumnName = "SAPYEAR")]
+ /// <summary>
+ /// SAP杩斿洖骞翠唤
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPYEAR")]
public short? Sapyear { get; set; }
- /// <summary>
- /// SAP杩斿洖淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "SAPTEXT")]
+ /// <summary>
+ /// SAP杩斿洖淇℃伅
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPTEXT")]
public string Saptext { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 鍙嶅鏍镐簨鍔＄被鍨嬬紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "MTRANSACTION_NO")]
+ /// <summary>
+ /// 鍙嶅鏍镐簨鍔＄被鍨嬬紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "MTRANSACTION_NO")]
public decimal? MtransactionNo { get; set; }
- /// <summary>
- /// 鑷姩淇濆瓨瀛楁
- /// </summary>
- [SugarColumn(ColumnName = "ZD_NUM")]
+ /// <summary>
+ /// 鑷姩淇濆瓨瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "ZD_NUM")]
public decimal? ZdNum { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚�
- /// </summary>
- [SugarColumn(ColumnName = "TS")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "TS")]
public decimal? Ts { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesInvTransaction.cs b/StandardPda/MES.Service/Modes/MesInvTransaction.cs
index 635c014..6b3aeae 100644
--- a/StandardPda/MES.Service/Modes/MesInvTransaction.cs
+++ b/StandardPda/MES.Service/Modes/MesInvTransaction.cs
@@ -8,75 +8,75 @@
[SugarTable("MES_INV_TRANSACTION")]
public class MesInvTransaction
{
- /// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NAME")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NAME")]
public string TransactionName { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鍗曟嵁ID
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_ID")]
+ /// <summary>
+ /// 鍗曟嵁ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BUSINESS_ID")]
public decimal? BusinessId { 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>
- /// 浜嬪姟缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NO")]
+ /// <summary>
+ /// 浜嬪姟缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NO")]
public decimal? TransactionNo { 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; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesItemType.cs b/StandardPda/MES.Service/Modes/MesItemType.cs
index 23f72ed..9c8fb4d 100644
--- a/StandardPda/MES.Service/Modes/MesItemType.cs
+++ b/StandardPda/MES.Service/Modes/MesItemType.cs
@@ -9,86 +9,106 @@
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>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string? Unit { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ ///</summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
+
+ /// <summary>
+ /// 涓嬪彂缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "USE_ORG_ID")]
+ public string? UseOrgId { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesItems.cs b/StandardPda/MES.Service/Modes/MesItems.cs
index 71834a9..d830cb6 100644
--- a/StandardPda/MES.Service/Modes/MesItems.cs
+++ b/StandardPda/MES.Service/Modes/MesItems.cs
@@ -156,7 +156,7 @@
/// ERP鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
+ public string? ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
@@ -323,16 +323,16 @@
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-31>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 鏂板锛�
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-31>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 鏂板锛�
/// </remarks>
-
/// <summary>
/// 鏃х墿鏂欑紪鐮�
/// </summary>
@@ -392,10 +392,10 @@
/// </summary>
[SugarColumn(ColumnName = "FOVERCONTROLMODE")]
public string? FOVERCONTROLMODE { get; set; }
+
/// <summary>
/// 妯″叿缂栧彿
/// </summary>
[SugarColumn(ColumnName = "F_MJBH")]
public string? F_MJBH { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesLinkU9.cs b/StandardPda/MES.Service/Modes/MesLinkU9.cs
index 4706cd1..a578b3d 100644
--- a/StandardPda/MES.Service/Modes/MesLinkU9.cs
+++ b/StandardPda/MES.Service/Modes/MesLinkU9.cs
@@ -3,37 +3,37 @@
namespace MES.Service.Modes;
/// <summary>
-/// MES涓嶶9绯荤粺鐨勯摼鎺ヨ〃
+/// MES涓嶶9绯荤粺鐨勯摼鎺ヨ〃
/// </summary>
[SugarTable("MES_LINK_U9")]
public class MesLinkU9
{
/// <summary>
- /// MES绯荤粺鐨処D
+ /// MES绯荤粺鐨処D
/// </summary>
[SugarColumn(ColumnName = "MES_ID")]
public string? MesId { get; set; }
/// <summary>
- /// U9绯荤粺鐨処D
+ /// U9绯荤粺鐨処D
/// </summary>
[SugarColumn(ColumnName = "U9_ID")]
public string? U9Id { get; set; }
/// <summary>
- /// 缁勭粐ID
+ /// 缁勭粐ID
/// </summary>
[SugarColumn(ColumnName = "ORG_ID")]
public string? OrgId { get; set; }
/// <summary>
- /// 琛ㄧ被鍨�
+ /// 琛ㄧ被鍨�
/// </summary>
[SugarColumn(ColumnName = "TABLE_TYPE")]
public string? TableType { get; set; }
/// <summary>
- /// 鍒涘缓鏃ユ湡
+ /// 鍒涘缓鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
diff --git a/StandardPda/MES.Service/Modes/MesPosition.cs b/StandardPda/MES.Service/Modes/MesPosition.cs
index f3b7460..c480978 100644
--- a/StandardPda/MES.Service/Modes/MesPosition.cs
+++ b/StandardPda/MES.Service/Modes/MesPosition.cs
@@ -90,20 +90,20 @@
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧炲垱寤虹粍缁噄d鍜屼娇鐢ㄧ粍缁噄d瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧炲垱寤虹粍缁噄d鍜屼娇鐢ㄧ粍缁噄d瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-25>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///[SugarColumn(ColumnName = "USE_ORG")]
- ///public decimal? UseOrg { get; set; }
- ///[SugarColumn(ColumnName = "CREATE_ORG")]
- ///public decimal? CreateOrg { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-25>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// [SugarColumn(ColumnName = "USE_ORG")]
+ /// public decimal? UseOrg { get; set; }
+ /// [SugarColumn(ColumnName = "CREATE_ORG")]
+ /// public decimal? CreateOrg { get; set; }
/// </remarks>
-
/// <summary>
/// 浣跨敤缁勭粐
/// </summary>
@@ -117,14 +117,15 @@
public decimal? UseOrg { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧� ERP鏁版嵁鐘舵�併��
+ /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧� ERP鏁版嵁鐘舵�併��
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-31>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-31>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
/// </remarks>
/// <summary>
/// ERP鏁版嵁鐘舵��
diff --git a/StandardPda/MES.Service/Modes/MesProject.cs b/StandardPda/MES.Service/Modes/MesProject.cs
new file mode 100644
index 0000000..78bd90d
--- /dev/null
+++ b/StandardPda/MES.Service/Modes/MesProject.cs
@@ -0,0 +1,63 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 椤圭洰琛�
+/// </summary>
+[SugarTable("MES_PROJECT")]
+public class MesProject
+{
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 椤圭洰缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT_CODE")]
+ public string? ProjectCode { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT_NAME")]
+ public string? ProjectName { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍒嗙被
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT_TYPE")]
+ public string? ProjectType { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ [SugarColumn(ColumnName = "DESCRIPTION")]
+ public string? Description { get; set; }
+
+ /// <summary>
+ /// 椤圭洰缁忕悊
+ /// </summary>
+ [SugarColumn(ColumnName = "OPERATORS_ID")]
+ public string? OperatorsId { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
+
+ /// <summary>
+ /// 鏄惁鐢熸晥
+ /// </summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
+
+ /// <summary>
+ /// 涓嬪彂缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_ORG_ID")]
+ public string? UseOrgId { get; set; }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs
index 14760fb..2a26d0c 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -8,324 +8,324 @@
[SugarTable("MES_QA_ITEMS_DETECT_01")]
public class MesQaItemsDetect01
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string ReleaseNo { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_DATE")]
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
public DateTime? FcheckDate { get; set; }
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
public string FcheckBy { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 鏉ユ枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FBATCH_QTY")]
+ /// <summary>
+ /// 鏉ユ枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FBATCH_QTY")]
public decimal? FbatchQty { get; set; }
- /// <summary>
- /// 鍒ゅ畾缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "FRECE_QTY")]
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "FRECE_QTY")]
public string FreceQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FNG_DESC")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_DESC")]
public string FngDesc { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
public string FcheckResu { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FREVIEW")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FREVIEW")]
public string Freview { get; set; }
- /// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ /// </summary>
+ [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
public string SampleSizeNo { get; set; }
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
+ /// <summary>
+ /// 妫�楠屾按骞�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_LEVEL")]
public string FcheckLevel { get; set; }
- /// <summary>
- /// 鎷掓敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_LEVEL")]
public string FacLevel { get; set; }
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QTY")]
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
public string CheckQty { get; set; }
- /// <summary>
- /// 鎵规鍙� --鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+ /// <summary>
+ /// 鎵规鍙� --鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ��
- /// </summary>
- [SugarColumn(ColumnName = "FMOVE")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ��
+ /// </summary>
+ [SugarColumn(ColumnName = "FMOVE")]
public string Fmove { get; set; }
- /// <summary>
- /// 鏄惁澶勭悊
- /// </summary>
- [SugarColumn(ColumnName = "FHANDLE")]
+ /// <summary>
+ /// 鏄惁澶勭悊
+ /// </summary>
+ [SugarColumn(ColumnName = "FHANDLE")]
public string Fhandle { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏇存柊鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鏄惁瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG")]
+ /// <summary>
+ /// 鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG")]
public decimal? Modify1Flag { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY")]
public string Modify1By { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE")]
public DateTime? Modify1Date { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// XRF娴嬭瘯鎶ュ憡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_REPNO")]
+ /// <summary>
+ /// XRF娴嬭瘯鎶ュ憡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_REPNO")]
public string FcheckRepno { get; set; }
- /// <summary>
- /// 绗笁鏂规姤鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FTHIRD_REP")]
+ /// <summary>
+ /// 绗笁鏂规姤鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTHIRD_REP")]
public string FthirdRep { get; set; }
- /// <summary>
- /// 鏄惁浣滃簾
- /// </summary>
- [SugarColumn(ColumnName = "FCANCEL")]
+ /// <summary>
+ /// 鏄惁浣滃簾
+ /// </summary>
+ [SugarColumn(ColumnName = "FCANCEL")]
public decimal? Fcancel { get; set; }
- /// <summary>
- /// 鎻愪氦鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "FSUBMIT")]
+ /// <summary>
+ /// 鎻愪氦鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
public decimal? Fsubmit { get; set; }
- /// <summary>
- /// 妫�楠屼緷鎹�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ACCORD")]
+ /// <summary>
+ /// 妫�楠屼緷鎹�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ACCORD")]
public string FcheckAccord { get; set; }
- /// <summary>
- /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
- /// </summary>
- [SugarColumn(ColumnName = "FTYPE")]
+ /// <summary>
+ /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
+ /// </summary>
+ [SugarColumn(ColumnName = "FTYPE")]
public short? Ftype { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_UNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_UNIT")]
public string ItemUnit { get; set; }
- /// <summary>
- /// 鍑鸿揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "OUT_DATE")]
+ /// <summary>
+ /// 鍑鸿揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_DATE")]
public string OutDate { get; set; }
- /// <summary>
- /// 鏄惁鍏嶆
- /// </summary>
- [SugarColumn(ColumnName = "FEXEMPTION")]
+ /// <summary>
+ /// 鏄惁鍏嶆
+ /// </summary>
+ [SugarColumn(ColumnName = "FEXEMPTION")]
public decimal? Fexemption { get; set; }
- /// <summary>
- /// 妗ｄ綅鏍囧噯
- /// </summary>
- [SugarColumn(ColumnName = "FGEAR_STAND")]
+ /// <summary>
+ /// 妗ｄ綅鏍囧噯
+ /// </summary>
+ [SugarColumn(ColumnName = "FGEAR_STAND")]
public string FgearStand { get; set; }
- /// <summary>
- /// 涓嶈壇澶勭悊鏂规硶
- /// </summary>
- [SugarColumn(ColumnName = "FNG_HANDLE")]
+ /// <summary>
+ /// 涓嶈壇澶勭悊鏂规硶
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_HANDLE")]
public string FngHandle { get; set; }
- /// <summary>
- /// 绠＄悊缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FMANAGE_NO")]
+ /// <summary>
+ /// 绠＄悊缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FMANAGE_NO")]
public string FmanageNo { get; set; }
- /// <summary>
- /// 杞崲鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FCOVERT_QTY")]
+ /// <summary>
+ /// 杞崲鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FCOVERT_QTY")]
public string FcovertQty { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "FVERSION")]
+ /// <summary>
+ /// 鐗堟湰
+ /// </summary>
+ [SugarColumn(ColumnName = "FVERSION")]
public decimal? Fversion { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FSECOND_RESU")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FSECOND_RESU")]
public string FsecondResu { get; set; }
- /// <summary>
- /// 鏈�澶ф娊妫�鏁�
- /// </summary>
- [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
+ /// <summary>
+ /// 鏈�澶ф娊妫�鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
public decimal? MaxCheckQty { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼鏄惁瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
public decimal? Modify1Flag1 { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY1")]
public string Modify1By1 { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE1")]
public DateTime? Modify1Date1 { get; set; }
- /// <summary>
- /// 灏忔壒娆″彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO1")]
+ /// <summary>
+ /// 灏忔壒娆″彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO1")]
public string LotNo1 { get; set; }
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO2")]
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO2")]
public string LotNo2 { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
public string BoardStyle { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHA018")]
+ /// <summary>
+ /// 鍒拌揣鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHA018")]
public string Dha018 { get; set; }
- /// <summary>
- /// 琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
public decimal? Dhb002 { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
public string Dhb001 { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "LIFNR")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "LIFNR")]
public string Lifnr { get; set; }
- /// <summary>
- /// 閫�鏂欐柟寮�
- /// </summary>
- [SugarColumn(ColumnName = "FMRMODE")]
+ /// <summary>
+ /// 閫�鏂欐柟寮�
+ /// </summary>
+ [SugarColumn(ColumnName = "FMRMODE")]
public string Fmrmode { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index 68ee666..d6159cc 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -8,167 +8,167 @@
[SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
public class MesQaItemsDetectDetail5
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鏍囧噯鍊肩被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "FTEXT_TYPE")]
+ /// <summary>
+ /// 鏍囧噯鍊肩被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTEXT_TYPE")]
public string FtextType { get; set; }
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [SugarColumn(ColumnName = "FSTAND")]
+ /// <summary>
+ /// 鏍囧噯鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTAND")]
public decimal? Fstand { get; set; }
- /// <summary>
- /// 涓婂叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
+ /// <summary>
+ /// 涓婂叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FUP_ALLOW")]
public string FupAllow { get; set; }
- /// <summary>
- /// 涓嬪叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
+ /// <summary>
+ /// 涓嬪叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FDOWN_ALLOW")]
public string FdownAllow { get; set; }
- /// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ /// </summary>
+ [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
public string SampleSizeNo { get; set; }
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
+ /// <summary>
+ /// 妫�楠屾按骞�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_LEVEL")]
public string FcheckLevel { get; set; }
- /// <summary>
- /// 鎷掓敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_LEVEL")]
public string FacLevel { get; set; }
- /// <summary>
- /// 妫�楠岄」鐩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM")]
public string FcheckItem { get; set; }
- /// <summary>
- /// 瑙勬牸瑕佹眰
- /// </summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
+ /// <summary>
+ /// 瑙勬牸瑕佹眰
+ /// </summary>
+ [SugarColumn(ColumnName = "FSPEC_REQU")]
public string FspecRequ { get; set; }
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QYT")]
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QYT")]
public decimal? CheckQyt { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
public string FcheckResu { get; set; }
- /// <summary>
- /// AC鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FAC_QTY")]
+ /// <summary>
+ /// AC鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_QTY")]
public decimal? FacQty { get; set; }
- /// <summary>
- /// RE鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FRE_QTY")]
+ /// <summary>
+ /// RE鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FRE_QTY")]
public decimal? FreQty { get; set; }
- /// <summary>
- /// 涓嶅悎鏍兼暟
- /// </summary>
- [SugarColumn(ColumnName = "FNG_QTY")]
+ /// <summary>
+ /// 涓嶅悎鏍兼暟
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_QTY")]
public decimal? FngQty { get; set; }
- /// <summary>
- /// 涓嶈壇鐜�
- /// </summary>
- [SugarColumn(ColumnName = "FNG_RATE")]
+ /// <summary>
+ /// 涓嶈壇鐜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_RATE")]
public decimal? FngRate { get; set; }
- /// <summary>
- /// 宸插綍鍏ユ暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "FENTER_QTY")]
+ /// <summary>
+ /// 宸插綍鍏ユ暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "FENTER_QTY")]
public decimal? FenterQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string ReleaseNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 妫�楠岄」鐩弿杩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
+ /// <summary>
+ /// 妫�楠岄」鐩弿杩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
public string FcheckItemDesc { get; set; }
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PROC_NO")]
+ /// <summary>
+ /// 宸ュ簭鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
public string ProcNo { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
+ /// <summary>
+ /// 宸ヤ綔涓績缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
public string WorkshopCenterCode { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FUNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "FUNIT")]
public string Funit { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼
- /// </summary>
- [SugarColumn(ColumnName = "GIVEN_MODIFY")]
+ /// <summary>
+ /// 鐗瑰畾淇敼
+ /// </summary>
+ [SugarColumn(ColumnName = "GIVEN_MODIFY")]
public short? GivenModify { get; set; }
- /// <summary>
- /// 妫�楠屽伐鍏�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
+ /// <summary>
+ /// 妫�楠屽伐鍏�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_TOOL")]
public string FcheckTool { get; set; }
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesRohIn.cs b/StandardPda/MES.Service/Modes/MesRohIn.cs
index 5d301b8..71427aa 100644
--- a/StandardPda/MES.Service/Modes/MesRohIn.cs
+++ b/StandardPda/MES.Service/Modes/MesRohIn.cs
@@ -286,5 +286,4 @@
/// </summary>
[SugarColumn(ColumnName = "ACCTYPE")]
public string? ACCTYPE { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesStaff.cs b/StandardPda/MES.Service/Modes/MesStaff.cs
index 7b50614..450ed0d 100644
--- a/StandardPda/MES.Service/Modes/MesStaff.cs
+++ b/StandardPda/MES.Service/Modes/MesStaff.cs
@@ -15,16 +15,17 @@
public decimal Id { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
+ /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-27>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///[SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- ///public string? FDOCUMENTSTATUS { get; set; }
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-27>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
+ /// [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
+ /// public string? FDOCUMENTSTATUS { get; set; }
/// </remarks>
/// <summary>
/// ERP鍗曟嵁鐘舵��
diff --git a/StandardPda/MES.Service/Modes/MesSupplier.cs b/StandardPda/MES.Service/Modes/MesSupplier.cs
index 513fd74..ac6a23b 100644
--- a/StandardPda/MES.Service/Modes/MesSupplier.cs
+++ b/StandardPda/MES.Service/Modes/MesSupplier.cs
@@ -9,177 +9,177 @@
public class MesSupplier
{
/// <summary>
- /// ID
- ///</summary>
+ /// ID
+ /// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- ///</summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string? SuppNo { get; set; }
/// <summary>
- /// 渚涘簲鍟嗗悕绉�
- ///</summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_NAME")]
public string? SuppName { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙畝绉�
- ///</summary>
+ /// 渚涘簲鍟嗙畝绉�
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_SNAME")]
public string? SuppSname { get; set; }
/// <summary>
- /// 鍦板尯
- ///</summary>
+ /// 鍦板尯
+ /// </summary>
[SugarColumn(ColumnName = "LAND1")]
public string? Land1 { get; set; }
/// <summary>
- /// 鍦板潃
- ///</summary>
+ /// 鍦板潃
+ /// </summary>
[SugarColumn(ColumnName = "STRAS")]
public string? Stras { get; set; }
/// <summary>
- /// 鐢佃瘽
- ///</summary>
+ /// 鐢佃瘽
+ /// </summary>
[SugarColumn(ColumnName = "TELF1")]
public string? Telf1 { get; set; }
/// <summary>
- /// 浼犵湡
- ///</summary>
+ /// 浼犵湡
+ /// </summary>
[SugarColumn(ColumnName = "TELFX")]
public string? Telfx { 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 = "REMARK")]
public string? Remark { get; set; }
/// <summary>
- /// 绠�鐮�(鎵撳嵃鏉＄爜鐢�)
- ///</summary>
+ /// 绠�鐮�(鎵撳嵃鏉＄爜鐢�)
+ /// </summary>
[SugarColumn(ColumnName = "FSCODE")]
public string? Fscode { 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 = "ITEM_C")]
public short? ItemC { get; set; }
/// <summary>
- /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
- ///</summary>
+ /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_SAP")]
public short? ItemSap { get; set; }
/// <summary>
- /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
- ///</summary>
+ /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
+ /// </summary>
[SugarColumn(ColumnName = "LOT_FLAG")]
public short? LotFlag { get; set; }
/// <summary>
- /// 鑱旂郴浜�
- ///</summary>
+ /// 鑱旂郴浜�
+ /// </summary>
[SugarColumn(ColumnName = "LXR")]
public string? Lxr { get; set; }
/// <summary>
- /// 璐熻矗浜�
- ///</summary>
+ /// 璐熻矗浜�
+ /// </summary>
[SugarColumn(ColumnName = "FSTAFFID")]
public string? Fstaffid { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
+ /// 绂佺敤鐘舵��
+ /// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- ///</summary>
+ /// 鍒涘缓缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_ORG")]
public string? CreateOrg { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- ///</summary>
+ /// 浣跨敤缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "USE_ORG")]
public string? 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>
- /// 鍚屾SRM 001=鏄紝002=鍚�
- ///</summary>
+ /// 鍚屾SRM 001=鏄紝002=鍚�
+ /// </summary>
[SugarColumn(ColumnName = "PRIVATE_DESC_SEG")]
public string? PrivateDescSeg { get; set; }
-
+
/// <summary>
- /// Z=鏆傚瓨,A=鍒涘缓,B=瀹℃牳涓�,C=宸插鏍�,D=閲嶆柊瀹℃牳
- ///</summary>
- [SugarColumn(ColumnName="DOCUMENT_STATUS" )]
+ /// Z=鏆傚瓨,A=鍒涘缓,B=瀹℃牳涓�,C=宸插鏍�,D=閲嶆柊瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
diff --git a/StandardPda/MES.Service/Modes/MesUnit.cs b/StandardPda/MES.Service/Modes/MesUnit.cs
index 5f4e4c8..45ab51e 100644
--- a/StandardPda/MES.Service/Modes/MesUnit.cs
+++ b/StandardPda/MES.Service/Modes/MesUnit.cs
@@ -9,153 +9,160 @@
public class MesUnit
{
/// <summary>
- /// BASEINFO
- /// </summary>
+ /// BASEINFO
+ ///</summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///[SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- ///public string? FDOCUMENTSTATUS { get; set; }
- /// </remarks>
- /// <summary>
- /// ERP鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- public string? FDOCUMENTSTATUS { 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 double? Fconvertdenominator { get; set; }
+ public decimal? Fconvertdenominator { get; set; }
/// <summary>
- /// 褰撳墠鍗曚綅
- /// </summary>
+ /// 褰撳墠鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "FCURRENTUNITID")]
public string? Fcurrentunitid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗗瓙
- /// </summary>
+ /// 鎹㈢畻鍒嗗瓙
+ ///</summary>
[SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
- public double? Fconvertnumerator { get; set; }
+ 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>
+ [SugarColumn(ColumnName = "BASE_UOMID")]
+ public string? BaseUomid { get; set; }
+
+ /// <summary>
+ /// 涓诲壇鍗曚綅杞崲鐜�
+ ///</summary>
+ [SugarColumn(ColumnName = "RATIO_TO_BASE")]
+ public string? RatioToBase { get; set; }
+
+ /// <summary>
+ /// 鑸嶅叆鍊�
+ ///</summary>
+ [SugarColumn(ColumnName = "ROUND_VALUE")]
+ public string? RoundValue { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/Organize.cs b/StandardPda/MES.Service/Modes/Organize.cs
index ba55bef..7725628 100644
--- a/StandardPda/MES.Service/Modes/Organize.cs
+++ b/StandardPda/MES.Service/Modes/Organize.cs
@@ -25,25 +25,25 @@
public string? Fname { get; set; }
/// <summary>
- /// 鏄惁鍚敤
+ /// 鏄惁鍚敤
/// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鎿嶄綔绫诲瀷
+ /// 鎿嶄綔绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "TYPE")]
public string? Type { get; set; }
/// <summary>
- /// 涓婄骇缁勭粐
+ /// 涓婄骇缁勭粐
/// </summary>
[SugarColumn(ColumnName = "FPARENTID")]
public string? Fparentid { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
+ /// 鍒涘缓鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "FCREATEDATE")]
public DateTime? Fcreatedate { get; set; }
diff --git a/StandardPda/MES.Service/Modes/Purdhb.cs b/StandardPda/MES.Service/Modes/Purdhb.cs
index b8de0cc..7fff6ee 100644
--- a/StandardPda/MES.Service/Modes/Purdhb.cs
+++ b/StandardPda/MES.Service/Modes/Purdhb.cs
@@ -8,267 +8,267 @@
[SugarTable("PURDHB")]
public class Purdhb
{
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
public string Dhb001 { get; set; }
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
public string Dhb002 { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB003")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB003")]
public string Dhb003 { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB004")]
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB004")]
public string Dhb004 { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DHB005")]
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB005")]
public string Dhb005 { get; set; }
- /// <summary>
- /// 浜よ揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB006")]
+ /// <summary>
+ /// 浜よ揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB006")]
public decimal? Dhb006 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DHB007")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB007")]
public string Dhb007 { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB008")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB008")]
public string Dhb008 { get; set; }
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB009")]
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB009")]
public string Dhb009 { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB010")]
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB010")]
public string Dhb010 { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB011")]
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB011")]
public string Dhb011 { get; set; }
- /// <summary>
- /// 鏉ユ簮搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB012")]
+ /// <summary>
+ /// 鏉ユ簮搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB012")]
public decimal? Dhb012 { get; set; }
- /// <summary>
- /// 娓呯偣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB013")]
+ /// <summary>
+ /// 娓呯偣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB013")]
public decimal? Dhb013 { get; set; }
- /// <summary>
- /// 鍒板巶鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DHB014")]
+ /// <summary>
+ /// 鍒板巶鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB014")]
public string Dhb014 { get; set; }
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB015")]
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB015")]
public decimal? Dhb015 { get; set; }
- /// <summary>
- /// 楠岄��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB016")]
+ /// <summary>
+ /// 楠岄��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB016")]
public decimal? Dhb016 { get; set; }
- /// <summary>
- /// 杩涜揣鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "DHB017")]
+ /// <summary>
+ /// 杩涜揣鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB017")]
public decimal? Dhb017 { get; set; }
- /// <summary>
- /// 杩涜揣閲戦
- /// </summary>
- [SugarColumn(ColumnName = "DHB018")]
+ /// <summary>
+ /// 杩涜揣閲戦
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB018")]
public decimal? Dhb018 { get; set; }
- /// <summary>
- /// 瀹㈡埛鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB019")]
+ /// <summary>
+ /// 瀹㈡埛鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB019")]
public string Dhb019 { get; set; }
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB020")]
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB020")]
public string Dhb020 { get; set; }
- /// <summary>
- /// 璧犲搧鏁�
- /// </summary>
- [SugarColumn(ColumnName = "DHB021")]
+ /// <summary>
+ /// 璧犲搧鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB021")]
public decimal? Dhb021 { get; set; }
- /// <summary>
- /// 鏇存柊ERP
- /// </summary>
- [SugarColumn(ColumnName = "DHB022")]
+ /// <summary>
+ /// 鏇存柊ERP
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB022")]
public string Dhb022 { get; set; }
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- [SugarColumn(ColumnName = "DHB023")]
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB023")]
public string Dhb023 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DHB024")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB024")]
public string Dhb024 { get; set; }
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
public decimal? Auditing { get; set; }
- /// <summary>
- /// ERP閲囪喘鍗曞彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB026")]
+ /// <summary>
+ /// ERP閲囪喘鍗曞彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB026")]
public decimal? Dhb026 { get; set; }
- /// <summary>
- /// ERP閲囪喘搴忓彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB027")]
+ /// <summary>
+ /// ERP閲囪喘搴忓彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB027")]
public decimal? Dhb027 { get; set; }
- /// <summary>
- /// ERP鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB028")]
+ /// <summary>
+ /// ERP鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB028")]
public decimal? Dhb028 { get; set; }
- /// <summary>
- /// 寰呮鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB029")]
+ /// <summary>
+ /// 寰呮鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB029")]
public decimal? Dhb029 { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DHB030")]
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB030")]
public string Dhb030 { get; set; }
- /// <summary>
- /// 妫�楠屽憳
- /// </summary>
- [SugarColumn(ColumnName = "DHB031")]
+ /// <summary>
+ /// 妫�楠屽憳
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB031")]
public string Dhb031 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB032")]
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB032")]
public decimal? Dhb032 { get; set; }
- /// <summary>
- /// 鍏ュ簱浜�
- /// </summary>
- [SugarColumn(ColumnName = "DHB033")]
+ /// <summary>
+ /// 鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB033")]
public string Dhb033 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHB034")]
+ /// <summary>
+ /// 鍏ュ簱鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB034")]
public string Dhb034 { get; set; }
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "DHB035")]
+ /// <summary>
+ /// 閫�璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB035")]
public decimal? Dhb035 { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "DHB037")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB037")]
public decimal? Dhb037 { get; set; }
- /// <summary>
- /// 閫�璐т汉
- /// </summary>
- [SugarColumn(ColumnName = "DHB036")]
+ /// <summary>
+ /// 閫�璐т汉
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB036")]
public string Dhb036 { get; set; }
- /// <summary>
- /// ERP鍘熷垎褰曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB038")]
+ /// <summary>
+ /// ERP鍘熷垎褰曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB038")]
public decimal? Dhb038 { get; set; }
- /// <summary>
- /// ERP婧愬崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB039")]
+ /// <summary>
+ /// ERP婧愬崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB039")]
public decimal? Dhb039 { get; set; }
- /// <summary>
- /// ERP婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "DHB040")]
+ /// <summary>
+ /// ERP婧愬崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB040")]
public decimal? Dhb040 { get; set; }
- /// <summary>
- /// ERP璁㈠崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB041")]
+ /// <summary>
+ /// ERP璁㈠崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB041")]
public decimal? Dhb041 { get; set; }
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
public decimal? Id { get; set; }
- /// <summary>
- /// 鏄惁妫�楠岋紝1涓哄凡妫�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
+ /// <summary>
+ /// 鏄惁妫�楠岋紝1涓哄凡妫�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
public decimal? Ischeck { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB042")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB042")]
public string Dhb042 { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/Purdka.cs b/StandardPda/MES.Service/Modes/Purdka.cs
index 4330c13..1c3ea40 100644
--- a/StandardPda/MES.Service/Modes/Purdka.cs
+++ b/StandardPda/MES.Service/Modes/Purdka.cs
@@ -8,123 +8,123 @@
[SugarTable("PURDKA")]
public class Purdka
{
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
public decimal? Id { get; set; }
- /// <summary>
- /// 鍒涘缓浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "CREATEUSER")]
+ /// <summary>
+ /// 鍒涘缓浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEUSER")]
public string Createuser { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATETIME")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATETIME")]
public string Createtime { get; set; }
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYTIME")]
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYTIME")]
public string Modifytime { get; set; }
- /// <summary>
- /// 淇敼浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYUSER")]
+ /// <summary>
+ /// 淇敼浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYUSER")]
public string Modifyuser { get; set; }
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
public string Auditing { get; set; }
- /// <summary>
- /// 閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DKA001")]
+ /// <summary>
+ /// 閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA001")]
public string Dka001 { get; set; }
- /// <summary>
- /// 閫�璐х被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "DKA002")]
+ /// <summary>
+ /// 閫�璐х被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA002")]
public string Dka002 { get; set; }
- /// <summary>
- /// 閫�璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DKA003")]
+ /// <summary>
+ /// 閫�璐ф棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA003")]
public string Dka003 { get; set; }
- /// <summary>
- /// 閫�璐ф椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "DKA004")]
+ /// <summary>
+ /// 閫�璐ф椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA004")]
public string Dka004 { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "DKA005")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA005")]
public string Dka005 { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "DKA006")]
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA006")]
public string Dka006 { get; set; }
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "DKA007")]
+ /// <summary>
+ /// 閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA007")]
public string Dka007 { get; set; }
- /// <summary>
- /// 瀹℃牳鑰�
- /// </summary>
- [SugarColumn(ColumnName = "DKA008")]
+ /// <summary>
+ /// 瀹℃牳鑰�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA008")]
public string Dka008 { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DKA009")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA009")]
public string Dka009 { get; set; }
- /// <summary>
- /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
- /// </summary>
- [SugarColumn(ColumnName = "DKA010")]
+ /// <summary>
+ /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA010")]
public string Dka010 { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
public decimal? Erpid { get; set; }
- /// <summary>
- /// 淇濈鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA011")]
+ /// <summary>
+ /// 淇濈鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA011")]
public string Dka011 { get; set; }
- /// <summary>
- /// 楠屾敹鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA012")]
+ /// <summary>
+ /// 楠屾敹鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA012")]
public string Dka012 { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
- /// </summary>
- [SugarColumn(ColumnName = "DKA013")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA013")]
public decimal? Dka013 { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/SysDepartment.cs b/StandardPda/MES.Service/Modes/SysDepartment.cs
index b171914..45ea1cf 100644
--- a/StandardPda/MES.Service/Modes/SysDepartment.cs
+++ b/StandardPda/MES.Service/Modes/SysDepartment.cs
@@ -165,15 +165,17 @@
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧� ERP鏁版嵁鐘舵�併��
+ /// 鎺ュ彛瀛楁璋冩暣锛氭柊澧� ERP鏁版嵁鐘舵�併��
/// </summary>
/// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-31>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
+ /// 淇敼浜猴細
+ /// <姹犲崡楠�>
+ /// 淇敼鏃ユ湡锛�<2024-12-31>
+ /// 淇敼璇存槑锛�
+ /// - 鍘熶唬鐮侊細绌�
+ /// - 淇敼鍚庯細
/// </remarks>
/// <summary>
/// ERP鏁版嵁鐘舵��
diff --git a/StandardPda/MES.Service/Modes/Womcaa.cs b/StandardPda/MES.Service/Modes/Womcaa.cs
index 0713d0c..86b5acb 100644
--- a/StandardPda/MES.Service/Modes/Womcaa.cs
+++ b/StandardPda/MES.Service/Modes/Womcaa.cs
@@ -437,6 +437,4 @@
/// </summary>
[SugarColumn(ColumnName = "F_XIFG_TEXT_TZK")]
public string? F_XIFG_TEXT_TZK { get; set; }
-
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs b/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
index 4e78597..13668bc 100644
--- a/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -1,12 +1,8 @@
-锘縰sing AngleSharp.Dom;
-using Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
-using System.Collections.Generic;
-using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
@@ -52,14 +48,12 @@
//var list = customers.Select(GetSysDepartment).ToList();
//鍥犱负U9鐨勬ā寮忥紝浼氬鑷村缁勭粐鐨勫熀纭�鏁版嵁琚鐞嗘垚List<>,鎵�浠ラ渶瑕佷慨鏀规柟娉曪紝SaveLits涓簲璇ユ槸鎶婂崟鏉″鐞嗗嚭鏉ョ殑List鏁版嵁鍔犺捣鏉ワ紝鑰屼笉鏄箣鍓嶇殑鏂规硶澶勭悊銆�
- List<MesCustomer> mes_customers = new List<MesCustomer>();
- foreach (ErpCustomer customer in customers)
+ List<MesCustomer> mes_customers = new();
+ foreach (var customer in customers)
{
var mesCustomerList = GetSysDepartment(customer);
if (mesCustomerList != null)
- {
mes_customers.AddRange(mesCustomerList);
- }
}
var groupBy = mes_customers.GroupBy(s => s.Type)
@@ -71,11 +65,13 @@
switch (customerGroup.Key)
{
case "0":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"A"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "A"))
throw new NotImplementedException("鍚敤澶辫触");
break;
case "1":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"B"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
case "3":
@@ -133,13 +129,15 @@
var db = SqlSugarHelper.GetInstance();
//var id = db.Insertable(insertObj).ExecuteReturnIdentity();
//鏍规嵁搴忓垪鑾峰彇鏂扮殑MES_ID
-
- List<MesCustomer> customers = new List<MesCustomer>();
- foreach (ErpDetail erpDetail in customer.ErpDetails)
+ List<MesCustomer> customers = new();
+
+ foreach (var erpDetail in customer.ErpDetails)
{
decimal mesId = 0;
- var exists = db.Queryable<MesLinkU9>().Any(u => u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId && u.TableType == "MES_CUSTOMER");
+ var exists = db.Queryable<MesLinkU9>().Any(u =>
+ u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_CUSTOMER");
if (!exists)
{
mesId = GetSeqUtil.GetSeq("U9_MES_ID");
@@ -147,17 +145,19 @@
{
CreateDate = DateTime.Now,
MesId = mesId.ToString(),
- U9Id = customer.Id.ToString(),
- OrgId = erpDetail.FUseOrgId.ToString(),
+ U9Id = customer.Id,
+ OrgId = erpDetail.FUseOrgId,
TableType = "MES_CUSTOMER"
-
};
var insertUser = db.Insertable(entity).ExecuteCommand();
}
else
{
mesId = Convert.ToDecimal(db.Queryable<MesLinkU9>()
- .Where(u => u.U9Id == customer.Id && u.OrgId == erpDetail.FUseOrgId && u.TableType == "MES_CUSTOMER")
+ .Where(u =>
+ u.U9Id == customer.Id &&
+ u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_CUSTOMER")
.Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
.First());
}
@@ -179,7 +179,7 @@
customers.Add(mesCustomer);
}
-
+
//customers = customer.ErpDetails.Select(ErpDetails => new MesCustomer
//{
// Id = GetSeqUtil.GetSeq("U9_MES_ID"),
@@ -194,7 +194,7 @@
// UseOrg = Convert.ToDecimal(ErpDetails.FUseOrgId),
//}).ToList();
-
+
return customers;
}
@@ -226,31 +226,34 @@
List<MesCustomer> customerList)
{
// 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
- var mesIds = customerList.Select(customer => customer.Id.ToString()).ToList();
+ var mesIds = customerList.Select(customer => customer.Id.ToString())
+ .ToList();
// 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
var u9Ids = db.Queryable<MesLinkU9>()
- .Where(u => mesIds.Contains(u.MesId) && u.TableType == "MES_CUSTOMER")
- .Select(u => u.U9Id)
- .Distinct() // 搴旂敤 Distinct 鍘婚噸
- .ToList();
+ .Where(u =>
+ mesIds.Contains(u.MesId) && u.TableType == "MES_CUSTOMER")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
// 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
// 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
var idsToDelete = db.Queryable<MesLinkU9>()
- .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_CUSTOMER")
- .Select(u => u.MesId)
- .Distinct() // 搴旂敤 Distinct 鍘婚噸
- .ToList();
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_CUSTOMER")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
//浠ヤ笂鏂规硶鍙互鑰冭檻浼樺寲锛屽皢U9id鎵句釜鏂板缓瀛楁瀛樺湪MES_CUSTOMER涓紝灏卞彲浠ュ皯涓�姝ユ煡璇簡銆�
- var deleteByIds = db.Deleteable<MesCustomer>().In(idsToDelete).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ var deleteByIds = db.Deleteable<MesCustomer>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
}
/// <summary>
diff --git a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
index 3c64061..4270cb1 100644
--- a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
@@ -1,5 +1,4 @@
-锘縰sing AngleSharp.Dom;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -23,7 +22,7 @@
return SaveOrUpdateData(db, mesDeliveryNoteBarcode) ? 1 : 0;
case "3":
case "6":
- return DeleteData(db, mesDeliveryNoteBarcode) ? 1: 0;
+ return DeleteData(db, mesDeliveryNoteBarcode) ? 1 : 0;
default:
throw new ArgumentNullException(
$"type娌℃湁{barcode.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
@@ -34,10 +33,11 @@
}
// 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ private bool InsertData(SqlSugarScope db,
+ MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
{
-
- if (mesDeliveryNoteBarcode.Id != null) base.DeleteById(mesDeliveryNoteBarcode.Id);
+ if (mesDeliveryNoteBarcode.Id != null)
+ base.DeleteById(mesDeliveryNoteBarcode.Id);
var insert = base.Insert(mesDeliveryNoteBarcode);
@@ -46,7 +46,8 @@
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool DeleteData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ private bool DeleteData(SqlSugarScope db,
+ MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
{
var detect = base.DeleteById(mesDeliveryNoteBarcode.Id);
@@ -55,9 +56,11 @@
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
{
- if (mesDeliveryNoteBarcode.Id != null) base.DeleteById(mesDeliveryNoteBarcode.Id);
+ if (mesDeliveryNoteBarcode.Id != null)
+ base.DeleteById(mesDeliveryNoteBarcode.Id);
var orUpdate = base.Insert(mesDeliveryNoteBarcode);
if (orUpdate) return true;
@@ -70,69 +73,69 @@
{
var result = barcodes.Select(Save).ToList();
return result.All(b => b);
- /* var list = barcodes.Select(GetMesDeliveryNoteBarcode).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
+ /* var list = barcodes.Select(GetMesDeliveryNoteBarcode).ToList();
+ var groupBy = list.GroupBy(s => s.Type)
+ .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var barcodeGroup in groupBy)
- switch (barcodeGroup.Key)
- {
- case "1":
- if (!UpdateItemStatusBatch(db, barcodeGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertItemBatch(db, barcodeGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{barcodeGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
+ return UseTransaction(db =>
+ {
+ foreach (var barcodeGroup in groupBy)
+ switch (barcodeGroup.Key)
+ {
+ case "1":
+ if (!UpdateItemStatusBatch(db, barcodeGroup.Value, "B"))
+ throw new NotImplementedException("绂佺敤澶辫触");
+ break;
+ case "2":
+ if (!InsertItemBatch(db, barcodeGroup.Value))
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{barcodeGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
- return 1;
- }) > 0; */
+ return 1;
+ }) > 0; */
}
- /* private bool InsertItemBatch(SqlSugarScope db, List<MesDeliveryNoteBarcode> barcodeList)
- {
- var insertRange = db.Insertable(barcodeList).ExecuteCommand();
- if (insertRange > 0)
- return true;
+ /* private bool InsertItemBatch(SqlSugarScope db, List<MesDeliveryNoteBarcode> barcodeList)
+ {
+ var insertRange = db.Insertable(barcodeList).ExecuteCommand();
+ if (insertRange > 0)
+ return true;
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
- private bool DeleteItemBatch(SqlSugarScope db, List<MesDeliveryNoteBarcode> barcodeList)
- {
- var ids = barcodeList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
+ private bool DeleteItemBatch(SqlSugarScope db, List<MesDeliveryNoteBarcode> barcodeList)
+ {
+ var ids = barcodeList.Select(it => it.Id).ToArray();
+ var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
+ if (deleteByIds > 0)
+ return true;
- throw new NotImplementedException("鍒犻櫎澶辫触");
- } */
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ } */
public MesDeliveryNoteBarcode GetMesDeliveryNoteBarcode(ErpBarcode barcode)
{
var mesDeliveryNoteBarcode = new MesDeliveryNoteBarcode();
- var single = base.GetSingle(it => it.SmallBarcode == barcode.SmallBarcode);
+ var single =
+ base.GetSingle(it => it.SmallBarcode == barcode.SmallBarcode);
if (single != null) mesDeliveryNoteBarcode.Id = single.Id;
mesDeliveryNoteBarcode.DeliveryNo = barcode.DeliveryNo;
mesDeliveryNoteBarcode.ProductCode = barcode.ProductCode;
- mesDeliveryNoteBarcode.SmallBarcode= barcode.SmallBarcode;
- mesDeliveryNoteBarcode.IncludeQty= Convert.ToDecimal(barcode.IncludeQty);
- mesDeliveryNoteBarcode.LineNo=Convert.ToDecimal(barcode.LineNo);
+ mesDeliveryNoteBarcode.SmallBarcode = barcode.SmallBarcode;
+ mesDeliveryNoteBarcode.IncludeQty =
+ Convert.ToDecimal(barcode.IncludeQty);
+ mesDeliveryNoteBarcode.LineNo = Convert.ToDecimal(barcode.LineNo);
mesDeliveryNoteBarcode.CreateDate = DateTime.Now;
mesDeliveryNoteBarcode.SuppNo = barcode.SupplierId;
return mesDeliveryNoteBarcode;
}
-
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
index 3093fe2..0fd0ff0 100644
--- a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -2,20 +2,21 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
public class MesDeliveryNoteManager : Repository<MesDeliveryNote>
{
- private readonly MesDeliveryDetailsManager mesDeliveryNoteManager= new ();
+ private readonly MesDeliveryDetailsManager mesDeliveryNoteManager = new();
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
public bool Save(Delivery delivery)
{
var erpDelivery = delivery.ErpDelivery;
var mesDeliveryNote = GetMesDeliveryNote(erpDelivery);
- var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.ErpDeliveryData, erpDelivery.DeliveryNo, mesDeliveryNote.Status);
+ var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(
+ delivery.ErpDeliveryData, erpDelivery.DeliveryNo,
+ mesDeliveryNote.Status);
return UseTransaction(db =>
{
@@ -24,10 +25,16 @@
case "2":
case "4":
case "5":
- return SaveOrUpdateData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1 : 0;
+ return SaveOrUpdateData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
case "3":
case "6":
- return DeleteData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1: 0;
+ return DeleteData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpDelivery.Type}杩欎釜绫诲瀷");
@@ -36,7 +43,8 @@
}
// 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
@@ -46,33 +54,42 @@
db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand();
var insert = base.Insert(mesDeliveryNote);
- var insertRange = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ var insertRange =
+ mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
if (insert && insertRange) return true;
throw new NotImplementedException("鎻掑叆澶辫触");
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesDeliveryNote.Id);
- var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鍒犻櫎澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
if (mesDeliveryNoteDetails.Count > 0)
- db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
+ db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesDeliveryNote);
- var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ var baOrUpdate =
+ mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -102,15 +119,18 @@
}
else
{
- mesDeliveryNote.Status =0;
+ mesDeliveryNote.Status = 0;
}
+
mesDeliveryNote.CreateDate = DateTime.Now;
mesDeliveryNote.DepotNo = delivery.DepotNo;
mesDeliveryNote.ErpId = delivery.ErpId;
return mesDeliveryNote;
}
- public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(List<ErpDeliveryData> erpDeliveryDatas, string? type,decimal? status)
+
+ public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(
+ List<ErpDeliveryData> erpDeliveryDatas, string? type, decimal? status)
{
return erpDeliveryDatas.Select(s =>
{
@@ -132,8 +152,10 @@
Fsrcbill_no = s.SalesOrderId,
RealQty = Convert.ToDecimal(s.IncludeQty)
};
- var single = mesDeliveryNoteManager.GetSingle(it =>it.LineNo == entity.LineNo);
- if (single !=null && status==1) entity.RealQty = single.RealQty;
+ var single =
+ mesDeliveryNoteManager.GetSingle(it =>
+ it.LineNo == entity.LineNo);
+ if (single != null && status == 1) entity.RealQty = single.RealQty;
return entity;
}).ToList();
diff --git a/StandardPda/MES.Service/service/BasicData/MesDepotsManager.cs b/StandardPda/MES.Service/service/BasicData/MesDepotsManager.cs
index d0b205c..3fe22a5 100644
--- a/StandardPda/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -46,7 +46,7 @@
string status)
{
var result = db.Updateable<MesDepots>()
- .SetColumns(s => s.IsNg == status)
+ .SetColumns(s => s.ForbidStatus == status)
.Where(s => s.DepotId == depotId).ExecuteCommand();
if (result > 0)
@@ -76,42 +76,12 @@
throw new NotImplementedException("鍙嶅鏍稿け璐�");
}
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆锛屽悓鏃剁敤id鍜孭ositionCode浣滀负鍒ゆ柇渚濇嵁
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- ///鍘熶唬鐮�
- // 鎻掑叆鎴栨洿鏂颁粨搴撶殑鏂规硶
- //private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
- //{
- // var exists = db.Queryable<MesDepots>()
- // .Any(e => e.DepotId == entity.DepotId);
- // if (exists)
- // {
- // var update = db.Updateable(entity).ExecuteCommand();
- // if (update > 0)
- // return true;
- // }
- // else
- // {
- // var insert = db.Insertable(entity).ExecuteCommand();
- // if (insert > 0)
- // return true;
- // }
-
- // return false;
- //}
/// 鏂颁唬鐮�
private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
{
db.Deleteable<MesDepots>()
- .Where(s => s.DepotId == entity.DepotId)
- .ExecuteCommand();
+ .Where(s => s.DepotId == entity.DepotId)
+ .ExecuteCommand();
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
@@ -128,27 +98,10 @@
IsFkc = depots.FAllowMinusQty,
CreateBy = depots.FPrincipal,
Depottype = depots.FStockProperty,
- /// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板渚涘簲鍟唅d銆佸鎴穒d銆佹暟鎹姸鎬併�佸簱瀛樼姸鎬佺被鍨嬪瓧娈点��
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///FDOCUMENTSTATUS = supplier.FDocumentStatus,
- /// </remarks>
- FSUPPLIERID = depots.FSupplierId,
- FCUSTOMERID = depots.FCustomerId,
- FDOCUMENTSTATUS = depots.FDocumentStatus,
- FSTOCKSTATUSTYPE = depots.FStockStatusType,
-
-
- IsNg = depots.FForbidStatus,
- Zuid = depots.FGroup,
- CreateOrg= Convert.ToDecimal(depots.FCreateOrgId),
- UseOrg= Convert.ToDecimal(depots.FUseOrgId),
+ IsLot = depots.IsLot,
+ DocumentStatus = depots.FDocumentStatus,
+ ForbidStatus = depots.FForbidStatus,
+ UseOrg = Convert.ToDecimal(depots.FUseOrgId),
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
@@ -158,103 +111,7 @@
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜浠撳簱璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
public bool SaveList(List<ErpDepots> erpDepots)
{
- var list = new List<MesDepots>();
- erpDepots.ForEach(s =>
- {
- var entity = GetMesDepots(s); // 灏� ErpDepots 杞崲涓� MesDepots
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var depotsGroup in groupBy)
- switch (depotsGroup.Key)
- {
- case "0":
- if (!UpdateDepotStatusBatch(db, depotsGroup.Value,
- "A")) // 鎵归噺鍚敤浠撳簱
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateDepotStatusBatch(db, depotsGroup.Value,
- "B")) // 鎵归噺绂佺敤浠撳簱
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- //case "2":
- // if (!InsertDepotBatch(db,
- // depotsGroup.Value)) // 鎵归噺鎻掑叆浠撳簱
- // throw new NotImplementedException("鎻掑叆澶辫触");
- // break;
- case "3":
- if (!DeleteDepotBatch(db,
- depotsGroup.Value)) // 鎵归噺鍒犻櫎浠撳簱
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "2":
- case "4":
- if (!InsertOrUpdateBatch(db,
- depotsGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{depotsGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊浠撳簱鐘舵�佺殑鏂规硶
- private bool UpdateDepotStatusBatch(SqlSugarScope db,
- List<MesDepots> depotList, string status)
- {
- var ids = depotList.Select(it => it.DepotId).ToArray();
- var result = db.Updateable<MesDepots>()
- .SetColumns(s => s.IsNg == status)
- .Where(s => ids.Contains(s.DepotId)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆浠撳簱鐨勬柟娉�
- private bool InsertDepotBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- var insertRange = db.Insertable(depotList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("瀹℃牳澶辫触");
- }
-
- // 鎵归噺鍒犻櫎浠撳簱鐨勬柟娉�
- private bool DeleteDepotBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- var ids = depotList.Select(it => it.DepotId).ToArray();
- var deleteByIds =
- db.Deleteable<MesDepots>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍙嶅鏍稿け璐�");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴撶殑鏂规硶
- private bool InsertOrUpdateBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- foreach (var entity in depotList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ var result = erpDepots.Select(Save).ToList();
+ return result.All(b => b);
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
index 4b055de..c2d65d6 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -10,45 +10,18 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
public bool Save(ErpItemType unit)
{
- /// <summary>
- /// save鏂规硶璋冩暣銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- ///鍘熶唬鐮�
- //try
- //{
- // switch (customer.Type)
- // {
- // case "0":
- // return InsertItemType(entity);
- // case "1":
- // return DeleteItemType(entity.Id);
- // default:
- // throw new ArgumentNullException(
- // $"type娌℃湁{customer.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- // }
- //}
- //catch (Exception ex)
- //{
- // throw new ApplicationException($"鎿嶄綔澶辫触: {ex.Message}", ex);
- //}
-
var entity = GetMesItemType(unit);
return UseTransaction(db =>
{
switch (unit.Type)
{
- case "0":
- if (InsertItemType(db, entity))
+ case "3":
+ if (DeleteItemType(entity))
return 1;
break;
- case "1":
- if (DeleteItemType(entity.Id))
+ case "2":
+ case "4":
+ if (InsertItemType(db, entity))
return 1;
break;
default:
@@ -58,133 +31,104 @@
throw new NotImplementedException("鎿嶄綔澶辫触");
}) > 0;
-
}
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- //// - 鍘熶唬鐮侊細
- //private bool InsertItemType(MesItemType entity)
- //{
- // var insert = base.Insert(entity);
- // if (insert)
- // return true;
-
- // throw new NotImplementedException("鎻掑叆澶辫触");
- //}
-
- //// - 鏂颁唬鐮侊細
- private bool InsertItemType(SqlSugarScope db, MesItemType entity)
+
+ private bool InsertItemType(SqlSugarScope db, List<MesItemType> entity)
{
- db.Deleteable<MesItemType>()
- .Where(s => s.Id == entity.Id)
- .ExecuteCommand();
+ DeleteItemType(entity);
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
}
- private bool DeleteItemType(decimal id)
+ private bool DeleteItemType(List<MesItemType> supplierId)
{
- var deleteById = base.DeleteById(id);
- if (deleteById)
- return true;
+ // 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
+ var ids = supplierId.Select(customer => customer.Id.ToString())
+ .ToList();
+
+ // 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
+ var u9Ids = Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ ids.Contains(u.MesId) && u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ // 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
+ // 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
+ var idsToDelete = Db.Queryable<MesLinkU9>()
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
+
+ var deleteByIds = Db.Deleteable<MesProject>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
}
- private MesItemType GetMesItemType(ErpItemType department)
+ private List<MesItemType> GetMesItemType(ErpItemType department)
{
- return new MesItemType
+
+ List<MesItemType> list = new();
+
+ foreach (var erpDetail in department.FUseOrgId)
{
- Id = Convert.ToDecimal(department.Id),
- Pgroup = department.FParentId,
- Tcode = department.FNumber,
- Tname = department.FName,
- Description = department.FDescription,
- CreateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
+ var exists = Db.Queryable<MesLinkU9>().Any(u =>
+ u.U9Id == department.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_ITEM_TYPE");
+
+ decimal mesId = 0;
+ if (exists)
+ {
+ //鑾峰彇mesid
+ mesId = Convert.ToDecimal(Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ u.U9Id == department.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
+ .First());
+ }
+ else
+ {
+ var entity = new MesLinkU9
+ {
+ CreateDate = DateTime.Now,
+ MesId = mesId.ToString(),
+ U9Id = department.Id,
+ OrgId = erpDetail.FUseOrgId,
+ TableType = "MES_ITEM_TYPE"
+ };
+ mesId = Db.Insertable(entity).ExecuteReturnIdentity();
+ }
+
+ var mesItemType = new MesItemType
+ {
+ Id = mesId,
+ Pgroup = department.FParentId,
+ Tcode = department.FNumber,
+ Tname = department.FName,
+ Unit = department.Unit,
+ ForbidStatus = department.FForbidStatus,
+ IqcType = department.IqcType,
+ CreateDate = DateTime.Now,
+ Company = "1000",
+ Factory = "1000"
+ };
+
+ list.Add(mesItemType);
+ }
+
+ return list;
}
public bool SaveList(List<ErpItemType> departments)
{
- var list = new List<MesItemType>();
- departments.ForEach(s =>
- {
- var entity = GetMesItemType(s);
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- var result = new List<bool>();
-
- foreach (var itemTypeGroup in groupBy)
- try
- {
- switch (itemTypeGroup.Key)
- {
- case "0":
- result.Add(InsertItemTypeBatch(itemTypeGroup.Value));
- break;
- case "1":
- result.Add(DeleteItemTypeBatch(itemTypeGroup.Value));
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemTypeGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
- }
- catch (Exception ex)
- {
- throw new ApplicationException($"鎵归噺鎿嶄綔澶辫触: {ex.Message}", ex);
- }
-
- if (result.All(b => b))
- return true;
-
- throw new NotImplementedException("鎺ュ彛鎵ц澶辫触");
- }
-
- private bool InsertItemTypeBatch(List<MesItemType> itemTypeList)
- {
- /// <summary>
- /// InsertItemTypeBatch鏂规硶璋冩暣锛屽厛鍒犻櫎鍐嶆彃鍏ャ��
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
- //鏂板锛氬厛鍒犻櫎锛屽啀鎻掑叆
- var ids = itemTypeList.Select(it => it.Id).ToArray();
- var deleteByIds =
- base.DeleteByIds(ids.Select(d => (dynamic)d).ToArray());
-
- var insertRange = base.InsertRange(itemTypeList);
- if (insertRange)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemTypeBatch(List<MesItemType> itemTypeList)
- {
- var ids = itemTypeList.Select(it => it.Id).ToArray();
- var deleteByIds =
- base.DeleteByIds(ids.Select(d => (dynamic)d).ToArray());
- if (deleteByIds)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
}
}
\ 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 6b43380..491b84b 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
@@ -134,7 +134,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
- ItemId= Convert.ToDecimal(item.Id),
+ ItemId = Convert.ToDecimal(item.Id),
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
@@ -234,14 +234,13 @@
}
/// <summary>
- /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
+ /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-31
- /// 淇敼璇存槑锛歚
+ /// 淇敼浜猴細姹犲崡楠�
+ /// 淇敼鏃ユ湡锛�2024-12-31
+ /// 淇敼璇存槑锛歚
/// </remarks>
-
/// 鍘熶唬鐮侊細
//private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
//{
@@ -261,7 +260,6 @@
// return false;
//}
-
private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
{
db.Deleteable<MesItems>()
diff --git a/StandardPda/MES.Service/service/BasicData/MesPositionManager.cs b/StandardPda/MES.Service/service/BasicData/MesPositionManager.cs
index ba4da7a..34d53d4 100644
--- a/StandardPda/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesPositionManager.cs
@@ -149,7 +149,10 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
DisabledBy = position.FForbidderId,
- DisabledDate = position.FForbidDate != null? DateTime.ParseExact(position.FForbidDate, "yyyy-MM-dd HH:mm:ss", null) : null
+ DisabledDate = position.FForbidDate != null
+ ? DateTime.ParseExact(position.FForbidDate,
+ "yyyy-MM-dd HH:mm:ss", null)
+ : null
};
}
diff --git a/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs b/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs
new file mode 100644
index 0000000..58bc851
--- /dev/null
+++ b/StandardPda/MES.Service/service/BasicData/MesProjectManager.cs
@@ -0,0 +1,155 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.BasicData;
+
+public class MesProjectManager : Repository<MesProject>
+{
+ public bool Save(ErpProject unit)
+ {
+ var entity = GetMesProject(unit);
+
+ return UseTransaction(db =>
+ {
+ switch (unit.Type)
+ {
+ case "0":
+ if (UpdateSupplierStatus(db, entity, "A"))
+ return 1;
+ break;
+ case "1":
+ if (UpdateSupplierStatus(db, entity, "B"))
+ return 1;
+ break;
+ case "3":
+ if (DeleteSupplier(entity))
+ return 1;
+ break;
+ case "2":
+ case "4":
+ if (InsertOrUpdate(db, entity))
+ return 1;
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ throw new NotImplementedException("鎿嶄綔澶辫触");
+ }) > 0;
+ }
+
+ public bool SaveList(List<ErpProject> suppliers)
+ {
+ var result = suppliers.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private bool UpdateSupplierStatus(SqlSugarScope db,
+ List<MesProject> supplierId,
+ string status)
+ {
+ var ids = supplierId.Select(it => it.Id).ToArray();
+
+ var result = db.Updateable<MesProject>()
+ .SetColumns(s => s.ForbidStatus == status)
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+
+ if (result > 0)
+ return true;
+
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ }
+
+ private bool DeleteSupplier(List<MesProject> supplierId)
+ {
+ // 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
+ var ids = supplierId.Select(customer => customer.Id.ToString())
+ .ToList();
+
+ // 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
+ var u9Ids = Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ ids.Contains(u.MesId) && u.TableType == "MES_PROJECT")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
+
+ // 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
+ // 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
+ var idsToDelete = Db.Queryable<MesLinkU9>()
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_PROJECT")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
+
+ var deleteByIds = Db.Deleteable<MesProject>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ private List<MesProject> GetMesProject(ErpProject supplier)
+ {
+ List<MesProject> list = new();
+ foreach (var se in supplier.FUseOrgId)
+ {
+ var exists = Db.Queryable<MesLinkU9>().Any(u =>
+ u.U9Id == supplier.ID && u.OrgId == se.FUseOrgId &&
+ u.TableType == "MES_PROJECT");
+
+ decimal mesId = 0;
+ if (exists)
+ {
+ //鑾峰彇mesid
+ mesId = Convert.ToDecimal(Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ u.U9Id == supplier.ID && u.OrgId == se.FUseOrgId &&
+ u.TableType == "MES_PROJECT")
+ .Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
+ .First());
+ }
+ else
+ {
+ var entity = new MesLinkU9
+ {
+ CreateDate = DateTime.Now,
+ MesId = mesId.ToString(),
+ U9Id = supplier.ID,
+ OrgId = se.FUseOrgId,
+ TableType = "MES_PROJECT"
+ };
+ mesId = Db.Insertable(entity).ExecuteReturnIdentity();
+ }
+
+ var mesSupplier = new MesProject
+ {
+ Id = mesId,
+ ProjectCode = supplier.Code,
+ ProjectName = supplier.Name,
+ ProjectType = supplier.ProjectType,
+ Description = supplier.Description,
+ OperatorsId = supplier.OperatorsID,
+ DocumentStatus = supplier.FDocumentStatus,
+ ForbidStatus = supplier.FForbidStatus,
+ UseOrgId = se.FUseOrgId,
+ };
+
+ list.Add(mesSupplier);
+ }
+
+ return list;
+ }
+
+ private bool InsertOrUpdate(SqlSugarScope db, List<MesProject> entity)
+ {
+ DeleteSupplier(entity);
+
+ var insert = db.Insertable(entity).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 dfe434e..8e84976 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -2,7 +2,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Security.AccessControl;
namespace MES.Service.service.BasicData;
@@ -15,7 +14,8 @@
{
var rohInErpRohIn = rohIn.ErpRohIn;
var mesRohIn = GetMesRohIn(rohInErpRohIn);
- var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
+ var mesRohInDatas =
+ GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
return UseTransaction(db =>
{
@@ -31,7 +31,7 @@
};
}) > 0;
}
-
+
// 鏇存柊鏁版嵁鐨勬柟娉�
private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
@@ -68,7 +68,7 @@
//var orUpdate = base.Insert(mesRohIn);
//var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas);
var orUpdate = db.Insertable(mesRohIn)
- .IgnoreColumns(true).ExecuteCommand() > 0;
+ .IgnoreColumns(true).ExecuteCommand() > 0;
var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1)
@@ -102,7 +102,8 @@
mesRohIn.DocumentType = rohIn.FBillTypeID;
mesRohIn.BusinessType = rohIn.FBusinessType;
if (rohIn.FDate != null)
- mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,"yyyy-MM-dd HH:mm:ss", null);
+ mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
+ "yyyy-MM-dd HH:mm:ss", null);
mesRohIn.Supplier = rohIn.FSupplierId;
mesRohIn.CloseStatus = rohIn.FCloseStatus;
mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
@@ -229,7 +230,6 @@
FCGDDSctzda = s.F_CGDD_SCTZDA,
FCGDDXHA = s.F_CGDD_XHA,
FXifgTextApv = s.F_XIFG_Text_apv
-
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/StandardPda/MES.Service/service/BasicData/MesStaffManager.cs b/StandardPda/MES.Service/service/BasicData/MesStaffManager.cs
index 4ce05b3..6848f8f 100644
--- a/StandardPda/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,11 +1,7 @@
-锘縰sing AngleSharp.Dom;
-using Castle.Core.Resource;
-using DnsClient;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Xml.Linq;
namespace MES.Service.service.BasicData;
@@ -16,7 +12,8 @@
{
var entity = GetMesStaff(unit); // 灏� ErpStaff 杞崲涓� MesStaff
var sysUser = GetUser(unit); // 鑾峰彇 SysUser 瀹炰緥
- var mesStaffPositionLink = GetMesStaffPositionLink(unit); // 鑾峰彇 MesStaffPositionLink 瀹炰緥
+ var mesStaffPositionLink =
+ GetMesStaffPositionLink(unit); // 鑾峰彇 MesStaffPositionLink 瀹炰緥
return UseTransaction(db =>
{
@@ -32,7 +29,8 @@
break;
case "2":
case "4":
- if (InsertOrUpdateStaff(db, sysUser, entity, mesStaffPositionLink)) // 鎻掑叆鎴栨洿鏂板憳宸�
+ if (InsertOrUpdateStaff(db, sysUser, entity,
+ mesStaffPositionLink)) // 鎻掑叆鎴栨洿鏂板憳宸�
return 1;
break;
case "3":
@@ -110,12 +108,12 @@
/// 鏂颁唬鐮�
// 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氫慨鏀瑰弬鏁帮紝鏂板List<MesStaffPositionLink>鐨勫弬鏁�
+ /// 鎺ュ彛瀛楁璋冩暣锛氫慨鏀瑰弬鏁帮紝鏂板List<MesStaffPositionLink>鐨勫弬鏁�
/// </summary>
/// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-25 鈥斺�斻�� 2025-01-05 浜屾淇敼
- /// 淇敼璇存槑锛氫负浜嗗簲涓轰竴涓憳宸ュ宀椾綅鐨勬儏鍐�
+ /// 淇敼浜猴細姹犲崡楠�
+ /// 淇敼鏃ユ湡锛�2024-12-25 鈥斺�斻�� 2025-01-05 浜屾淇敼
+ /// 淇敼璇存槑锛氫负浜嗗簲涓轰竴涓憳宸ュ宀椾綅鐨勬儏鍐�
/// </remarks>
private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
MesStaff entity, List<MesStaffPositionLink> mesStaffPositionLink)
@@ -128,10 +126,11 @@
db.Deleteable<MesStaff>()
- .Where(s => s.Id == entity.Id )
+ .Where(s => s.Id == entity.Id)
.ExecuteCommand();
- var insertStaff = db.Insertable(entity).IgnoreColumns(true).ExecuteCommand();
+ var insertStaff =
+ db.Insertable(entity).IgnoreColumns(true).ExecuteCommand();
var insertPosition = 1;
@@ -139,17 +138,18 @@
{
//鍏堝垹闄わ紝鍐嶆柊澧�
db.Deleteable<MesStaffPositionLink>()
- .Where(s => mesStaffPositionLink.Any(m => m.StaffId == s.StaffId))
- .ExecuteCommand();
+ .Where(s =>
+ mesStaffPositionLink.Any(m => m.StaffId == s.StaffId))
+ .ExecuteCommand();
//鎵归噺鎻掑叆鏃讹紝蹇界暐绌哄瓧娈�
insertPosition = db.Insertable(mesStaffPositionLink).PageSize(1)
- .IgnoreColumnsNull().ExecuteCommand();
+ .IgnoreColumnsNull().ExecuteCommand();
}
-
- return (insertStaff > 0 && insertPosition >0);
+
+ return insertStaff > 0 && insertPosition > 0;
}
/// <summary>
@@ -188,13 +188,15 @@
{
var deleteStaff =
db.Deleteable<MesStaff>()
- .Where(s => s.Id == entity.Id && s.PositionCode == entity.PositionCode)
- .ExecuteCommand();
+ .Where(s =>
+ s.Id == entity.Id &&
+ s.PositionCode == entity.PositionCode)
+ .ExecuteCommand();
//鍒犻櫎瀵瑰簲鍛樺伐宀椾綅淇℃伅鍏宠仈琛� 姹犲崡楠� 2025-01-02
var insertPosition = db.Deleteable<MesStaffPositionLink>()
- .Where(s => s.StaffId == entity.Id)
- .ExecuteCommand();
+ .Where(s => s.StaffId == entity.Id)
+ .ExecuteCommand();
if (deleteStaff > 0)
return true;
@@ -244,29 +246,38 @@
}
/// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭牴鎹甹son鏍煎紡锛屽湪MesStaffPositionLink<List>涓瓨鍏ユ暟鎹��
+ /// 鎺ュ彛瀛楁璋冩暣锛氭牴鎹甹son鏍煎紡锛屽湪MesStaffPositionLink<List>涓瓨鍏ユ暟鎹��
/// </summary>
/// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2025-01-02 鈥斺�斻�� 2025-01-05 浜屾淇敼
- /// 淇敼璇存槑锛�
- /// - 鏂板浠ｇ爜
+ /// 淇敼浜猴細姹犲崡楠�
+ /// 淇敼鏃ユ湡锛�2025-01-02 鈥斺�斻�� 2025-01-05 浜屾淇敼
+ /// 淇敼璇存槑锛�
+ /// - 鏂板浠ｇ爜
/// </remarks>
private List<MesStaffPositionLink> GetMesStaffPositionLink(ErpStaff staff)
{
- List<MesStaffPositionLink> staffDetails = new List<MesStaffPositionLink>();
+ List<MesStaffPositionLink> staffDetails = new();
if (staff.ErpStaffDetails != null && staff.ErpStaffDetails.Count > 0)
- {
- staffDetails = staff.ErpStaffDetails.Select(staffDetail => new MesStaffPositionLink
- {
- StaffId = Convert.ToDecimal(staff.Id),
- PositionId = string.IsNullOrEmpty(staffDetail.fPostId.ToString()) ? null : Convert.ToDecimal(staffDetail.fPostId),
- FPostDeptId = string.IsNullOrEmpty(staffDetail.fPostDeptid.ToString()) ? null : Convert.ToDecimal(staffDetail.fPostDeptid),
- FStaffStartDate = string.IsNullOrEmpty(staffDetail.fStaffStartDate.ToString()) ? null : DateTime.ParseExact(staffDetail.fStaffStartDate, "yyyy-MM-dd HH:mm:ss", null)
-
- }).ToList();
- }
+ staffDetails = staff.ErpStaffDetails.Select(staffDetail =>
+ new MesStaffPositionLink
+ {
+ StaffId = Convert.ToDecimal(staff.Id),
+ PositionId =
+ string.IsNullOrEmpty(staffDetail.fPostId.ToString())
+ ? null
+ : Convert.ToDecimal(staffDetail.fPostId),
+ FPostDeptId =
+ string.IsNullOrEmpty(staffDetail.fPostDeptid.ToString())
+ ? null
+ : Convert.ToDecimal(staffDetail.fPostDeptid),
+ FStaffStartDate =
+ string.IsNullOrEmpty(staffDetail.fStaffStartDate
+ .ToString())
+ ? null
+ : DateTime.ParseExact(staffDetail.fStaffStartDate,
+ "yyyy-MM-dd HH:mm:ss", null)
+ }).ToList();
//postIds.AddRange(links);
return staffDetails;
@@ -277,10 +288,12 @@
{
//鑾峰彇褰撳墠鐢ㄦ埛浣跨敤缁勭粐瀵瑰簲鐨勭粍缁囧悕绉�
var db = SqlSugarHelper.GetInstance();
- string organize = db.Queryable<Organize>()
- .Where(it => it.Id == Convert.ToDecimal(staff.FUseOrgId)) // 浣跨敤 Where 鏂规硶鏍规嵁鍗曚釜 ID 鏌ヨ
- .Select(it => it.Fname) // 閫夋嫨 Fname 灞炴��
- .Single(); // 浣跨敤 Single 鍥犱负鎴戜滑鏈熸湜鍙湁涓�涓尮閰嶉」
+ var organize = db.Queryable<Organize>()
+ .Where(it =>
+ it.Id ==
+ Convert.ToDecimal(staff.FUseOrgId)) // 浣跨敤 Where 鏂规硶鏍规嵁鍗曚釜 ID 鏌ヨ
+ .Select(it => it.Fname) // 閫夋嫨 Fname 灞炴��
+ .Single(); // 浣跨敤 Single 鍥犱负鎴戜滑鏈熸湜鍙湁涓�涓尮閰嶉」
//string organizeName = organize.f;
@@ -329,7 +342,8 @@
sysUser.Type = s.Type;
userList.Add(sysUser);
- var mesStaffPositionLink = GetMesStaffPositionLink(s); // 鑾峰彇 SysUser 瀹炰緥
+ var mesStaffPositionLink =
+ GetMesStaffPositionLink(s); // 鑾峰彇 SysUser 瀹炰緥
mesStaffPositionLinkList.AddRange(mesStaffPositionLink);
});
@@ -358,7 +372,8 @@
case "2":
case "4":
if (!InsertOrUpdateBatch(db, userList,
- staffGroup.Value, mesStaffPositionLinkList)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
+ staffGroup.Value,
+ mesStaffPositionLinkList)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
throw new NotImplementedException("鍚屾澶辫触");
break;
default:
@@ -419,12 +434,14 @@
// 鎵归噺鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
- List<MesStaff> staffList, List<MesStaffPositionLink> mesStaffPositionLink)
+ List<MesStaff> staffList,
+ List<MesStaffPositionLink> mesStaffPositionLink)
{
foreach (var sysUser in userList)
{
var entity = staffList.First(s => s.Id == sysUser.Sid);
- if (!InsertOrUpdateStaff(db, sysUser, entity, mesStaffPositionLink)) return false;
+ if (!InsertOrUpdateStaff(db, sysUser, entity, mesStaffPositionLink))
+ return false;
}
return true;
diff --git a/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs b/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
index 655f745..ddfc488 100644
--- a/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -65,19 +65,40 @@
private bool DeleteSupplier(List<MesSupplier> supplierId)
{
- var ids = supplierId.Select(it => it.Id).ToArray();
+ // 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
+ var ids = supplierId.Select(customer => customer.Id.ToString())
+ .ToList();
+
+ // 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
+ var u9Ids = Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ ids.Contains(u.MesId) && u.TableType == "MES_SUPPLIER")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
- var executeCommand = Db.Deleteable<MesSupplier>()
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+ // 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
+ // 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
+ var idsToDelete = Db.Queryable<MesLinkU9>()
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_SUPPLIER")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
- if (executeCommand > 0) return true;
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ //浠ヤ笂鏂规硶鍙互鑰冭檻浼樺寲锛屽皢U9id鎵句釜鏂板缓瀛楁瀛樺湪MES_CUSTOMER涓紝灏卞彲浠ュ皯涓�姝ユ煡璇簡銆�
+
+ var deleteByIds = Db.Deleteable<MesSupplier>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
}
private List<MesSupplier> GetMesSupplier(ErpSupplier supplier)
{
- List<MesSupplier> list = new List<MesSupplier>();
+ List<MesSupplier> list = new();
foreach (var se in supplier.FUseOrgId)
{
var exists = Db.Queryable<MesLinkU9>().Any(u =>
@@ -176,18 +197,9 @@
///鏂颁唬鐮�
private bool InsertOrUpdate(SqlSugarScope db, List<MesSupplier> entity)
{
- var ids = entity.Select(it => it.Id).ToArray();
-
- var executeCommand = db.Deleteable<MesSupplier>()
- .Where(s => ids.Contains(s.Id))
- .ExecuteCommand();
-
- if (executeCommand > 0)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- return insert > 0;
- }
-
- throw new Exception("鎿嶄綔澶辫触");
+ DeleteSupplier(entity);
+
+ var insert = db.Insertable(entity).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 a6cb425..e03adea 100644
--- a/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
@@ -43,39 +43,8 @@
public bool SaveList(List<ErpUnit> units)
{
- var list = units.Select(GetMesUnit).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var unitGroup in groupBy)
- switch (unitGroup.Key)
- {
- case "0":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "3":
- if (!DeleteUnitBatch(db, unitGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "2":
- case "4":
- if (!InsertOrUpdateBatch(db, unitGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unitGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
+ var result = units.Select(Save).ToList();
+ return result.All(b => b);
}
private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,
@@ -89,15 +58,6 @@
return true;
throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnit(SqlSugarScope db, MesUnit entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
}
private bool DeleteUnit(SqlSugarScope db, decimal unitId)
@@ -117,108 +77,29 @@
Fnumber = unit.FNumber,
Fname = unit.FName,
Funitgroupid = unit.FUnitGroupId,
- Fconvertdenominator = unit.FConvertDenominator,
- Fcurrentunitid = unit.FCurrentUnitId,
- Fconvertnumerator = unit.FConvertNumerator,
Fbaseunit = unit.FBaseUnit,
Froundtype = unit.FRoundType,
Fprecision = unit.FPrecision,
Fdescription = unit.FDescription,
- /// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///FDOCUMENTSTATUS = supplier.FDocumentStatus,
- /// </remarks>
- FDOCUMENTSTATUS = unit.FDocumentStatus,
Fforbidstatus = unit.FForbidStatus,
+ DocumentStatus = unit.FDocumentStatus,
+ BaseUomid = unit.BaseUomid,
+ RatioToBase = unit.RatioToBase,
+ RoundValue = unit.RoundValue,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
}
-
- private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,
- string status)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var insertRange = db.Insertable(unitList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
- return deleteByIds > 0;
- }
-
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
- ///鍘熶唬鐮�
- //private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
- //{
- // var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
- // if (exists)
- // {
- // var update = db.Updateable(entity).ExecuteCommand();
- // if (update > 0)
- // return true;
- // }
- // else
- // {
- // var insert = db.Insertable(entity).ExecuteCommand();
- // if (insert > 0)
- // return true;
- // }
-
- // return false;
- //}
-
///鏂颁唬鐮�
private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
db.Deleteable<MesUnit>()
- .Where(s => s.Id == entity.Id)
- .ExecuteCommand();
+ .Where(s => s.Id == entity.Id)
+ .ExecuteCommand();
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- foreach (var entity in unitList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
}
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
index 02e25f4..e6f254f 100644
--- a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
@@ -1,261 +1,265 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
-using System.Xml.Linq;
+using MES.Service.Modes;
+using SqlSugar;
-namespace MES.Service.service
-{
+namespace MES.Service.service.BasicData;
+
public class OrganizeManager : Repository<Organize>
{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
+ public bool Save(ErpOrganize item)
+ {
+ var entity = GetOrganize(item);
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
- public bool Save(ErpOrganize item)
+ return UseTransaction(db =>
{
- var entity = GetOrganize(item);
-
- return UseTransaction(db =>
+ switch (item.Type)
{
- switch (item.Type)
+ case "0":
+ if (UpdateOrganizetatus(db, entity.Id, "A"))
+ return 1;
+ break;
+ case "1":
+ 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 "2":
+ case "4":
+ if (InsertOrUpdate(db, entity))
+ return 1;
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ throw new NotImplementedException("鎿嶄綔澶辫触");
+ }) > 0;
+ }
+
+ public bool SaveList(List<ErpOrganize> Organize)
+ {
+ var list = Organize.Select(GetOrganize).ToList();
+ var groupBy = list.GroupBy(s => s.Type)
+ .ToDictionary(g => g.Key, g => g.ToList());
+
+ return UseTransaction(db =>
+ {
+ foreach (var itemGroup in groupBy)
+ switch (itemGroup.Key)
{
case "0":
- if (UpdateOrganizetatus(db, entity.Id, "A"))
- return 1;
+ if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
+ throw new NotImplementedException("鍚敤澶辫触");
break;
case "1":
- if (UpdateOrganizetatus(db, entity.Id, "B"))
- return 1;
+ if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
+ throw new NotImplementedException("绂佺敤澶辫触");
break;
//case "2":
- // if (InsertItem(db, entity))
- // return 1;
+ // if (!InsertItemBatch(db, itemGroup.Value))
+ // throw new NotImplementedException("鎻掑叆澶辫触");
// break;
case "3":
- if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
- return 1;
+ if (!DeleteItemBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "2":
case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
+ if (!InsertOrUpdateBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鍚屾澶辫触");
break;
default:
throw new ArgumentNullException(
- $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
}
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
+ return 1;
+ }) > 0;
+ }
- public bool SaveList(List<ErpOrganize> Organize)
+ private bool UpdateOrganizetatus(SqlSugarScope db, decimal itemId,
+ string status)
+ {
+ var result = db.Updateable<Organize>()
+ .SetColumns(s => s.Fforbidstatus == status)
+ .Where(s => s.Id == itemId).ExecuteCommand();
+
+ if (result > 0)
+ return true;
+
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ }
+
+ private bool InsertItem(SqlSugarScope db, Organize entity)
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ return true;
+
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ private bool DeleteItem(SqlSugarScope db, decimal itemId)
+ {
+ var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
+ if (deleteById > 0)
+ return true;
+
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ private Organize GetOrganize(ErpOrganize Organize)
+ {
+ return new Organize
{
- var list = Organize.Select(GetOrganize).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
+ Id = Convert.ToDecimal(Organize.Id),
+ Fnumber = Organize.FNumber,
+ Fname = Organize.FName,
+ Fforbidstatus = Organize.FForbidStatus,
+ Type = Organize.Type,
+ //Fparentid=Organize.FParentID,
+ Fcreatedate = Organize.fCreateDate != null
+ ? DateTime.ParseExact(Organize.fCreateDate,
+ "yyyy-MM-dd HH:mm:ss", null)
+ : null
+ };
+ }
- return UseTransaction(db =>
- {
- foreach (var itemGroup in groupBy)
- switch (itemGroup.Key)
- {
- case "0":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- //case "2":
- // if (!InsertItemBatch(db, itemGroup.Value))
- // throw new NotImplementedException("鎻掑叆澶辫触");
- // break;
- case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "2":
- case "4":
- if (!InsertOrUpdateBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
+ private bool UpdateOrganizetatusBatch(SqlSugarScope db,
+ List<Organize> itemList, string status)
+ {
+ var ids = itemList.Select(it => it.Id).ToArray();
+ var result = db.Updateable<Organize>()
+ .SetColumns(s => s.Fforbidstatus == status)
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
- return 1;
- }) > 0;
- }
+ if (result > 0)
+ return true;
- private bool UpdateOrganizetatus(SqlSugarScope db, decimal itemId,
- string status)
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ }
+
+ private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
+ {
+ var insertRange = db.Insertable(itemList).ExecuteCommand();
+ if (insertRange > 0)
+ return true;
+
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
+ {
+ var ids = itemList.Select(it => it.Id).ToArray();
+ var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
+ if (deleteByIds > 0)
+ return true;
+
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
+ {
+ var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
+ if (exists)
{
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == itemId).ExecuteCommand();
-
- if (result > 0)
+ var update = db.Updateable(entity).ExecuteCommand();
+ if (update > 0)
return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
}
-
- private bool InsertItem(SqlSugarScope db, Organize entity)
+ else
{
var insert = db.Insertable(entity).ExecuteCommand();
if (insert > 0)
return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
}
- private bool DeleteItem(SqlSugarScope db, decimal itemId)
- {
- var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
- if (deleteById > 0)
- return true;
+ return false;
+ }
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private Organize GetOrganize(ErpOrganize Organize)
- {
- return new Organize
- {
-
- Id = Convert.ToDecimal(Organize.Id),
- Fnumber = Organize.FNumber,
- Fname = Organize.FName,
- Fforbidstatus = Organize.FForbidStatus,
- Type = Organize.Type,
- //Fparentid=Organize.FParentID,
- Fcreatedate = Organize.fCreateDate != null ?DateTime.ParseExact(Organize.fCreateDate, "yyyy-MM-dd HH:mm:ss", null):null
- };
- }
-
- private bool UpdateOrganizetatusBatch(SqlSugarScope db,
- List<Organize> itemList, string status)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var insertRange = db.Insertable(itemList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
- {
- var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
- {
- foreach (var entity in itemList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
- #region 鏁欏鏂规硶
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
+ private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
{
-
- /*********鏌ヨ*********/
+ foreach (var entity in itemList)
+ if (!InsertOrUpdate(db, entity))
+ return false;
- var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
- var data2 = base.GetList();//鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ return true;
+ }
+
+ #region 鏁欏鏂规硶
+
+ /// <summary>
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// </summary>
+ public void Study()
+ {
+ /*********鏌ヨ*********/
+
+ var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
+ var data2 = base.GetList(); //鏌ヨ鎵�鏈�
+ var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
//var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
- var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
+ var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
- var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-
- List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel() { FieldName= typeof(Organize).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+ var data6 =
+ base.GetPageList(it => 1 == 1, p,
+ it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
- base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+ List<IConditionalModel> conModels = new(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel
+ {
+ FieldName = typeof(Organize).GetProperties()[0].Name,
+ ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ }); //id=1
+ var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
+ AsQueryable().Where(x => 1 == 1)
+ .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
/*********鎻掑叆*********/
- var insertData = new Organize() { };//娴嬭瘯鍙傛暟
- var insertArray = new Organize[] { insertData };
- base.Insert(insertData);//鎻掑叆
- base.InsertRange(insertArray);//鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
- base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+ var insertData = new Organize(); //娴嬭瘯鍙傛暟
+ var insertArray = new[] { insertData };
+ base.Insert(insertData); //鎻掑叆
+ base.InsertRange(insertArray); //鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+ AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
- /*********鏇存柊*********/
- var updateData = new Organize() { };//娴嬭瘯鍙傛暟
- var updateArray = new Organize[] { updateData };//娴嬭瘯鍙傛暟
- base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ /*********鏇存柊*********/
+ var updateData = new Organize(); //娴嬭瘯鍙傛暟
+ var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+ base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray); //鎵归噺鏇存柊
//base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+ AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
- /*********鍒犻櫎*********/
- var deldata = new Organize() { };//娴嬭瘯鍙傛暟
- base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
- base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ /*********鍒犻櫎*********/
+ var deldata = new Organize(); //娴嬭瘯鍙傛暟
+ base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+ AsDeleteable().Where(it => 1 == 2)
+ .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
}
- #endregion
- }
+
+ #endregion
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs b/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
index 1d62dd3..c2776c7 100644
--- a/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -1,9 +1,7 @@
锘縰sing System.Globalization;
-using AngleSharp.Dom;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
-using MES.Service.util;
using SqlSugar;
namespace MES.Service.service.BasicData;
@@ -83,7 +81,7 @@
var baOrUpdate = db.Insertable(mesWomcabss).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
-
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -117,7 +115,7 @@
{
Caa001 = erpDto.FBillNo,
DepotCode = erpDto.FStockID,
- CreateDate = erpDto.FDate,// ParseDateTime(erpDto.FDate) ?? null,
+ CreateDate = erpDto.FDate, // ParseDateTime(erpDto.FDate) ?? null,
Caa004 = erpDto.FBillType,
Caa023 = erpDto.FStatus,
Caa006 = erpDto.FMaterialId,
@@ -126,13 +124,17 @@
WorkGroupId = erpDto.FWorkGroupId,
PlanId = erpDto.FPlannerID,
Caa010 = erpDto.FPlanStartDate,
- //ParseDateTime(erpDto.FPlanStartDate) ?? null,
+ //ParseDateTime(erpDto.FPlanStartDate) ?? null,
Caa011 = erpDto.FPlanFinishDate,
//ParseDateTime(erpDto.FPlanFinishDate) ?? null,
PLANCONFIRMATION = erpDto.PlanConfirmation,
- StockInlimith = erpDto.FStockInLimitH,//Convert.ToDecimal(erpDto.FStockInLimitH),
- StockInlimitl = erpDto.FStockInLimitL,//Convert.ToDecimal(erpDto.FStockInLimitL),
+ StockInlimith =
+ erpDto
+ .FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH),
+ StockInlimitl =
+ erpDto
+ .FStockInLimitL, //Convert.ToDecimal(erpDto.FStockInLimitL),
Mtono = erpDto.FMTONO,
Lot = erpDto.FLot,
Caa013 = erpDto.FBomId,
@@ -154,7 +156,9 @@
Erpid = Convert.ToDecimal(erpDto.FID),
FSUBENTRYID = erpDto.FSUBENTRYID,
FPURORDERNO = erpDto.FPurOrderNo,
- FPURORDERENTRYSEQ = erpDto.FPurOrderEntrySeq,//Convert.ToInt32(erpDto.FPurOrderEntrySeq),
+ FPURORDERENTRYSEQ =
+ erpDto
+ .FPurOrderEntrySeq, //Convert.ToInt32(erpDto.FPurOrderEntrySeq),
FBASESTOCKINQTY = Convert.ToDecimal(erpDto.FBaseStockInQty),
FBASENOSTOCKINQTY = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
FINSTOCKOWNERID = erpDto.FInStockOwnerId,
@@ -185,7 +189,7 @@
var productionOrderSub = new Womcab
{
Cab001 = erpDto.FBillNo,
- Cab002 = erpDto.FSEQ,//Convert.ToInt32(erpDto.FSEQ),
+ Cab002 = erpDto.FSEQ, //Convert.ToInt32(erpDto.FSEQ),
Cab003 = erpDto.FMaterialID2,
MustQty = Convert.ToDecimal(erpDto.FMustQty),
Cab006 = Convert.ToDecimal(erpDto.FMustQty),
@@ -227,7 +231,8 @@
ErpProductionEntryCode = erpDto.FSUBENTRYID
};
- var single = base.GetSingle(it => it.Erpid == productionOrderSub.Erpid);
+ var single =
+ base.GetSingle(it => it.Erpid == productionOrderSub.Erpid);
if (single != null) productionOrderSub.Id = single.Id;
productionOrderSubList.Add(productionOrderSub);
diff --git a/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index 3b0027b..90ef3df 100644
--- a/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -1,6 +1,5 @@
锘縰sing MES.Service.DB;
using MES.Service.Modes;
-using SqlSugar;
namespace MES.Service.service.BasicData;
@@ -9,5 +8,4 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesReturnNoticeManager.cs
-
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
index 61fdb3d..7329c00 100644
--- a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -115,8 +115,6 @@
//}
-
-
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
///鏂颁唬鐮�
@@ -131,6 +129,7 @@
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
}
+
private SysDepartment GetSysDepartment(ErpDepartment department)
{
return new SysDepartment
diff --git a/StandardPda/MES.Service/util/GetSeqUtil.cs b/StandardPda/MES.Service/util/GetSeqUtil.cs
index 712e6a6..82bad7d 100644
--- a/StandardPda/MES.Service/util/GetSeqUtil.cs
+++ b/StandardPda/MES.Service/util/GetSeqUtil.cs
@@ -8,19 +8,18 @@
* 鍒ゆ柇瀛楃涓叉槸鍚︿负绌�
* 涓虹┖鏃惰繑鍥瀟rue
*/
- public static Decimal GetSeq(string? seqName)
+ public static decimal GetSeq(string? seqName)
{
var db = SqlSugarHelper.GetInstance();
- string sequenceName = $"{seqName}.NEXTVAL"; // 娉ㄦ剰杩欓噷鐩存帴浣跨敤浜哊EXTVAL鏉ヨ幏鍙栦笅涓�涓��
+ var sequenceName = $"{seqName}.NEXTVAL"; // 娉ㄦ剰杩欓噷鐩存帴浣跨敤浜哊EXTVAL鏉ヨ幏鍙栦笅涓�涓��
// 鐢变簬SQLSugar涓嶇洿鎺ユ敮鎸佸簭鍒楄皟鐢ㄤ綔涓哄弬鏁帮紝鎴戜滑闇�瑕佹瀯閫犱竴涓猄QL璇彞
- string sql = $"SELECT {sequenceName} FROM DUAL"; // DUAL鏄疧racle涓殑涓�涓櫄鎷熻〃锛岀敤浜庝粠涓嶉渶瑕佸疄闄呰〃鐨勫嚱鏁版垨琛ㄨ揪寮忎腑閫夋嫨鏁版嵁
+ var sql =
+ $"SELECT {sequenceName} FROM DUAL"; // DUAL鏄疧racle涓殑涓�涓櫄鎷熻〃锛岀敤浜庝粠涓嶉渶瑕佸疄闄呰〃鐨勫嚱鏁版垨琛ㄨ揪寮忎腑閫夋嫨鏁版嵁
// 鎵ц鍘熺敓SQL璇彞骞惰幏鍙栫粨鏋�
- Decimal result = Convert.ToDecimal( db.Ado.GetScalar(sql));
+ var result = Convert.ToDecimal(db.Ado.GetScalar(sql));
return result;
}
-
-
}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs b/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
index 8a79067..7659e40 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
@@ -5,7 +5,6 @@
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
index bd5d18b..6154c2e 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
@@ -20,7 +20,8 @@
private readonly string TableName = "MES_DELIVERY_NOTE_BARCODE";
- private readonly string URL = "http://localhost:10054/api/MesDeliveryNoteBarcode/";
+ private readonly string URL =
+ "http://localhost:10054/api/MesDeliveryNoteBarcode/";
[HttpPost("Save")]
public ResponseResult Save(ErpBarcode barcode)
@@ -212,7 +213,8 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesDeliveryNoteBarcode data)
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] MesDeliveryNoteBarcode data)
{
try
{
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
index 89c2bbb..c7905dc 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
@@ -117,7 +117,8 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesDeliveryNoteDetails data)
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] MesDeliveryNoteDetails data)
{
try
{
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
new file mode 100644
index 0000000..1afe641
--- /dev/null
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
@@ -0,0 +1,262 @@
+锘縰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.BasicData;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MesProjectController : ControllerBase
+{
+ private readonly MesProjectManager m = new();
+
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_SUPPLIER";
+
+ private readonly string URL = "http://localhost:10054/api/MesSupplier/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpProject unit)
+ {
+ 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.Code;
+ try
+ {
+ 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);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpProject> 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.Code).Join(",");
+ 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
+ {
+ 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);
+ }
+ }
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ 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);
+ }
+ }
+
+ /// <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
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] MesProject data)
+ {
+ 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);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] MesProject 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] MesProject 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/OrganizeController.cs b/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
index 9496ffa..688a4c8 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -1,266 +1,260 @@
-锘縰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 MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
-using MES.Service.util;
-using MES.Service.Dto.webApi;
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 OrganizeController : ControllerBase
{
- [ApiController]
- [Route("api/[controller]")]
- public class OrganizeController : ControllerBase
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly OrganizeManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "Organize";
+
+ private readonly string URL = "http://localhost:10054/api/Organize/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpOrganize unit)
{
- private readonly MessageCenterManager _manager = new();
-
- private readonly OrganizeManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "Organize";
-
- private readonly string URL = "http://localhost:10054/api/Organize/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpOrganize unit)
+ 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";
+ 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";
- try
+ 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
{
- 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<ErpOrganize> 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";
- 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);
- }
- }
- // private OrganizeManager m = new OrganizeManager();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
- {
- 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);
- }
- }
-
- /// <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
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞
- /// </summary>
- /// <returns></returns>
- [HttpPost("Insert")]
- public ResponseResult Add([FromBody] Organize data)
- {
- 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);
- }
- }
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] Organize 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] Organize 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);
- }
+ return ResponseResult.ResponseError(ex);
}
}
-}
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpOrganize> 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";
+ 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
+ {
+ 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);
+ }
+ }
+ // private OrganizeManager m = new OrganizeManager();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ 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);
+ }
+ }
+
+ /// <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
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] Organize data)
+ {
+ 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);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] Organize 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] Organize 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/Filter/ActionFilter.cs b/StandardPda/MESApplication/Filter/ActionFilter.cs
index e44c97f..07166f2 100644
--- a/StandardPda/MESApplication/Filter/ActionFilter.cs
+++ b/StandardPda/MESApplication/Filter/ActionFilter.cs
@@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Newtonsoft.Json;
-namespace MESApplication;
+namespace MESApplication.Filter;
/// <summary>
/// 鏂规硶杩囨护鍣�
diff --git a/StandardPda/MESApplication/Filter/ErrorLog.cs b/StandardPda/MESApplication/Filter/ErrorLog.cs
index 426110e..4457743 100644
--- a/StandardPda/MESApplication/Filter/ErrorLog.cs
+++ b/StandardPda/MESApplication/Filter/ErrorLog.cs
@@ -1,4 +1,4 @@
-锘縩amespace MESApplication;
+锘縩amespace MESApplication.Filter;
public class ErrorLog
{
diff --git a/StandardPda/MESApplication/Startup.cs b/StandardPda/MESApplication/Startup.cs
index 50bfa25..b764775 100644
--- a/StandardPda/MESApplication/Startup.cs
+++ b/StandardPda/MESApplication/Startup.cs
@@ -1,6 +1,7 @@
锘縰sing System.Reflection;
using MES.Service.Dto.@base;
using MES.Service.util;
+using MESApplication.Filter;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
--
Gitblit v1.9.3