From 89d384623e1acdb3c58ec6d4094f9e8f2ec5ca57 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 22 十月 2025 09:23:58 +0800
Subject: [PATCH] 销售发货同步防呆+合并单号
---
StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs | 12 +++++++++++-
StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs | 1 +
StandardInterface/MES.Service/Modes/SalesDeliveryNotice.cs | 7 ++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs b/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
index 18a1f6d..b496e63 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
@@ -44,6 +44,7 @@
public string? FCancelStatus { get; set; } // 浣滃簾鐘舵��
public string? FCancellerId { get; set; } // 浣滃簾浜�
public string? FCancelDate { get; set; } // 浣滃簾鏃ユ湡
+ public string? HbDh { get; set; } // 浣滃簾鏃ユ湡
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/SalesDeliveryNotice.cs b/StandardInterface/MES.Service/Modes/SalesDeliveryNotice.cs
index e5ad985..5abec41 100644
--- a/StandardInterface/MES.Service/Modes/SalesDeliveryNotice.cs
+++ b/StandardInterface/MES.Service/Modes/SalesDeliveryNotice.cs
@@ -229,7 +229,12 @@
public string? BillStatus { get; set; }
-
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "HB_DH")]
+ public string? HbDh { get; set; }
+
}
}
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
index 4c1bf3a..0c7ab57 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
@@ -90,6 +90,15 @@
private bool SaveOrUpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,
List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
{
+
+ // 1. 鏍￠獙鏄惁瀛樺湪棰嗘枡璁板綍锛圡ES_INV_ITEM_OUTS锛�
+ var hasMaterialOut = db.Queryable<MesInvItemOuts>()
+ .Any(x => x.WorkNo == mesSalesDelivery.BillNo);
+
+ if (hasMaterialOut)
+ {
+ throw new Exception($"MES宸叉湁棰嗘枡璁板綍锛屽崟鍙凤細{mesSalesDelivery.BillNo}锛屼笉鑳芥洿鏂帮紒");
+ }
if (mesSalesDelivery.Id != null) base.DeleteById(mesSalesDelivery.Id);
if (mesSalesDeliveryDatas.Count > 0)
@@ -176,7 +185,8 @@
CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
BillStatus = erpDto.FDocumentStatus, //鍗曟嵁鐘舵��
DeliveryOrg = erpDto.FDeliveryOrgID, //鍙戣揣缁勭粐
- SalesOrg = erpDto.FSaleOrgId //閿�鍞粍缁�
+ SalesOrg = erpDto.FSaleOrgId, //閿�鍞粍缁�
+ HbDh = erpDto.HbDh //閿�鍞粍缁�
};
--
Gitblit v1.9.3