From 3767c658e315be5279bea5c1d42b7881c1f45d97 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 25 二月 2025 10:04:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/MES/YadaU9/mes_WhLotCodeQtyInfo.cs | 17 +++++++++++------
Tiger.Model.Net/Entitys/MES/YadaU9/mes_MaterialBarCodeByBin.cs | 32 ++++++++++++++++++++++----------
Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs | 2 +-
3 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
index 335588b..123c645 100644
--- a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
+++ b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
@@ -69,7 +69,7 @@
itemDesc= item.ItemDescription,
sapItemCode= "",
WoBatch = item.LotCode,
- batchQty= item.PackQty,
+ batchQty= item.PackQty.ToDecimal(),
qrCode="",
};
temps.Add(temp);
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MaterialBarCodeByBin.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MaterialBarCodeByBin.cs
index e404cee..e530d03 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MaterialBarCodeByBin.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MaterialBarCodeByBin.cs
@@ -66,17 +66,29 @@
///
/// </summary>
public string BinInfo_Code { get; set; }
- #endregion
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime PROD_DATE { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string Unit { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string LotNo { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 枚举变量
- /*例子
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
[Description("枚举描述0")]
@@ -85,11 +97,11 @@
Enum1,
}
*/
- #endregion
+ #endregion
- #region 公共方法
+ #region 公共方法
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_WhLotCodeQtyInfo.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_WhLotCodeQtyInfo.cs
index a34a14e..c202671 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_WhLotCodeQtyInfo.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_WhLotCodeQtyInfo.cs
@@ -19,13 +19,18 @@
/// 实体：mes_WhLotCodeQtyInfo
/// </summary>
public mes_WhLotCodeQtyInfo() {}
- #endregion
+ #endregion
- #region 公共属性
- /// <summary>
- ///
- /// </summary>
- public string ItemCode { get; set; }
+ #region 公共属性
+ /// <summary>
+ ///
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string ID { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ItemCode { get; set; }
/// <summary>
///
/// </summary>
--
Gitblit v1.9.3