From e26159999c0b643de525daddc99a977caf66855e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 26 七月 2024 16:54:01 +0800
Subject: [PATCH] 增加生产包装信息实体
---
Tiger.Business.MES/Transaction/PackingNode.cs | 2
Tiger.Model.Net/Tiger.Model.Net.csproj | 1
Tiger.Business.MES/Transaction/TestNode.cs | 2
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 176 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 2dfdb3f..a736c08 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -170,7 +170,7 @@
return woStatus;
}
//闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO).IncludesAllFirstLayer().First() ?? new MES_WIP_DATA()
+ var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
{
SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 2d15879..17ef458 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -171,7 +171,7 @@
return woStatus;
}
//闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
+ var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
{
SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
new file mode 100644
index 0000000..697192f
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -0,0 +1,176 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：生产包装记录
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("生产包装记录")]
+ [Serializable]
+ [SugarTable("MES_WIP_PKG")]
+ public class MES_WIP_PKG : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：生产包装记录
+ /// </summary>
+ public MES_WIP_PKG() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 条码
+ /// </summary>
+ [DisplayName("条码")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 父包装条码
+ /// </summary>
+ [DisplayName("父包装条码")]
+ public string PARENT_SN { get; set; }
+ /// <summary>
+ /// 包装类型(0OnePiece单件|1Container载具|2Carton箱|3Pallet栈板)
+ /// </summary>
+ [DisplayName("包装类型(0OnePiece单件|1Container载具|2Carton箱|3Pallet栈板)")]
+ public int PKG_TYPE { get; set; }
+ /// <summary>
+ /// 物料编码
+ /// </summary>
+ [DisplayName("物料编码")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 数量
+ /// </summary>
+ [DisplayName("数量")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 单位
+ /// </summary>
+ [DisplayName("单位")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 工单号
+ /// </summary>
+ [DisplayName("工单号")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 工单批次号
+ /// </summary>
+ [DisplayName("工单批次号")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 工艺路线编码
+ /// </summary>
+ [DisplayName("工艺路线编码")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 工艺路线节点ID
+ /// </summary>
+ [DisplayName("工艺路线节点ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 工艺路线节点名称
+ /// </summary>
+ [DisplayName("工艺路线节点名称")]
+ public string NODE_NAME { get; set; }
+ /// <summary>
+ /// 工厂编码
+ /// </summary>
+ [DisplayName("工厂编码")]
+ public string FTY_CODE { get; set; }
+ /// <summary>
+ /// 车间编码
+ /// </summary>
+ [DisplayName("车间编码")]
+ public string WS_CODE { get; set; }
+ /// <summary>
+ /// 产线编码
+ /// </summary>
+ [DisplayName("产线编码")]
+ public string LINE_CODE { get; set; }
+ /// <summary>
+ /// 岗位编码
+ /// </summary>
+ [DisplayName("岗位编码")]
+ public string POST_CODE { get; set; }
+ /// <summary>
+ /// 工序编码
+ /// </summary>
+ [DisplayName("工序编码")]
+ public string OPER_CODE { get; set; }
+ /// <summary>
+ /// 加工段
+ /// </summary>
+ [DisplayName("加工段")]
+ public string SEGMENT { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 追溯信息
+ /// </summary>
+ [DisplayName("追溯信息")]
+ public string TRACE_INFO { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_PKG类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_PKGId))]//ClassA表中的MES_WIP_PKGId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_PKGId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 枚举：包装类型(0OnePiece单件|1Container载具|2Carton箱|3Pallet栈板)
+ /// </summary>
+ public enum PKG_TYPEs
+ {
+ [Description("单件")]
+ OnePiece = 0,
+ [Description("载具")]
+ Container = 1,
+ [Description("箱")]
+ Carton = 2,
+ [Description("栈板")]
+ Pallet = 3,
+ }
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index cdf2e67..4548c30 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -141,6 +141,7 @@
<Compile Include="Entitys\MES\MES_WIP_DFT.cs" />
<Compile Include="Entitys\MES\MES_WIP_EXT.cs" />
<Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_PKG.cs" />
<Compile Include="Entitys\MES\MES_WO_ACTION.cs" />
<Compile Include="Entitys\MES\MES_WO_EDGE.cs" />
<Compile Include="Entitys\MES\MES_WO_NODE.cs" />
--
Gitblit v1.9.3