From db8dbafae693a62e9fe901adabfc4adcdbd92f7b Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期五, 23 五月 2025 15:01:50 +0800
Subject: [PATCH] 测试生产订单添加行id，srm送货加route
---
StandardInterface/MES.Service/Modes/Womcaa.cs | 7 ++++++-
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs | 1 +
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs | 3 +++
StandardInterface/MES.Service/service/WomcaaManager.cs | 4 ++--
StandardInterface/MESApplication/Controllers/WomcaaController.cs | 1 +
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs | 1 +
StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs | 1 +
StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs | 1 +
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs | 1 +
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs | 1 +
10 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs b/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
index c9c0002..f87624c 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
@@ -62,6 +62,7 @@
public string? TypeA { get; set; } //鍗曟嵁鐘舵��
public string? RK_ORG { get; set; } //鍏ュ簱缁勭粐
public string? RCN { get; set; } //鏃ヤ骇鑳�
+ public string? CG_LINE_ID { get; set; } //閲囪喘璁㈠崟琛宨d
////濮斿瀛楁
diff --git a/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs b/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
index bcbd735..96e5216 100644
--- a/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
@@ -8,4 +8,5 @@
public string? FDate { get; set; }
public string? Remark { get; set; }
public string? FReceiveOrgId { get; set; }
+ public string? Is_SRM { get; set; }
}
diff --git a/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs b/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
index f117a37..1f574b3 100644
--- a/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
+++ b/StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
@@ -41,6 +41,9 @@
//鏀舵枡缁勭粐
[SugarColumn(ColumnName = "SITE")]
public string? Site { get; set; }
+ //鏄惁SRM
+ [SugarColumn(ColumnName = "IS_SRM")]
+ public string? Issrm { get; set; }
//鍒涘缓鏃堕棿
[SugarColumn(ColumnName = "CREATE_DATE")]
diff --git a/StandardInterface/MES.Service/Modes/Womcaa.cs b/StandardInterface/MES.Service/Modes/Womcaa.cs
index c7fd9bf..50d680f 100644
--- a/StandardInterface/MES.Service/Modes/Womcaa.cs
+++ b/StandardInterface/MES.Service/Modes/Womcaa.cs
@@ -419,6 +419,11 @@
/// 瀹㈡埛
///</summary>
[SugarColumn(ColumnName="F_ZSXG_KH" )]
- public string FZsxgKh { get; set; }
+ public string FZsxgKh { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ ///</summary>
+ [SugarColumn(ColumnName= "CG_LINE_ID")]
+ public string Cglineid { get; set; }
}
}
diff --git a/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs b/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
index f678895..0b7b061 100644
--- a/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
+++ b/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
@@ -15,6 +15,7 @@
{
get
{
+ //string json = "{\"ap1\":{ \"AcctID\":\"" + "68044981e73323" + "\",\"Username\":\"骞挎繁\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
string json = "{\"ap1\":{ \"AcctID\":\"" + "6533e4ab79156b" + "\",\"Username\":\"骞挎繁\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
var resp = GetResponse("http://47.96.178.105/k3cloud/Kingdee.BOS.ServiceFacade.ServicesStub.User.UserService.ValidateLoginInfo.common.kdsvc", json, new Dictionary<string, string>());
string ret = (new StreamReader(resp.GetResponseStream(), Encoding.UTF8)).ReadToEnd();
diff --git a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
index 9ff5996..79c9578 100644
--- a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
+++ b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
@@ -78,6 +78,7 @@
mesDeliveryNote.DeliveryDate = delivery.FDate;
mesDeliveryNote.Remark = delivery.Remark;
mesDeliveryNote.Site = delivery.FReceiveOrgId;
+ mesDeliveryNote.Issrm=delivery.Is_SRM;
if (single != null)
{
mesDeliveryNote.Status = single.Status;
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 7a4d1ca..f8df994 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -60,7 +60,7 @@
.IgnoreColumns(true).ExecuteCommand() > 0;
//鎵归噺鎻掑叆蹇界暐绌哄瓧娈�
- var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
+ var baOrUpdate = db.Insertable(mesWomcabs).PageSize(10)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
@@ -201,7 +201,7 @@
Typea = dto.TypeA, /// 鍗曟嵁鐘舵��
RkOrg = dto.RK_ORG, //鍏ュ簱缁勭粐
Rcn=dto.RCN, //鏃ヤ骇鑳�
-
+ Cglineid=dto.CG_LINE_ID, //閲囪喘璁㈠崟琛宨d
//娌冨皵鏂板
// WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
diff --git a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
index 84d1a97..7713f50 100644
--- a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
+++ b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
@@ -121,6 +121,7 @@
entity.Data = JsonConvert.SerializeObject(barcode);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = barcode.SmallBarcode;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs
index fa4d7a1..33c8f3c 100644
--- a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs
+++ b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs
@@ -118,6 +118,7 @@
entity.Data = JsonConvert.SerializeObject(delivery);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route= delivery.DeliveryNo;
try
{
dynamic resultInfos = new ExpandoObject();
diff --git a/StandardInterface/MESApplication/Controllers/WomcaaController.cs b/StandardInterface/MESApplication/Controllers/WomcaaController.cs
index 68b4c4b..a1de1a6 100644
--- a/StandardInterface/MESApplication/Controllers/WomcaaController.cs
+++ b/StandardInterface/MESApplication/Controllers/WomcaaController.cs
@@ -32,6 +32,7 @@
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = rohIn.ErpCaa.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
--
Gitblit v1.9.3