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/Transaction/Yada/Count_BIZ_U9_ASN.cs | 313 ++++++++++++++++-----------------------------------
1 files changed, 98 insertions(+), 215 deletions(-)
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();
--
Gitblit v1.9.3