From f2900f2e7a9fef2e536c34e8d8406ac60c0f06ba Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 17 七月 2025 23:36:32 +0800
Subject: [PATCH] 添加首检的查询条件，添加首检，巡检返回总行数
---
StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
index 4e91e23..1112ba7 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
@@ -47,8 +47,19 @@
private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
List<SalesReturnNoticeDetail> mesSalesReturnDatas)
{
- var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
+ // var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
+ var decimals = mesSalesReturnDatas
+ ?.Where(x => x.Id.HasValue)
+ .Select(x => x.Id.Value)
+ .ToArray() ?? new decimal[0];
+ //鎵爜涓嶅厑璁稿垹闄�
+ var hasMaterialOut = db.Queryable<MesInvItemIns>()
+ .Any(x => x.CbillNo == mesSalesReturn.BillNo);
+ if (hasMaterialOut)
+ {
+ throw new Exception($"MES鏈夐鏂欒褰曪紝鍗曞彿锛歿mesSalesReturn.BillNo}锛屼笉鑳藉垹闄わ紒");
+ }
var update = true;
if (mesSalesReturn != null)
{
@@ -120,6 +131,7 @@
BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
+ SalesOrg = erpDto.FSaleOrgId, //閿�鍞粍缁�
ReturnCustomer = erpDto.FRetcustId, // 閫�璐у鎴�
ReturnReason = erpDto.FRetcustReason, // 閫�璐у師鍥�
DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
--
Gitblit v1.9.3