From 3091217d4f4ccecde578ef1abddd810094bfc6bc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 10 10月 2025 13:39:32 +0800
Subject: [PATCH] 增加字段
---
DEmon/iWareDataCore/ORM/TASKMainTask.cs | 11 +++
DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs | 121 ++++++++++++++++++++++-----------------
DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs | 43 +++++++++++++-
3 files changed, 118 insertions(+), 57 deletions(-)
diff --git a/DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs b/DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs
index 5eb4d49..b8ee996 100644
--- a/DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs
+++ b/DEmon/iWareDataCore/BASE/Service/PlaceMaterialViewService.cs
@@ -43,12 +43,12 @@
-
+
/// <summary>
/// 鑾峰彇鍚勭鐘舵�佺殑搴撲綅
/// </summary>
/// <returns></returns>
- public List<PlaceStatusNumEntity> GetPlaceStatusNum(out string msg)
+ public List<PlaceStatusNumEntity> GetPlaceStatusNum(out string msg)
{
msg = "";
List<PlaceStatusNumEntity> psnlst = new List<PlaceStatusNumEntity>();
@@ -77,7 +77,7 @@
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
- public List<PlaceMaterialViewEntity> GetPlacePreview(out string msg)
+ public List<PlaceMaterialViewEntity> GetPlacePreview(out string msg)
{
msg = "";
List<PlaceMaterialViewEntity> psnlst = new List<PlaceMaterialViewEntity>();
@@ -119,7 +119,7 @@
return mcore.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == materialcode).placecode;
}
-
+
}
catch (Exception ex)
{
@@ -128,5 +128,40 @@
}
}
+
+ /// <summary>
+ /// 鏍规嵁鐗╂枡淇℃伅鍒楄〃鎵惧彇鎸囧畾鐨勫簱浣嶇墿鏂欎俊鎭� 銆怑ditby shaocx,2025-09-29銆�
+ /// </summary>
+ /// <param name="materialcode"></param>
+ /// <returns></returns>
+ public List<int> GetPlaceMaterialViewsByCodeList(List<string> materialcodeList, out string msg)
+ {
+ msg = "";
+ try
+ {
+ using (DbModelCore mcore = new DbModelCore())
+ {
+
+ var list = mcore.BASEPlaceMaterialViews.Where(x => materialcodeList.Contains(x.materialcode)).ToList();
+ foreach (var item in list)
+ {
+ if (!materialcodeList.Contains(item.materialcode))
+ {
+ msg = $"鍞竴缂栫爜{item.materialcode}娌℃湁搴撳瓨";
+ return null;
+ }
+ }
+ return list.Select(x => x.id).ToList();
+ }
+
+ }
+ catch (Exception ex)
+ {
+ msg = "寮傚父:" + ex.ToString();
+ LogTextHelper.WriteLog(Resources.LogDir, this.ToString(), "GetPlaceMaterialViewsByCodeList", ex.Message);
+ return null;
+ }
+ }
+
}
}
diff --git a/DEmon/iWareDataCore/ORM/TASKMainTask.cs b/DEmon/iWareDataCore/ORM/TASKMainTask.cs
index 522a26d..5d4472c 100644
--- a/DEmon/iWareDataCore/ORM/TASKMainTask.cs
+++ b/DEmon/iWareDataCore/ORM/TASKMainTask.cs
@@ -51,5 +51,16 @@
public int islots { get; set; }
public int priority { get; set; }
+
+
+ /// <summary>
+ /// 表BASEInOutListDetail的ID 【Editby shaocx,2025-09-29】
+ /// </summary>
+ public int? InOutListDetailId { get; set; }
+
+ /// <summary>
+ /// 表BASEInOutList的ListNo 【Editby shaocx,2025-09-29】
+ /// </summary>
+ public string ListNo { get; set; }
}
}
diff --git a/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs b/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
index db7ef74..4133e5e 100644
--- a/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
+++ b/DEmon/iWareDataCore/TASK/Entity/MainTaskEntity.cs
@@ -10,79 +10,90 @@
namespace iWareDataCore.TASK.Entity
{
- public class MainTaskEntity : ICommonEntity<TASKMainTask>
+ public class MainTaskEntity : ICommonEntity<TASKMainTask>
{
/// <summary>
/// 1涓讳换鍔′富閿�
/// </summary>
public int Id { get; set; }
- /// <summary>
- /// 绯荤粺缂栧彿
- /// </summary>
+ /// <summary>
+ /// 绯荤粺缂栧彿
+ /// </summary>
public string SysCode { get; set; }
- /// <summary>
- /// 浠诲姟缂栧彿
- /// </summary>
+ /// <summary>
+ /// 浠诲姟缂栧彿
+ /// </summary>
public string TaskNo { get; set; }
- /// <summary>
- /// 鍙戦�佹椂闂�
- /// </summary>
+ /// <summary>
+ /// 鍙戦�佹椂闂�
+ /// </summary>
public DateTime SendTime { get; set; }
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
+ /// <summary>
+ /// 璧峰浣嶇疆
+ /// </summary>
public string SourcePlace { get; set; }
- /// <summary>
- /// 鐩爣浣嶇疆
- /// </summary>
+ /// <summary>
+ /// 鐩爣浣嶇疆
+ /// </summary>
public string ToPlace { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
public string ProcessCardNumber { get; set; }
- /// <summary>
- /// 鐗╂枡鍙�
- /// </summary>
+ /// <summary>
+ /// 鐗╂枡鍙�
+ /// </summary>
public string MaterialCode { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
public int Quantity { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
public int TaskType { get; set; }
- /// <summary>
- ///鐘舵��
- /// </summary>
+ /// <summary>
+ ///鐘舵��
+ /// </summary>
public int Status { get; set; }
- /// <summary>
- /// 鍒嗚В鏃堕棿
- /// </summary>
+ /// <summary>
+ /// 鍒嗚В鏃堕棿
+ /// </summary>
public DateTime DecompositionTime { get; set; }
- /// <summary>
- /// 鍙嶉鐘舵��
- /// </summary>
+ /// <summary>
+ /// 鍙嶉鐘舵��
+ /// </summary>
public int WipStatus { get; set; }
- /// <summary>
- /// 鍒嗚В娆℃暟
- /// </summary>
+ /// <summary>
+ /// 鍒嗚В娆℃暟
+ /// </summary>
public int DecompositionTimes { get; set; }
- /// <summary>
- /// 宸ュ寘
- /// </summary>
+ /// <summary>
+ /// 宸ュ寘
+ /// </summary>
public string PackageNo { get; set; }
- /// <summary>
- /// 鏄惁鎵规鍏ュ簱锛�0锛氬惁锛�1锛氭槸锛�
- /// </summary>
+ /// <summary>
+ /// 鏄惁鎵规鍏ュ簱锛�0锛氬惁锛�1锛氭槸锛�
+ /// </summary>
public int IsLots { get; set; }
- /// <summary>
- /// 浼樺厛绾�
- /// </summary>
+ /// <summary>
+ /// 浼樺厛绾�
+ /// </summary>
public int Priority { get; set; }
-
+ /// <summary>
+ /// 琛˙ASEInOutListDetail鐨処D 銆怑ditby shaocx,2025-09-29銆�
+ /// </summary>
+ public int? InOutListDetailId { get; set; }
+
+ /// <summary>
+ /// 琛˙ASEInOutList鐨凩istNo 銆怑ditby shaocx,2025-09-29銆�
+ /// </summary>
+ public string ListNo { get; set; }
+
+
+
public List<MaterialViewEntity> Materials { get; set; }
/// <summary>
@@ -105,8 +116,8 @@
/// <returns></returns>
public static Dictionary<string, string> GetColumnMap()
{
- return new Dictionary<string, string>()
- {
+ return new Dictionary<string, string>()
+ {
{"Id", "id"},
{"SysCode", "syscode"},
{"TaskNo", "taskno"},
@@ -123,6 +134,8 @@
{"DecompositionTimes","decompositiontimes"},
{"IsLots","islots"},
{"Priority","priority"},
+ {"InOutListDetailId","InOutListDetailId"},
+ {"ListNo","ListNo"},
{"PackageNo","packageno"}
};
}
@@ -146,7 +159,7 @@
}
public static Dictionary<string, string> GetOutColumnMap()
{
- return new Dictionary<string, string>()
+ return new Dictionary<string, string>()
{
//{"Id", "id"},
{"SysCode", "syscode"},
@@ -164,6 +177,8 @@
{"DecompositionTimes","decompositiontimes"},
{"IsLots","islots"},
{"Priority","priority"},
+ {"InOutListDetailId","InOutListDetailId"},
+ {"ListNo","ListNo"},
{"PackageNo","packageno"}
};
}
--
Gitblit v1.9.3