From afea8227dd6be19e60890d4dd67c560ac6bc5a41 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期三, 15 一月 2025 17:25:02 +0800
Subject: [PATCH] 泰莱姆接口代码
---
MES.Service/Dto/webApi/ErpDepartment.cs | 10
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Dto/webApi/ErpCAB.cs | 20
MES.Service/Modes/MesRohInData.cs | 18
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/Dto/webApi/ErpDelivery.cs | 11
MESApplication/bin/Release/net8.0/publish/web.config | 3
MES.Service/Dto/webApi/ErpDepots.cs | 8
MES.Service/Modes/MesRohIn.cs | 12
MES.Service/Dto/webApi/ErpItemType.cs | 4
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.staticwebassets.endpoints.json | 5
MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs | 138 ++
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/Dto/webApi/ErpRohinData.cs | 33
MES.Service/Modes/MesStaff.cs | 44
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/service/BasicData/MesDepotsManager.cs | 5
MES.Service/Dto/webApi/ErpCustomer.cs | 11
MES.Service/Dto/webApi/Delivery.cs | 7
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Modes/SysDepartment.cs | 18
MESApplication/bin/Release/net8.0/publish/MESApplication.staticwebassets.endpoints.json | 5
MES.Service/service/BasicData/MesPositionManager.cs | 10
MESApplication/bin/Debug/net8.0/MESApplication.xml | 180 ++
MES.Service/Modes/MesDeliveryNoteBarcode.cs | 61
MES.Service/service/BasicData/SysDepartmentManager.cs | 4
MES.Service/Modes/Womcab.cs | 19
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpUnit.cs | 2
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/Controllers/BasicData/OrganizeController.cs | 266 ++++
MES.Service/Modes/MesDeliveryNote.cs | 85 +
MES.Service/service/BasicData/MesItemsManager.cs | 7
MESApplication/bin/Debug/net8.0/MESApplication.staticwebassets.endpoints.json | 5
MESApplication/bin/Release/net8.0/publish/appsettings.json | 2
MES.Service/Modes/Organize.cs | 28
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/appsettings.json | 2
MES.Service/Dto/webApi/ErpDeliveryData.cs | 16
MES.Service/service/BasicData/MesStaffManager.cs | 17
MES.Service/service/BasicData/MesRohInManager.cs | 61
MES.Service/Dto/webApi/ErpRohIn.cs | 15
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.xml | 180 ++
MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 141 ++
MES.Service/service/WomcaaManager.cs | 115 +
MES.Service/service/WomcaaWWManager.cs | 200 +++
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs | 257 ++++
MES.Service/Dto/webApi/ErpSupplier.cs | 9
MES.Service/Dto/webApi/ErpOrganize.cs | 17
MES.Service/service/BasicData/MesCustomerManager.cs | 15
MES.Service/service/BasicData/OrganizeManager.cs | 259 ++++
MES.Service/Modes/Womcaa.cs | 85 +
MESApplication/bin/Debug/net8.0/MESApplication.deps.json | 5
MES.Service/service/BasicData/MesSupplierManager.cs | 8
MES.Service/Modes/MesSupplier.cs | 12
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/Modes/MesCustomer.cs | 12
MES.Service/Dto/webApi/ErpPosition.cs | 3
MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs | 257 ++++
MESApplication/bin/Debug/net8.0/appsettings.json | 2
MES.Service/Modes/MesDeliveryNoteDetails.cs | 108 +
MES.Service/Modes/MesDepots.cs | 12
MESApplication/bin/Release/net8.0/publish/MESApplication.xml | 180 ++
MES.Service/service/BasicData/MesUnitManager.cs | 1
MES.Service/Dto/webApi/ErpItems.cs | 7
MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json | 5
MES.Service/Dto/webApi/ErpCAA.cs | 30
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/WomcaaWWController.cs | 261 ++++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 108
MESApplication/Controllers/WomcaaController.cs | 8
MESApplication/MESApplication.csproj.user | 2
MES.Service/Dto/webApi/ErpStaff.cs | 4
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
MES.Service/Dto/webApi/ErpBarcode.cs | 11
MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs | 162 ++
MES.Service/service/BasicData/MesDeliveryNoteDetailsManager.cs | 79 +
MES.Service/service/BasicData/MesItemTypeManager.cs | 3
MESApplication/appsettings.json | 2
88 files changed, 3,396 insertions(+), 300 deletions(-)
diff --git a/MES.Service/Dto/webApi/Delivery.cs b/MES.Service/Dto/webApi/Delivery.cs
new file mode 100644
index 0000000..8322af0
--- /dev/null
+++ b/MES.Service/Dto/webApi/Delivery.cs
@@ -0,0 +1,7 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class Delivery
+{
+ public ErpDelivery ErpDelivery { get; set; }
+ public List<ErpDeliveryData> ErpDeliveryData { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpBarcode.cs b/MES.Service/Dto/webApi/ErpBarcode.cs
new file mode 100644
index 0000000..4bf2677
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpBarcode.cs
@@ -0,0 +1,11 @@
+锘縩amespace MES.Service.Dto.webApi;
+public class ErpBarcode
+{
+ public string? Type { get; set; }
+ public string? DeliveryNo { get; set; }
+ public string? LineNo { get; set; }
+ public string? ProductCode { get; set; }
+ public string? SmallBarcode { get; set; }
+ public string? IncludeQty { get; set; }
+ public string? SupplierId { get; set; }
+}
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 523cdaf..60fc494 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -2,12 +2,10 @@
public class ErpCAA
{
- public string Id { get; set; }
+ public string? Id { get; set; }
public string? Type { get; set; }
-
- public string? FBILLTYPE { get; set; }
public string? FBillNo { get; set; }
- public string? FWorkShopID0 { get; set; }
+ public string? FWorkShopID { get; set; }
public string? FRoutingId { get; set; }
public string? FREMWorkShopId { get; set; }
public string? FStockId { get; set; }
@@ -27,7 +25,7 @@
public string? FMTONO { get; set; }
public string? FLot { get; set; }
public string? FBomId { get; set; }
- public string? F_UNW_Text_xsddh { get; set; }
+ public string? FXSHTH { get; set; }
public string? FCreateType { get; set; }
public string? FSrcBillType { get; set; }
public string? FSrcBillNo { get; set; }
@@ -37,9 +35,23 @@
public string? FForceCloserId { get; set; }
public string? FCloseType { get; set; }
public string? FSrcSplitBillNo { get; set; }
- public string? FMemoItem { get; set; }
+ public string? PLAN_ID { get; set; }
+ public string? PLAN_SEQ { get; set; }
+ public string? PLAN_NUM { get; set; }
+ public string? erP_SCZZ { get; set; }
+ public string? erP_WTZZ { get; set; }
+ public string? F_ZJXF_YHRQ { get; set; }
+ public string? F_ZSXG_KH { get; set; }
+ public string? FDescription { get; set; }
+ public string? fsubentryid { get; set; }
+ public string? FPurOrderNo { get; set; }
+ public string? FPurOrderEntrySeq { get; set; }
+ public string? Caa024 { get; set; }
+ public string? Caa025 { get; set; }
+ public string? ErpRkhz { get; set; }
+ public string? ErpRkzz { get; set; }
+ //濮斿瀛楁
+ public string? F_ZJXF_DATETIME_YHRQ { get; set; }
+ public string? F_ZJXF_BASE_KH { get; set; }
- public string? planId { get; set; }
- public string? planSeq { get; set; }
- public string? planNum { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index 70efe64..20f9c3f 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -3,28 +3,32 @@
public class ErpCAB
{
public string? FBillNo { get; set; }
- public string? FMaterialID2 { get; set; }
- public string? FNeedQty2 { get; set; }
+ public string? FMaterialID { get; set; }
+ public string? FNeedQty { get; set; }
public string? FPickedQty { get; set; }
public string? FPositionNO { get; set; }
+ public string? FChildSupplyOrgId { get; set; }
+ public string? FSupplyOrg { get; set; }
public string? FOwnerID { get; set; }
public string? FMTONO { get; set; }
public string? FLot { get; set; }
public string? FStockID { get; set; }
public string? FIssueType { get; set; }
- public string? F_UNW_Text_tpgy { get; set; }
public string? FUnitID { get; set; }
public string? FSupplyType { get; set; }
public string? FStdQty { get; set; }
public string? FIsKeyItem { get; set; }
public string? FNumerator { get; set; }
public string? FDenominator { get; set; }
- public string ID { get; set; }
- public string? PID { get; set; }
-
+ public string? FID { get; set; }
+ public string? FENTRYID { get; set; }
public string? FSeq { get; set; }
-
public string? FFixScrapQty { get; set; }
-
public string? FScrapRate { get; set; }
+ public string? FSALEORDERNO { get; set; }
+ public string? F_ZJXF_YHRQ { get; set; }
+ public string? FXSHTBH { get; set; }
+ public string? FReplaceGroup { get; set; }
+ public string? FOwnerTypeId { get; set; }
+ public string? FMaterialType { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCustomer.cs b/MES.Service/Dto/webApi/ErpCustomer.cs
index 46440a7..a97d68a 100644
--- a/MES.Service/Dto/webApi/ErpCustomer.cs
+++ b/MES.Service/Dto/webApi/ErpCustomer.cs
@@ -2,13 +2,16 @@
public class ErpCustomer
{
- public string? Type { get; set; }
public string Id { get; set; }
+ public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FShortName { get; set; }
public string? FName { get; set; }
- public string? Fcontact { get; set; }
- public string? Fmobilephone { get; set; }
- public string? Fseller { get; set; }
+ public string? FContact { get; set; }
+ public string? FMobilephone { get; set; }
+ public string? FSeller { get; set; }
public string? FForbidStatus { get; set; }
+ public string? FCreateOrgId { get; set; }
+ public string? FUseOrgId { get; set; }
+ public string? FDescription { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDelivery.cs b/MES.Service/Dto/webApi/ErpDelivery.cs
new file mode 100644
index 0000000..4aba2ee
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpDelivery.cs
@@ -0,0 +1,11 @@
+锘縩amespace MES.Service.Dto.webApi;
+public class ErpDelivery
+{
+ public string? Type { get; set; }
+ public string? DeliveryNo { get; set; }
+ public string? DepotNo { get; set; }
+ public string? FDate { get; set; }
+ public string? Remark { get; set; }
+ public string? SupplierId { get; set; }
+ public string? ErpId { get; set; }
+}
diff --git a/MES.Service/Dto/webApi/ErpDeliveryData.cs b/MES.Service/Dto/webApi/ErpDeliveryData.cs
new file mode 100644
index 0000000..a4a6030
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpDeliveryData.cs
@@ -0,0 +1,16 @@
+锘縩amespace MES.Service.Dto.webApi;
+public class ErpDeliveryData
+{
+ public string? LineNo { get; set; }
+ public string? FBillNo { get; set; }
+ public string? ProductCode { get; set; }
+ public string? IncludeQty { get; set; }
+ public string? PurchaseQty { get; set; }
+ public string? DeliveryQty { get; set; }
+ public string? SalesOrderId { get; set; }
+ public string? OrderlineId { get; set; }
+ public string? PurchaseUnit { get; set; }
+ public string? InventoryUnit { get; set; }
+ public string? FXSHTH { get; set; }
+ public string? Remark { get; set; }
+}
diff --git a/MES.Service/Dto/webApi/ErpDepartment.cs b/MES.Service/Dto/webApi/ErpDepartment.cs
index e5fa314..878dfde 100644
--- a/MES.Service/Dto/webApi/ErpDepartment.cs
+++ b/MES.Service/Dto/webApi/ErpDepartment.cs
@@ -3,18 +3,14 @@
public class ErpDepartment
{
public string Id { get; set; }
-
public string? FNumber { get; set; }
-
public string? FName { get; set; }
-
public string? FDeptProperty { get; set; }
-
public string? FGroup { get; set; }
-
public string? FWIPStockID { get; set; }
-
public string? FForbidStatus { get; set; }
-
public string? Type { get; set; }
+ public string? FParentID { get; set; }
+ public string? FCreateOrgId { get; set; }
+ public string? FUseOrgId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index 8a88ef3..ee44fad 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -2,11 +2,12 @@
public class ErpDepots
{
+ public string Id { get; set; }
+ public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
- public string Id { get; set; }
public string? FAllowMinusQty { get; set; }
@@ -18,5 +19,8 @@
public string? FGroup { get; set; }
- public string? Type { get; set; }
+
+ public string? FCreateOrgId { get; set; }
+
+ public string? FUseOrgId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItemType.cs b/MES.Service/Dto/webApi/ErpItemType.cs
index ea4146c..c3dfb32 100644
--- a/MES.Service/Dto/webApi/ErpItemType.cs
+++ b/MES.Service/Dto/webApi/ErpItemType.cs
@@ -2,9 +2,9 @@
public class ErpItemType
{
- public string? Type { get; set; }
public string Id { get; set; }
- public string? FParentGroup { get; set; }
+ public string? Type { get; set; }
+ public string? FParentId { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? FDescription { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpItems.cs b/MES.Service/Dto/webApi/ErpItems.cs
index e2b3a76..3ba6814 100644
--- a/MES.Service/Dto/webApi/ErpItems.cs
+++ b/MES.Service/Dto/webApi/ErpItems.cs
@@ -25,7 +25,12 @@
public string? FForbidStatus { get; set; }
public string? FErpClsID { get; set; }
public string? FWorkShopId { get; set; }
-
public string? FPRODUCEUNITID { get; set; }
public string? FSUBCONUNITID { get; set; }
+ public string? FCreateOrgId { get; set; }
+ public string? FUseOrgId { get; set; }
+ public string? FLOSSPERCENT { get; set; }
+ public string? FMnemonicCode { get; set; }
+ public string? FExpPeriod { get; set; }
+ public string? FColor { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOrganize.cs b/MES.Service/Dto/webApi/ErpOrganize.cs
new file mode 100644
index 0000000..ca4cd28
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -0,0 +1,17 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpOrganize
+{
+ public string Id { get; set; }
+ public string? Type { get; set; }
+ public string? FNumber { get; set; }
+ public string? FName { get; set; }
+ public string? FForbidStatus { get; set; }
+ public string? FDescription { get; set; }
+ public string? FParentID { get; set; }
+ public string? fCreateDate { get; set; }
+ public string? FForbidorid { get; set; }
+ public string? FForbiddate { get; set; }
+
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpPosition.cs b/MES.Service/Dto/webApi/ErpPosition.cs
index f3e812b..7da84f0 100644
--- a/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/MES.Service/Dto/webApi/ErpPosition.cs
@@ -2,12 +2,13 @@
public class ErpPosition
{
+
+ public string Id { get; set; }
/// <summary>
/// 0 鍚敤 1绂佺敤 2 瀹℃牳 3鍙嶅鏍�
/// </summary>
public string? Type { get; set; }
- public string Id { get; set; }
public string? FNumber { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index bbd2c6b..491734d 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -14,22 +14,10 @@
public string? FPurchaseOrgId { get; set; }
public string? FPurchaseDeptId { get; set; }
public string? FPurchaserGroupId { get; set; }
- public string? Facctype { get; set; }
public string? FPurchaserId { get; set; }
-
- public string? F_UNW_Remarks_zlyq { get; set; }
-
- // public string? F_UNW_GYSLXR { get; set; }
- // public string? F_UNW_LXRDH { get; set; }
- // public string? FProviderJob { get; set; }
- // public string? FProviderPhone { get; set; }
- // public string? FProviderAddress { get; set; }
public string? FSettleId { get; set; }
public string? FChargeId { get; set; }
public string? FProviderEMail { get; set; }
- public string? F_UNW_Text_ysfs { get; set; }
- public string? F_UNW_BZ { get; set; }
- public string? F_UNW_Combo_zjmj { get; set; }
public string? FCancelStatus { get; set; }
public string? FCancellerId { get; set; }
public string? FCancelDate { get; set; }
@@ -40,7 +28,8 @@
public string? FApproverId { get; set; }
public string? FApproveDate { get; set; }
- public string? FCHANGEREASON { get; set; }
+ public string? FChangeReason { get; set; }
+ public string? FReceiveOrgId { get; set; }
//閲囪喘璁㈠崟A 閲囪喘璁㈠崟鍙樻洿鍗旴
public string? FBILLTYPE { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 70cd6a6..8cbe8bc 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,10 +5,9 @@
public string id { get; set; }
public string Eid { get; set; }
public string? FBillNo { get; set; }
- public string? F_UNW_Text_xsddh { get; set; }
+ public string? FSeq { get; set; }
+ public string? FXSHTH { get; set; }
public string? FMaterialId { get; set; }
- public string? FMaterialName { get; set; }
- public string? FModel { get; set; }
public string? FUnitId { get; set; }
public string? FQty { get; set; }
public string? FStockUnitID { get; set; }
@@ -17,11 +16,19 @@
public string? FDeliveryDate { get; set; }
public string? FDeliveryEarlyDate { get; set; }
public string? FDeliveryLastDate { get; set; }
+ // start
+ public string? FRequireOrgId { get; set; }
+ public string? FRequireDeptId { get; set; }
+ public string? FReceiveOrgId { get; set; }
+ public string? FReceiveDeptId { get; set; }
+ public string? FEntrySettleOrgId { get; set; }
+ // end
public string? FGiveAway { get; set; }
+ public string? FNote { get; set; }
public string? FEntryNote { get; set; }
public string? FSupMatId { get; set; }
public string? FSupMatName { get; set; }
- public string? FSUBREQBILLNO { get; set; }
+ public string? FSubreqBillNo { get; set; }
public string? FLot { get; set; }
public string? FMRPCloseStatus { get; set; }
public string? FMRPFreezeStatus { get; set; }
@@ -30,23 +37,19 @@
public string? FMRPTerminateStatus { get; set; }
public string? FTerminaterId { get; set; }
public string? FTerminateDate { get; set; }
- public string? FReceiveQty { get; set; }
+ public string? FBaseReceiveQty { get; set; }
public string? FRemainReceiveQty { get; set; }
- public string? FStockInQty { get; set; }
+ public string? FBaseStockInQty { get; set; }
public string? FRemainStockINQty { get; set; }
public string? FMrbQty { get; set; }
- public string? FCHECKRETQTY { get; set; }
- public string? FSTOCKRETQTY { get; set; }
+ public string? FBaseCheckRetQty { get; set; }
+ public string? FBaseStockRetQty { get; set; }
public string? FSrcBillTypeId { get; set; }
public string? FSrcBillNo { get; set; }
public string? FReqTraceNo { get; set; }
public string? FMtoNo { get; set; }
public string? FChangeFlag { get; set; }
- public string? FDEMANDTYPE { get; set; }
- public string? FDEMANDBILLNO { get; set; }
- public string? FDEMANDBILLENTRYSEQ { get; set; }
- public string? PurchaseOrderLineNumber { get; set; }
- public string? Demand { get; set; }
- public string? Receiving { get; set; }
- public string? Settlement { get; set; }
+ public string? FDemandType { get; set; }
+ public string? FDemandBillNo { get; set; }
+ public string? FDemandBillEntrySeq { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpStaff.cs b/MES.Service/Dto/webApi/ErpStaff.cs
index 263ad9a..77828fa 100644
--- a/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/MES.Service/Dto/webApi/ErpStaff.cs
@@ -2,8 +2,8 @@
public class ErpStaff
{
- public string? Type { get; set; }
public string Id { get; set; }
+ public string? Type { get; set; }
public string? FStaffNumber { get; set; }
public string? FName { get; set; }
public string? FPostDept { get; set; }
@@ -12,4 +12,6 @@
public string? FStaffStartDate { get; set; }
public string? FDescription { get; set; }
public string? FForbidStatus { get; set; }
+ public string? FCreateOrgId { get; set; }
+ public string? FUseOrgId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSupplier.cs b/MES.Service/Dto/webApi/ErpSupplier.cs
index 7187428..a0d7de1 100644
--- a/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -2,13 +2,16 @@
public class ErpSupplier
{
- public string? Type { get; set; }
public string Id { get; set; }
+ public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FShortName { get; set; }
public string? FName { get; set; }
- public string? F_UNW_LXR { get; set; }
- public string? F_UNW_LXRDH { get; set; }
+ public string? FContact { get; set; }
+ public string? FTel { get; set; }
public string? FStaffId { get; set; }
public string? FForbidStatus { get; set; }
+ public string? FCreateOrgId { get; set; }
+ public string? FUseOrgId { get; set; }
+ public string? FDescription { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpUnit.cs b/MES.Service/Dto/webApi/ErpUnit.cs
index 26511cd..657fd10 100644
--- a/MES.Service/Dto/webApi/ErpUnit.cs
+++ b/MES.Service/Dto/webApi/ErpUnit.cs
@@ -2,8 +2,8 @@
public class ErpUnit
{
- public string? Type { get; set; }
public string Id { get; set; }
+ public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? FUnitGroupId { get; set; }
diff --git a/MES.Service/Modes/MesCustomer.cs b/MES.Service/Modes/MesCustomer.cs
index 40948f7..b0e17ea 100644
--- a/MES.Service/Modes/MesCustomer.cs
+++ b/MES.Service/Modes/MesCustomer.cs
@@ -141,16 +141,16 @@
public string? Fseller { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal? CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal? UseOrg { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
diff --git a/MES.Service/Modes/MesDeliveryNote.cs b/MES.Service/Modes/MesDeliveryNote.cs
new file mode 100644
index 0000000..f0d7350
--- /dev/null
+++ b/MES.Service/Modes/MesDeliveryNote.cs
@@ -0,0 +1,85 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閫佽揣鍗曟潯鐮佽〃
+/// </summary>
+[SugarTable("MES_DELIVERY_NOTE")]
+public class MesDeliveryNote
+{
+ /// <summary>
+ /// SEQ_DELIVERY
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_NO")]
+ public string? DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string? SuppNo { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ public string? DeliveryDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
+ public decimal? Status { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
+ public string? CheckUser { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "SITE")]
+ public string? Site { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string? Remark { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_NO")]
+ public string? DepotNo { get; set; }
+
+
+ /// <summary>
+ /// ERP鏀舵枡閫氱煡鍗曟嵁澶村唴鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? ErpId { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDeliveryNoteBarcode.cs b/MES.Service/Modes/MesDeliveryNoteBarcode.cs
new file mode 100644
index 0000000..16b8478
--- /dev/null
+++ b/MES.Service/Modes/MesDeliveryNoteBarcode.cs
@@ -0,0 +1,61 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閫佽揣鍗曟潯鐮佽〃
+/// </summary>
+[SugarTable("MES_DELIVERY_NOTE_BARCODE")]
+public class MesDeliveryNoteBarcode
+{
+ /// <summary>
+ /// SEQ_DELIVERY
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_DELIVERY")]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_NO")]
+ public string? DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCT_CODE")]
+ public string? ProductCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "SMALL_BARCODE")]
+ public string? SmallBarcode { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "INCLUDE_QTY")]
+ public decimal? IncludeQty { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string? SuppNo { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曢」娆�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public decimal? LineNo { get; set; }
+
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDeliveryNoteDetails.cs b/MES.Service/Modes/MesDeliveryNoteDetails.cs
new file mode 100644
index 0000000..707c793
--- /dev/null
+++ b/MES.Service/Modes/MesDeliveryNoteDetails.cs
@@ -0,0 +1,108 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閫佽揣鍗曟潯鐮佽〃
+/// </summary>
+[SugarTable("MES_DELIVERY_NOTE_DETAILS")]
+public class MesDeliveryNoteDetails
+{
+ /// <summary>
+ /// SEQ_DELIVERY
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_NO")]
+ public string? DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public decimal? LineNo { get; set; }
+
+ /// <summary>
+ /// ERP閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_NO")]
+ public string? ErpNo { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曢」娆�
+ /// </summary>
+ [SugarColumn(ColumnName = "PO_LINENO")]
+ public string? PoLineNo { get; set; }
+
+ /// <summary>
+ /// 浜у搧缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCT_CODE")]
+ public string? ProductCode { get; set; }
+
+ /// <summary>
+ /// 鏀舵枡鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "SL_UNIT")]
+ public string? SlUnit { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "KC_UNIT")]
+ public string? KcUnit { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈搴旀敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_QTY")]
+ public decimal? DeliveryQty { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PURCHASE_QTY")]
+ public decimal? PurchaseQty { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "INCLUDE_QTY")]
+ public decimal? IncludeQty { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_ORDER")]
+ public string? SaleOrder { get; set; }
+
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FSRCBILL_NO")]
+ public string? Fsrcbill_no { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string? Remark { get; set; }
+
+ /// <summary>
+ /// 鏈瀹炴敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "REAL_QTY")]
+ public decimal? RealQty { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 27537b2..5dd2f87 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -147,16 +147,16 @@
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal? CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal? UseOrg { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index f90f8fa..5f60d31 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -18,73 +18,73 @@
/// 宸ュ巶
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
+ public string? Factory { get; set; }
/// <summary>
/// 鍏徃缂栧彿
/// </summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
+ public string? Company { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
+ public string? ItemNo { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "ITEM_NAME")]
- public string ItemName { get; set; }
+ public string? ItemName { get; set; }
/// <summary>
/// 鐗╂枡绠�绉�
/// </summary>
[SugarColumn(ColumnName = "ITEM_SNAME")]
- public string ItemSname { get; set; }
+ public string? ItemSname { get; set; }
/// <summary>
/// 瑙勬牸鍨嬪彿
/// </summary>
[SugarColumn(ColumnName = "ITEM_MODEL")]
- public string ItemModel { get; set; }
+ public string? ItemModel { get; set; }
/// <summary>
/// 鐗╂枡鎻忚堪
/// </summary>
[SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
- public string ItemDescription { get; set; }
+ public string? ItemDescription { get; set; }
/// <summary>
/// 鐗╂枡鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "ITEM_UNIT")]
- public string ItemUnit { get; set; }
+ public string? ItemUnit { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "ITEM_TYPE")]
- public string ItemType { get; set; }
+ public string? ItemType { get; set; }
/// <summary>
/// 浜у搧鐗堟湰
/// </summary>
[SugarColumn(ColumnName = "ITEM_VERSION")]
- public string ItemVersion { get; set; }
+ public string? ItemVersion { get; set; }
/// <summary>
/// 瀹㈡埛缂栧彿
/// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
- public string CustNo { get; set; }
+ public string? CustNo { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string CreateBy { get; set; }
+ public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -96,7 +96,7 @@
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string LastupdateBy { get; set; }
+ public string? LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
@@ -126,25 +126,25 @@
/// 璁㈠崟鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "ORDERUNIT")]
- public string Orderunit { get; set; }
+ public string? Orderunit { get; set; }
/// <summary>
/// 閿�鍞崟浣�
/// </summary>
[SugarColumn(ColumnName = "SALEUNIT")]
- public string Saleunit { get; set; }
+ public string? Saleunit { get; set; }
/// <summary>
/// 搴撴埧鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "STOREUNIT")]
- public string Storeunit { get; set; }
+ public string? Storeunit { get; set; }
/// <summary>
/// 鐢熶骇鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "PRODUCTUNIT")]
- public string Productunit { get; set; }
+ public string? Productunit { get; set; }
/// <summary>
/// 鐗╂枡ID
@@ -156,43 +156,43 @@
/// ERP鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string ErpItemNo { get; set; }
+ public string? ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
/// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string DepotCode { get; set; }
+ public string? DepotCode { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙被缂栧彿
/// </summary>
[SugarColumn(ColumnName = "PPBOM00019124")]
- public string Ppbom00019124 { get; set; }
+ public string? Ppbom00019124 { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
/// </summary>
[SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
+ public string? Remarks { get; set; }
/// <summary>
/// 閲囪喘鍛�
/// </summary>
[SugarColumn(ColumnName = "FPURCHASERID")]
- public string Fpurchaserid { get; set; }
+ public string? Fpurchaserid { get; set; }
/// <summary>
/// 绂佺敤鐘舵��
/// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string Fforbidstatus { get; set; }
+ public string? Fforbidstatus { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
/// </summary>
[SugarColumn(ColumnName = "FMATERIALGROUP")]
- public string Fmaterialgroup { get; set; }
+ public string? Fmaterialgroup { get; set; }
/// <summary>
/// 瀹屽伐瓒呮敹姣斾緥
@@ -204,7 +204,7 @@
/// 鍙戞枡鏂瑰紡
/// </summary>
[SugarColumn(ColumnName = "FISSUETYPE")]
- public string Fissuetype { get; set; }
+ public string? Fissuetype { get; set; }
/// <summary>
/// 鍚敤鎵瑰彿绠＄悊
@@ -216,97 +216,97 @@
/// 閲囪喘鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "FPURCHASEUNITID")]
- public string Fpurchaseunitid { get; set; }
+ public string? Fpurchaseunitid { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal UseOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
+ /// 鎹熻�楃巼
/// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string Remark3 { get; set; }
+ [SugarColumn(ColumnName = "LOSS_PERCENT")]
+ public string? LossPercent { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
+ /// 鍔╄鐮�
/// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string Remark4 { get; set; }
+ [SugarColumn(ColumnName = "MNEMONIC_CODE")]
+ public string? MnemonicCode { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
+ /// 淇濊川鏈�
/// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string Remark5 { get; set; }
+ [SugarColumn(ColumnName = "EXP_PERIOD")]
+ public string? ExpPeriod { get; set; }
/// <summary>
/// 鐢熶骇杞﹂棿
/// </summary>
[SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
- public string ProductionWorkshop { get; set; }
+ public string? ProductionWorkshop { get; set; }
/// <summary>
/// 鐗╂枡灞炴��
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
- public string MaterialProperti { get; set; }
+ public string? MaterialProperti { get; set; }
/// <summary>
/// 鐢熶骇鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "PRODUCE_UNIT")]
- public string ProduceUnit { get; set; }
+ public string? ProduceUnit { get; set; }
/// <summary>
/// 濮斿鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "SUBCON_UNIT")]
- public string SubconUnit { get; set; }
+ public string? SubconUnit { get; set; }
/// <summary>
/// 鍥剧墖1
/// </summary>
[SugarColumn(ColumnName = "BZ06")]
- public string Bz06 { get; set; }
+ public string? Bz06 { get; set; }
/// <summary>
/// 鍥剧墖2
/// </summary>
[SugarColumn(ColumnName = "BZ07")]
- public string Bz07 { get; set; }
+ public string? Bz07 { get; set; }
/// <summary>
/// 鍥剧墖3
/// </summary>
[SugarColumn(ColumnName = "BZ08")]
- public string Bz08 { get; set; }
+ public string? Bz08 { get; set; }
/// <summary>
/// 鍥剧墖4
/// </summary>
[SugarColumn(ColumnName = "BZ09")]
- public string Bz09 { get; set; }
+ public string? Bz09 { get; set; }
/// <summary>
/// 鍥剧墖5
/// </summary>
[SugarColumn(ColumnName = "BZ10")]
- public string Bz10 { get; set; }
+ public string? Bz10 { get; set; }
/// <summary>
/// QC鍒嗙粍ID
/// </summary>
[SugarColumn(ColumnName = "QC_TEAMID")]
- public string QcTeamid { get; set; }
+ public string? QcTeamid { get; set; }
/// <summary>
/// 鐗╂枡ID
@@ -314,5 +314,11 @@
[SugarColumn(ColumnName = "ITEM_ID")]
public decimal? ItemId { get; set; }
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ [SugarColumn(ColumnName = "COLOR_NAME")]
+ public string? ColorName { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index abdfd74..2c9fc7a 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -268,4 +268,16 @@
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
+
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "ARRIVE_DATE")]
+ public DateTime? ArriveDate { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVE_ORG")]
+ public decimal? ReceiveOrg { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 0fd7920..0e7a344 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -347,4 +347,22 @@
/// </summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
+
+ /// <summary>
+ /// 闇�姹傞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "DEMAND_DEPT")]
+ public string? DemandDept { get; set; }
+
+ /// <summary>
+ /// 闇�姹傞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVING_DEPT")]
+ public string? ReceivingDept { get; set; }
+
+ /// <summary>
+ /// 棰勮鍒拌揣鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "ARRIVE_DATE")]
+ public DateTime? ArriveDate { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 0b7e36c..464ce7a 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -18,43 +18,43 @@
/// 鍛樺伐缂栫爜
/// </summary>
[SugarColumn(ColumnName = "STAFF_NO")]
- public string StaffNo { get; set; }
+ public string? StaffNo { get; set; }
/// <summary>
/// 鍛樺伐濮撳悕
/// </summary>
[SugarColumn(ColumnName = "STAFF_NAME")]
- public string StaffName { get; set; }
+ public string? StaffName { get; set; }
/// <summary>
/// 閮ㄩ棬缂栫爜
/// </summary>
[SugarColumn(ColumnName = "DEPARTMENT_NO")]
- public string DepartmentNo { get; set; }
+ public string? DepartmentNo { get; set; }
/// <summary>
/// 閮ㄩ棬鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "DEPARTMENT_NAME")]
- public string DepartmentName { get; set; }
+ public string? DepartmentName { get; set; }
/// <summary>
/// 宀椾綅缂栫爜
/// </summary>
[SugarColumn(ColumnName = "POSITION_CODE")]
- public string PositionCode { get; set; }
+ public string? PositionCode { get; set; }
/// <summary>
/// 宀椾綅鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "POSITION_NAME")]
- public string PositionName { get; set; }
+ public string? PositionName { get; set; }
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
[SugarColumn(ColumnName = "PHONE_NUMBER")]
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
/// <summary>
/// 浠诲矖寮�濮嬫棩鏈�
@@ -66,43 +66,43 @@
/// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
+ public string? Remark { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal? CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal? UseOrg { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
- public string Remark3 { get; set; }
+ public string? Remark3 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
/// </summary>
[SugarColumn(ColumnName = "REMARK4")]
- public string Remark4 { get; set; }
+ public string? Remark4 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�5
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
- public string Remark5 { get; set; }
+ public string? Remark5 { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string CreateBy { get; set; }
+ public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -114,7 +114,7 @@
/// 鏇存柊浜�
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string LastupdateBy { get; set; }
+ public string? LastupdateBy { get; set; }
/// <summary>
/// 鏇存柊鏃堕棿
@@ -126,13 +126,13 @@
/// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "MEMO")]
- public string Memo { get; set; }
+ public string? Memo { get; set; }
/// <summary>
/// 鐢熶骇绾�
/// </summary>
[SugarColumn(ColumnName = "LINE_NO")]
- public string LineNo { get; set; }
+ public string? LineNo { get; set; }
/// <summary>
/// 鐢熶骇鍛樺伐鏍囪瘑
@@ -144,7 +144,7 @@
/// 鏄惁绂佺敤
/// </summary>
[SugarColumn(ColumnName = "FFORBID_STATUS")]
- public string FforbidStatus { get; set; }
+ public string? FforbidStatus { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSupplier.cs b/MES.Service/Modes/MesSupplier.cs
index 8736c2b..bbf3f6a 100644
--- a/MES.Service/Modes/MesSupplier.cs
+++ b/MES.Service/Modes/MesSupplier.cs
@@ -141,16 +141,16 @@
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal? CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal? UseOrg { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
diff --git a/MES.Service/Modes/Organize.cs b/MES.Service/Modes/Organize.cs
index 55205e6..96b15b1 100644
--- a/MES.Service/Modes/Organize.cs
+++ b/MES.Service/Modes/Organize.cs
@@ -10,27 +10,41 @@
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
+ public decimal Id { get; set; }
/// <summary>
- /// 缁勭粐鑻辨枃
+ /// 缁勭粐id
/// </summary>
[SugarColumn(ColumnName = "FNUMBER")]
- public string Fnumber { get; set; }
+ public string? Fnumber { get; set; }
/// <summary>
- /// 缁勭粐鍚�
+ /// 缁勭粐鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "FNAME")]
- public string Fname { get; set; }
+ public string? Fname { get; set; }
/// <summary>
+ /// 鏄惁鍚敤
/// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string Fforbidstatus { get; set; }
+ public string? Fforbidstatus { get; set; }
/// <summary>
+ /// 鎿嶄綔绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "TYPE")]
- public string Type { get; set; }
+ 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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index f2b6669..4ea2a99 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -134,22 +134,22 @@
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍒涘缓缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public decimal? CreateOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤缁勭粐
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public decimal? UseOrg { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
+ /// 涓婄骇閮ㄩ棬
/// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
+ [SugarColumn(ColumnName = "PARENT_ID")]
+ public decimal? ParentId { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 67a75ab..85ba38c 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -9,10 +9,9 @@
public class Womcaa
{
/// <summary>
- /// 鑷鍒� SEQ_AOI
+ /// 鑷鍒� SEQ_CAA
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
- OracleSequenceName = "SEQ_AOI")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_CAA")]
public decimal? Id { get; set; }
/// <summary>
@@ -104,7 +103,7 @@
/// ERP婧愬崟琛屽彿
/// </summary>
[SugarColumn(ColumnName = "CAA019")]
- public decimal? Caa019 { get; set; }
+ public string? Caa019 { get; set; }
/// <summary>
/// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
@@ -273,4 +272,82 @@
/// </summary>
[SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
public string? SrcSplitBillno { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "F_ZSXG_KH")]
+ public string? F_ZSXG_KH { get; set; }
+
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
+ public string? F_ZJXF_YHRQ { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "PRD_ORG")]
+ public string? PrdOrg { get; set; }
+
+ /// <summary>
+ /// 濮旀墭缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "TRUST_ORG")]
+ public string? TrustOrg { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "TB_TIME")]
+ public DateTime? TbTime { get; set; }
+
+ /// <summary>
+ /// 缁撴鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_TIME")]
+ public DateTime? JaTime { get; set; }
+
+ /// <summary>
+ /// 缁撴鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_BS")]
+ public string? JaBs { get; set; }
+
+ /// <summary>
+ /// 淇敼鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_XG")]
+ public decimal? IsXg { get; set; }
+
+ /// <summary>
+ /// 濮斿閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERNO")]
+ public string? FPURORDERNO { get; set; }
+
+ /// <summary>
+ /// 濮斿閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
+ public decimal? FPURORDERENTRYSEQ { get; set; }
+
+ /// <summary>
+ /// 濮斿璁㈠崟鍒嗗綍鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBENTRYID")]
+ public decimal? FSUBENTRYID { get; set; }
+
+ /// <summary>
+ /// 濮斿鍏ュ簱鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTOCKINQTY")]
+ public decimal? FSTOCKINQTY { get; set; }
+
+ /// <summary>
+ /// 濮斿鏈叆搴撴暟
+ /// </summary>
+ [SugarColumn(ColumnName = "FNOSTOCKINQTY")]
+ public decimal? FNOSTOCKINQTY { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 1ec7044..7e44673 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -11,8 +11,7 @@
/// <summary>
/// 鑷鍒�
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
- OracleSequenceName = "SEQ_AOI")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_CAB")]
public decimal? Id { get; set; }
/// <summary>
@@ -145,13 +144,13 @@
/// 鍒嗗瓙
/// </summary>
[SugarColumn(ColumnName = "NUMERATOR")]
- public string? Numerator { get; set; }
+ public decimal? Numerator { get; set; }
/// <summary>
/// 鍒嗘瘝
/// </summary>
[SugarColumn(ColumnName = "DENOMINATOR")]
- public string? Denominator { get; set; }
+ public decimal? Denominator { get; set; }
/// <summary>
/// 鍥哄畾鎹熻��
@@ -164,4 +163,16 @@
/// </summary>
[SugarColumn(ColumnName = "SCRAPRATE")]
public decimal? SCRAPRATE { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER")]
+ public string? SalesOrder { get; set; }
+
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
+ public string? F_ZJXF_YHRQ { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 17b0621..a5e2509 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index a77bd2d..61cb04c 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index b0cbbee..f9c19cd 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 089d566..b9ceea7 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 774f869..805a5fa 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -56,13 +56,11 @@
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 "2":
@@ -126,10 +124,13 @@
CustNo = customer.FNumber,
CustSname = customer.FShortName,
CustName = customer.FName,
- Anred = customer.Fcontact,
- Telf1 = customer.Fmobilephone,
- Fseller = customer.Fseller,
+ Anred = customer.FContact,
+ Telf1 = customer.FMobilephone,
+ Fseller = customer.FSeller,
Fforbidstatus = customer.FForbidStatus,
+ CreateDate = DateTime.Now,
+ CreateOrg= Convert.ToDecimal(customer.FCreateOrgId),
+ UseOrg= Convert.ToDecimal(customer.FUseOrgId),
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
new file mode 100644
index 0000000..3c64061
--- /dev/null
+++ b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
@@ -0,0 +1,138 @@
+锘縰sing AngleSharp.Dom;
+using MES.Service.DB;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.BasicData;
+
+public class MesDeliveryNoteBarcodeManager : Repository<MesDeliveryNoteBarcode>
+{
+ //private readonly MesDeliveryNoteBarcodeManager mesDeliveryNoteBarcode = new();
+ public bool Save(ErpBarcode barcode)
+ {
+ var mesDeliveryNoteBarcode = GetMesDeliveryNoteBarcode(barcode);
+
+ return UseTransaction(db =>
+ {
+ switch (barcode.Type)
+ {
+ case "2":
+ case "4":
+ case "5":
+ return SaveOrUpdateData(db, mesDeliveryNoteBarcode) ? 1 : 0;
+ case "3":
+ case "6":
+ return DeleteData(db, mesDeliveryNoteBarcode) ? 1: 0;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{barcode.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ throw new NotImplementedException("鎿嶄綔澶辫触");
+ }) > 0;
+ }
+
+ // 鎻掑叆鏁版嵁鐨勬柟娉�
+ private bool InsertData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ {
+
+ if (mesDeliveryNoteBarcode.Id != null) base.DeleteById(mesDeliveryNoteBarcode.Id);
+
+ var insert = base.Insert(mesDeliveryNoteBarcode);
+
+ if (insert) return true;
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ // 鏇存柊鏁版嵁鐨勬柟娉�
+ private bool DeleteData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ {
+ var detect = base.DeleteById(mesDeliveryNoteBarcode.Id);
+
+ if (detect) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ {
+ if (mesDeliveryNoteBarcode.Id != null) base.DeleteById(mesDeliveryNoteBarcode.Id);
+
+ var orUpdate = base.Insert(mesDeliveryNoteBarcode);
+ if (orUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpBarcode> barcodes)
+ {
+ 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());
+
+ 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; */
+ }
+
+ /* private bool InsertItemBatch(SqlSugarScope db, List<MesDeliveryNoteBarcode> barcodeList)
+ {
+ var insertRange = db.Insertable(barcodeList).ExecuteCommand();
+ if (insertRange > 0)
+ return true;
+
+ 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;
+
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ } */
+
+
+ public MesDeliveryNoteBarcode GetMesDeliveryNoteBarcode(ErpBarcode barcode)
+ {
+ var mesDeliveryNoteBarcode = new MesDeliveryNoteBarcode();
+ 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.CreateDate = DateTime.Now;
+ mesDeliveryNoteBarcode.SuppNo = barcode.SupplierId;
+
+ return mesDeliveryNoteBarcode;
+ }
+
+
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteDetailsManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteDetailsManager.cs
new file mode 100644
index 0000000..b7815be
--- /dev/null
+++ b/MES.Service/service/BasicData/MesDeliveryNoteDetailsManager.cs
@@ -0,0 +1,79 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.BasicData;
+
+public class MesDeliveryDetailsManager : Repository<MesDeliveryNoteDetails>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesRohInDataManager.cs
+
+
+ #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 data5 = base.GetPageList(it => 1 == 1, p);
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
+
+ var data6 =
+ base.GetPageList(it => 1 == 1, p,
+ it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
+
+ var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel
+ {
+ FieldName = typeof(MesDeliveryNoteDetails).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 MesDeliveryNoteDetails(); //娴嬭瘯鍙傛暟
+ var insertArray = new[] { insertData };
+ base.Insert(insertData); //鎻掑叆
+ base.InsertRange(insertArray); //鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+ AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+ /*********鏇存柊*********/
+ var updateData = new MesDeliveryNoteDetails(); //娴嬭瘯鍙傛暟
+ var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+ base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray); //鎵归噺鏇存柊
+ //base.Update(it => new MesRohInData() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new MesDeliveryNoteDetails(); //娴嬭瘯鍙傛暟
+ base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+ AsDeleteable().Where(it => 1 == 2)
+ .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+
+ #endregion
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
new file mode 100644
index 0000000..3093fe2
--- /dev/null
+++ b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -0,0 +1,141 @@
+锘縰sing MES.Service.DB;
+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 ();
+
+ // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
+ public bool Save(Delivery delivery)
+ {
+ var erpDelivery = delivery.ErpDelivery;
+ var mesDeliveryNote = GetMesDeliveryNote(erpDelivery);
+ var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.ErpDeliveryData, erpDelivery.DeliveryNo, mesDeliveryNote.Status);
+
+ return UseTransaction(db =>
+ {
+ switch (erpDelivery.Type)
+ {
+ case "2":
+ case "4":
+ case "5":
+ return SaveOrUpdateData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1 : 0;
+ case "3":
+ case "6":
+ return DeleteData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1: 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpDelivery.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ // 鎻掑叆鏁版嵁鐨勬柟娉�
+ private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ {
+ var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
+
+ if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
+
+ if (decimals.Length > 0)
+ db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand();
+
+ var insert = base.Insert(mesDeliveryNote);
+ var insertRange = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+
+ if (insert && insertRange) return true;
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ // 鏇存柊鏁版嵁鐨勬柟娉�
+ 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;
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ 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();
+
+ var orUpdate = base.Insert(mesDeliveryNote);
+ var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ if (orUpdate && baOrUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<Delivery> deliveries)
+ {
+ var result = deliveries.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ public MesDeliveryNote GetMesDeliveryNote(ErpDelivery delivery)
+ {
+ var mesDeliveryNote = new MesDeliveryNote();
+ var single = base.GetSingle(it => it.DeliveryNo == delivery.DeliveryNo);
+ if (single != null) mesDeliveryNote.Id = single.Id;
+
+ mesDeliveryNote.DeliveryNo = delivery.DeliveryNo;
+ mesDeliveryNote.SuppNo = delivery.SupplierId;
+ mesDeliveryNote.DeliveryDate = delivery.FDate;
+ mesDeliveryNote.Remark = delivery.Remark;
+ if (single != null)
+ {
+ mesDeliveryNote.Status = single.Status;
+ mesDeliveryNote.CheckUser = single.CheckUser;
+ mesDeliveryNote.CheckDate = single.CheckDate;
+ }
+ else
+ {
+ 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)
+ {
+ return erpDeliveryDatas.Select(s =>
+ {
+ var entity = new MesDeliveryNoteDetails
+ {
+ DeliveryNo = type,
+ LineNo = Convert.ToDecimal(s.LineNo),
+ ErpNo = s.FBillNo,
+ PoLineNo = s.OrderlineId,
+ ProductCode = s.ProductCode,
+ SlUnit = s.PurchaseUnit,
+ KcUnit = s.InventoryUnit,
+ DeliveryQty = Convert.ToDecimal(s.DeliveryQty),
+ Remark = s.Remark,
+ CreateDate = DateTime.Now,
+ SaleOrder = s.FXSHTH,
+ PurchaseQty = Convert.ToDecimal(s.PurchaseQty),
+ IncludeQty = Convert.ToDecimal(s.IncludeQty),
+ 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;
+
+ return entity;
+ }).ToList();
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index d10b6f7..10c7f9d 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -105,14 +105,17 @@
{
return new MesDepots
{
+ DepotId = Convert.ToDecimal(depots.Id),
DepotCode = depots.FNumber,
DepotName = depots.FName,
- DepotId = Convert.ToDecimal(depots.Id),
IsFkc = depots.FAllowMinusQty,
CreateBy = depots.FPrincipal,
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
+ CreateOrg= Convert.ToDecimal(depots.FCreateOrgId),
+ UseOrg= Convert.ToDecimal(depots.FUseOrgId),
+ CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index 6aea112..36685c3 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -53,10 +53,11 @@
return new MesItemType
{
Id = Convert.ToDecimal(department.Id),
- Pgroup = department.FParentGroup,
+ Pgroup = department.FParentId,
Tcode = department.FNumber,
Tname = department.FName,
Description = department.FDescription,
+ CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 748cc1c..7bdb461 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -130,6 +130,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
+ ItemId= Convert.ToDecimal(item.Id),
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
@@ -153,6 +154,12 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
+ CreateOrg = Convert.ToDecimal(item.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(item.FUseOrgId),
+ LossPercent = item.FLOSSPERCENT,
+ MnemonicCode = item.FMnemonicCode,
+ ExpPeriod = item.FExpPeriod,
+ ColorName = item.FColor,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index a670906..628faf8 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -102,15 +102,9 @@
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
- CreationDate = position.FCreateDate != null
- ? DateTime.ParseExact(position.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
+ CreationDate = DateTime.Now,
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/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 35acb3c..2b901f2 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -14,8 +14,7 @@
{
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 =>
{
@@ -30,6 +29,8 @@
return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
case "2":
case "4":
+ case "5":
+ case "B":
return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
? 1
: 0;
@@ -135,25 +136,17 @@
mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
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;
mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
- mesRohIn.QtyAcceptance = rohIn.Facctype;
mesRohIn.Purchaser = rohIn.FPurchaserId;
- mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
mesRohIn.Email = rohIn.FProviderEMail;
- mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
- mesRohIn.Remarks = rohIn.F_UNW_BZ;
- mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -163,11 +156,6 @@
"yyyy-MM-dd HH:mm:ss", null);
mesRohIn.CreateBy = rohIn.FCreatorId;
-
- if (rohIn.FCreateDate != null)
- mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
mesRohIn.LastupdateBy = rohIn.FModifierId;
if (rohIn.FModifyDate != null)
@@ -176,7 +164,9 @@
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
- mesRohIn.Changereason = rohIn.FCHANGEREASON;
+ mesRohIn.Changereason = rohIn.FChangeReason;
+ mesRohIn.CreateDate = DateTime.Now;
+ mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
return mesRohIn;
}
@@ -192,7 +182,9 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- SalesOrderId = s.F_UNW_Text_xsddh,
+ OrderLineId=s.FSeq,
+ PurchaseOrderLineNumber = s.FSeq,
+ SalesOrderId = s.FXSHTH,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
@@ -212,10 +204,10 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
IsGift = s.FGiveAway,
- Remarks = s.FEntryNote,
+ Remarks = s.FNote,
SupplierItemCode = s.FSupMatId,
SupplierItemName = s.FSupMatName,
- OutsourcingOrderId = s.FSUBREQBILLNO,
+ OutsourcingOrderId = s.FSubreqBillNo,
BatchNumber = s.FLot,
BusinessClose = s.FMRPCloseStatus,
BusinessFreeze = s.FMRPFreezeStatus,
@@ -230,26 +222,29 @@
? DateTime.ParseExact(s.FTerminateDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty),
- RemainingReceivedQty =
- Convert.ToDecimal(s.FRemainReceiveQty),
- TotalStoredQty = Convert.ToDecimal(s.FStockInQty),
+ TotalReceivedQty = Convert.ToDecimal(s.FQty)-Convert.ToDecimal(s.FRemainReceiveQty),
+ RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty),
+ TotalStoredQty = Convert.ToDecimal(s.FQty) - Convert.ToDecimal(s.FRemainStockINQty),
RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
- ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY),
- ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY),
+ ReturnableReceivedQty = Convert.ToDecimal(s.FBaseCheckRetQty),
+ ReturnableStoredQty = Convert.ToDecimal(s.FBaseStockRetQty),
SourceDocumentType = s.FSrcBillTypeId,
SourceDocumentId = s.FSrcBillNo,
DemandTrackingId = s.FReqTraceNo,
PlanTrackingId = s.FMtoNo,
ChangeFlag = s.FChangeFlag,
- DemandSource = s.FDEMANDTYPE,
- DemandDocumentId = s.FDEMANDBILLNO,
- DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
- PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
- Demand = s.Demand,
- Receiving = s.Receiving,
- Settlement = s.Settlement
+ DemandSource = s.FDemandType,
+ DemandDocumentId = s.FDemandBillNo,
+ DemandDocumentLineId = s.FDemandBillEntrySeq,
+ Demand = s.FRequireOrgId,
+ DemandOrg = s.FRequireOrgId,
+ Receiving = s.FReceiveOrgId,
+ ReceivingOrg = s.FReceiveOrgId,
+ Settlement = s.FEntrySettleOrgId,
+ SettlementOrg = s.FEntrySettleOrgId,
+ DemandDept = s.FRequireDeptId,
+ ReceivingDept = s.FReceiveDeptId
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 1f5f4dc..9977229 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -114,9 +114,12 @@
Id = Convert.ToDecimal(staff.Id),
StaffNo = staff.FStaffNumber,
StaffName = staff.FName,
- DepartmentName = staff.FPostDept,
- PositionName = staff.FPost,
+ DepartmentNo = staff.FPostDept,
+ PositionCode = staff.FPost,
PhoneNumber = staff.FMobile,
+ CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
+ CreateDate = DateTime.Now,
Remark = staff.FDescription,
FforbidStatus = staff.FForbidStatus
};
@@ -137,11 +140,14 @@
Fcode = staff.FStaffNumber,
Fname = staff.FName,
Fpassword = "8+()./,", // 鍒濆瀵嗙爜
- Fsystem = "涓婃牸",
+ Fsystem = "娉拌幈濮�",
Lever = 0,
Fcompany = "1000",
Ffactory = "1000",
DelFlag = 0,
+ Dev=0,
+ Tet=0,
+ Prd=1,
Ismanager = 0,
Isacq = 0,
ExpField9 = "1020",
@@ -149,7 +155,10 @@
Status = 0,
Isdeparture = 0,
CheckFlag = 0,
- ExpFiel12 = 0
+ ExpFiel12 = 0,
+ FirstLogin = 0,
+ CreateDate = DateTime.Now,
+ PswEditTime = DateTime.Now
};
}
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index f64e2e9..fb8718f 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -123,10 +123,14 @@
SuppNo = supplier.FNumber,
SuppSname = supplier.FShortName,
SuppName = supplier.FName,
- Lxr = supplier.F_UNW_LXR,
- Telf1 = supplier.F_UNW_LXRDH,
+ Lxr = supplier.FContact,
+ Telf1 = supplier.FTel,
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
+ CreateDate = DateTime.Now,
+ CreateOrg= Convert.ToDecimal(supplier.FCreateOrgId),
+ UseOrg= Convert.ToDecimal(supplier.FUseOrgId),
+ Remark=supplier.FDescription,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 3135863..4ad9501 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -131,6 +131,7 @@
Fprecision = unit.FPrecision,
Fdescription = unit.FDescription,
Fforbidstatus = unit.FForbidStatus,
+ CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
new file mode 100644
index 0000000..f5f5f31
--- /dev/null
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -0,0 +1,259 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+using MES.Service.Dto.webApi;
+using System.Xml.Linq;
+
+namespace MES.Service.service
+{
+public class OrganizeManager : Repository<Organize>
+{
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
+ public bool Save(ErpOrganize item)
+ {
+ var entity = GetOrganize(item);
+
+ return UseTransaction(db =>
+ {
+ 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 "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 (!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 "4":
+ if (!InsertOrUpdateBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鍚屾澶辫触");
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ return 1;
+ }) > 0;
+ }
+
+ 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
+ {
+
+ Id = Convert.ToDecimal(Organize.Id),
+ Fnumber = Organize.FNumber,
+ Fname = Organize.FName,
+ Fforbidstatus = Organize.FForbidStatus,
+ Type = Organize.Type,
+ Fparentid=Organize.FParentID,
+ Fcreatedate=DateTime.Now
+ };
+ }
+
+ 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()
+ {
+
+ /*********鏌ヨ*********/
+
+ 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 data5 = base.GetPageList(it => 1 == 1, p);
+ 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);
+
+ base.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 updateData = new Organize() { };//娴嬭瘯鍙傛暟
+ var updateArray = new Organize[] { 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鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+
+ /*********鍒犻櫎*********/
+ 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瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 21efa39..5410fdb 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -117,6 +117,10 @@
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
Depextr4 = department.FForbidStatus,
+ CreateDate = DateTime.Now,
+ CreateOrg = Convert.ToDecimal(department.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(department.FUseOrgId),
+ ParentId = Convert.ToDecimal(department.FParentID),
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index bdddbe0..7b09e4b 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -1,7 +1,9 @@
-锘縰sing MES.Service.DB;
+锘縰sing Dm;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System.Net.NetworkInformation;
namespace MES.Service.service;
@@ -32,8 +34,10 @@
{
case "3":
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ case "1":
case "2":
case "4":
+ case "5":
return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
? 1
: 0;
@@ -44,14 +48,12 @@
}) > 0;
}
- private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabs.Count > 0)
- db.Deleteable<Womcab>()
- .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
@@ -59,14 +61,11 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
var decimals = mesWomcabs.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesWomcaa.Id);
- var insertOrUpdate = db
- .Deleteable<Womcab>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
@@ -74,47 +73,73 @@
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
{
+ string jabs="0";
+
var entity = new Womcaa
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
- Caa021 = dto.FWorkShopID0,
+ Caa004 = dto.FBillType,
+ Caa005 = dto.FConveyDate,
+ Caa006 = dto.FMaterialId,
+ Caa009 = dto.FUnitId,
+ Caa010 = dto.FPlanStartDate,
+ Caa011 = dto.FPlanFinishDate,
+ Caa012 = Convert.ToDecimal(dto.FQty),
+ Caa013 = dto.FBomId,
+ Caa015 = dto.FXSHTH,
+ Caa015Head = dto.FSaleOrderEntrySeq,
+ Caa016 = dto.FDescription,
+ Caa017 = 0,
+ Caa018 = Convert.ToDecimal(dto.PLAN_ID),
+ Caa019 = dto.PLAN_SEQ,
+ Caa020 = dto.PLAN_NUM,
+ Caa021 = dto.FWorkShopID,
+ Fstatus = 0,
+ Caa022 = Convert.ToDecimal(dto.FQty),
+ Caa023 = dto.FStatus,
+ Caa024 = 0,
RoutingId = dto.FRoutingId,
WorkShopId = dto.FREMWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
- Caa004 = dto.FBillType,
- Caa023 = dto.FStatus,
- Caa006 = dto.FMaterialId,
- Caa009 = dto.FUnitId,
- Caa012 = !string.IsNullOrEmpty(dto.FQty)
- ? Convert.ToDecimal(dto.FQty)
- : null,
WorkGroupId = dto.FWorkGroupId,
PlanId = dto.FPlannerID,
- Caa010 = dto.FPlanStartDate,
- Caa011 = dto.FPlanFinishDate,
- Caa005 = dto.FConveyDate,
StockInlimith = dto.FStockInLimitH,
StockInlimitl = dto.FStockInLimitL,
Mtono = dto.FMTONO,
Lot = dto.FLot,
- Caa013 = dto.FBomId,
- Caa015 = dto.F_UNW_Text_xsddh,
CreateType = dto.FCreateType,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
SrcBillentryseq = dto.FSrcBillEntrySeq,
- SaleOrderNo = dto.FSaleOrderNo,
+ SaleOrderNo = dto.FXSHTH,
SaleOrderEntryseq = dto.FSaleOrderEntrySeq,
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
- Caa016 = dto.FMemoItem,
- Caa018 = Convert.ToDecimal(dto.planId),
- Caa019 = Convert.ToDecimal(dto.planSeq),
- Caa020 = dto.planNum
+ F_ZSXG_KH = dto.F_ZSXG_KH,
+ F_ZJXF_YHRQ = dto.F_ZJXF_YHRQ,
+ PrdOrg = dto.erP_SCZZ,
+ TrustOrg = dto.erP_WTZZ,
+ TbTime = DateTime.Now,
+ JaBs = "0"
};
+
+ if (dto.Type == "5")
+ {
+ entity.IsXg = 1;
+ }
+ else
+ {
+ entity.IsXg = 0;
+ }
+
+ if (dto.FStatus == "6" || dto.FStatus == "7")
+ {
+ entity.JaBs = "1";
+ entity.JaTime = DateTime.Now;
+ }
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
if (single != null) entity.Id = single.Id;
@@ -130,34 +155,32 @@
{
var womcab = new Womcab
{
- Erpid = Convert.ToDecimal(dto.ID),
+ Erpid = Convert.ToDecimal(dto.FENTRYID),
Cab001 = dto.FBillNo,
Cab002 = dto.FSeq,
- Cab003 = dto.FMaterialID2,
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
- ? Convert.ToDecimal(dto.FNeedQty2)
- : null,
- Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
- ? Convert.ToDecimal(dto.FPickedQty)
- : null,
+ Cab003 = dto.FMaterialID,
+ Cab006 = Convert.ToDecimal(dto.FNeedQty),
+ Cab007 = Convert.ToDecimal(dto.FPickedQty),
+ Cab009 = dto.FUnitID,
+ Cab012 = Convert.ToDecimal(dto.FStdQty),
+ Cab014 = dto.FIsKeyItem,
+ Pid = Convert.ToDecimal(dto.FID),
+ Eid = Convert.ToDecimal(dto.FID),
PositionNo = dto.FPositionNO,
+ IssuingOrganization=dto.FSupplyOrg,
+ SupplyOrganization=dto.FChildSupplyOrgId,
OwnerId = dto.FOwnerID,
Mtono = dto.FMTONO,
Lot = dto.FLot,
DepotCode = dto.FStockID,
IssueType = dto.FIssueType,
- Cab008 = dto.F_UNW_Text_tpgy,
- Cab009 = dto.FUnitID,
SupplyType = dto.FSupplyType,
- Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
- ? Convert.ToDecimal(dto.FStdQty)
- : null,
- Cab014 = dto.FIsKeyItem,
- Numerator = dto.FNumerator,
- Denominator = dto.FDenominator,
- Eid = Convert.ToDecimal(dto.PID),
+ Numerator = Convert.ToDecimal(dto.FNumerator),
+ Denominator = Convert.ToDecimal(dto.FDenominator),
SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
+ SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
+ SalesOrder=dto.FXSHTBH,
+ F_ZJXF_YHRQ=dto.F_ZJXF_YHRQ
};
var entity = Db.Queryable<Womcab>()
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
new file mode 100644
index 0000000..2acad32
--- /dev/null
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -0,0 +1,200 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using SqlSugar;
+using System;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+
+namespace MES.Service.service;
+
+public class WomcaaWWManager : Repository<Womcaa>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomcaaManager.cs
+
+ private readonly WomcabManager _womcabWWManager = new();
+ private decimal?[] decimals;
+ private bool update;
+ private bool insertOrUpdate;
+
+ public bool SaveList(List<ErpWOM> rohIns)
+ {
+ var result = rohIns.Select(SaveWw).ToList();
+ return result.All(b => b);
+ }
+
+ public bool SaveWw(ErpWOM wom)
+ {
+ var womErpCaa = wom.ErpCaa;
+ var mesWomcaa = MapErpCAAtoWomcaaWw(womErpCaa);
+ var mesWomcabs = MapErpCABtoWomcabWw(wom.ErpCabs);
+
+ return UseTransaction(db =>
+ {
+ switch (womErpCaa.Type)
+ {
+ case "3":
+ return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ case "1":
+ case "2":
+ case "4":
+ case "5":
+ return SaveOrUpdateDataWw(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabss)
+ {
+ if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+
+ if (mesWomcabss.Count > 0)
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+
+ var orUpdate = base.Insert(mesWomcaa);
+ var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabss);
+ if (orUpdate && baOrUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
+ {
+ if (mesWomcaa.Id != null)
+ {
+ decimals = mesWomcabs.Select(s => s.Id).ToArray();
+ update = base.DeleteById(mesWomcaa.Id);
+ insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ }
+ else
+ {
+ update = true;
+ insertOrUpdate = true;
+ }
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ private Womcaa MapErpCAAtoWomcaaWw(ErpCAA dto)
+ {
+ var entity = new Womcaa
+ {
+ Erpid = Convert.ToDecimal(dto.Id),
+ Caa001 = dto.FBillNo,
+ Caa004 = dto.FBillType,
+ Caa005 = dto.FConveyDate,
+ Caa006 = dto.FMaterialId,
+ Caa009 = dto.FUnitId,
+ Caa010 = dto.FPlanStartDate,
+ Caa011 = dto.FPlanFinishDate,
+ Caa012 = Convert.ToDecimal(dto.FQty),
+ Caa013 = dto.FBomId,
+ Caa015 = dto.FXSHTH,
+ Caa016 = dto.FDescription,
+ Caa017 = 0,
+ Caa018 = Convert.ToDecimal(dto.PLAN_ID),
+ Caa019 = dto.PLAN_SEQ,
+ Caa020 = dto.PLAN_NUM,
+ Caa021 = dto.FWorkShopID,
+ Fstatus = 0,
+ Caa022 = Convert.ToDecimal(dto.FQty),
+ Caa023 = dto.FStatus,
+ Caa024 = 0,
+ RoutingId = dto.FRoutingId,
+ WorkShopId = dto.FREMWorkShopId,
+ DepotCode = dto.FStockId,
+ CreateDate = dto.FDate,
+ WorkGroupId = dto.FWorkGroupId,
+ PlanId = dto.FPlannerID,
+ StockInlimith = dto.FStockInLimitH,
+ StockInlimitl = dto.FStockInLimitL,
+ Mtono = dto.FMTONO,
+ Lot = dto.FLot,
+ CreateType = dto.FCreateType,
+ SrcBillType = dto.FSrcBillType,
+ SrcBillNo = dto.FSrcBillNo,
+ SrcBillentryseq = dto.FSrcBillEntrySeq,
+ SaleOrderNo = dto.FSaleOrderNo,
+ SaleOrderEntryseq = dto.FSaleOrderEntrySeq,
+ ForceCloserid = dto.FForceCloserId,
+ CloseType = dto.FCloseType,
+ SrcSplitBillno = dto.FSrcSplitBillNo,
+ F_ZSXG_KH = dto.F_ZJXF_BASE_KH,
+ F_ZJXF_YHRQ = dto.F_ZJXF_DATETIME_YHRQ,
+ PrdOrg = dto.erP_SCZZ,
+ TrustOrg = dto.erP_WTZZ,
+ TbTime = DateTime.Now,
+ JaBs = "0",
+ FPURORDERNO = dto.FPurOrderNo,
+ FPURORDERENTRYSEQ = Convert.ToDecimal(dto.FPurOrderEntrySeq),
+ FSUBENTRYID = Convert.ToDecimal(dto.fsubentryid),
+ FSTOCKINQTY = Convert.ToDecimal(dto.Caa024),
+ FNOSTOCKINQTY = Convert.ToDecimal(dto.Caa025)
+ };
+ if (dto.Type == "5")
+ {
+ entity.IsXg = 1;
+ }
+ else
+ {
+ entity.IsXg = 0;
+ }
+
+ if (dto.FStatus == "6" || dto.FStatus == "7")
+ {
+ entity.JaBs = "1";
+ entity.JaTime = DateTime.Now;
+ }
+
+ var single = base.GetSingle(it => it.Erpid == entity.Erpid);
+ if (single != null) entity.Id = single.Id;
+
+ return entity;
+ }
+
+ private List<Womcab> MapErpCABtoWomcabWw(List<ErpCAB> dtoList)
+ {
+ var womcabList = new List<Womcab>();
+
+ foreach (var dto in dtoList)
+ {
+ var womcab = new Womcab
+ {
+ Erpid = Convert.ToDecimal(dto.FENTRYID),
+ Cab001 = dto.FBillNo,
+ Cab002 = dto.FSeq,
+ Cab003 = dto.FMaterialID,
+ Cab006 = Convert.ToDecimal(dto.FNeedQty),
+ Cab007 = Convert.ToDecimal(dto.FPickedQty),
+ Cab009 = dto.FUnitID,
+ Cab014 = dto.FIsKeyItem,
+ Pid = Convert.ToDecimal(dto.FID),
+ Eid = Convert.ToDecimal(dto.FID),
+ PositionNo = dto.FPositionNO,
+ IssuingOrganization = dto.FSupplyOrg,
+ SupplyOrganization = dto.FChildSupplyOrgId,
+ OwnerId = dto.FOwnerID,
+ Mtono = dto.FMTONO,
+ Lot = dto.FLot,
+ DepotCode = dto.FStockID,
+ IssueType = dto.FIssueType,
+ SupplyType = dto.FSupplyType,
+ Numerator = Convert.ToDecimal(dto.FNumerator),
+ Denominator = Convert.ToDecimal(dto.FDenominator),
+ SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
+ SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
+ SalesOrder = dto.FXSHTBH,
+ };
+
+ var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
+ if (entity != null) womcab.Id = entity.Id;
+
+ womcabList.Add(womcab);
+ }
+
+ return womcabList;
+ }
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
new file mode 100644
index 0000000..bd5d18b
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
@@ -0,0 +1,257 @@
+锘縰sing System.Dynamic;
+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/DeliveryBarcode")]
+public class MesDeliveryNoteBarcodeController : ControllerBase
+{
+ private readonly MessageCenterManager _manager = new();
+ private readonly MesDeliveryNoteBarcodeManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_DELIVERY_NOTE_BARCODE";
+
+ private readonly string URL = "http://localhost:10054/api/MesDeliveryNoteBarcode/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpBarcode barcode)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(barcode);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(barcode);
+ 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<ErpBarcode> barcodes)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(barcodes);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(barcodes);
+ 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] MesDeliveryNoteBarcode 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] MesDeliveryNoteBarcode 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] MesDeliveryNoteBarcode 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/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
new file mode 100644
index 0000000..28ac2b5
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
@@ -0,0 +1,257 @@
+锘縰sing System.Dynamic;
+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/DeliveryNote")]
+public class MesDeliveryNoteController : ControllerBase
+{
+ private readonly MessageCenterManager _manager = new();
+ private readonly MesDeliveryNoteManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_DELIVERY_NOTE";
+
+ private readonly string URL = "http://localhost:10054/api/MesDeliveryNote/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(Delivery delivery)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(delivery);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(delivery);
+ 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<Delivery> deliveries)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(deliveries);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(deliveries);
+ 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] MesDeliveryNote 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] MesDeliveryNote 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] MesDeliveryNote 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/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
new file mode 100644
index 0000000..89c2bbb
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
@@ -0,0 +1,162 @@
+锘縰sing System.Dynamic;
+using MES.Service.Modes;
+using MES.Service.service.BasicData;
+using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
+
+namespace MESApplication.Controllers.BasicData;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MesDeliveryNoteDetailsController : ControllerBase
+{
+ private readonly MesDeliveryDetailsManager m = new();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <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] MesDeliveryNoteDetails 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] MesDeliveryNoteDetails 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] MesDeliveryNoteDetails 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/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
new file mode 100644
index 0000000..9496ffa
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -0,0 +1,266 @@
+锘縰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;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using MES.Service.Dto.webApi;
+using MES.Service.service.BasicData;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers
+{
+ [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)
+ {
+ 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
+ {
+ 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<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);
+ }
+ }
+ }
+}
diff --git a/MESApplication/Controllers/WomcaaController.cs b/MESApplication/Controllers/WomcaaController.cs
index 579cf20..6ff858f 100644
--- a/MESApplication/Controllers/WomcaaController.cs
+++ b/MESApplication/Controllers/WomcaaController.cs
@@ -40,13 +40,9 @@
resultInfos.tbBillList = save;
entity.Result = 0;
- entity.DealWith = 0;
- if (save)
- {
- entity.Result = 1;
- entity.DealWith = 1;
- }
+ if (save) entity.Result = 1;
+ entity.DealWith = 1;
_manager.save(entity);
return new ResponseResult
diff --git a/MESApplication/Controllers/WomcaaWWController.cs b/MESApplication/Controllers/WomcaaWWController.cs
new file mode 100644
index 0000000..68c7fdb
--- /dev/null
+++ b/MESApplication/Controllers/WomcaaWWController.cs
@@ -0,0 +1,261 @@
+锘�
+using System.Dynamic;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class WomcaaWWController : ControllerBase
+{
+ private readonly MessageCenterManager _manager = new();
+ private readonly WomcaaWWManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "WOMCAA";
+
+ private readonly string URL = "http://localhost:10054/api/Womcaaww/";
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult SaveWw(ErpWOM rohIn)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(rohIn);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveWw(rohIn);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ entity.DealWith = 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<ErpWOM> 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);
+ }
+ }
+
+ /// <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] Womcaa 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] Womcaa 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] Womcaa 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/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index 272876a..5b80522 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>D:\Tools\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\Tool\LTS\PDA_NEW\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index e173f82..1acdf34 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>D:\Tools\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-08-20T09:12:00.2924570Z||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <_PublishTargetUrl>E:\Tool\LTS\PDA_NEW\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2024-12-28T01:06:17.0669698Z||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index 41c8e8b..2ee6c2e 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = tlm_dev; Password=tlmdev"
}
}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 17b0621..a5e2509 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index a77bd2d..61cb04c 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
index a38b276..95a84e5 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
@@ -1412,7 +1412,10 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {}
+ "MES.Service.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
}
}
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 1869b75..78a4161 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 9dd5730..700d0b3 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index a54f851..9c9dff8 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.staticwebassets.endpoints.json b/MESApplication/bin/Debug/net8.0/MESApplication.staticwebassets.endpoints.json
new file mode 100644
index 0000000..2b6c535
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.staticwebassets.endpoints.json
@@ -0,0 +1,5 @@
+{
+ "Version": 1,
+ "ManifestType": "Build",
+ "Endpoints": []
+}
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 3378e73..661cfc0 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -102,6 +102,114 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Add(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Update(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Add(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Update(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Add(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Update(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.BasicData.MesDepotsController.GetList">
<summary>
鑾峰彇鎵�鏈�
@@ -675,6 +783,42 @@
<member name="M:MESApplication.Controllers.BasicData.SysDepartmentController.Update(MES.Service.Modes.SysDepartment)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
+ <summary>
+ 淇敼
</summary>
<returns></returns>
</member>
@@ -1393,6 +1537,42 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Add(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.InsertReturnIdentity(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Update(MES.Service.Modes.Womcaa)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.WomcabController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Debug/net8.0/appsettings.json b/MESApplication/bin/Debug/net8.0/appsettings.json
index 41c8e8b..2ee6c2e 100644
--- a/MESApplication/bin/Debug/net8.0/appsettings.json
+++ b/MESApplication/bin/Debug/net8.0/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = tlm_dev; Password=tlmdev"
}
}
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index b0cbbee..f9c19cd 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 089d566..b9ceea7 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 2cff899..60ae3e8 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 15b3623..700d0b3 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 6b36183..4ef9027 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.staticwebassets.endpoints.json b/MESApplication/bin/Release/net8.0/MESApplication.staticwebassets.endpoints.json
new file mode 100644
index 0000000..2b6c535
--- /dev/null
+++ b/MESApplication/bin/Release/net8.0/MESApplication.staticwebassets.endpoints.json
@@ -0,0 +1,5 @@
+{
+ "Version": 1,
+ "ManifestType": "Build",
+ "Endpoints": []
+}
\ No newline at end of file
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index 3378e73..661cfc0 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -102,6 +102,114 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Add(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Update(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Add(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Update(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Add(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Update(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.BasicData.MesDepotsController.GetList">
<summary>
鑾峰彇鎵�鏈�
@@ -675,6 +783,42 @@
<member name="M:MESApplication.Controllers.BasicData.SysDepartmentController.Update(MES.Service.Modes.SysDepartment)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
+ <summary>
+ 淇敼
</summary>
<returns></returns>
</member>
@@ -1393,6 +1537,42 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Add(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.InsertReturnIdentity(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Update(MES.Service.Modes.Womcaa)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.WomcabController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/appsettings.json b/MESApplication/bin/Release/net8.0/appsettings.json
index 41c8e8b..2ee6c2e 100644
--- a/MESApplication/bin/Release/net8.0/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = tlm_dev; Password=tlmdev"
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index b0cbbee..f9c19cd 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 089d566..b9ceea7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
index e23a3b1..6cd3c2a 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
@@ -1160,7 +1160,10 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {}
+ "MES.Service.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 2cff899..60ae3e8 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 15b3623..700d0b3 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 6b36183..4ef9027 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.staticwebassets.endpoints.json b/MESApplication/bin/Release/net8.0/publish/MESApplication.staticwebassets.endpoints.json
new file mode 100644
index 0000000..8403e6b
--- /dev/null
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.staticwebassets.endpoints.json
@@ -0,0 +1,5 @@
+{
+ "Version": 1,
+ "ManifestType": "Publish",
+ "Endpoints": []
+}
\ No newline at end of file
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index 3378e73..661cfc0 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -102,6 +102,114 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Add(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Update(MES.Service.Modes.MesDeliveryNoteBarcode)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Add(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.Update(MES.Service.Modes.MesDeliveryNote)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Add(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteDetailsController.Update(MES.Service.Modes.MesDeliveryNoteDetails)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.BasicData.MesDepotsController.GetList">
<summary>
鑾峰彇鎵�鏈�
@@ -675,6 +783,42 @@
<member name="M:MESApplication.Controllers.BasicData.SysDepartmentController.Update(MES.Service.Modes.SysDepartment)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
+ <summary>
+ 淇敼
</summary>
<returns></returns>
</member>
@@ -1393,6 +1537,42 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Add(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.InsertReturnIdentity(MES.Service.Modes.Womcaa)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.WomcaaWWController.Update(MES.Service.Modes.Womcaa)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.WomcabController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/appsettings.json b/MESApplication/bin/Release/net8.0/publish/appsettings.json
index 41c8e8b..2ee6c2e 100644
--- a/MESApplication/bin/Release/net8.0/publish/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/publish/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = tlm_dev; Password=tlmdev"
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/web.config b/MESApplication/bin/Release/net8.0/publish/web.config
index 4cc5990..00d405f 100644
--- a/MESApplication/bin/Release/net8.0/publish/web.config
+++ b/MESApplication/bin/Release/net8.0/publish/web.config
@@ -8,4 +8,5 @@
<aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
-</configuration>
\ No newline at end of file
+</configuration>
+<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->
\ No newline at end of file
--
Gitblit v1.9.3