From ea4002e9f17e4659cf1905250780f5e0a5b17473 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期四, 19 六月 2025 16:37:56 +0800
Subject: [PATCH] 1
---
StandardInterface/MES.Service/Modes/MesItems.cs | 15 +++++++++++++++
StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs | 1 +
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs | 2 ++
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 3 +++
StandardInterface/MESApplication/appsettings.json | 2 +-
5 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/MesItems.cs b/StandardInterface/MES.Service/Modes/MesItems.cs
index afa7d7d..dc9187d 100644
--- a/StandardInterface/MES.Service/Modes/MesItems.cs
+++ b/StandardInterface/MES.Service/Modes/MesItems.cs
@@ -487,5 +487,20 @@
/// </summary>
[SugarColumn(ColumnName = "MJBM")]
public string? MJBM { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "KHWLBM")]
+ public string? Khwlbm { get; set; }
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ [SugarColumn(ColumnName = "YS")]
+ public string? Ys { get; set; }
+ /// <summary>
+ /// 涓嬮亾宸ュ簭
+ /// </summary>
+ [SugarColumn(ColumnName = "NEXT_GX")]
+ public string? NesxGx { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
index f18ff8d..77be21a 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -219,6 +219,9 @@
F_BZGS =item.F_BZGS,
WLFZMC=item.F_FZMC,
MJBM =item.MJBM,
+ Khwlbm =item.KHWLBM,
+ Ys=item.YS,
+ NesxGx=item.NEXT_GX,
};
}
diff --git a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
index d4da44a..6291f89 100644
--- a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -144,6 +144,7 @@
Fsubid = erpDto.FSUBID,
Fsubbillnoseq = erpDto.FSUBBILLNOSEQ,
Fsubbillno = erpDto.FSUBBILLNO,
+ Caa020 = erpDto.FSUBBILLNO,
SrcBillType = erpDto.FSrcBillType,
SrcBillNo = erpDto.FSrcBillNo,
SrcBillentryseq = erpDto.FSrcBillEntrySeq,
diff --git a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
index 0f423b8..d991443 100644
--- a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
+++ b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
@@ -210,6 +210,7 @@
entity.Data = JsonConvert.SerializeObject(delivery);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route= delivery.DeliveryNo;
try
{
dynamic resultInfos = new ExpandoObject();
@@ -296,6 +297,7 @@
entity.Data = JsonConvert.SerializeObject(dt);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route=dt.DeliveryNo;
try
{
dynamic resultInfos = new ExpandoObject();
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