From 8d50f77ff706e213955e3c8dd2029dc10e9f9b63 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 20 三月 2025 21:29:05 +0800
Subject: [PATCH] 优化清点逻辑，支持扫箱条码，增加退货的数量处理 更新实体
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 14
Tiger.Api/Language.db | 0
Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs | 12
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_HIS.cs | 2
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 313 +++++++---------------
Tiger.Model.Net/Entitys/WMS/V_ITEM_BIZ_ERP_RECEIPT_SN.cs | 2
Tiger.Model.Net/Tiger.Model.Net.csproj | 6
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_Y.cs | 2
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM.cs | 2
Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs | 141 ++++++++++
/dev/null | 141 ----------
Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs | 151 ++++++++++
Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs | 7
Tiger.Model.Net/Entitys/WMS/WMS_ITEM_HIS.cs | 2
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_X.cs | 2
Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_DTL.cs | 12
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_D.cs | 2
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_A.cs | 2
18 files changed, 426 insertions(+), 387 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index a53d097..0531dba 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 73fa43c..fe547b9 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -328,7 +328,7 @@
{
BIZ_U9_RECEIPT_DTL info = new()
{
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
@@ -387,13 +387,13 @@
string UserCode = "U9C_In_GetReturn";
var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 1 && x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_RETURN> result = new();
- List<BIZ_U9_RETURN_DTL> resultDt = new();
+ List<BIZ_U9_RMA> result = new();
+ List<BIZ_U9_RMA_DTL> resultDt = new();
if (list != null && list.Count > 0)
{
result = list
.GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_U9_RETURN
+ .Select(x => new BIZ_U9_RMA
{
STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(), //鐘舵��
ORDER_NO = x.Key.DocNo, //鍗曞彿
@@ -413,9 +413,9 @@
Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
foreach (var item in list)
{
- BIZ_U9_RETURN_DTL info = new()
+ BIZ_U9_RMA_DTL info = new()
{
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
@@ -617,7 +617,7 @@
{
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
UNIT =item.StoreUOM,// UNIT 鍗曚綅
QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
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 8074ddc..9cb73f2 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -84,203 +84,72 @@
var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
try
{
- if (CurInvItem.IsNullOrEmpty())
+ //瑙ｆ瀽鏉＄爜
+ Barcode barcode = new Barcode(input.SN);
+ if (barcode.IsException)
{
- //瑙ｆ瀽鏉＄爜
- Barcode barcode = new Barcode(input.SN);
- if (barcode.IsException)
- {
- throw barcode.AnalyseException;
- }
- //闈炴硶鏉＄爜
- else if (!barcode.IsRegular)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
- action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
- return action;
- }
+ throw barcode.AnalyseException;
+ }
+ //闈炴硶鏉＄爜
+ else if (!barcode.IsRegular)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
+ action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
+ return action;
+ }
- if (barcode.Type == Barcode.Types.OuterPackage)
+ if (barcode.Type == Barcode.Types.OuterPackage)
+ {
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
+ }
+ else
+ {
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
+ foreach (var sn in CurSn)
{
- CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
+ sn.META_SN = input.SN;
}
- else
- {
- CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
- foreach (var sn in CurSn)
- {
- sn.META_SN = input.SN;
- }
- }
-
- if (CurSn.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SnNotExists", input.SN);
- return action;
- }
- if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
- return action;
- }
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
- return action;
- }
-
+ }
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(barcode.SN, input.AuthOption, true);
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
- }
- var inv = result.Data as Inventory;
-
- //鐗╂枡楠岃瘉
- if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", (inv.ItemInfo?.ITEM_CODE).IsNullOrEmpty(inv.Barcode.ItemCode));
- return action;
- }
-
- if (inv.Items.Count == 0)
- {
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
-
- Item = new()
- {
- SN = inv.Barcode.SN,
- ITEM_CODE = inv.Barcode.ItemCode,
- AUTH_ORG = input.AuthOption.CurOrg,
- STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = inv.Barcode.Qty.ToDouble(),
- PROD_DATE = (inv.Barcode.DateCode?? DateTime.Now.ToString("yyyy-MM-dd")).ToDateTime(),
- UNIT = inv.Barcode.Unit,
- };
-
- ItemPkgs = new()
- {
- SN = inv.Barcode.SN,
- AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = inv.Barcode.ItemCode,
- QTY = inv.Barcode.Qty.ToDouble(),
- UNIT = inv.Barcode.Unit,
- };
-
- var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
- //鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
- foreach (var item in noExt)
- {
- inv.ItemsExt.Add(new()
- {
- SN = item.SN,
- META_SN = inv.Barcode.MetaSn,
- QR_CODE = inv.Barcode.MetaSn
- });
- }
-
- inv.Items.Add(Item);
- inv.Packages.Add(ItemPkgs);
- }
- //闆呰揪涓嶄粠鏉＄爜涓婃洿鏂版暟閲�
- //else if (inv.Items.Count == 1)
- //{
- // inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
-
- // inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
- //}
- //濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
- else
- {
- foreach (var item in inv.Items)
- {
- item.ERP_WH = "";
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- foreach (var item in inv.Packages)
- {
- item.ERP_WH = "";
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- }
- CurInvItem = inv;
-
- //妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鏇存柊鏉＄爜鏁伴噺
- if (CurInvItem.Items.Any(q => q.QTY <= 0))
- {
- var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
- foreach (var qty in qtyList)
- {
- var item = CurInvItem.Items.First(q => q.SN == qty.Code);
- item.QTY = qty.WhQty;
- item.SUPP_LOTNO = new Barcode(qty.Code).LotNo; //渚涘簲鍟嗘壒娆″彿
- var pkg = CurInvItem.Packages.First(q => q.SN == qty.Code);
- pkg.QTY = qty.WhQty;
- }
- CurInvItem.UpdatePkgQty();
- }
+ if (CurSn.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SnNotExists", input.SN);
+ return action;
+ }
+ if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
+ return action;
+ }
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
+ return action;
}
//鎵ц娓呯偣鏁版嵁澶勭悊
foreach (var sn in CurSn)
{
sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
- sn.QTY = CurInvItem.Items.Where(q => q.SN == sn.SN).Sum(q => q.QTY);
sn.RECEIVER = UserCode;
sn.RECEIVE_DATE = DateTime.Now;
}
- foreach (var item in CurInvItem.Items)
- {
- var sn = CurSn.First(q => q.SN == item.SN);
- item.AUTH_ORG = sn.AUTH_ORG;
- item.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
- item.SOURCE_CODE = item.TRANS_CODE;
- item.SOURCE_ORDER = item.TRANS_NO;
- item.SOURCE_LINE = item.TRANS_LINE;
- item.TRANS_CODE = nameof(BIZ_U9_ASN);
- item.TRANS_NO = sn.ORDER_NO;
- item.TRANS_LINE = sn.LINE_NO;
- CurInvItem.History.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{CurInvItem.SN}]娓呯偣瀹屾垚锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
- }
- //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _CurSn = CurSn.Clone();
- var _Items = CurInvItem.Items.Clone();
- var _Packages = CurInvItem.Packages.Clone();
- var _History = CurInvItem.History.Clone();
- var _ItemsExt = CurInvItem.ItemsExt.Clone();
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _CurSn = CurSn.Clone();
AddCommitAction("Counted", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- var t = db.Storageable(_Items, UserCode).ToStorage();
- t.AsInsertable.ExecuteCommand();
- t.AsUpdateable.UpdateColumns(q => new { q.QTY, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- var p = db.Storageable(_Packages, UserCode).ToStorage();
- p.AsInsertable.ExecuteCommand();
- p.AsUpdateable.UpdateColumns(q => new { q.QTY, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- db.Storageable(_Packages, UserCode).ToStorage().AsInsertable.ExecuteCommand();
- db.Insertable(_History, UserCode).ExecuteCommand();
- var e = db.Storageable(_ItemsExt, UserCode).ToStorage().AsInsertable.ExecuteCommand();//涓嶅瓨鍦ㄦ彃鍏�
db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
db.Storageable(_CurSn, UserCode).ExecuteCommand();
});
@@ -318,7 +187,7 @@
action.Data.Data = ScanList;
//action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurInvItem.SN);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
//閲嶇疆宸ュ簭
ResetScan();
@@ -341,28 +210,28 @@
sn.RECEIVE_DATE = DateTime.MinValue;
}
- var historys = new List<WMS_ITEM_HIS>();
- var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
- foreach (var item in items)
- {
- var order = item.TRANS_CODE;
- item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- item.SOURCE_CODE = "";
- item.SOURCE_ORDER = "";
- item.SOURCE_LINE = "";
- item.TRANS_CODE = item.SOURCE_CODE;
- item.TRANS_NO = item.SOURCE_ORDER;
- item.TRANS_LINE = item.SOURCE_LINE;
- historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
- }
+ //var historys = new List<WMS_ITEM_HIS>();
+ //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
+ //foreach (var item in items)
+ //{
+ // var order = item.TRANS_CODE;
+ // item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ // item.SOURCE_CODE = "";
+ // item.SOURCE_ORDER = "";
+ // item.SOURCE_LINE = "";
+ // item.TRANS_CODE = item.SOURCE_CODE;
+ // item.TRANS_NO = item.SOURCE_ORDER;
+ // item.TRANS_LINE = item.SOURCE_LINE;
+ // historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
+ //}
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
var dbTran = db.UseTran(() =>
{
db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
- db.Updateable(items, UserCode).ExecuteCommand();
- db.Insertable(historys, UserCode).ExecuteCommand();
+ //db.Updateable(items, UserCode).ExecuteCommand();
+ //db.Insertable(historys, UserCode).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
@@ -392,15 +261,15 @@
var action = new ApiAction();
try
{
- var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
- var order = item.TRANS_CODE;
- item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- item.SOURCE_CODE = "";
- item.SOURCE_ORDER = "";
- item.SOURCE_LINE = "";
- item.TRANS_CODE = item.SOURCE_CODE;
- item.TRANS_NO = item.SOURCE_ORDER;
- item.TRANS_LINE = item.SOURCE_LINE;
+ //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
+ //var order = item.TRANS_CODE;
+ //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ //item.SOURCE_CODE = "";
+ //item.SOURCE_ORDER = "";
+ //item.SOURCE_LINE = "";
+ //item.TRANS_CODE = item.SOURCE_CODE;
+ //item.TRANS_NO = item.SOURCE_ORDER;
+ //item.TRANS_LINE = item.SOURCE_LINE;
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
@@ -410,8 +279,8 @@
.SetColumns(q => q.RECEIVER == null)
.SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
.Where(q => q.SN == input.SN).ExecuteCommand();
- db.Updateable(item, UserCode).ExecuteCommand();
- db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
+ //db.Updateable(item, UserCode).ExecuteCommand();
+ //db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
@@ -463,9 +332,10 @@
foreach (var dtl in order.Details)
{
dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
- dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue()).Sum(q => q.QTY);
+ dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
}
- }
+ order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
+ }
}
return action;
}
@@ -529,12 +399,12 @@
}
//鏌ヨ鏄惁娓呯偣瀹屾垚
- var noFinish = order.Details.Where(q => q.QTY != order.SnList.Sum(s => s.QTY));
+ var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
if (noFinish.Any())
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("娓呯偣鏁伴噺涓嶅");// Biz.L("WMS.InReceipt.ScanItem.CheckingDataToSubmit"); //$"娓呯偣鏁伴噺涓嶅";
- action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚");
+ //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
return action;
}
@@ -544,7 +414,7 @@
IsLogin = true,
CreateRcvBySrcASNParam = new ()
{
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY + q.QTY_GIFT } }).ToList(),
+ aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
}
};
var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
@@ -626,10 +496,11 @@
//鏇存柊搴撳瓨琛ㄤ俊鎭�
var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
- var historys = new List<WMS_ITEM_HIS>();
+ var historys = new List<WMS_ITEM_HIS>();
foreach (var item in items)
{
- item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
item.SOURCE_CODE = item.TRANS_CODE;
item.SOURCE_ORDER = item.TRANS_NO;
item.SOURCE_LINE = item.TRANS_LINE;
@@ -638,6 +509,17 @@
item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
historys.Add(new WMS_ITEM_HIS(item, $"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
}
+ var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ foreach (var item in pkgs)
+ {
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ item.SOURCE_CODE = item.TRANS_CODE;
+ item.SOURCE_ORDER = item.TRANS_NO;
+ item.SOURCE_LINE = item.TRANS_LINE;
+ item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
+ item.TRANS_NO = receipt.ORDER_NO;
+ item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
+ }
order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
order.RECEIVER_ID = receipt.ID;
order.RECEIVER_NO = receipt.ORDER_NO;
@@ -648,8 +530,9 @@
var db = GetCommitDB();
var dbTran = db.UseTran(() =>
{
- db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
- db.Insertable(historys, UserCode).ExecuteCommand();
+ db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ db.Insertable(historys, UserCode).ExecuteCommand();
db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
db.Insertable(receipt, UserCode).ExecuteCommand();
db.Insertable(receipt.Details, UserCode).ExecuteCommand();
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
index c14dca7..dda1f6d 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
@@ -29,10 +29,10 @@
/// </summary>
[DisplayName("鍗曟嵁鍙�")]
public string ORDER_NO { get; set; }
- /// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)
- /// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)")]
+ /// <summary>
+ /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4Finished宸插畬鎴恷5Cancel宸蹭綔搴�)
+ /// </summary>
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4Finished宸插畬鎴恷5Cancel宸蹭綔搴�)")]
public int STATUS { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鐮�
@@ -121,6 +121,8 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
+ [SugarColumn(IsIgnore = true)]
+ public bool IsFinished { get; set; }
#endregion
#region 澶栭敭灞炴��
@@ -153,7 +155,7 @@
*/
/// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4Finished宸插畬鎴恷5Cancel宸蹭綔搴�)
/// </summary>
public enum STATUSs
{
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs
deleted file mode 100644
index af9b165..0000000
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using SqlSugar;
-using System.Linq;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace Tiger.Model
-{
- /// <summary>
- /// 实体：退货单(U9)
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("退货单(U9)")]
- [Serializable]
- [SugarTable("BIZ_U9_RETURN")]
- public class BIZ_U9_RETURN : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：退货单(U9)
- /// </summary>
- public BIZ_U9_RETURN() {}
- #endregion
-
- #region 公共属性
- /// <summary>
- /// 单据号
- /// </summary>
- [DisplayName("单据号")]
- public string ORDER_NO { get; set; }
- /// <summary>
- /// 状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)
- /// </summary>
- [DisplayName("状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 供应商编码
- /// </summary>
- [DisplayName("供应商编码")]
- public string SUPP_CODE { get; set; }
- /// <summary>
- /// 供应商名称
- /// </summary>
- [DisplayName("供应商名称")]
- public string SUPP_NAME { get; set; }
- /// <summary>
- /// 单据日期
- /// </summary>
- [DisplayName("单据日期")]
- public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 收货人
- /// </summary>
- [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; }
- /// <summary>
- /// -1:未处理，0:同步处理完，>0:同步处理失败次数
- /// </summary>
- [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
- public int HANDLED { get; set; } = -1;
- /// <summary>
- /// 最后一次同步处理日期
- /// </summary>
- [DisplayName("最后一次同步处理日期")]
- public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 过账提交的JSON
- /// </summary>
- [DisplayName("过账提交的JSON")]
- public string COMMIT_JSON { get; set; }
- /// <summary>
- /// 过账提交的返回信息
- /// </summary>
- [DisplayName("过账提交的返回信息")]
- public string COMMIT_MSG { get; set; }
- #endregion
-
- #region 虚拟属性
- /*例子
- [SugarColumn(IsIgnore = true)]
- public string FieldName { get; set; }
- */
- #endregion
-
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURNId))]//ClassA表中的BIZ_U9_RETURNId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURNId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
- */
- #endregion
-
- #region 枚举变量
- /*例子
- public enum FieldNames
- {
- [Description("枚举描述0")]
- Enum0,
- [Description("枚举描述1")]
- Enum1,
- }
- */
-
- /// <summary>
- /// 枚举：状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)
- /// </summary>
- public enum STATUSs
- {
- [Description("初始化")]
- Init = 0,
- [Description("已导入")]
- Imported = 1,
- [Description("已送达")]
- Arrived = 2,
- [Description("清点中")]
- Counting = 3,
- [Description("检验中")]
- InQC = 4,
- [Description("上架中")]
- Storing = 5,
- [Description("待审核")]
- Review = 6,
- [Description("已完成")]
- Finished = 7,
- [Description("已作废")]
- Cancel = 8,
- }
- #endregion
-
- #region 公共方法
-
- #endregion
-
- }//endClass
-}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_SN.cs
deleted file mode 100644
index e9046e1..0000000
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_SN.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using SqlSugar;
-using System.Linq;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace Tiger.Model
-{
- /// <summary>
- /// 实体：退货单(U9)条码明细
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("退货单(U9)条码明细")]
- [Serializable]
- [SugarTable("BIZ_U9_RETURN_SN")]
- public class BIZ_U9_RETURN_SN : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：退货单(U9)条码明细
- /// </summary>
- public BIZ_U9_RETURN_SN() {}
- #endregion
-
- #region 公共属性
- /// <summary>
- /// 单据号
- /// </summary>
- [DisplayName("单据号")]
- public string ORDER_NO { get; set; }
- /// <summary>
- /// 单据行号
- /// </summary>
- [DisplayName("单据行号")]
- public string LINE_NO { get; set; }
- /// <summary>
- /// 条码
- /// </summary>
- [DisplayName("条码")]
- public string SN { get; set; }
- /// <summary>
- /// 元条码
- /// </summary>
- [DisplayName("元条码")]
- public string META_SN { get; set; }
- /// <summary>
- /// 物料编码
- /// </summary>
- [DisplayName("物料编码")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 状态(同WMS_ITEM状态)
- /// </summary>
- [DisplayName("状态(同WMS_ITEM状态)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 数量
- /// </summary>
- [DisplayName("数量")]
- public double QTY { get; set; }
- /// <summary>
- /// 单位
- /// </summary>
- [DisplayName("单位")]
- public string UNIT { get; set; }
- /// <summary>
- /// 是否良品(Y/N)
- /// </summary>
- [DisplayName("是否良品(Y/N)")]
- public string IS_OK { get; set; }
- /// <summary>
- /// 是否入库(Y/N)
- /// </summary>
- [DisplayName("是否入库(Y/N)")]
- public string IS_IN { get; set; }
- /// <summary>
- /// 是否报废(Y/N)
- /// </summary>
- [DisplayName("是否报废(Y/N)")]
- public string IS_SCRAP { get; set; }
- /// <summary>
- /// 批次号
- /// </summary>
- [DisplayName("批次号")]
- public string LOTNO { get; set; }
- /// <summary>
- /// 箱号
- /// </summary>
- [DisplayName("箱号")]
- public string CARTON_NO { get; set; }
- /// <summary>
- /// 栈板号
- /// </summary>
- [DisplayName("栈板号")]
- public string PALLET_NO { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
- public string REMARK { get; set; }
- #endregion
-
- #region 虚拟属性
- /*例子
- [SugarColumn(IsIgnore = true)]
- public string FieldName { get; set; }
- */
- #endregion
-
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN_SN类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_SNId))]//ClassA表中的BIZ_U9_RETURN_SNId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_SNId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
- */
- #endregion
-
- #region 枚举变量
- /*例子
- public enum FieldNames
- {
- [Description("枚举描述0")]
- Enum0,
- [Description("枚举描述1")]
- Enum1,
- }
- */
- #endregion
-
- #region 公共方法
-
- #endregion
-
- }//endClass
-}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs
new file mode 100644
index 0000000..71dd48a
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs
@@ -0,0 +1,151 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋锛氶��璐у崟(U9)
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("閫�璐у崟(U9)")]
+ [Serializable]
+ [SugarTable("BIZ_U9_RMA")]
+ public class BIZ_U9_RMA : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氶��璐у崟(U9)
+ /// </summary>
+ public BIZ_U9_RMA() {}
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ [DisplayName("鍗曟嵁鍙�")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)
+ /// </summary>
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [DisplayName("渚涘簲鍟嗙紪鐮�")]
+ public string SUPP_CODE { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [DisplayName("渚涘簲鍟嗗悕绉�")]
+ public string SUPP_NAME { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ /// </summary>
+ [DisplayName("鍗曟嵁鏃ユ湡")]
+ public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鏀惰揣浜�
+ /// </summary>
+ [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; }
+ /// <summary>
+ /// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
+ /// </summary>
+ [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")]
+ public int HANDLED { get; set; } = -1;
+ /// <summary>
+ /// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
+ /// </summary>
+ [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")]
+ public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 杩囪处鎻愪氦鐨凧SON
+ /// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨凧SON")]
+ public string COMMIT_JSON { get; set; }
+ /// <summary>
+ /// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
+ /// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")]
+ public string COMMIT_MSG { get; set; }
+ #endregion
+
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RMA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMAId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RMAId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ */
+ #endregion
+
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("鍒濆鍖�")]
+ Init = 0,
+ [Description("宸插鍏�")]
+ Imported = 1,
+ [Description("宸查�佽揪")]
+ Arrived = 2,
+ [Description("娓呯偣涓�")]
+ Counting = 3,
+ [Description("妫�楠屼腑")]
+ InQC = 4,
+ [Description("涓婃灦涓�")]
+ Storing = 5,
+ [Description("寰呭鏍�")]
+ Review = 6,
+ [Description("宸插畬鎴�")]
+ Finished = 7,
+ [Description("宸蹭綔搴�")]
+ Cancel = 8,
+ }
+ #endregion
+
+ #region 鍏叡鏂规硶
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_DTL.cs
similarity index 90%
rename from Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs
rename to Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_DTL.cs
index c28ee5b..4f0bb35 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_DTL.cs
@@ -12,14 +12,14 @@
[Description("Primary:ID")]
[DisplayName("閫�璐у崟(U9)鏄庣粏")]
[Serializable]
- [SugarTable("BIZ_U9_RETURN_DTL")]
- public class BIZ_U9_RETURN_DTL : DbEntityWithAuth
+ [SugarTable("BIZ_U9_RMA_DTL")]
+ public class BIZ_U9_RMA_DTL : DbEntityWithAuth
{
#region 鏋勯�犲嚱鏁�
/// <summary>
/// 瀹炰綋锛氶��璐у崟(U9)鏄庣粏
/// </summary>
- public BIZ_U9_RETURN_DTL() {}
+ public BIZ_U9_RMA_DTL() {}
#endregion
#region 鍏叡灞炴��
@@ -124,13 +124,13 @@
#region 澶栭敭灞炴��
/*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RETURN_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RMA_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
//涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RETURN_DTLId
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMA_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RMA_DTLId
public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
//澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_DTLId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMA_DTLId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
[Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs
new file mode 100644
index 0000000..5b71bcb
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs
@@ -0,0 +1,141 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋锛氶��璐у崟(U9)鏉＄爜鏄庣粏
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("閫�璐у崟(U9)鏉＄爜鏄庣粏")]
+ [Serializable]
+ [SugarTable("BIZ_U9_RMA_SN")]
+ public class BIZ_U9_RMA_SN : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氶��璐у崟(U9)鏉＄爜鏄庣粏
+ /// </summary>
+ public BIZ_U9_RMA_SN() {}
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ [DisplayName("鍗曟嵁鍙�")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 鍗曟嵁琛屽彿
+ /// </summary>
+ [DisplayName("鍗曟嵁琛屽彿")]
+ public string LINE_NO { get; set; }
+ /// <summary>
+ /// 鏉＄爜
+ /// </summary>
+ [DisplayName("鏉＄爜")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鍏冩潯鐮�
+ /// </summary>
+ [DisplayName("鍏冩潯鐮�")]
+ public string META_SN { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鐘舵��(鍚學MS_ITEM鐘舵��)
+ /// </summary>
+ [DisplayName("鐘舵��(鍚學MS_ITEM鐘舵��)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [DisplayName("鏁伴噺")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 鏄惁鑹搧(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鑹搧(Y/N)")]
+ public string IS_OK { get; set; }
+ /// <summary>
+ /// 鏄惁鍏ュ簱(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍏ュ簱(Y/N)")]
+ public string IS_IN { get; set; }
+ /// <summary>
+ /// 鏄惁鎶ュ簾(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鎶ュ簾(Y/N)")]
+ public string IS_SCRAP { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [DisplayName("鎵规鍙�")]
+ public string LOTNO { get; set; }
+ /// <summary>
+ /// 绠卞彿
+ /// </summary>
+ [DisplayName("绠卞彿")]
+ public string CARTON_NO { get; set; }
+ /// <summary>
+ /// 鏍堟澘鍙�
+ /// </summary>
+ [DisplayName("鏍堟澘鍙�")]
+ public string PALLET_NO { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RMA_SN绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMA_SNId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RMA_SNId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMA_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ */
+ #endregion
+
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 鍏叡鏂规硶
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/V_ITEM_BIZ_ERP_RECEIPT_SN.cs b/Tiger.Model.Net/Entitys/WMS/V_ITEM_BIZ_ERP_RECEIPT_SN.cs
index b5ad4ec..0a47c86 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_ITEM_BIZ_ERP_RECEIPT_SN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_ITEM_BIZ_ERP_RECEIPT_SN.cs
@@ -34,7 +34,7 @@
/// </summary>
public string ITEM_CODE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM.cs
index 60e2602..23506fe 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM.cs
@@ -46,7 +46,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_A.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_A.cs
index ec1bc59..d6c2f6e 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_A.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_A.cs
@@ -46,7 +46,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_D.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_D.cs
index 114e9f4..6da8ce1 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_D.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_D.cs
@@ -46,7 +46,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_HIS.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_HIS.cs
index 1276027..13c1583 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_HIS.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_HIS.cs
@@ -48,7 +48,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_X.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_X.cs
index 9ddca8c..b2763cb 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_X.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_X.cs
@@ -46,7 +46,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_Y.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_Y.cs
index ef6ca5e..7f24072 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_Y.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_Y.cs
@@ -46,7 +46,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
index 2e56adc..c398bd2 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
+++ b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM.cs
@@ -45,7 +45,7 @@
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
@@ -204,7 +204,7 @@
#region 鏋氫妇鍙橀噺
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public enum STATUSs
{
@@ -220,6 +220,9 @@
[Description("寰呮楠�")]
WaitTest = 20,
+ [Description("闇�閫�璐�")]
+ Rejected = 22,
+
[Description("寰呭叆搴�")]
WaitIn = 30,
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_HIS.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_HIS.cs
index 57b43df..68019d2 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_HIS.cs
+++ b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_HIS.cs
@@ -74,7 +74,7 @@
/// </summary>
public string SN_TYPE { get; set; }
/// <summary>
- /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
+ /// 鍌ㄥ瓨鐘舵��(0NotExists涓嶅瓨鍦▅10Incoming閫佽揣涓瓅20WaitTest寰呮楠寍21Rejected闇�閫�璐30WaitIn寰呭叆搴搢40InStore鍦ㄥ簱|50OffShelf宸蹭笅鏋秥60Sended宸插彂鏂檤70Loaded宸蹭笂鏂檤80UseUp宸茶�楀敖|90Returned宸查��鏂檤100Shipped宸插嚭璐�)
/// </summary>
public int STATUS { get; set; }
/// <summary>
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 39a312f..6f1dfc4 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -291,9 +291,9 @@
<Compile Include="Entitys\WMS\BIZ_U9_RECEIPT.cs" />
<Compile Include="Entitys\WMS\BIZ_U9_RECEIPT_DTL.cs" />
<Compile Include="Entitys\WMS\BIZ_U9_RECEIPT_SN.cs" />
- <Compile Include="Entitys\WMS\BIZ_U9_RETURN.cs" />
- <Compile Include="Entitys\WMS\BIZ_U9_RETURN_DTL.cs" />
- <Compile Include="Entitys\WMS\BIZ_U9_RETURN_SN.cs" />
+ <Compile Include="Entitys\WMS\BIZ_U9_RMA.cs" />
+ <Compile Include="Entitys\WMS\BIZ_U9_RMA_DTL.cs" />
+ <Compile Include="Entitys\WMS\BIZ_U9_RMA_SN.cs" />
<Compile Include="Entitys\WMS\BIZ_WMS_PREP.cs" />
<Compile Include="Entitys\WMS\BIZ_WMS_PREP_DTL.cs" />
<Compile Include="Entitys\WMS\BIZ_WMS_PREP_SN.cs" />
--
Gitblit v1.9.3