From fbb0bc175c8788f2f6ce4202d2630b01506bff80 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 13 六月 2025 11:40:36 +0800
Subject: [PATCH] 发货通知单新增客户编码和客户名称。生产订单添加含税单价
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Dto/webApi/ErpCAB.cs | 8
MESApplication/bin/Release/net8.0/MESApplication.xml | 36 ----
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/service/WomcaaManager.cs | 9
MES.Service/service/WomcaaWWManager.cs | 2
MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs | 157 +++++------------
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MES.Service/Modes/Womcaa.cs | 8
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs | 85 +++------
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
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.xml | 36 ----
MES.Service/Dto/webApi/ErpCAA.cs | 1
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 5
MES.Service/Dto/webApi/DelBarcode.cs | 6
MESApplication/MESApplication.csproj.user | 2
MES.Service/Modes/SalesDeliveryNotice.cs | 76 ++++----
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 2
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 54 +++--
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
28 files changed, 178 insertions(+), 313 deletions(-)
diff --git a/MES.Service/Dto/webApi/DelBarcode.cs b/MES.Service/Dto/webApi/DelBarcode.cs
new file mode 100644
index 0000000..eda3f18
--- /dev/null
+++ b/MES.Service/Dto/webApi/DelBarcode.cs
@@ -0,0 +1,6 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class DelBarcode
+{
+ public string SmallBarcode { get; set; }
+}
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 586b827..435b50b 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -54,5 +54,4 @@
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/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index 00deb30..e6c9376 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -26,10 +26,12 @@
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? 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; }
- public string? F_ZJXF_SSGX { get; set; }
+ public string? F_ZJXF_SSGX { get; set; } //鐢熶骇宸ュ簭
+ public string? F_WWC_TEXT { get; set; } //閿�鍞崟鍙�
+ public string? F_ZJXF_HSDJ { 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 19b2b24..59c7476 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -39,5 +39,7 @@
public string? FXSHTH { get; set; } // 閿�鍞鍗曞彿
public string? F_ZJXF_TEXT_QTR_LEE { get; set; } // 瀹㈡埛璁㈠崟鍙�
public string? FXSHTBH { get; set; } // 閿�鍞悎鍚岀紪鍙�
+ public string? F_KHWLMC { get; set; } // 瀹㈡埛鐗╂枡鍚嶇О
+ public string? F_KHWLBM { get; set; } // 瀹㈡埛鐗╂枡缂栫爜
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesDeliveryNotice.cs b/MES.Service/Modes/SalesDeliveryNotice.cs
index 7027191..0146a9a 100644
--- a/MES.Service/Modes/SalesDeliveryNotice.cs
+++ b/MES.Service/Modes/SalesDeliveryNotice.cs
@@ -13,18 +13,18 @@
/// <summary>
///
///</summary>
- [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)]
public decimal? Id { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷
///</summary>
[SugarColumn(ColumnName="BILL_TYPE" )]
- public string BillType { get; set; }
+ public string? BillType { get; set; }
/// <summary>
/// 鍗曟嵁缂栧彿
///</summary>
[SugarColumn(ColumnName="BILL_NO" )]
- public string BillNo { get; set; }
+ public string? BillNo { get; set; }
/// <summary>
/// 鏃ユ湡
///</summary>
@@ -34,127 +34,127 @@
/// 缁撶畻甯佸埆
///</summary>
[SugarColumn(ColumnName="CURRENCY" )]
- public string Currency { get; set; }
+ public string? Currency { get; set; }
/// <summary>
/// 閿�鍞粍缁�
///</summary>
[SugarColumn(ColumnName="SALES_ORG" )]
- public string SalesOrg { get; set; }
+ public string? SalesOrg { get; set; }
/// <summary>
/// 閿�鍞儴闂�
///</summary>
[SugarColumn(ColumnName="SALES_DEPT" )]
- public string SalesDept { get; set; }
+ public string? SalesDept { get; set; }
/// <summary>
/// 瀹㈡埛璁㈠崟
///</summary>
[SugarColumn(ColumnName="CUSTOMER_ORDER_NO" )]
- public string CustomerOrderNo { get; set; }
+ public string? CustomerOrderNo { get; set; }
/// <summary>
/// 瀹㈡埛
///</summary>
[SugarColumn(ColumnName="CUSTOMER" )]
- public string Customer { get; set; }
+ public string? Customer { get; set; }
/// <summary>
/// 娣樺疂瀹㈡埛澶囨敞
///</summary>
[SugarColumn(ColumnName="TAOBAO_REMARK" )]
- public string TaobaoRemark { get; set; }
+ public string? TaobaoRemark { get; set; }
/// <summary>
/// 浜よ揣鏂瑰紡
///</summary>
[SugarColumn(ColumnName="DELIVERY_METHOD" )]
- public string DeliveryMethod { get; set; }
+ public string? DeliveryMethod { get; set; }
/// <summary>
/// 浜よ揣鍦扮偣
///</summary>
[SugarColumn(ColumnName="DELIVERY_LOCATION" )]
- public string DeliveryLocation { get; set; }
+ public string? DeliveryLocation { get; set; }
/// <summary>
/// 鎵胯繍鍟�
///</summary>
[SugarColumn(ColumnName="CARRIER" )]
- public string Carrier { get; set; }
+ public string? Carrier { get; set; }
/// <summary>
/// 杩愯緭鍗曞彿
///</summary>
[SugarColumn(ColumnName="TRANSPORT_NO" )]
- public string TransportNo { get; set; }
+ public string? TransportNo { get; set; }
/// <summary>
/// 鍗曟嵁鐘舵��
///</summary>
[SugarColumn(ColumnName="BILL_NO_TYPE" )]
- public string BillNoType { get; set; }
+ public string? BillNoType { get; set; }
/// <summary>
/// 鍙戣揣缁勭粐
///</summary>
[SugarColumn(ColumnName="DELIVERY_ORG" )]
- public string DeliveryOrg { get; set; }
+ public string? DeliveryOrg { get; set; }
/// <summary>
/// 鍙戣揣閮ㄩ棬
///</summary>
[SugarColumn(ColumnName="DELIVERY_DEPT" )]
- public string DeliveryDept { get; set; }
+ public string? DeliveryDept { get; set; }
/// <summary>
/// 搴撳瓨缁�
///</summary>
[SugarColumn(ColumnName="INVENTORY_GROUP" )]
- public string InventoryGroup { get; set; }
+ public string? InventoryGroup { get; set; }
/// <summary>
/// 浠撶鍛�
///</summary>
[SugarColumn(ColumnName="WAREHOUSE_MANAGER" )]
- public string WarehouseManager { get; set; }
+ public string? WarehouseManager { get; set; }
/// <summary>
/// 閿�鍞粍
///</summary>
[SugarColumn(ColumnName="SALES_GROUP" )]
- public string SalesGroup { get; set; }
+ public string? SalesGroup { get; set; }
/// <summary>
/// 閿�鍞憳
///</summary>
[SugarColumn(ColumnName="SALES_PERSON" )]
- public string SalesPerson { get; set; }
+ public string? SalesPerson { get; set; }
/// <summary>
/// 鏀惰揣鏂�
///</summary>
[SugarColumn(ColumnName="RECEIVER" )]
- public string Receiver { get; set; }
+ public string? Receiver { get; set; }
/// <summary>
/// 鏀惰揣鏂硅仈绯讳汉
///</summary>
[SugarColumn(ColumnName="RECEIVER_CONTACT" )]
- public string ReceiverContact { get; set; }
+ public string? ReceiverContact { get; set; }
/// <summary>
/// 鏀惰揣鏂瑰湴鍧�
///</summary>
[SugarColumn(ColumnName="RECEIVER_ADDRESS" )]
- public string ReceiverAddress { get; set; }
+ public string? ReceiverAddress { get; set; }
/// <summary>
/// 鏀惰揣鏂瑰鍚�
///</summary>
[SugarColumn(ColumnName="RECEIVER_NAME" )]
- public string ReceiverName { get; set; }
+ public string? ReceiverName { get; set; }
/// <summary>
/// 鑱旂郴鐢佃瘽
///</summary>
[SugarColumn(ColumnName="LINK_PHONE" )]
- public string LinkPhone { get; set; }
+ public string? LinkPhone { get; set; }
/// <summary>
/// 缁撶畻鏂�
///</summary>
[SugarColumn(ColumnName="SETTLE_PARTY" )]
- public string SettleParty { get; set; }
+ public string? SettleParty { get; set; }
/// <summary>
/// 浠樻鏂�
///</summary>
[SugarColumn(ColumnName="PAYER_PARTY" )]
- public string PayerParty { get; set; }
+ public string? PayerParty { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
[SugarColumn(ColumnName="CREATED_BY" )]
- public string CreatedBy { get; set; }
+ public string? CreatedBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
@@ -164,7 +164,7 @@
/// 淇敼浜�
///</summary>
[SugarColumn(ColumnName="MODIFIED_BY" )]
- public string ModifiedBy { get; set; }
+ public string? ModifiedBy { get; set; }
/// <summary>
/// 淇敼鏃堕棿
///</summary>
@@ -174,12 +174,12 @@
/// 鍏抽棴浜�
///</summary>
[SugarColumn(ColumnName="CLOSED_BY" )]
- public string ClosedBy { get; set; }
+ public string? ClosedBy { get; set; }
/// <summary>
/// 鍏抽棴鍘熷洜
///</summary>
[SugarColumn(ColumnName="CLOSE_REASON" )]
- public string CloseReason { get; set; }
+ public string? CloseReason { get; set; }
/// <summary>
/// 鍏抽棴鏃ユ湡
///</summary>
@@ -189,7 +189,7 @@
/// 瀹℃牳浜�
///</summary>
[SugarColumn(ColumnName="APPROVED_BY" )]
- public string ApprovedBy { get; set; }
+ public string? ApprovedBy { get; set; }
/// <summary>
/// 瀹℃牳鏃ユ湡
///</summary>
@@ -199,12 +199,12 @@
/// 浣滃簾鐘舵��
///</summary>
[SugarColumn(ColumnName="CANCEL_STATUS" )]
- public string CancelStatus { get; set; }
+ public string? CancelStatus { get; set; }
/// <summary>
/// 浣滃簾浜�
///</summary>
[SugarColumn(ColumnName="CANCELLED_BY" )]
- public string CancelledBy { get; set; }
+ public string? CancelledBy { get; set; }
/// <summary>
/// 浣滃簾鏃ユ湡
///</summary>
@@ -214,23 +214,23 @@
/// 鍏抽棴鐘舵��
///</summary>
[SugarColumn(ColumnName="CLOSE_STATUS" )]
- public string CloseStatus { get; set; }
+ public string? CloseStatus { get; set; }
/// <summary>
/// 鏄惁鎵嬪姩鍏抽棴
///</summary>
[SugarColumn(ColumnName="MANUAL_CLOSE_FLAG" )]
- public string ManualCloseFlag { get; set; }
+ public string? ManualCloseFlag { get; set; }
/// <summary>
/// ERP澶碔D
///</summary>
[SugarColumn(ColumnName="ERP_ID" )]
- public string ErpId { get; set; }
+ public string? ErpId { get; set; }
/// <summary>
/// 鍗曟嵁鐘舵��
///</summary>
[SugarColumn(ColumnName = "BILL_STATUS")]
- public string BillStatus { get; set; }
+ public string? BillStatus { get; set; }
}
}
diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 39b93c0..fb36222 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -13,33 +13,33 @@
/// <summary>
///
///</summary>
- [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)]
public decimal? Id { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
///</summary>
[SugarColumn(ColumnName="SALES_ORDER_ID")]
- public string SalesOrderId { get; set; }
+ public string? SalesOrderId { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
///</summary>
[SugarColumn(ColumnName="MATERIAL_ID")]
- public string MaterialId { get; set; }
+ public string? MaterialId { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
///</summary>
[SugarColumn(ColumnName="MATERIAL_NAME")]
- public string MaterialName { get; set; }
+ public string? MaterialName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
///</summary>
[SugarColumn(ColumnName="MATERIAL_SPECIFICATION")]
- public string MaterialSpecification { get; set; }
+ public string? MaterialSpecification { get; set; }
/// <summary>
/// 閿�鍞崟浣�
///</summary>
[SugarColumn(ColumnName="SALES_UNIT_ID")]
- public string SalesUnitId { get; set; }
+ public string? SalesUnitId { get; set; }
/// <summary>
/// 閿�鍞暟閲�
///</summary>
@@ -59,22 +59,22 @@
/// 鍑鸿揣浠撳簱
///</summary>
[SugarColumn(ColumnName="WAREHOUSE")]
- public string Warehouse { get; set; }
+ public string? Warehouse { get; set; }
/// <summary>
/// 璁″垝璺熻釜鍙�
///</summary>
[SugarColumn(ColumnName="PLAN_TRACKING_NUMBER")]
- public string PlanTrackingNumber { get; set; }
+ public string? PlanTrackingNumber { get; set; }
/// <summary>
/// 鎵瑰彿
///</summary>
[SugarColumn(ColumnName="LOT_NUMBER")]
- public string LotNumber { get; set; }
+ public string? LotNumber { get; set; }
/// <summary>
/// 婧愬崟缂栧彿
///</summary>
[SugarColumn(ColumnName="SRC_BILL_NO")]
- public string SrcBillNo { get; set; }
+ public string? SrcBillNo { get; set; }
/// <summary>
/// 璁′环鏁伴噺
///</summary>
@@ -84,12 +84,12 @@
/// 璐т富
///</summary>
[SugarColumn(ColumnName="OWNER_ID")]
- public string OwnerId { get; set; }
+ public string? OwnerId { get; set; }
/// <summary>
/// 搴撳瓨鍗曚綅
///</summary>
[SugarColumn(ColumnName="INVENTORY_UNIT")]
- public string InventoryUnit { get; set; }
+ public string? InventoryUnit { get; set; }
/// <summary>
/// 搴撳瓨鏁伴噺
///</summary>
@@ -99,7 +99,7 @@
/// 鐗╂枡绫诲埆
///</summary>
[SugarColumn(ColumnName="MATERIAL_CATEGORY")]
- public string MaterialCategory { get; set; }
+ public string? MaterialCategory { get; set; }
/// <summary>
/// 璁″垝鍙戣揣鏃ユ湡
///</summary>
@@ -109,7 +109,7 @@
/// 瓒呭彂鎺у埗鍗曚綅
///</summary>
[SugarColumn(ColumnName="OUT_LMT_UNIT")]
- public string OutLmtUnit { get; set; }
+ public string? OutLmtUnit { get; set; }
/// <summary>
/// 鍑哄簱涓婇檺
///</summary>
@@ -124,27 +124,27 @@
/// 浜よ揣鍦扮偣
///</summary>
[SugarColumn(ColumnName="DELIVERY_LOC")]
- public string DeliveryLoc { get; set; }
+ public string? DeliveryLoc { get; set; }
/// <summary>
/// 浜よ揣鍦板潃
///</summary>
[SugarColumn(ColumnName="DELIVERYL_ADDRESS")]
- public string DeliverylAddress { get; set; }
+ public string? DeliverylAddress { get; set; }
/// <summary>
/// 婧愬崟鍗曞彿
///</summary>
[SugarColumn(ColumnName="SOURCE_BILL_NO")]
- public string SourceBillNo { get; set; }
+ public string? SourceBillNo { get; set; }
/// <summary>
/// 璁㈠崟鍗曞彿
///</summary>
[SugarColumn(ColumnName="ORDER_BILL_NO")]
- public string OrderBillNo { get; set; }
+ public string? OrderBillNo { get; set; }
/// <summary>
/// 缁堟鐘舵��
///</summary>
[SugarColumn(ColumnName="TERMINATION_STATUS")]
- public string TerminationStatus { get; set; }
+ public string? TerminationStatus { get; set; }
/// <summary>
/// 缁堟鏃ユ湡
///</summary>
@@ -164,12 +164,12 @@
/// ERP琛孖D
///</summary>
[SugarColumn(ColumnName="ERP_LINE_ID")]
- public string ErpLineId { get; set; }
+ public string? ErpLineId { get; set; }
/// <summary>
/// ERP澶碔D
///</summary>
[SugarColumn(ColumnName="ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
+ public string? ErpHeadId { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
/// </summary>
@@ -187,6 +187,18 @@
/// </summary>
[SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
public string? SalesContractNo { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KHWLMC")]
+ public string? F_KHWLMC { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KHWLBM")]
+ public string? F_KHWLBM { get; set; }
}
}
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index d76ffa4..7669e20 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -358,8 +358,14 @@
public string? SupplierId { get; set; }
/// <summary>
- /// 渚涘簲鍟�
+ /// 鎴愬搧
/// </summary>
[SugarColumn(ColumnName = "FINISHED_PRODUCT")]
public string? FinishedProduct { get; set; }
+
+ /// <summary>
+ /// 鍚◣鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "F_ZJXF_HSDJ")]
+ public string? F_ZJXF_HSDJ { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index c0cffee..6ddfb23 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 1c42ffc..196a864 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/MesDeliveryNoteBarcodeManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
index 3c64061..d087bb8 100644
--- a/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
+++ b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
@@ -25,24 +25,11 @@
case "6":
return DeleteData(db, mesDeliveryNoteBarcode) ? 1: 0;
default:
- throw new ArgumentNullException(
- $"type娌℃湁{barcode.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ 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("鎻掑叆澶辫触");
}
// 鏇存柊鏁版嵁鐨勬柟娉�
@@ -52,6 +39,32 @@
if (detect) return true;
throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鍒犻櫎鏁版嵁鐨勬柟娉�
+ private bool DeleteBarcode(SqlSugarScope db, DelBarcode barcode)
+ {
+ var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.SmallBarcode == barcode.SmallBarcode).ExecuteCommand() > 0;
+
+ if (del)
+ {
+ return true;
+ }
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ public dynamic Delete(DelBarcode barcode)
+ {
+ return UseTransaction(db =>
+ {
+ return DeleteBarcode(db, barcode) ? 1 : 0;
+ }) > 0;
+ }
+
+ public dynamic DeleteList(List<DelBarcode> barcode)
+ {
+ var result = barcode.Select(Delete).ToList();
+ return result.All(b => b);
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
@@ -70,51 +83,7 @@
{
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)
{
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 5f0bfa6..ab42549 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -197,8 +197,9 @@
RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
SalesOrder = erpDto.FXSHTH,//閿�鍞鍗曞彿
CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,//瀹㈡埛璁㈠崟鍙�
- SalesContractNo = erpDto.FXSHTBH//閿�鍞悎鍚岀紪鍙�
-
+ SalesContractNo = erpDto.FXSHTBH,//閿�鍞悎鍚岀紪鍙�
+ F_KHWLBM=erpDto.F_KHWLBM,
+ F_KHWLMC=erpDto.F_KHWLMC
};
var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 96d630b..a569556 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -24,7 +24,7 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH, wom.ErpCabs[0].F_ZJXF_HSDJ);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -134,7 +134,7 @@
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string? fxshtbh,string? hsdj)
{
string jabs="0";
@@ -150,7 +150,7 @@
Caa011 = dto.FPlanFinishDate,
Caa012 = Convert.ToDecimal(dto.FQty),
Caa013 = dto.FBomId,
- Caa015 = dto.FSaleOrderNo,
+ Caa015 = fxshtbh,
Caa015Head = dto.FSaleOrderEntrySeq,
Caa016 = dto.FDescription,
Caa017 = 0,
@@ -188,7 +188,8 @@
TbTime = DateTime.Now,
JaBs = "0",
SupplierId=dto.SupplierId,
- FinishedProduct=dto.FinishedProduct
+ FinishedProduct=dto.FinishedProduct,
+ F_ZJXF_HSDJ= hsdj
};
if (dto.Type == "5")
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index bc6bf20..afc91ae 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -253,7 +253,7 @@
Denominator = Convert.ToDecimal(dto.FDenominator),
SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- SalesOrder = dto.FXSHTBH,
+ SalesOrder = dto.F_WWC_TEXT,
};
var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
diff --git a/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
index bd5d18b..eead4df 100644
--- a/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
@@ -108,19 +108,28 @@
}
}
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
+ [HttpPost("Delete")]
+ public ResponseResult Delete(DelBarcode barcode)
{
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Delete";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(barcode);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
+ var save = m.Delete(barcode);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
return new ResponseResult
{
status = 0,
@@ -130,22 +139,40 @@
}
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("GetById")]
- public ResponseResult GetById(int id)
+ [HttpPost("DeleteList")]
+ public ResponseResult DeleteList(List<DelBarcode> barcodes)
{
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "DeleteList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(barcodes);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
+ var save = m.DeleteList(barcodes);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
return new ResponseResult
{
status = 0,
@@ -155,102 +182,14 @@
}
catch (Exception ex)
{
- return ResponseResult.ResponseError(ex);
- }
- }
+ entity.Result = 0;
- /// <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);
- }
- }
+ entity.DealWith = 0;
- /// <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);
- }
- }
+ entity.ResultData = ex.Message;
- /// <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);
- }
- }
+ _manager.save(entity);
- /// <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);
}
}
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index 7e69957..afcd1bd 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>C:\Users\Administrator\Desktop\鏈�鏂板悗绔唬鐮乗MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\Tool\TLM\TLM_JK\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 08b18ac..bf49d40 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>C:\Users\Administrator\Desktop\鏈�鏂板悗绔唬鐮乗MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-05-16T07:10:24.9670924Z||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;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||;</History>
+ <_PublishTargetUrl>E:\Tool\TLM\TLM_JK\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2025-06-13T03:39:26.7350436Z||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;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||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index c0cffee..6ddfb23 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 1c42ffc..196a864 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 8fadc44..bb20e26 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 25c899f..26a68ab 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 b0c8ae7..1995386 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.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index 04e95d7..3fecfd7 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -102,42 +102,6 @@
</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>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index c0cffee..6ddfb23 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 1c42ffc..196a864 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 8fadc44..bb20e26 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 25c899f..26a68ab 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 b0c8ae7..1995386 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.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index 04e95d7..3fecfd7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -102,42 +102,6 @@
</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>
鑾峰彇鎵�鏈�
--
Gitblit v1.9.3