From ad1aeb59db293e459695b131323fd0caa58e7be1 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 08 五月 2025 18:59:34 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/Dto/webApi/ErpItems.cs | 3 +++
StandardInterface/MESApplication/Controllers/BasicData/MesRohInController.cs | 1 +
StandardInterface/MES.Service/Modes/MesItems.cs | 16 ++++++++++++++++
StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs | 6 +++---
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 3 +++
StandardInterface/MES.Service/MES.Service.csproj | 1 +
6 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
index 44afd41..f8b7caa 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpItems.cs
@@ -80,4 +80,7 @@
public string? F_BZGS { get; set; } //鏍囧噯宸ユ椂
public string? F_FZMC { get; set; } //鐗╂枡鍒嗙粍鍚嶇О锛堢被鍨嬪悕绉帮級
public string? MJBM { get; set; } //妯″叿缂栫爜锛堝悕绉帮級
+ public string? KHWLBM { get; set; } //瀹㈡埛鐗╂枡缂栫爜
+ public string? YS { get; set; } //棰滆壊
+ public string? NEXT_GX { get; set; } //涓嬮亾宸ュ簭
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/MES.Service.csproj b/StandardInterface/MES.Service/MES.Service.csproj
index fb62dfb..0cdbe87 100644
--- a/StandardInterface/MES.Service/MES.Service.csproj
+++ b/StandardInterface/MES.Service/MES.Service.csproj
@@ -19,6 +19,7 @@
<ItemGroup>
<Folder Include="Dto\webApi\SRM\" />
+ <Folder Include="Dto\webApi\鏂版枃浠跺す\" />
<Folder Include="Modes\SRM\" />
<Folder Include="service\SRM\" />
</ItemGroup>
diff --git a/StandardInterface/MES.Service/Modes/MesItems.cs b/StandardInterface/MES.Service/Modes/MesItems.cs
index afa7d7d..bd6cf87 100644
--- a/StandardInterface/MES.Service/Modes/MesItems.cs
+++ b/StandardInterface/MES.Service/Modes/MesItems.cs
@@ -488,4 +488,20 @@
[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? Next_Gx { 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..4b8dbc9 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,
+ Next_Gx = item.NEXT_GX,
};
}
diff --git a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
index 49bb250..8f3b66b 100644
--- a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
@@ -94,9 +94,9 @@
.Deleteable<MesRohInData>()
.Where(s => decimals.Contains(s.Id))
.ExecuteCommand() > 0;
-
- if (update && insertOrUpdate) return true;
- throw new NotImplementedException("鏇存柊澶辫触");
+ return true;
+ /* if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");*/
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
diff --git a/StandardInterface/MESApplication/Controllers/BasicData/MesRohInController.cs b/StandardInterface/MESApplication/Controllers/BasicData/MesRohInController.cs
index fbce082..a720f08 100644
--- a/StandardInterface/MESApplication/Controllers/BasicData/MesRohInController.cs
+++ b/StandardInterface/MESApplication/Controllers/BasicData/MesRohInController.cs
@@ -34,6 +34,7 @@
entity.Data = JsonConvert.SerializeObject(rohIn);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route= rohIn.ErpRohIn.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
--
Gitblit v1.9.3