From b57fb8b61bd053601035694470ac4e79fbf99bf8 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 12 四月 2025 17:52:56 +0800
Subject: [PATCH] 雅达-优化收货单处理逻辑及参数结构
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 361 +++++++++++++++++++++++----------------------------
1 files changed, 161 insertions(+), 200 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index a61beaa..c13c311 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -9,11 +9,10 @@
using Tiger.IBusiness;
using SqlSugar;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
-using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.WMS
{
- public partial class U9C_WMS: IU9C_WMS
+ public partial class U9C_WMS : IU9C_WMS
{
/// <summary>
/// 鍚屾鐗╂枡鏉＄爜淇℃伅
@@ -37,7 +36,7 @@
item.Segment5 = barcode.ItemCode;
item.PROD_DATE = barcode.DateCode.ToDateTime();
item.Unit = barcode.Unit;
- item.LotNo= barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
+ item.LotNo = barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
}
//淇濆瓨鍒版暟鎹簱
@@ -79,7 +78,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public ApiAction In_DocASN(U9C_Base_Input input)
+ public ApiAction In_DocASN(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"閫佽揣鍗旳sn淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -96,7 +95,7 @@
List<WMS_ITEM_EXT> itemExts = new();
List<WMS_ITEM_PKG> pkgs = new();
- if (list != null && list.Count > 0)
+ if (list != null && list.Count > 0)
{
asns = list
.GroupBy(x => new { x.DocNo })
@@ -112,7 +111,7 @@
PLANARRIVED_DATE = x.Max(t => t.PlanArriveDate),
ORDER_DATE = x.Max(t => t.ModifiedOn),
CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- CREATE_USER= UserCode,
+ CREATE_USER = UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
})
@@ -145,7 +144,7 @@
foreach (var asn in asns)
{
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);
@@ -178,7 +177,7 @@
AUTH_ORG = asn.AUTH_ORG,
STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
QTY = sn.WhQty,
- PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ??DateTime.Now,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ?? DateTime.Now,
UNIT = barcode.Unit,
TRANS_CODE = nameof(BIZ_U9_ASN),
TRANS_NO = info.ORDER_NO,
@@ -227,7 +226,7 @@
.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();
+ 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.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
});
}
if (dtls.Any())
@@ -238,7 +237,7 @@
.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.PO_QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).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.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
if (sns.Any())
@@ -249,7 +248,7 @@
.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();
+ 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.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
if (items.Any())
@@ -301,13 +300,13 @@
Logger.Scheduler.Info($"{input.triggerDetail}");
DbClient db = Biz.DataSource["YadaU9C"].Client;
string UserCode = "U9C_In_GetReceipt";
- var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 0&& x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
+ var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 0 && x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_RECEIPT> result = new();
- List<BIZ_U9_RECEIPT_DTL> resultDt = new();
+ List<BIZ_U9_RECEIPT> header = new();
+ List<BIZ_U9_RECEIPT_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list
+ header = list
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_U9_RECEIPT
{
@@ -323,7 +322,7 @@
UPDATE_USER = UserCode,
})
.ToList();
- Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{result.Count}]");
+ Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{header.Count}]");
foreach (var item in list)
{
BIZ_U9_RECEIPT_DTL info = new()
@@ -341,35 +340,35 @@
ERP_STATUS_CODE = item.Status.ToString(),
ERP_STATUS_NAME = item.StatusName,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"鏀惰揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"鏀惰揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 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();
+ 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.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 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.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.CREATE_USER, q.CREATE_TIME, q.UPDATE_USER, q.UPDATE_TIME }).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.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]");
- action.Message = $"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{detail.Count}]");
+ action.Message = $"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -389,13 +388,11 @@
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_RMA> result = new();
- List<BIZ_U9_RMA_DTL> resultDt = new();
+ List<BIZ_U9_RMA> header = new();
+ List<BIZ_U9_RMA_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_U9_RMA
+ header = list.GroupBy(x => new { x.DocNo }).Select(x => new BIZ_U9_RMA
{
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
ORDER_NO = x.Key.DocNo, //鍗曞彿
@@ -407,9 +404,8 @@
CREATE_USER = UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
- })
- .ToList();
- Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ }).ToList();
+ Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in list)
{
BIZ_U9_RMA_DTL info = new()
@@ -425,35 +421,35 @@
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"閫�璐у崟鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"閫�璐у崟鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 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 }).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.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 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();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -474,18 +470,18 @@
var list = db.Queryable<mes_MiscRcvTrans>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var listLine = db.Queryable<mes_MiscRcvTransLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_MISC_IN> result = new();
- List<BIZ_U9_MISC_IN_DTL> resultDt = new();
+ List<BIZ_U9_MISC_IN> header = new();
+ List<BIZ_U9_MISC_IN_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list.Select(x => new BIZ_U9_MISC_IN
+ header = list.Select(x => new BIZ_U9_MISC_IN
{
ID = x.MiscRcvTransID.ToString(),
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
ORDER_NO = x.DocNo, //鍗曟嵁鍙�
STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
- TYPE_CODE =x.MiscRcvDocType, //鍗曟嵁绫诲瀷缂栫爜
- TYPE_NAME= x.MiscRcvDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
+ TYPE_CODE = x.MiscRcvDocType, //鍗曟嵁绫诲瀷缂栫爜
+ TYPE_NAME = x.MiscRcvDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
ERP_STATUS_CODE = x.Status.ToString(), // ERP鍗曟嵁鐘舵��
ERP_STATUS_NAME = x.StatusName, // ERP鍗曟嵁鐘舵�佸悕绉�
ORDER_DATE = x.BusinessDate, //鍗曟嵁鏃ユ湡
@@ -494,10 +490,10 @@
UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
}).ToList();
- Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in listLine)
{
- var order = result.Where(x => x.ID == item.MiscRcvTransID.ToString()).First();
+ var order = header.Where(x => x.ID == item.MiscRcvTransID.ToString()).First();
BIZ_U9_MISC_IN_DTL info = new()
{
ID = item.MiscRcvTransLineID.ToString(),
@@ -508,9 +504,9 @@
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
UNIT = item.StoreUOM,// UNIT 鍗曚綅
QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
- UNIT_COST = item. CostUOM, // 鎴愭湰鍗曚綅
+ UNIT_COST = item.CostUOM, // 鎴愭湰鍗曚綅
QTY_COST = item.CostUOMQty, // 鎴愭湰鏁伴噺
- COST_PRICE =item.CostPrice, // 鍗曚环
+ COST_PRICE = item.CostPrice, // 鍗曚环
COST_MNY = item.CostMny, // 鎴愭湰
WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
@@ -524,13 +520,13 @@
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"鏉傛敹鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
@@ -540,9 +536,9 @@
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
@@ -551,8 +547,8 @@
y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -572,11 +568,11 @@
var list = db.Queryable<mes_MiscShip>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var listLine = db.Queryable<mes_MiscShipLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_MISC_OUT> result = new();
- List<BIZ_U9_MISC_OUT_DTL> resultDt = new();
+ List<BIZ_U9_MISC_OUT> header = new();
+ List<BIZ_U9_MISC_OUT_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list.Select(x => new BIZ_U9_MISC_OUT
+ header = list.Select(x => new BIZ_U9_MISC_OUT
{
ID = x.MiscShipID.ToString(),
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
@@ -592,10 +588,10 @@
UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
}).ToList();
- Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in listLine)
{
- var order = result.Where(x => x.ID == item.MiscShipID.ToString()).First();
+ var order = header.Where(x => x.ID == item.MiscShipID.ToString()).First();
BIZ_U9_MISC_OUT_DTL info = new()
{
ID = item.MiscShipLineID.ToString(),
@@ -621,13 +617,13 @@
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"鏉傚彂鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
@@ -637,9 +633,9 @@
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
@@ -648,8 +644,8 @@
y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.OUTSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -668,51 +664,38 @@
string UserCode = "U9C_In_GetScmOut";
var list = db.Queryable<mes_SCMPickList>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_SCM_OUT> result = new();
- List<BIZ_U9_SCM_OUT_DTL> resultDt = new();
+ List<BIZ_U9_SCM_OUT> header = new();
+ List<BIZ_U9_SCM_OUT_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.PoDocNo })
- .Select(x => new BIZ_U9_SCM_OUT
+ header = list.GroupBy(x => new { x.PoId, x.PoDocNo }).Select(x => new BIZ_U9_SCM_OUT
{
+ ID = x.Key.PoId.ToString(), //閲囪喘鍗旾D
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
ORDER_NO = x.Key.PoDocNo, //鍗曟嵁鍙�--U9鐨勯噰璐鍗曞彿
STATUS = BIZ_U9_SCM_OUT.STATUSs.Init.GetValue(), //鐘舵��
- ORDER_DATE = x.Max(t => t.CreatedOn), //鍗曟嵁鏃ユ湡 ---鍒涘缓鏃ユ湡
- SUPP_ORG = x.Max(t=>t.WhCode),//渚涘簲鍟嗙粍缁� ---渚涘簲鍟嗗湴鐐圭紪鐮�
- PO_ID = x.Max(t => t.PoId).ToString(), //閲囪喘鍗旾D
- PO_NO = x.Key.PoDocNo, //閲囪喘鍗曞彿
- // PREP_PERSON 澶囨枡浜�
- // FINISH_TIME 澶囨枡瀹屾垚鏃堕棿
- //REQ_PERSON 棰嗘枡浜�
- ///REQ_DEPT 棰嗘枡閮ㄩ棬
- //DLVY_TIME 鍑哄簱鏃堕棿
- //REMARK 澶囨敞
- HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
- HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
- // COMMIT_JSON 杩囪处鎻愪氦鐨凧SON
- //COMMIT_MSG 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
+ ORDER_DATE = x.Max(t => t.CreatedOn), //鍗曟嵁鏃ユ湡 ---鍒涘缓鏃ユ湡
+ SUPP_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.SupplyOrg).ToString())?.ORG_CODE,
CREATE_USER = UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
- })
- .ToList();
- Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ }).ToList();
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in list)
{
var org = db.Queryable<mes_SCMPickList>().Where(x => x.SupplyOrg == list.First().SupplyOrg).First();
BIZ_U9_SCM_OUT_DTL info = new()
{
+ ID = item.SCMPickListID.ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.SupplyOrg.ToString())?.ORG_CODE, //缁勭粐
ORDER_NO = item.PoDocNo, //鍗曟嵁鍙�--U9鐨勯噰璐鍗曞彿
LINE_NO = item.PickLineNo.ToString(), //鍗曟嵁琛屽彿
STATUS = BIZ_U9_SCM_OUT.STATUSs.Init.GetValue(), //鐘舵��
- //ITEM_ID 鐗╂枡ID
+ ITEM_ID = item.ItemMaster.ToString(), //鐗╂枡ID
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
UNIT = item.IssueUOM,// UNIT 鍗曚綅
QTY = item.ActualReqQty,//QTY 鍗曟嵁鏁伴噺 ---瀹為檯闇�姹傛暟閲�
- //QTY_PREP = , //宸插鏂欐暟閲�
QTY_DLVY = item.IssuedQty,//宸插彂鏂欐暟閲�
QTY_NOTDLVY = item.IssueNotDeliverQty,// 棰嗘枡鏈彂鏁伴噺
DLVY_TYPE = item.IssueStyle.ToString(), // 鍙戞枡鏂瑰紡(ERP)
@@ -723,42 +706,40 @@
LOCATION_ID = item.BinId.ToString(),// 鍌ㄤ綅缂栫爜(ERP)
LOCATION_CODE = item.BinCode, // 鍌ㄤ綅缂栫爜(ERP)
LOCATION_NAME = item.BinName,// 鍌ㄤ綅鍚嶇О(ERP)
- //REMARK 澶囨敞
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.SupplyOrg.ToString())?.ORG_CODE, //缁勭粐
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 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.ORDER_DATE,q.SUPP_ORG,q.PO_ID, q.PO_NO ,q.HANDLED ,q.HANDLED_DATE ,q.AUTH_ORG ,q.CREATE_USER ,q.UPDATE_TIME ,q.UPDATE_USER ,}).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_DATE, q.SUPP_ORG, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 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.QTY_DLVY, q.QTY_NOTDLVY, q.DLVY_TYPE, q.DLVY_NAME, q.WH_ID,q.WH_CODE, q.WH_NAME, q.LOCATION_ID, q.LOCATION_CODE, q.LOCATION_NAME, q.AUTH_ORG, q.CREATE_TIME, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.QTY_DLVY, q.QTY_NOTDLVY, q.DLVY_TYPE, q.DLVY_NAME, q.WH_ID, q.WH_CODE, q.WH_NAME, q.LOCATION_ID, q.LOCATION_CODE, q.LOCATION_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -778,92 +759,80 @@
var list = db.Queryable<mes_TransferIn>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var listLine = db.Queryable<mes_TransInLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_WMS_TRANSFER> result = new();
- List<BIZ_WMS_TRANSFER_DTL> resultDt = new();
+ List<BIZ_WMS_TRANSFER> header = new();
+ List<BIZ_WMS_TRANSFER_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_WMS_TRANSFER
+ header = list.Select(x => new BIZ_WMS_TRANSFER
{
- ORDER_NO = x.Key.DocNo, //璋冩嫧鍗曞彿
- ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡
- STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(), //鐘舵��
- //OUT_WH_CODE 璋冨嚭浠撳簱
- //IN_WH_CODE 鎷ㄥ叆浠撳簱
- SOURCE_CODE = x.Max(t => t.TransferInDocType), //鏉ユ簮鍗曟嵁缂栫爜
- SOURCE_ORDER = x.Max(t => t.TransferInDocTypeName), //鍗曟嵁绫诲瀷鍚嶇О
- //ERP_ORDER ERP鍗曟嵁鍙风爜
- //REMARK 澶囨敞
- HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
- HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
- //COMMIT_JSON 杩囪处鎻愪氦鐨凧SON
- //COMMIT_MSG 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
- CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ ID = x.TransferInId.ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
+ ORDER_NO = x.DocNo, //璋冩嫧鍗曞彿
+ ORDER_DATE = x.BusinessDate, //鍗曟嵁鏃ユ湡
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Imported.GetValue(), //鐘舵��
+ TYPE_CODE = x.TransferInDocType, //鍗曟嵁绫诲瀷缂栫爜
+ TYPE_NAME = x.TransferInDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
+ ERP_STATUS_CODE = x.Status.ToString(), // ERP鍗曟嵁鐘舵��
+ ERP_STATUS_NAME = x.StatusName, // ERP鍗曟嵁鐘舵�佸悕绉�
+ CREATE_TIME = x.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
- })
- .ToList();
- Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ }).ToList();
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in listLine)
{
- var org = db.Queryable<mes_TransferIn>().Where(x => x.TransferInId == listLine.First().TransferInId).First();
+ var order = header.Where(x => x.ID == item.TransferInId.ToString()).First();
BIZ_WMS_TRANSFER_DTL info = new()
{
- ORDER_NO = item.TransferInId.ToString(), //璋冩嫧鍗曞彿 ---鍗曞ごid
+ ID = item.TransferInLineId.ToString(),
+ AUTH_ORG = order.AUTH_ORG, //缁勭粐
+ ORDER_NO = order.ORDER_NO, //璋冩嫧鍗曞彿 ---鍗曞ごid
ORDER_LINE = item.DocLineNo.ToString(), //璋冩嫧鍗曡鍙�
STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鍗曟嵁琛岀姸鎬�
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜 -- 鏂欏彿
UNIT = item.StoreUOM,// UNIT 鍗曚綅 ---璋冨嚭鍗曚綅
- QTY_REQ = item.CostUOMQty,// 闇�姹傛暟閲� --- 鎴愭湰鏁伴噺
- QTY_OUT = item.StoreUOMQty, // 璋冨嚭鏁伴噺
- // QTY_IN = item.CostUOMQty, // 鎷ㄥ叆鏁伴噺
+ QTY_REQ = item.StoreUOMQty,// 闇�姹傛暟閲� --- 鎴愭湰鏁伴噺
OUT_WH_CODE = item.TransOutWhCode, // 璋冨嚭浠撳簱
IN_WH_CODE = item.TransInWhCode, // 鎷ㄥ叆浠撳簱
+ OUT_LOCATION_CODE = item.TransOutBin, // 璋冨嚭鍌ㄤ綅
+ IN_LOCATION_CODE = item.TransInBin, // 鎷ㄥ叆鍌ㄤ綅
OUT_LOTNO = item.LotCode,// 璋冨嚭鎵规 -- 鎵规
IN_LOTNO = item.LotCode, // 鎷ㄥ叆鎵规 -- 鎵规
- //SOURCE_CODE = item.BenefitDept,// 鏉ユ簮鍗曟嵁缂栫爜
- SOURCE_ORDER = item.TransferInId.ToString(), // 鏉ユ簮鍗曡鍙�-- 鍗曞ごID
- SOURCE_LINE = item.DocLineNo.ToString(),// 鏉ユ簮鍗曡鍙� ---琛屽彿
- // ERP_ORDER = item.InStorageReason, // ERP鍗曟嵁鍙风爜
- //REMARK 澶囨敞
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //缁勭粐
CREATE_TIME = item.CreatedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = item.CreatedBy,
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"璋冩嫧鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 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.ORDER_NO, q.ORDER_DATE, q.STATUS,q.SOURCE_CODE,q.SOURCE_ORDER,q.HANDLED,q.HANDLED_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER,}).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_DATE, q.STATUS, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.ORDER_LINE, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY_REQ,q.QTY_OUT,q.OUT_WH_CODE,q.IN_WH_CODE,q.OUT_LOTNO,q.IN_LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY_REQ, q.OUT_WH_CODE, q.IN_WH_CODE, q.OUT_LOCATION_CODE, q.IN_LOCATION_CODE, q.OUT_LOTNO, q.IN_LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
@@ -880,95 +849,87 @@
Logger.Scheduler.Info($"{input.triggerDetail}");
DbClient db = Biz.DataSource["YadaU9C"].Client;
string UserCode = "U9C_In_GetTransfer";
- var list = db.Queryable<mes_TransferForm>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
+ var list = db.Queryable<mes_TransferForm>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var listLine = db.Queryable<mes_TransferFormLine>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_ITEM_CVT> result = new();
- List<BIZ_ITEM_CVT_DTL> resultDt = new();
+ List<BIZ_ITEM_CVT> header = new();
+ List<BIZ_ITEM_CVT_DTL> detail = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_ITEM_CVT
+ header = list.Select(x => new BIZ_ITEM_CVT
{
- ORDER_NO = x.Key.DocNo, //杞彉鍗曞彿
- ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡 --涓氬姟鏃ユ湡
- STATUS = BIZ_U9_MISC_IN.STATUSs.Init.GetValue(), //鐘舵��
- ERP_TYPE_CODE = x.Max(t => t.TransferFormDocType), //ERP绫诲瀷
- ERP_TYPE_NAME = x.Max(t => t.TransferFormDocTypeName), //ERP鍚嶇О
- ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP鍗曟嵁鐘舵��
- ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP鍗曟嵁鐘舵�佸悕绉�
- //REMARK 澶囨敞
- HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
- HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
- //COMMIT_JSON 杩囪处鎻愪氦鐨凧SON
- //COMMIT_MSG 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
- CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ ID = x.TransferFormId.ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
+ ORDER_NO = x.DocNo, //璋冩嫧鍗曞彿
+ ORDER_DATE = x.BusinessDate, //鍗曟嵁鏃ユ湡
+ STATUS = BIZ_ITEM_CVT.STATUSs.Init.GetValue(), //鐘舵��
+ ERP_TYPE_CODE = x.TransferFormDocType, //鍗曟嵁绫诲瀷缂栫爜
+ ERP_TYPE_NAME = x.TransferFormDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
+ ERP_STATUS_CODE = x.Status.ToString(), // ERP鍗曟嵁鐘舵��
+ ERP_STATUS_NAME = x.StatusName, // ERP鍗曟嵁鐘舵�佸悕绉�
+ CREATE_TIME = x.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
- })
- .ToList();
- Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ }).ToList();
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{header.Count}]");
foreach (var item in listLine)
{
- var org = db.Queryable<mes_TransferForm>().Where(x => x.TransferFormId == listLine.First().TransferFormId).First();
+ var order = header.Where(x => x.ID == item.TransferFormId.ToString()).First();
BIZ_ITEM_CVT_DTL info = new()
{
- ORDER_NO = item.TransferFormId.ToString(), //杞彉鍗曞彿 ---褰㈡�佽浆鎹㈠崟澶磇d
+ ID = item.TransferFormLineId.ToString(),
+ AUTH_ORG = order.AUTH_ORG, //缁勭粐
+ ORDER_NO = order.ORDER_NO, //杞彉鍗曞彿 ---褰㈡�佽浆鎹㈠崟澶磇d
ORDER_LINE = item.DocLineNo.ToString(), //杞彉鍗曡鍙�
STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
- ITEM_CODE_BF= item.ItemCode, //鍘熺墿鏂欑紪鐮�
+ ITEM_CODE_BF = item.ItemCode, //鍘熺墿鏂欑紪鐮�
ITEM_NAME_BF = item.ItemName,//鍘熺墿鏂欏悕绉�
- // ITEM_CODE_AF,//杞彉鍚庣墿鏂欑紪鐮�
- //ITEM_NAME_AF,//杞彉鍚庣墿鏂欏悕绉�
QTY = item.StoreUOMQty,// 杞彉鏁伴噺
- ERP_TYPE_CODE =item.TransferFormType.ToString(), //ERP杞彉绫诲瀷
+ ERP_TYPE_CODE = item.TransferFormType.ToString(), //ERP杞彉绫诲瀷
ERP_TYPE_NAME = item.TransferFormTypeName,//ERP杞彉鍚嶇О
- //STORE_UNIT,//搴撳瓨鍗曚綅
- //STORE_UNIT_QTY,//搴撳瓨鍗曚綅鏁伴噺
+ STORE_UNIT = item.StoreUOM,//搴撳瓨鍗曚綅
+ STORE_UNIT_QTY = item.StoreUOMQty,//搴撳瓨鍗曚綅鏁伴噺
COST_UNIT = item.CostUOM,//鎴愭湰鍗曚綅
COST_UNIT_QTY = item.CostUOMQty,//鎴愭湰鏁伴噺
WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
- //LOCATION_CODE = item.WhCode,//鍌ㄤ綅缂栫爜
+ LOCATION_CODE = item.BinCode,//鍌ㄤ綅缂栫爜
LOTNO = item.LotInfo_LotCode,//鎵规鍙�
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //缁勭粐
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
- resultDt.Add(info);
+ detail.Add(info);
}
- Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{detail.Count}]");
db = Biz.Db;
- if (result.Any())
+ if (header.Any())
{
- db.Utilities.PageEach(result, 100, pageList =>
+ db.Utilities.PageEach(header, 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.ORDER_NO, q.ORDER_DATE,q.STATUS, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME,q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.HANDLED, q.HANDLED_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_DATE, q.STATUS, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
- if (resultDt.Any())
+ if (detail.Any())
{
- db.Utilities.PageEach(resultDt, 100, pageList =>
+ db.Utilities.PageEach(detail, 100, pageList =>
{
var y = db.Storageable(pageList, UserCode)
.WhereColumns(t => new { t.ORDER_NO, t.ORDER_LINE, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE_BF, q.ITEM_NAME_BF, q.QTY,q.ERP_TYPE_CODE,q.ERP_TYPE_NAME, q.COST_UNIT, q.COST_UNIT_QTY, q.WH_CODE, q.WH_NAME, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ITEM_CODE_BF, q.ITEM_NAME_BF, q.QTY, q.ERP_TYPE_CODE, q.ERP_TYPE_NAME, q.STORE_UNIT, q.STORE_UNIT_QTY, q.COST_UNIT, q.COST_UNIT_QTY, q.WH_CODE, q.WH_NAME,q.LOCATION_CODE, q.LOTNO, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
- Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
- action.Message = $"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]");
+ action.Message = $"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{detail.Count}]";
}
return action;
}
--
Gitblit v1.9.3