From e163a27328c805ffec7c894259430f76f0881d00 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 03 四月 2025 23:12:23 +0800
Subject: [PATCH] 更新收货单提交按行提交已完成清点的行，上架增加IQC审核的判断
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 414 +++++++++++++++++++++++++++--------------------------------
1 files changed, 189 insertions(+), 225 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 4366634..28f4a1d 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -7,14 +7,9 @@
using Tiger.Model.MES.Yada;
using Tiger.Model;
using Tiger.IBusiness;
-using Microsoft.CodeAnalysis.Options;
-using Tiger.Model.Entitys.MES.U9C;
using SqlSugar;
-using System.Collections;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
-using static IronPython.Modules.PythonDateTime;
-using System.Net;
-using static IronPython.Modules._ast;
+using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.WMS
{
@@ -94,8 +89,12 @@
var list = db.Queryable<mes_AsnDocInfo>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BIZ_U9_ASN> asns = new();
- List<BIZ_U9_ASN_DTL> items = new();
+ List<BIZ_U9_ASN_DTL> dtls = new();
List<BIZ_U9_ASN_SN> sns = new();
+ List<WMS_ITEM> items = new();
+ List<WMS_ITEM_HIS> hiss = new();
+ List<WMS_ITEM_EXT> itemExts = new();
+ List<WMS_ITEM_PKG> pkgs = new();
if (list != null && list.Count > 0)
{
@@ -121,117 +120,168 @@
})
.ToList();
Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{asns.Count}]");
- foreach (var item in list)
+ foreach (var dtl in list)
{
- BIZ_U9_ASN_DTL info = new() {
+ BIZ_U9_ASN_DTL info = new()
+ {
STATUS = BIZ_U9_ASN.STATUSs.Imported.GetValue(),
- ORDER_NO = item.DocNo,
- LINE_NO = item.DocLineNo.ToString(),
- SUPP_CODE = item.SupplierCode,
- ID = item.LineID.ToString(),
- ITEM_CODE = item.ItemCode,
- QTY_PACKING = item.PackQty.ToDouble(),
- QTY = item.POQtyTU.ToDouble(),
- SUPP_LOTNO = item.SupplierLot,
- LOTNO = item.LotMater,
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE,
- CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
+ ORDER_NO = dtl.DocNo,
+ LINE_NO = dtl.DocLineNo.ToString(),
+ ID = dtl.LineID.ToString(),
+ ITEM_CODE = dtl.ItemCode,
+ QTY_PACKING = dtl.PackQty.ToDouble(),
+ QTY = dtl.ShipQtyTU.ToDouble(),
+ PO_QTY = dtl.POQtyTU,
+ SUPP_CODE = dtl.SupplierCode,
+ SUPP_LOTNO = dtl.LotMater,
+ LOTNO = dtl.LotMater,
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == dtl.Org.ToString())?.ORG_CODE,
+ CREATE_TIME = dtl.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = item.ModifiedOn,
- UPDATE_USER = UserCode };
- items.Add(info);
+ UPDATE_TIME = dtl.ModifiedOn,
+ UPDATE_USER = UserCode
+ };
+ dtls.Add(info);
}
- Logger.Scheduler.Info($"閫佽揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ Logger.Scheduler.Info($"閫佽揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{dtls.Count}]");
foreach (var asn in asns)
{
- var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO ).ToList();
- foreach (var item in snlist)
+ var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
+
+ foreach (var sn in snlist)
{
+ var barcode = new Barcode(sn.Code);
+ var dtl = dtls.First(q => q.LINE_NO == barcode.OrderLine);
+ var asnDtl = list.First(q => q.DocLineNo.ToString() == barcode.OrderLine);
BIZ_U9_ASN_SN info = new()
{
- STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
- ORDER_NO = item.Segment1,
- LINE_NO = item.Segment2,
- SN = item.Code,
- ITEM_CODE = item.Segment5,
- QTY = item.WhQty.ToDouble(),
- LOTNO = item.Segment7,
AUTH_ORG = asn.AUTH_ORG,
CREATE_TIME = DateTime.Now,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = DateTime.Now,
UPDATE_USER = UserCode,
+ STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
+ ORDER_NO = barcode.OrderNo,
+ LINE_NO = dtl.LINE_NO,
+ SN = barcode.SN,
+ META_SN = sn.Code,
+ ITEM_CODE = barcode.ItemCode,
+ QTY = sn.WhQty,
+ LOTNO = barcode.LotNo,
+ CARTON_NO = barcode.SN,
};
sns.Add(info);
+ if (!sn.Code.StartsWith("Carton"))
+ {
+ var item = new WMS_ITEM()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = asn.AUTH_ORG,
+ STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
+ QTY = sn.WhQty,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ??DateTime.Now,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ items.Add(item);
+ hiss.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{barcode.SN}]瀵煎叆锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
+ var ext = new WMS_ITEM_EXT()
+ {
+ SN = barcode.SN,
+ META_SN = sn.Code,
+ QR_CODE = sn.Code,
+ };
+ itemExts.Add(ext);
+ var pkg = new WMS_ITEM_PKG()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = asn.AUTH_ORG,
+ QTY = sn.WhQty,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ pkgs.Add(pkg);
+ }
}
+
Logger.Scheduler.Info($"閫佽揣鍗昜{asn.ORDER_NO}]鏉＄爜鏄庣粏淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{snlist.Count}]");
}
+
+
db = Biz.Db;
if (asns.Any())
{
- if (asns.Count > 100)
+ db.Utilities.PageEach(asns, 100, pageList =>
{
- db.Utilities.PageEach(asns, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C_In_DocASN")
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE, q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME,q.AUTH_ORG ,q.UPDATE_USER , }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(asns, "U9C_In_DocASN")
+ var y = db.Storageable(pageList, "U9C_In_DocASN")
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE, q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE,q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
+ });
}
- if (items.Any())
+ if (dtls.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(dtls, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C_In_DocASN")
- .WhereColumns(t => new { t.ORDER_NO,t.ID, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO,q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG,q.CREATE_USER, q.UPDATE_TIME ,q.UPDATE_USER, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C_In_DocASN")
- .WhereColumns(t => new { t.ORDER_NO,t.ID, t.GHOST_ROW })
+ var y = db.Storageable(pageList, "U9C_In_DocASN")
+ .WhereColumns(t => new { t.ORDER_NO, t.ID, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO,q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY,q.PO_QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ });
}
if (sns.Any())
{
- if (sns.Count > 100)
+ db.Utilities.PageEach(sns, 100, pageList =>
{
- db.Utilities.PageEach(sns, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C_In_DocASN")
- .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO,t.SN, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SN, q.ITEM_CODE, q.QTY, q.LOTNO, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(sns, "U9C_In_DocASN")
+ var y = db.Storageable(pageList, "U9C_In_DocASN")
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.SN, t.GHOST_ROW })
.ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SN, q.ITEM_CODE, q.QTY, q.LOTNO, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ });
+ }
+ if (items.Any())
+ {
+ db.Utilities.PageEach(items, 100, pageList =>
+ {
+ var s = db.Storageable(pageList, "U9C_In_DocASN").WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SN, q.ITEM_CODE, q.QTY, q.LOTNO, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
- }
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.STATUS, q.QTY, q.PROD_DATE, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ });
+ }
+ if (hiss.Any())
+ {
+ db.Insertable(hiss, "U9C_In_DocASN").ExecuteCommand();
+ }
+ if (itemExts.Any())
+ {
+ db.Utilities.PageEach(itemExts, 100, pageList =>
+ {
+ var s = db.Storageable(pageList, "U9C_In_DocASN").WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.META_SN, q.QR_CODE, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ });
+ }
+ if (items.Any())
+ {
+ db.Utilities.PageEach(pkgs, 100, pageList =>
+ {
+ var s = db.Storageable(pageList, "U9C_In_DocASN").WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ });
}
Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]");
action.Message = $"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]";
@@ -282,16 +332,18 @@
{
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, //鐗╂枡缂栫爜
- QTY = item.RtnFillQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+ QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE, //鐢熶骇鍗曞厓鎺堟潈鏍囪瘑瀛楃
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = item.ModifiedOn,
- UPDATE_USER = UserCode
+ UPDATE_TIME = item.ModifiedOn,
+ UPDATE_USER = UserCode,
+ ERP_STATUS_CODE = item.Status.ToString(),
+ ERP_STATUS_NAME = item.StatusName,
};
resultDt.Add(info);
}
@@ -299,48 +351,26 @@
db = Biz.Db;
if (result.Any())
{
- if (result.Count > 100)
+ db.Utilities.PageEach(result, 100, pageList =>
{
- db.Utilities.PageEach(result, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE,q.AUTH_ORG, q.CREATE_USER,q.UPDATE_TIME,q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(result, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns( q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ });
}
if (resultDt.Any())
{
- if (resultDt.Count > 100)
+ db.Utilities.PageEach(resultDt, 100, pageList =>
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER,q.UPDATE_TIME }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(resultDt, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER,q.UPDATE_TIME }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.CREATE_USER, q.CREATE_TIME, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
+ });
}
Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]");
action.Message = $"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]";
@@ -363,13 +393,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, //鍗曞彿
@@ -389,9 +419,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, //鐗╂枡缂栫爜
@@ -408,48 +438,26 @@
db = Biz.Db;
if (result.Any())
{
- if (result.Count > 100)
+ db.Utilities.PageEach(result, 100, pageList =>
{
- db.Utilities.PageEach(result, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(result, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ });
}
if (resultDt.Any())
{
- if (resultDt.Count > 100)
+ db.Utilities.PageEach(resultDt, 100, pageList =>
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(resultDt, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
+ });
}
Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
action.Message = $"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
@@ -509,8 +517,8 @@
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
- UNIT = item.StoreUOM,// UNIT 鍗曚綅 -------寰呯‘璁�
- QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺-----寰呯‘璁�
+ UNIT = item.StoreUOM,// UNIT 鍗曚綅
+ QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
UNIT_COST = item. CostUOM, // 鎴愭湰鍗曚綅
QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
COST_PRICE =item.CostPrice, // 鍗曚环
@@ -534,48 +542,26 @@
db = Biz.Db;
if (result.Any())
{
- if (result.Count > 100)
+ db.Utilities.PageEach(result, 100, pageList =>
{
- db.Utilities.PageEach(result, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME,q.UPDATE_USER,q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(result, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns( q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ });
}
if (resultDt.Any())
{
- if (resultDt.Count > 100)
+ db.Utilities.PageEach(resultDt, 100, pageList =>
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT,q.QTY,q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME ,q.BNF_DEPT_CODE ,q.BNF_DEPT_NAME,q.RETURN_REASON ,q.INSTORE_REASON,q.AUTH_ORG ,q.CREATE_USER,q.UPDATE_TIME,q.UPDATE_USER }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(resultDt, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY,q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ });
}
Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
action.Message = $"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
@@ -612,7 +598,7 @@
TYPE_NAME = x.Max(t => t.MiscShipDocTypeName), //鍗曟嵁绫诲瀷鍚嶇О
ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP鍗曟嵁鐘舵��
ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP鍗曟嵁鐘舵�佸悕绉�
- ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡 ---寰呯‘璁�
+ ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡
/* PREP_PERSON //澶囨枡浜�
FINISH_TIME //澶囨枡瀹屾垚鏃堕棿
REQ_PERSON //棰嗘枡浜�
@@ -637,10 +623,10 @@
{
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 鍗曟嵁鏁伴噺-----寰呯‘璁�
+ UNIT =item.StoreUOM,// UNIT 鍗曚綅
+ QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
UNIT_COST = item.CostUOM, // 鎴愭湰鍗曚綅
QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
COST_PRICE = item.CostPrice, // 鍗曚环
@@ -664,48 +650,26 @@
db = Biz.Db;
if (result.Any())
{
- if (result.Count > 100)
+ db.Utilities.PageEach(result, 100, pageList =>
{
- db.Utilities.PageEach(result, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(result, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ });
}
if (resultDt.Any())
{
- if (resultDt.Count > 100)
+ db.Utilities.PageEach(resultDt, 100, pageList =>
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
- {
- var y = db.Storageable(pageList, UserCode)
- .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(resultDt, UserCode)
+ var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ });
}
Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
action.Message = $"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
--
Gitblit v1.9.3