From e3c454b61eb969d186110c3ad7ab6a289cbc013a Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 25 四月 2025 10:17:22 +0800
Subject: [PATCH] 生产订单 加 成品编号
---
MES.Service/Modes/SalesReturnNoticeDetail.cs | 2
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/service/QC/SJService.cs | 4
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/Modes/SalesOrder.cs | 21 -
MES.Service/service/WomcaaManager.cs | 42 +++
MES.Service/service/WomcaaWWManager.cs | 41 +++
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs | 5
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
MES.Service/Modes/Womcaa.cs | 12 +
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Modes/SalesOrderDetail.cs | 20 -
MES.Service/Dto/webApi/ErpCAA.cs | 3
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 94 +++----
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/BasicData/SalesOrderController.cs | 5
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.xml | 84 +++++++
MES.Service/service/QC/RKJService.cs | 4
MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs | 2
MES.Service/Dto/webApi/ErpSalesOrderDto.cs | 5
MES.Service/Dto/webApi/ErpSalesReturnDto.cs | 3
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 7
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 64 ++--
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 83 +++----
MES.Service/service/BasicData/SalesOrderManager.cs | 98 +++-----
41 files changed, 326 insertions(+), 277 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 60fc494..586b827 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -50,8 +50,9 @@
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? SupplierId { get; set; }
+ public string? FinishedProduct { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 073e6b6..19b2b24 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -3,10 +3,7 @@
public class ErpSalesDeliveryDetailDto
{
public string? Type { get; set; }
- public string? F_UNW_Text_xsddh { get; set; } // 閿�鍞鍗曞彿
public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
- //public string? FMaterialName { get; set; } // 鐗╂枡鍚嶇О
- //public string? FMaterialModel { get; set; } // 瑙勬牸鍨嬪彿
public string? FUnitID { get; set; } // 閿�鍞崟浣�
public string? FQty { get; set; } // 閿�鍞暟閲�
public string? FIsFree { get; set; } // 鏄惁璧犲搧
@@ -14,12 +11,8 @@
public string? FStockId { get; set; } // 浠撳簱
public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
public string? FLot { get; set; } // 鎵瑰彿
- //public string? FEntryDescription { get; set; } // 澶囨敞
- //public string? FRmType { get; set; } // 閫�璐х被鍨�
- public string? F_UNW_Base_GDY { get; set; } // 璺熷崟鍛�
public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
- // public string? FMaterialType { get; set; } // 鐗╂枡绫诲埆
public string? FOwnerTypeID { get; set; } // 璐т富绫诲瀷
public string? FOwnerId { get; set; } // 璐т富
public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
index b117617..e89990f 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
@@ -9,9 +9,7 @@
public string? FDate { get; set; } // 鏃ユ湡
public string? FSettleCurrld { get; set; } // 缁撶畻甯佸埆
public string? FSaleDeptId { get; set; } // 閿�鍞儴闂�
- public string? F_UNW_Text_KHDD { get; set; } // 瀹㈡埛璁㈠崟
public string? FCustomerID { get; set; } // 瀹㈡埛
- public string? F_UNW_LargeText_TBKHBZ { get; set; } // 娣樺疂瀹㈡埛澶囨敞
public string? FHeadDeliveryWay { get; set; } // 浜よ揣鏂瑰紡
public string? FHeadLocId { get; set; } // 浜よ揣鍦扮偣
public string? FCarrierID { get; set; } // 鎵胯繍鍟�
diff --git a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
index d4afaa6..d109203 100644
--- a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -2,7 +2,6 @@
public class ErpSalesOrderDetailDto
{
- public string? Type { get; set; }
public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
public string? FUnitID { get; set; } // 閿�鍞崟浣�
public string? FQty { get; set; } // 閿�鍞暟閲�
@@ -10,8 +9,6 @@
public string? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
public string? FDeliveryDate { get; set; } // 瑕佽揣鏃ユ湡
public string? FIsFree { get; set; } // 鏄惁璧犲搧
- public string? F_UNW_Text_xsddh { get; set; } // 閿�鍞鍗曞彿
- public string? F_UNW_Base_GDY { get; set; } // 璺熷崟鍛�
public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷
public string? FOwnerId { get; set; } // 璐т富
public string? FEntryNote { get; set; } // 澶囨敞
@@ -43,4 +40,6 @@
public string? F_ZJXF_CGDHRQ { get; set; } //閲囪喘鍒拌揣璐ф湡
public string? F_ZJXF_KHGGXH { get; set; } //瀹㈡埛鐗╂枡瑙勬牸鍨嬪彿
public string? F_ZJXF_DDLY { get; set; } //璁㈠崟鏉ユ簮
+ public string? F_KHWLBM { get; set; } //瀹㈡埛鐗╂枡缂栫爜
+ public string? F_KHWLMC { get; set; } //瀹㈡埛鐗╂枡鍚嶇О
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrderDto.cs b/MES.Service/Dto/webApi/ErpSalesOrderDto.cs
index c7eb822..0667f3a 100644
--- a/MES.Service/Dto/webApi/ErpSalesOrderDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesOrderDto.cs
@@ -11,17 +11,12 @@
public string? FBusinessType { get; set; } // 涓氬姟绫诲瀷
public string? FHeadDeliveryWay { get; set; } // 浜よ揣鏂瑰紡
public string? FHEADLOCID { get; set; } // 浜よ揣鍦扮偣
- public string? F_UNW_Text_KHDD { get; set; } // 瀹㈡埛璁㈠崟
- public string? F_UNW_Date_KHXQ { get; set; } // 瀹㈡埛闇�姹備氦鏈�
- public string? F_UNW_BaseProperty_KHDJ { get; set; } // 瀹㈡埛绛夌骇
public string? FCustId { get; set; } // 瀹㈡埛
- public string? F_UNW_LargeText_TBKHBZ { get; set; } // 娣樺疂瀹㈡埛澶囨敞
public string? FCloseStatus { get; set; } // 鍏抽棴鐘舵��
public string? FSaleDeptId { get; set; } // 閿�鍞儴闂�
public string? FSalerId { get; set; } // 閿�鍞憳
public string? FChangeReason { get; set; } // 鍙樻洿鍘熷洜
public string? FNote { get; set; } // 澶囨敞
- public string? F_UNW_Remarks_KHJHDD { get; set; } // 瀹㈡埛浜よ揣鍦扮偣
public string? FSettleId { get; set; } // 缁撶畻鏂�
public string? FApproverId { get; set; } // 瀹℃牳浜�
public string? FLinkMan { get; set; } // 鏀惰揣浜哄鍚�
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
index f1a486a..2dfbe61 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
@@ -3,7 +3,6 @@
public class ErpSalesReturnDetailDto
{
public string? Type { get; set; }
- public string? F_UNW_Text_xsddh { get; set; } // 閿�鍞鍗曞彿
public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
public string? FMaterialName { get; set; } // 鐗╂枡鍚嶇О
public string? FMaterialModel { get; set; } // 瑙勬牸鍨嬪彿
@@ -16,7 +15,6 @@
public string? FLot { get; set; } // 鎵瑰彿
public string? FEntryDescription { get; set; } // 澶囨敞
public string? FRmType { get; set; } // 閫�璐х被鍨�
- public string? F_UNW_Base_GDY { get; set; } // 璺熷崟鍛�
public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
public string? FMaterialType { get; set; } // 鐗╂枡绫诲埆
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
index 221f20b..4afbbc1 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
@@ -10,7 +10,6 @@
public string? FSettleCurrld { get; set; } // 缁撶畻甯佸埆
public string? FSaleDeptId { get; set; } // 閿�鍞儴闂�
public string? FRetcustId { get; set; } // 閫�璐у鎴�
- public string? F_UNW_LargeText_TBKHBZ { get; set; } // 娣樺疂瀹㈡埛澶囨敞
public string? FRetcustReason { get; set; } // 閫�璐у師鍥�
public string? FHeadLocId { get; set; } // 浜よ揣鍦扮偣
public string? FRetDeptId { get; set; } // 搴撳瓨閮ㄩ棬
@@ -18,8 +17,6 @@
public string? FStockerId { get; set; } // 浠撶鍛�
public string? FSaleGroupId { get; set; } // 閿�鍞粍
public string? FSalesManId { get; set; } // 閿�鍞憳
-
- public string? F_UNW_Text_KDDH { get; set; } // 蹇�掑崟鍙�
public string? FReceiveCusId { get; set; } // 鏀惰揣鏂�
public string? FReceiveCusContact { get; set; } // 鏀惰揣鏂硅仈绯讳汉
public string? FReceiveAddress { get; set; } // 鏀惰揣鏂瑰湴鍧�
diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 4864e81..39b93c0 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -18,157 +18,157 @@
/// <summary>
/// 閿�鍞鍗曞彿
///</summary>
- [SugarColumn(ColumnName="SALES_ORDER_ID" )]
+ [SugarColumn(ColumnName="SALES_ORDER_ID")]
public string SalesOrderId { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
///</summary>
- [SugarColumn(ColumnName="MATERIAL_ID" )]
+ [SugarColumn(ColumnName="MATERIAL_ID")]
public string MaterialId { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
///</summary>
- [SugarColumn(ColumnName="MATERIAL_NAME" )]
+ [SugarColumn(ColumnName="MATERIAL_NAME")]
public string MaterialName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
///</summary>
- [SugarColumn(ColumnName="MATERIAL_SPECIFICATION" )]
+ [SugarColumn(ColumnName="MATERIAL_SPECIFICATION")]
public string MaterialSpecification { get; set; }
/// <summary>
/// 閿�鍞崟浣�
///</summary>
- [SugarColumn(ColumnName="SALES_UNIT_ID" )]
+ [SugarColumn(ColumnName="SALES_UNIT_ID")]
public string SalesUnitId { get; set; }
/// <summary>
/// 閿�鍞暟閲�
///</summary>
- [SugarColumn(ColumnName="SALES_QUANTITY" )]
+ [SugarColumn(ColumnName="SALES_QUANTITY")]
public decimal? SalesQuantity { get; set; }
/// <summary>
/// 鏄惁璧犲搧
///</summary>
- [SugarColumn(ColumnName="IS_FREE" )]
- public string IsFree { get; set; }
+ [SugarColumn(ColumnName="IS_FREE")]
+ public decimal IsFree { get; set; }
/// <summary>
/// 瑕佽揣鏃ユ湡
///</summary>
- [SugarColumn(ColumnName="DELIVERY_DATE" )]
+ [SugarColumn(ColumnName="DELIVERY_DATE")]
public DateTime? DeliveryDate { get; set; }
/// <summary>
/// 鍑鸿揣浠撳簱
///</summary>
- [SugarColumn(ColumnName="WAREHOUSE" )]
+ [SugarColumn(ColumnName="WAREHOUSE")]
public string Warehouse { get; set; }
/// <summary>
/// 璁″垝璺熻釜鍙�
///</summary>
- [SugarColumn(ColumnName="PLAN_TRACKING_NUMBER" )]
+ [SugarColumn(ColumnName="PLAN_TRACKING_NUMBER")]
public string PlanTrackingNumber { get; set; }
/// <summary>
/// 鎵瑰彿
///</summary>
- [SugarColumn(ColumnName="LOT_NUMBER" )]
+ [SugarColumn(ColumnName="LOT_NUMBER")]
public string LotNumber { get; set; }
/// <summary>
/// 婧愬崟缂栧彿
///</summary>
- [SugarColumn(ColumnName="SRC_BILL_NO" )]
+ [SugarColumn(ColumnName="SRC_BILL_NO")]
public string SrcBillNo { get; set; }
/// <summary>
/// 璁′环鏁伴噺
///</summary>
- [SugarColumn(ColumnName="PRICE_QTY" )]
+ [SugarColumn(ColumnName="PRICE_QTY")]
public decimal? PriceQty { get; set; }
/// <summary>
/// 璐т富
///</summary>
- [SugarColumn(ColumnName="OWNER_ID" )]
+ [SugarColumn(ColumnName="OWNER_ID")]
public string OwnerId { get; set; }
/// <summary>
/// 搴撳瓨鍗曚綅
///</summary>
- [SugarColumn(ColumnName="INVENTORY_UNIT" )]
+ [SugarColumn(ColumnName="INVENTORY_UNIT")]
public string InventoryUnit { get; set; }
/// <summary>
/// 搴撳瓨鏁伴噺
///</summary>
- [SugarColumn(ColumnName="INVENTORY_QUANTITY" )]
+ [SugarColumn(ColumnName="INVENTORY_QUANTITY")]
public decimal? InventoryQuantity { get; set; }
/// <summary>
/// 鐗╂枡绫诲埆
///</summary>
- [SugarColumn(ColumnName="MATERIAL_CATEGORY" )]
+ [SugarColumn(ColumnName="MATERIAL_CATEGORY")]
public string MaterialCategory { get; set; }
/// <summary>
/// 璁″垝鍙戣揣鏃ユ湡
///</summary>
- [SugarColumn(ColumnName="PLAN_DELIVERY_DATE" )]
+ [SugarColumn(ColumnName="PLAN_DELIVERY_DATE")]
public DateTime? PlanDeliveryDate { get; set; }
/// <summary>
/// 瓒呭彂鎺у埗鍗曚綅
///</summary>
- [SugarColumn(ColumnName="OUT_LMT_UNIT" )]
+ [SugarColumn(ColumnName="OUT_LMT_UNIT")]
public string OutLmtUnit { get; set; }
/// <summary>
/// 鍑哄簱涓婇檺
///</summary>
- [SugarColumn(ColumnName="OUT_MAX_QTY" )]
+ [SugarColumn(ColumnName="OUT_MAX_QTY")]
public decimal? OutMaxQty { get; set; }
/// <summary>
/// 鍑哄簱涓嬮檺
///</summary>
- [SugarColumn(ColumnName="OUT_MIN_QTY" )]
+ [SugarColumn(ColumnName="OUT_MIN_QTY")]
public decimal? OutMinQty { get; set; }
/// <summary>
/// 浜よ揣鍦扮偣
///</summary>
- [SugarColumn(ColumnName="DELIVERY_LOC" )]
+ [SugarColumn(ColumnName="DELIVERY_LOC")]
public string DeliveryLoc { get; set; }
/// <summary>
/// 浜よ揣鍦板潃
///</summary>
- [SugarColumn(ColumnName="DELIVERYL_ADDRESS" )]
+ [SugarColumn(ColumnName="DELIVERYL_ADDRESS")]
public string DeliverylAddress { get; set; }
/// <summary>
/// 婧愬崟鍗曞彿
///</summary>
- [SugarColumn(ColumnName="SOURCE_BILL_NO" )]
+ [SugarColumn(ColumnName="SOURCE_BILL_NO")]
public string SourceBillNo { get; set; }
/// <summary>
/// 璁㈠崟鍗曞彿
///</summary>
- [SugarColumn(ColumnName="ORDER_BILL_NO" )]
+ [SugarColumn(ColumnName="ORDER_BILL_NO")]
public string OrderBillNo { get; set; }
/// <summary>
/// 缁堟鐘舵��
///</summary>
- [SugarColumn(ColumnName="TERMINATION_STATUS" )]
+ [SugarColumn(ColumnName="TERMINATION_STATUS")]
public string TerminationStatus { get; set; }
/// <summary>
/// 缁堟鏃ユ湡
///</summary>
- [SugarColumn(ColumnName="TERMINATION_DATE" )]
+ [SugarColumn(ColumnName="TERMINATION_DATE")]
public DateTime? TerminationDate { get; set; }
/// <summary>
/// 绱鍑哄簱鏁伴噺
///</summary>
- [SugarColumn(ColumnName="SUM_OUT_QTY" )]
+ [SugarColumn(ColumnName="SUM_OUT_QTY")]
public decimal? SumOutQty { get; set; }
/// <summary>
/// 鏈嚭搴撴暟閲�
///</summary>
- [SugarColumn(ColumnName="REMAIN_OUT_QTY" )]
+ [SugarColumn(ColumnName="REMAIN_OUT_QTY")]
public decimal? RemainOutQty { get; set; }
/// <summary>
/// ERP琛孖D
///</summary>
- [SugarColumn(ColumnName="ERP_LINE_ID" )]
+ [SugarColumn(ColumnName="ERP_LINE_ID")]
public string ErpLineId { get; set; }
/// <summary>
/// ERP澶碔D
///</summary>
- [SugarColumn(ColumnName="ERP_HEAD_ID" )]
+ [SugarColumn(ColumnName="ERP_HEAD_ID")]
public string ErpHeadId { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
index 26feda0..7a5b386 100644
--- a/MES.Service/Modes/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder.cs
@@ -11,8 +11,7 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD",IsPrimaryKey = true)]
public decimal? Id { get; set; }
[SugarColumn(ColumnName = "ERP_ID")]
@@ -39,20 +38,8 @@
[SugarColumn(ColumnName = "HEAD_LOC_ID")]
public string? HeadLocId { get; set; } // 浜よ揣鍦扮偣
- [SugarColumn(ColumnName = "UNW_TEXT_KHDD")]
- public string? UnWTextKhdd { get; set; } // 瀹㈡埛璁㈠崟
-
- [SugarColumn(ColumnName = "UNW_DATE_KHXQ")]
- public DateTime? UnWDateKhxq { get; set; } // 瀹㈡埛闇�姹備氦鏈�
-
- [SugarColumn(ColumnName = "UNW_BASE_PROPERTY_KHDJ")]
- public string? UnWBasePropertyKhdj { get; set; } // 瀹㈡埛绛夌骇
-
[SugarColumn(ColumnName = "CUST_ID")]
public string? CustId { get; set; } // 瀹㈡埛
-
- [SugarColumn(ColumnName = "UNW_LARGE_TEXT_TBKHBZ")]
- public string? UnWLargetextTbkhbz { get; set; } // 娣樺疂瀹㈡埛澶囨敞
[SugarColumn(ColumnName = "CLOSE_STATUS")]
public string? CloseStatus { get; set; } // 鍏抽棴鐘舵��
@@ -65,12 +52,6 @@
[SugarColumn(ColumnName = "CHANGE_REASON")]
public string? ChangeReason { get; set; } // 鍙樻洿鍘熷洜
-
- [SugarColumn(ColumnName = "NOTE")]
- public string? Note { get; set; } // 澶囨敞
-
- [SugarColumn(ColumnName = "UNW_REMARKS_KHJHDD")]
- public string? UnWRemarksKhjHdd { get; set; } // 瀹㈡埛浜よ揣鍦扮偣
[SugarColumn(ColumnName = "SETTLE_ID")]
public string? SettleId { get; set; } // 缁撶畻鏂�
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 28de21c..4650faa 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -11,8 +11,7 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD_MX",IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
@@ -67,19 +66,7 @@
/// 鏄惁璧犲搧
/// </summary>
[SugarColumn(ColumnName = "IS_FREE")]
- public string? IsFree { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "UNW_TEXT_XSDDH")]
- public string? SalesOrderNo { get; set; }
-
- /// <summary>
- /// 璺熷崟鍛�
- /// </summary>
- [SugarColumn(ColumnName = "UNW_BASE_GDY")]
- public string? SalesFollowUp { get; set; }
+ public decimal? IsFree { get; set; }
/// <summary>
/// 璐т富绫诲瀷
@@ -179,8 +166,9 @@
/// <summary>
/// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ /// </summary>
[SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
- public decimal? BaseRetNoticeQty { get; set; } /// </summary>
+ public decimal? BaseRetNoticeQty { get; set; }
/// <summary>
/// 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
diff --git a/MES.Service/Modes/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNoticeDetail.cs
index 8e563a0..cb50a1e 100644
--- a/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -54,7 +54,7 @@
/// 鏄惁璧犲搧
/// </summary>
[SugarColumn(ColumnName = "IS_FREE")]
- public string IsFree { get; set; }
+ public decimal IsFree { get; set; }
/// <summary>
/// 閫�璐ф棩鏈�
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 85ba38c..d76ffa4 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -350,4 +350,16 @@
/// </summary>
[SugarColumn(ColumnName = "FNOSTOCKINQTY")]
public decimal? FNOSTOCKINQTY { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLIER_ID")]
+ public string? SupplierId { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "FINISHED_PRODUCT")]
+ public string? FinishedProduct { 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 22f056e..1873705 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 9ebd887..40ca793 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 b1bcfed..c378807 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 0eefd2c..834fff2 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/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 9bd69ae..5f0bfa6 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -14,8 +14,7 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- private readonly SalesDeliveryNoticeDetailManager _SalesDeliveryDetailManager =
- new();
+ private readonly SalesDeliveryNoticeDetailManager _SalesDeliveryDetailManager = new();
//ErpSalesRerurn
public bool Save(ErpSalesDelivery SalesDelivery)
{
@@ -27,51 +26,47 @@
{
switch (erpSalesDeliveryDto.Type)
{
- // case "2":
- // return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
- // rohInErpRohIn.FBILLTYPE)
- // ? 1
- // : 0;
case "3":
- return UpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas) ? 1 : 0;
+ return DeleteData(db, mesSalesDelivery, mesSalesDeliveryDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type) ? 1: 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException( $"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,
- List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
+ private bool DeleteData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
{
var decimals = mesSalesDeliveryDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesDelivery.Id);
- var insertOrUpdate = db
- .Deleteable<SalesDeliveryNoticeDetail>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesDeliveryNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,
- List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
{
- if (mesSalesDelivery.Id != null) base.DeleteById(mesSalesDelivery.Id);
-
+ if (mesSalesDelivery.Id != null)
+ {
+ base.DeleteById(mesSalesDelivery.Id);
+ }
if (mesSalesDeliveryDatas.Count > 0)
- db.Deleteable<SalesDeliveryNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
-
+ {
+ db.Deleteable<SalesDeliveryNoticeDetail>().Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesDelivery);
var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
- if (orUpdate && baOrUpdate) return true;
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -84,19 +79,17 @@
return result.All(b => b);
}
- private SalesDeliveryNotice ConvertErpToSalesDelivery(
- ErpSalesDeliveryDto erpDto)
+ private SalesDeliveryNotice ConvertErpToSalesDelivery(ErpSalesDeliveryDto erpDto)
{
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None, out parsedDate))
+ {
return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -109,9 +102,7 @@
BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
- CustomerOrderNo = erpDto.F_UNW_Text_KHDD, // 瀹㈡埛璁㈠崟
Customer = erpDto.FCustomerID, // 瀹㈡埛
- TaobaoRemark = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
DeliveryMethod = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
Carrier = erpDto.FCarrierID, // 鎵胯繍鍟�
@@ -147,28 +138,27 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(
- List<ErpSalesDeliveryDetailDto> erpDtoList)
+ private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(List<ErpSalesDeliveryDetailDto> erpDtoList)
{
- var salesOrderSubList =
- new List<SalesDeliveryNoticeDetail>();
+ var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
-
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -180,13 +170,10 @@
{
ErpLineId = erpDto.ErpID,//ERP琛孖D
ErpHeadId = erpDto.EHID,//ERP澶碔D
- SalesOrderId = erpDto.F_UNW_Text_xsddh,//閿�鍞鍗曞彿
MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
- // MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
- //MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
- IsFree = erpDto.FIsFree,//鏄惁璧犲搧
+ IsFree = Convert.ToDecimal(erpDto.FIsFree),//鏄惁璧犲搧
DeliveryDate = ParseDateTime(erpDto.FDeliverydate),//瑕佽揣鏃ユ湡
Warehouse = erpDto.FStockId,//鍑鸿揣浠撳簱
PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
@@ -196,7 +183,6 @@
OwnerId = erpDto.FOwnerIdHead,//璐т富
InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
- //MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//璁″垝鍙戣揣鏃ユ湡
OutLmtUnit = erpDto.FOutLmtUnit,//瓒呭彂鎺у埗鍗曚綅
OutMaxQty = erpDto.FOutMaxQty,//鍑哄簱涓婇檺
@@ -215,9 +201,11 @@
};
- var single = _SalesDeliveryDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 95ae9e9..e009c81 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -4,7 +4,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using DbType = System.Data.DbType;
namespace MES.Service.service.BasicData;
@@ -12,8 +11,7 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- private readonly SalesOrderDetailManager _SalesOrderDetailManager =
- new();
+ private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
//ErpSalesOrder
public bool Save(ErpSalesOrder SalesOrder)
{
@@ -25,52 +23,50 @@
{
switch (erpSalesOrderDto.Type)
{
- // case "2":
- // return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
- // rohInErpRohIn.FBILLTYPE)
- // ? 1
- // : 0;
case "3":
- return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
- ? 1
- : 0;
+ case "5":
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type) ? 1: 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException( $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
- List<SalesOrderDetail> mesSalesOrderDatas)
+ private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas)
{
var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesOrder.Id);
- var insertOrUpdate = db
- .Deleteable<SalesOrderDetail>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
- List<SalesOrderDetail> mesSalesOrderDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas,string type)
{
- if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
+ if (mesSalesOrder.Id != null)
+ {
+ base.DeleteById(mesSalesOrder.Id);
+ }
if (mesSalesOrderDatas.Count > 0)
- db.Deleteable<SalesOrderDetail>()
- .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+ {
+ db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesOrder);
var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
- if (orUpdate && baOrUpdate) return true;
-
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -82,20 +78,17 @@
return result.All(b => b);
}
- private SalesOrder ConvertErpToSalesOrder(
- ErpSalesOrderDto erpDto)
+ private SalesOrder ConvertErpToSalesOrder(ErpSalesOrderDto erpDto)
{
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
-
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -109,17 +102,11 @@
BusinessType = erpDto.FBusinessType, // 涓氬姟绫诲瀷
HeadDeliveryWay = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
HeadLocId = erpDto.FHEADLOCID, // 浜よ揣鍦扮偣
- UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // 瀹㈡埛璁㈠崟
- UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // 瀹㈡埛闇�姹備氦鏈�
- UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // 瀹㈡埛绛夌骇
CustId = erpDto.FCustId, // 瀹㈡埛
- UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
CloseStatus = erpDto.FCloseStatus, // 鍏抽棴鐘舵��
SaleDeptId = erpDto.FSaleDeptId, // 閿�鍞儴闂�
SalerId = erpDto.FSalerId, // 閿�鍞憳
ChangeReason = erpDto.FChangeReason, // 鍙樻洿鍘熷洜
- Note = erpDto.FNote, // 澶囨敞
- UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // 瀹㈡埛浜よ揣鍦扮偣
SettleId = erpDto.FSettleId, // 缁撶畻鏂�
ApproverId = erpDto.FApproverId, // 瀹℃牳浜�
LinkMan = erpDto.FLinkMan, // 鏀惰揣浜哄鍚�
@@ -138,23 +125,20 @@
VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
EntryNote = erpDto.FEntryNote // 澶囨敞
- //ParseDateTime() ?? null
- //long.Parse()
- //Convert.ToDecimal()
- //Convert.ToDouble()
};
var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
- List<ErpSalesOrderDetailDto> erpDtoList)
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
{
- var salesOrderSubList =
- new List<SalesOrderDetail>();
+ var salesOrderSubList = new List<SalesOrderDetail>();
foreach (var erpDto in erpDtoList)
{
@@ -168,9 +152,7 @@
PriceUnitId = erpDto.FPriceUnitId,
PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
- IsFree = erpDto.FIsFree,
- SalesOrderNo = erpDto.F_UNW_Text_xsddh,
- SalesFollowUp = erpDto.F_UNW_Base_GDY,
+ IsFree = Convert.ToDecimal(erpDto.FIsFree),
OwnerTypeId = erpDto.FOwnerTypeId,
OwnerId = erpDto.FOwnerId,
EntryNote = erpDto.FEntryNote,
@@ -194,8 +176,8 @@
SalesOrder = erpDto.FXSHTH,
CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,
SalesContractNo = erpDto.FXSHTBH,
- ItemNo = erpDto.F_CPLH,
- ItemName = erpDto.F_ZJXF_REMARKS_YRR,
+ ItemNo = erpDto.F_KHWLBM,
+ ItemName = erpDto.F_KHWLMC,
CustId = erpDto.F_ZJXF_TEXT_KF,
ArrivalDate = Convert.ToDateTime(erpDto.F_ZJXF_CGDHRQ),
ItemModel = erpDto.F_ZJXF_KHGGXH,
@@ -203,9 +185,11 @@
};
- var single = _SalesOrderDetailManager.GetSingle(it =>
- it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesOrderDetailManager.GetSingle(it =>it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index c4cca56..e7b730d 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -25,18 +25,11 @@
{
switch (erpSalesReturnDto.Type)
{
- // case "2":
- // return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
- // rohInErpRohIn.FBILLTYPE)
- // ? 1
- // : 0;
case "3":
return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1: 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
@@ -44,32 +37,38 @@
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas)
+ private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas)
{
var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesReturn.Id);
- var insertOrUpdate = db
- .Deleteable<SalesReturnNoticeDetail>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
{
- if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
+ if (mesSalesReturn.Id != null)
+ {
+ base.DeleteById(mesSalesReturn.Id);
+ }
if (mesSalesReturnDatas.Count > 0)
- db.Deleteable<SalesReturnNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ {
+ db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesReturn);
var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
- if (orUpdate && baOrUpdate) return true;
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -82,20 +81,17 @@
return result.All(b => b);
}
- private SalesReturnNotice ConvertErpToSalesReturn(
- ErpSalesReturnDto erpDto)
+ private SalesReturnNotice ConvertErpToSalesReturn(ErpSalesReturnDto erpDto)
{
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
-
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -108,7 +104,6 @@
Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
ReturnCustomer = erpDto.FRetcustId, // 閫�璐у鎴�
- TaobaoRemark = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
ReturnReason = erpDto.FRetcustReason, // 閫�璐у師鍥�
DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
InventoryDept = erpDto.FRetDeptId, // 搴撳瓨閮ㄩ棬
@@ -116,7 +111,6 @@
WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
SalesPerson = erpDto.FSalesManId,//閿�鍞憳
- ExpressNo = erpDto.F_UNW_Text_KDDH, // 蹇�掑崟鍙�
Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
@@ -140,27 +134,28 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
- List<ErpSalesReturnDetailDto> erpDtoList)
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
{
- var salesOrderSubList =
- new List<SalesReturnNoticeDetail>();
+ var salesOrderSubList = new List<SalesReturnNoticeDetail>();
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
+ }
+
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -173,20 +168,18 @@
{
ErpLineId = erpDto.ErpID,//ERP琛孖D
ErpHeadId = erpDto.EHID,//ERP澶碔D
- SalesOrderId = erpDto.F_UNW_Text_xsddh,//閿�鍞鍗曞彿
MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
- IsFree = erpDto.FIsFree,//鏄惁璧犲搧
+ IsFree = Convert.ToDecimal(erpDto.FIsFree),//鏄惁璧犲搧
ReturnDate = ParseDateTime(erpDto.FDeliverydate),//閫�璐ф棩鏈�
Warehouse = erpDto.FStockId,//浠撳簱
PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
LotNumber = erpDto.FLot,//鎵瑰彿
Note = erpDto.FEntryDescription,//澶囨敞
ReturnType = erpDto.FRmType,//閫�璐х被鍨�
- SalesClerk = erpDto.F_UNW_Base_GDY,//璺熷崟鍛�
InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
@@ -200,9 +193,11 @@
};
- var single = _SalesReturnDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesReturnDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 8656f8a..4bda309 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -57,10 +57,6 @@
public List<RkDaa002> GetDaa001s(string lineNo)
{
var db = SqlSugarHelper.GetInstance();
- // return db.Queryable<RKJDaa001>()
- // .Where(t => t.LineNo == lineNo)
- // .OrderBy(t => t.BillNo, OrderByType.Desc)
- // .ToList();
return null;
}
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 435dd6a..0f0f20a 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -17,9 +17,7 @@
{
var db = SqlSugarHelper.GetInstance();
var date = DateTime.Now.ToString("yyyy-MM-dd");
- var sql =
- "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" +
- date + "'";
+ var sql ="select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" + date + "'";
var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 928bde2..b4d469a 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -85,14 +85,41 @@
private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+ if (mesWomcaa.Id != null)
+ {
+ base.DeleteById(mesWomcaa.Id);
+ }
- if (mesWomcabs.Count > 0)
+ if (mesWomcabs.Count > 0)
+ {
db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
- if (orUpdate && baOrUpdate) return true;
+
+ if (orUpdate && baOrUpdate)
+ {
+ //瀹氫箟杈撳叆鍙傛暟
+ var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outParam1 = new SugarParameter("c_Result", null, true);
+ var outParam2 = new SugarParameter("C_MSG", null, true);
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ int result = int.Parse((string)outParam1.Value);
+ string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ if (result == 1)
+ {
+ //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
+ db.Ado.RollbackTran();
+ throw new Exception(message);
+ }
+ // 鎻愪氦浜嬪姟
+ db.Ado.CommitTran();
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -122,7 +149,7 @@
Caa011 = dto.FPlanFinishDate,
Caa012 = Convert.ToDecimal(dto.FQty),
Caa013 = dto.FBomId,
- Caa015 = dto.FXSHTH,
+ Caa015 = dto.FSaleOrderNo,
Caa015Head = dto.FSaleOrderEntrySeq,
Caa016 = dto.FDescription,
Caa017 = 0,
@@ -148,7 +175,7 @@
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
SrcBillentryseq = dto.FSrcBillEntrySeq,
- SaleOrderNo = dto.FXSHTH,
+ SaleOrderNo = dto.FSaleOrderNo,
SaleOrderEntryseq = dto.FSaleOrderEntrySeq,
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
@@ -158,7 +185,9 @@
PrdOrg = dto.erP_SCZZ,
TrustOrg = dto.erP_WTZZ,
TbTime = DateTime.Now,
- JaBs = "0"
+ JaBs = "0",
+ SupplierId=dto.SupplierId,
+ FinishedProduct=dto.FinishedProduct
};
if (dto.Type == "5")
@@ -225,7 +254,6 @@
womcabList.Add(womcab);
}
-
return womcabList;
}
}
\ No newline at end of file
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index 25adab9..692661b 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -87,14 +87,40 @@
private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabss)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
-
+ 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;
+
+ if (orUpdate && baOrUpdate)
+ {
+ //瀹氫箟杈撳叆鍙傛暟
+ var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outParam1 = new SugarParameter("c_Result", null, true);
+ var outParam2 = new SugarParameter("C_MSG", null, true);
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ int result = int.Parse((string)outParam1.Value);
+ string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ if (result == 1)
+ {
+ //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
+ db.Ado.RollbackTran();
+ throw new Exception(message);
+ }
+ // 鎻愪氦浜嬪姟
+ db.Ado.CommitTran();
+ return true;
+ }
+
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -130,6 +156,7 @@
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),
@@ -154,7 +181,7 @@
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
SrcBillentryseq = dto.FSrcBillEntrySeq,
- SaleOrderNo = dto.FSaleOrderNo,
+ SaleOrderNo = dto.FXSHTH,
SaleOrderEntryseq = dto.FSaleOrderEntrySeq,
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
@@ -169,7 +196,9 @@
FPURORDERENTRYSEQ = Convert.ToDecimal(dto.FPurOrderEntrySeq),
FSUBENTRYID = Convert.ToDecimal(dto.fsubentryid),
FSTOCKINQTY = Convert.ToDecimal(dto.Caa024),
- FNOSTOCKINQTY = Convert.ToDecimal(dto.Caa025)
+ FNOSTOCKINQTY = Convert.ToDecimal(dto.Caa025),
+ SupplierId = dto.SupplierId,
+ FinishedProduct = dto.FinishedProduct
};
if (dto.Type == "5")
{
diff --git a/MESApplication/Controllers/BasicData/SalesOrderController.cs b/MESApplication/Controllers/BasicData/SalesOrderController.cs
index 3505f28..a578b9c 100644
--- a/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ b/MESApplication/Controllers/BasicData/SalesOrderController.cs
@@ -21,11 +21,8 @@
private readonly string TableName = "SALES_ORDER";
- private readonly string URL =
- "http://localhost:10054/api/SalesOrder/";
+ private readonly string URL = "http://localhost:10054/api/SalesOrder/";
-
- //
[HttpPost("Save")]
public ResponseResult Save(ErpSalesOrder salesOrder)
{
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 4261372..5fb3b6a 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Tool\LTS\PDA_NEW\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-02-14T12:58:59.6306239Z||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;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>
+ <History>True|2025-04-16T10:13:28.4207378Z||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;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/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 22f056e..1873705 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 9ebd887..40ca793 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.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 33d8b2f..bf9edc2 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 2dff69f..88937e7 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 41471d6..7baf028 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.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 661cfc0..04e95d7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -642,37 +642,37 @@
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList">
<summary>
鑾峰彇鎵�鏈�
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)">
<summary>
鏍规嵁涓婚敭鑾峰彇
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])">
<summary>
鏍规嵁涓婚敭鍒犻櫎
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
<summary>
娣诲姞
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
<summary>
娣诲姞杩斿洖鑷
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
+ <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
<summary>
淇敼
</summary>
@@ -822,6 +822,78 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index b1bcfed..c378807 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 0eefd2c..834fff2 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 95b6c1c..09ad5bb 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 fcea17d..88937e7 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 fc04eec..a33549f 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/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index b1bcfed..c378807 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 0eefd2c..834fff2 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.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 95b6c1c..09ad5bb 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 fcea17d..88937e7 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 fc04eec..a33549f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3