From 05fdade2564f0880fcba935aadf12e79a467764b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 18 三月 2025 00:15:47 +0800
Subject: [PATCH] 优化清点逻辑
---
Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_SN.cs | 120 +++++++++++++++++++++------------------
Tiger.Business.WMS/Transaction/In_Default.cs | 2
Tiger.Business.WMS/Transaction/Out_Default.cs | 2
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 7 -
Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs | 2
5 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index ef69adc..9f0f1cd 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -23,7 +23,7 @@
{
public IIn_Default Init(string id, string userCode, string apiHost, string orgCode)
{
- base.Init(id, apiHost, userCode, orgCode);
+ base.Init(id, userCode, apiHost, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
diff --git a/Tiger.Business.WMS/Transaction/Out_Default.cs b/Tiger.Business.WMS/Transaction/Out_Default.cs
index 77518d0..f2521f5 100644
--- a/Tiger.Business.WMS/Transaction/Out_Default.cs
+++ b/Tiger.Business.WMS/Transaction/Out_Default.cs
@@ -19,7 +19,7 @@
{
public IOut_Default Init(string id, string userCode, string apiHost, string orgCode)
{
- base.Init(id, apiHost, userCode, orgCode);
+ base.Init(id, userCode, apiHost, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index 2eaa822..f00575a 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -41,8 +41,7 @@
/// </summary>
private void LoadData()
{
- var orders = MainDB.Queryable<BIZ_U9_ASN>().Where(q => ("," + q.RECEIVER + ",").Contains("," + UserCode + ",")).ToList();
- OrderList = orders.Select(q => q.ORDER_NO).ToList();
+ OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == UserCode && SqlFunc.Subqueryable<BIZ_U9_ASN>().Where(s => s.ORDER_NO == q.ORDER_NO && s.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Any()).Select(q => q.ORDER_NO).ToList();
}
/// <summary>
/// 鎵弿鍏ュ彛
@@ -139,7 +138,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", (inv.ItemInfo?.ITEM_CODE).IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
@@ -156,7 +155,6 @@
STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
QTY = inv.Barcode.Qty.ToDouble(),
PROD_DATE = (inv.Barcode.DateCode?? DateTime.Now.ToString("yyyy-MM-dd")).ToDateTime(),
- ERP_WH = "", //CurScanShelf.WarehouseCode,
UNIT = inv.Barcode.Unit,
};
@@ -166,7 +164,6 @@
AUTH_ORG = input.AuthOption.CurOrg,
ITEM_CODE = inv.Barcode.ItemCode,
QTY = inv.Barcode.Qty.ToDouble(),
- ERP_WH = "", //CurScanShelf.WarehouseCode,
UNIT = inv.Barcode.Unit,
};
diff --git a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
index aa797e4..135ed8c 100644
--- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -21,7 +21,7 @@
{
public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode)
{
- base.Init(id, apiHost, userCode, orgCode);
+ base.Init(id, userCode, apiHost, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_SN.cs
index cd6ea8c..f09f30d 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_SN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_SN.cs
@@ -7,138 +7,148 @@
namespace Tiger.Model
{
/// <summary>
- /// 瀹炰綋锛氶�佽揣鍗�(U9)鏉＄爜鏄庣粏
+ /// 实体：送货单(U9)条码明细
/// </summary>
[Description("Primary:ID")]
- [DisplayName("閫佽揣鍗�(U9)鏉＄爜鏄庣粏")]
+ [DisplayName("送货单(U9)条码明细")]
[Serializable]
[SugarTable("BIZ_U9_ASN_SN")]
public class BIZ_U9_ASN_SN : DbEntityWithAuth
{
- #region 鏋勯�犲嚱鏁�
+ #region 构造函数
/// <summary>
- /// 瀹炰綋锛氶�佽揣鍗�(U9)鏉＄爜鏄庣粏
+ /// 实体：送货单(U9)条码明细
/// </summary>
public BIZ_U9_ASN_SN() {}
#endregion
- #region 鍏叡灞炴��
+ #region 公共属性
/// <summary>
- /// 鍗曟嵁鍙�
+ /// 单据号
/// </summary>
- [DisplayName("鍗曟嵁鍙�")]
+ [DisplayName("单据号")]
public string ORDER_NO { get; set; }
/// <summary>
- /// 鍗曟嵁琛屽彿
+ /// 单据行号
/// </summary>
- [DisplayName("鍗曟嵁琛屽彿")]
+ [DisplayName("单据行号")]
public string LINE_NO { get; set; }
/// <summary>
- /// 鏉＄爜
+ /// 条码
/// </summary>
- [DisplayName("鏉＄爜")]
+ [DisplayName("条码")]
public string SN { get; set; }
/// <summary>
- /// 鍏冩潯鐮�
+ /// 元条码
/// </summary>
- [DisplayName("鍏冩潯鐮�")]
+ [DisplayName("元条码")]
public string META_SN { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 物料编码
/// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
+ [DisplayName("物料编码")]
public string ITEM_CODE { get; set; }
/// <summary>
- /// 鐘舵��(鍚學MS_ITEM鐘舵��)
+ /// 状态(同WMS_ITEM状态)
/// </summary>
- [DisplayName("鐘舵��(鍚學MS_ITEM鐘舵��)")]
+ [DisplayName("状态(同WMS_ITEM状态)")]
public int STATUS { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 数量
/// </summary>
- [DisplayName("鏁伴噺")]
+ [DisplayName("数量")]
public double QTY { get; set; }
/// <summary>
- /// 鍗曚綅
+ /// 单位
/// </summary>
- [DisplayName("鍗曚綅")]
+ [DisplayName("单位")]
public string UNIT { get; set; }
/// <summary>
- /// 鏄惁璧犲搧(Y/N)
+ /// 是否赠品(Y/N)
/// </summary>
- [DisplayName("鏄惁璧犲搧(Y/N)")]
+ [DisplayName("是否赠品(Y/N)")]
public string IS_GIFT { get; set; }
/// <summary>
- /// 鏄惁鑹搧(Y/N)
+ /// 是否良品(Y/N)
/// </summary>
- [DisplayName("鏄惁鑹搧(Y/N)")]
+ [DisplayName("是否良品(Y/N)")]
public string IS_OK { get; set; }
/// <summary>
- /// 鏄惁鍏ュ簱(Y/N)
+ /// 是否入库(Y/N)
/// </summary>
- [DisplayName("鏄惁鍏ュ簱(Y/N)")]
+ [DisplayName("是否入库(Y/N)")]
public string IS_IN { get; set; }
/// <summary>
- /// 鏄惁閫�璐�(Y/N)
+ /// 是否退货(Y/N)
/// </summary>
- [DisplayName("鏄惁閫�璐�(Y/N)")]
+ [DisplayName("是否退货(Y/N)")]
public string IS_RETURN { get; set; }
/// <summary>
- /// 鎵规鍙�
+ /// 批次号
/// </summary>
- [DisplayName("鎵规鍙�")]
+ [DisplayName("批次号")]
public string LOTNO { get; set; }
/// <summary>
- /// 绠卞彿
+ /// 箱号
/// </summary>
- [DisplayName("绠卞彿")]
+ [DisplayName("箱号")]
public string CARTON_NO { get; set; }
/// <summary>
- /// 鏍堟澘鍙�
+ /// 栈板号
/// </summary>
- [DisplayName("鏍堟澘鍙�")]
+ [DisplayName("栈板号")]
public string PALLET_NO { get; set; }
/// <summary>
- /// 澶囨敞
+ /// 收货人
/// </summary>
- [DisplayName("澶囨敞")]
+ [DisplayName("收货人")]
+ public string RECEIVER { get; set; }
+ /// <summary>
+ /// 收货日期
+ /// </summary>
+ [DisplayName("收货日期")]
+ public DateTime RECEIVE_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
public string REMARK { get; set; }
#endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
#endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
- //涓�瀵逛竴澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_ASN_SN绫婚噷闈㈢殑澶栭敭ID瀛楁
- public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASN_SNId))]//ClassA琛ㄤ腑鐨凚IZ_U9_ASN_SNId
- public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASN_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
- public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_ASN_SN类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASN_SNId))]//ClassA表中的BIZ_U9_ASN_SNId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASN_SNId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
*/
#endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
- [Description("鏋氫妇鎻忚堪0")]
+ [Description("枚举描述0")]
Enum0,
- [Description("鏋氫妇鎻忚堪1")]
+ [Description("枚举描述1")]
Enum1,
}
*/
#endregion
- #region 鍏叡鏂规硶
+ #region 公共方法
#endregion
--
Gitblit v1.9.3