From 78456b712df7ed58cb43ea980395a07c502a356a Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期二, 08 七月 2025 17:49:22 +0800
Subject: [PATCH] 销售退货 退货组织，收料通的单创建人
---
StandardInterface/MES.Service/Modes/SalesReturnNotice.cs | 5 +++++
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs | 1 +
StandardInterface/MES.Service/service/DbckaManager.cs | 5 ++++-
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs | 4 +++-
StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs | 1 +
StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs | 1 +
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs | 1 +
StandardInterface/MESApplication/appsettings.json | 2 +-
8 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs b/StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
index 4afbbc1..8f2f9ce 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
@@ -9,6 +9,7 @@
public string? FDate { get; set; } // 鏃ユ湡
public string? FSettleCurrld { get; set; } // 缁撶畻甯佸埆
public string? FSaleDeptId { get; set; } // 閿�鍞儴闂�
+ public string? FSaleOrgId { get; set; } // 閿�鍞粍缁�
public string? FRetcustId { get; set; } // 閫�璐у鎴�
public string? FRetcustReason { get; set; } // 閫�璐у師鍥�
public string? FHeadLocId { get; set; } // 浜よ揣鍦扮偣
diff --git a/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs b/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
index 96e5216..195fbb0 100644
--- a/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
@@ -9,4 +9,5 @@
public string? Remark { get; set; }
public string? FReceiveOrgId { get; set; }
public string? Is_SRM { get; set; }
+ public string? CREATE_BY { get; set; }
}
diff --git a/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs b/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
index 1f574b3..b2e7f03 100644
--- a/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
+++ b/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
@@ -44,7 +44,9 @@
//鏄惁SRM
[SugarColumn(ColumnName = "IS_SRM")]
public string? Issrm { get; set; }
-
+ //鍒涘缓浜�
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string? CreateBy { get; set; }
//鍒涘缓鏃堕棿
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs b/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
index 480458a..013a601 100644
--- a/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
+++ b/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
@@ -41,6 +41,11 @@
[SugarColumn(ColumnName = "SALES_DEPT")]
public string SalesDept { get; set; }
/// <summary>
+ /// 閿�鍞粍缁�
+ ///</summary>
+ [SugarColumn(ColumnName = "SALES_ORG")]
+ public string SalesOrg { get; set; }
+ /// <summary>
/// 閫�璐у鎴�
///</summary>
[SugarColumn(ColumnName = "RETURN_CUSTOMER")]
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
index b1f0a77..1112ba7 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
@@ -131,6 +131,7 @@
BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
+ SalesOrg = erpDto.FSaleOrgId, //閿�鍞粍缁�
ReturnCustomer = erpDto.FRetcustId, // 閫�璐у鎴�
ReturnReason = erpDto.FRetcustReason, // 閫�璐у師鍥�
DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
diff --git a/StandardInterface/MES.Service/service/DbckaManager.cs b/StandardInterface/MES.Service/service/DbckaManager.cs
index 55dde67..5df6e9b 100644
--- a/StandardInterface/MES.Service/service/DbckaManager.cs
+++ b/StandardInterface/MES.Service/service/DbckaManager.cs
@@ -6,6 +6,7 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using System.Net.NetworkInformation;
namespace MES.Service.service
{
@@ -56,7 +57,9 @@
Remark = dto.bz,
Erpid = dto.erpid,
CreateDate = DateTime.Now,
- CreateBy = "System"
+ CreateBy = "System",
+ DbStatus="鏈皟鎷�",
+ Status=1
};
// var single = base.GetSingle(it => it.Erpid == entity.Erpid);
diff --git a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
index 951992b..910fb12 100644
--- a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
+++ b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
@@ -79,6 +79,7 @@
mesDeliveryNote.Remark = delivery.Remark;
mesDeliveryNote.Site = delivery.FReceiveOrgId;
mesDeliveryNote.Issrm=delivery.Is_SRM;
+ mesDeliveryNote.CreateBy=delivery.Is_SRM;
if (single != null)
{
mesDeliveryNote.Status = single.Status;
diff --git a/StandardInterface/MESApplication/appsettings.json b/StandardInterface/MESApplication/appsettings.json
index 28cfc2a..59a3601 100644
--- a/StandardInterface/MESApplication/appsettings.json
+++ b/StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
}
}
--
Gitblit v1.9.3