From 223ad76695223d90104da82e7bc6e9e984563e47 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 07 四月 2025 16:45:36 +0800
Subject: [PATCH] 调拨单对应字段修改
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 852 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 695 insertions(+), 157 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 346b9f2..ba66a6d 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -7,13 +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 Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.WMS
{
@@ -41,7 +37,7 @@
item.Segment5 = barcode.ItemCode;
item.PROD_DATE = barcode.DateCode.ToDateTime();
item.Unit = barcode.Unit;
- item.LotNo= barcode.LotNo;
+ item.LotNo= barcode.LotNo.IsNullOrEmpty() ? item.Segment7 : barcode.LotNo;
}
//淇濆瓨鍒版暟鎹簱
@@ -93,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)
{
@@ -120,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}]";
@@ -239,7 +290,7 @@
}
/// <summary>
- /// 鍚屾鏀惰揣鍗旳sn淇℃伅
+ /// 鍚屾鏀惰揣鍗曚俊鎭�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -281,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);
}
@@ -298,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}]";
@@ -349,7 +380,7 @@
/// <summary>
- /// 鍚屾閫�璐у崟Asn淇℃伅
+ /// 鍚屾閫�璐у崟淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -362,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, //鍗曞彿
@@ -388,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, //鐗╂枡缂栫爜
@@ -407,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}]";
@@ -457,5 +466,534 @@
}
+ /// <summary>
+ /// 鍚屾鑾峰彇鏉傛敹鍗曟嵁淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetMiscRcvTrans(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ string UserCode = "U9C_In_GetMiscRcvTrans";
+ 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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .Select(x => new BIZ_U9_MISC_IN
+ {
+ ORDER_NO = x.Key.DocNo, //鍗曟嵁鍙�
+ STATUS = BIZ_U9_MISC_IN.STATUSs.Init.GetValue(), //鐘舵��
+ TYPE_CODE =x.Max(t =>t.MiscRcvDocType), //鍗曟嵁绫诲瀷缂栫爜
+ TYPE_NAME= x.Max(t => t.MiscRcvDocTypeName), //鍗曟嵁绫诲瀷鍚嶇О
+ 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.ModifiedOn), //鍗曟嵁鏃ユ湡
+ CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
+ // RECEIVER 鏀惰揣浜�
+ //RECEIVE_DATE 鏀惰揣鏃ユ湡
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
+ HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
+ })
+ .ToList();
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ foreach (var item in listLine)
+ {
+ var org = db.Queryable<mes_MiscRcvTrans>().Where(x => x.MiscRcvTransID == listLine.First().MiscRcvTransID).First();
+ BIZ_U9_MISC_IN_DTL info = new()
+ {
+ ORDER_NO = item.DocNo, //鍗曟嵁鍙�
+ 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_COST = item. CostUOM, // 鎴愭湰鍗曚綅
+ QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
+ COST_PRICE =item.CostPrice, // 鍗曚环
+ COST_MNY = item.CostMny, // 鎴愭湰
+ WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
+ WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
+ BNF_DEPT_CODE = item.BenefitDept,// 鍙楃泭閮ㄩ棬缂栫爜
+ BNF_DEPT_NAME = item.BenefitDeptName, // 鏀剁泭閮ㄩ棬鍚嶇О
+ // ERP_CODE ERP缂栫爜
+ RETURN_REASON = item.ReturnStorageReason,// 閫�鏂欏師鍥�
+ INSTORE_REASON = item.InStorageReason, // INSTORE_REASON 鍏ュ簱鍘熷洜
+ 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);
+ }
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ 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();
+ });
+ }
+
+ if (resultDt.Any())
+ {
+ 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();
+ });
+ }
+ Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾鑾峰彇鏉傚彂鍗曟嵁淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetMiscShip(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ string UserCode = "U9C_In_GetMiscShip";
+ 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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .Select(x => new BIZ_U9_MISC_OUT
+ {
+ ORDER_NO = x.Key.DocNo, //鍗曟嵁鍙�
+ STATUS = BIZ_U9_MISC_OUT.STATUSs.Init.GetValue(), //鐘舵��
+ TYPE_CODE = x.Max(t => t.MiscShipDocType), //鍗曟嵁绫诲瀷缂栫爜
+ 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), //鍗曟嵁鏃ユ湡
+ /* PREP_PERSON //澶囨枡浜�
+ FINISH_TIME //澶囨枡瀹屾垚鏃堕棿
+ REQ_PERSON //棰嗘枡浜�
+ REQ_DEPT //棰嗘枡閮ㄩ棬
+ DLVY_TIME //鍑哄簱鏃堕棿*/
+ CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
+ HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
+ // COMMIT_JSON 杩囪处鎻愪氦鐨凧SON
+ //COMMIT_MSG 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
+ })
+ .ToList();
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ foreach (var item in listLine)
+ {
+ var org = db.Queryable<mes_MiscShip>().Where(x => x.MiscShipID == listLine.First().MiscShipID).First();
+ BIZ_U9_MISC_OUT_DTL info = new()
+ {
+ ORDER_NO = item.DocNo, //鍗曟嵁鍙�
+ LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
+ ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
+ UNIT =item.StoreUOM,// UNIT 鍗曚綅
+ QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
+ UNIT_COST = item.CostUOM, // 鎴愭湰鍗曚綅
+ QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
+ COST_PRICE = item.CostPrice, // 鍗曚环
+ COST_MNY = item.CostMny, // 鎴愭湰
+ WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
+ WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
+ BNF_DEPT_CODE = item.BenefitDept,// 鍙楃泭閮ㄩ棬缂栫爜
+ BNF_DEPT_NAME = item.BenefitDeptName, // 鏀剁泭閮ㄩ棬鍚嶇О
+ // ERP_CODE ERP缂栫爜
+ OUTSTORE_REASON = item.OutStorageReason, // OUTSTORE_REASON 鍑哄簱鍘熷洜
+
+ 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);
+ }
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ 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();
+ });
+ }
+
+ if (resultDt.Any())
+ {
+ 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();
+ });
+ }
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾鑾峰彇濮斿鍙戞枡鍗�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetScmOut(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ 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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.PoDocNo })
+ .Select(x => new BIZ_U9_SCM_OUT
+ {
+ 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 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
+ 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}]");
+ 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()
+ {
+ ORDER_NO = item.PoDocNo, //鍗曟嵁鍙�--U9鐨勯噰璐鍗曞彿
+ LINE_NO = item.PickLineNo.ToString(), //鍗曟嵁琛屽彿
+ STATUS = BIZ_U9_SCM_OUT.STATUSs.Init.GetValue(), //鐘舵��
+ //ITEM_ID 鐗╂枡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)
+ DLVY_NAME = item.IssueStyleName,// 鍙戞枡鏂瑰紡鍚嶇О(ERP)
+ WH_ID = item.WhId.ToString(), // 浠撳簱缂栫爜(ERP)
+ WH_CODE = item.WhCode.ToString(), // 浠撳簱缂栫爜(ERP)
+ WH_NAME = item.WhName,// 浠撳簱鍚嶇О(ERP)
+ 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);
+ }
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ 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.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();
+ });
+ }
+
+ if (resultDt.Any())
+ {
+ 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.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();
+ });
+ }
+ Logger.Scheduler.Info($"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"濮斿鍙戞枡鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾鑾峰彇璋冩嫧鍗曟嵁淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetTransfer(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ string UserCode = "U9C_In_GetTransfer";
+ 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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .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, //缁勭粐
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ })
+ .ToList();
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ foreach (var item in listLine)
+ {
+ var org = db.Queryable<mes_TransferIn>().Where(x => x.TransferInId == listLine.First().TransferInId).First();
+ BIZ_WMS_TRANSFER_DTL info = new()
+ {
+ ORDER_NO = item.TransferInId.ToString(), //璋冩嫧鍗曞彿 ---鍗曞ご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, // 鎷ㄥ叆鏁伴噺
+ OUT_WH_CODE = item.TransOutWhCode, // 璋冨嚭浠撳簱
+ IN_WH_CODE = item.TransInWhCode, // 鎷ㄥ叆浠撳簱
+ 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);
+ }
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ 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.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();
+ });
+ }
+
+ if (resultDt.Any())
+ {
+ db.Utilities.PageEach(resultDt, 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();
+ });
+ }
+ Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾鑾峰彇鐗╁搧杞崲鍗曟嵁淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetTransferForm(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ 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 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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .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, //缁勭粐
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ })
+ .ToList();
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ foreach (var item in listLine)
+ {
+ var org = db.Queryable<mes_TransferForm>().Where(x => x.TransferFormId == listLine.First().TransferFormId).First();
+ BIZ_ITEM_CVT_DTL info = new()
+ {
+ ORDER_NO = item.TransferFormId.ToString(), //杞彉鍗曞彿 ---褰㈡�佽浆鎹㈠崟澶磇d
+ ORDER_LINE = item.DocLineNo.ToString(), //杞彉鍗曡鍙�
+ STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
+ 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_NAME = item.TransferFormTypeName,//ERP杞彉鍚嶇О
+ //STORE_UNIT,//搴撳瓨鍗曚綅
+ //STORE_UNIT_QTY,//搴撳瓨鍗曚綅鏁伴噺
+ COST_UNIT = item.CostUOM,//鎴愭湰鍗曚綅
+ COST_UNIT_QTY = item.CostUOMQty,//鎴愭湰鏁伴噺
+ WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
+ WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
+ //LOCATION_CODE = item.WhCode,//鍌ㄤ綅缂栫爜
+ 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);
+ }
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ 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.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();
+ });
+ }
+
+ if (resultDt.Any())
+ {
+ db.Utilities.PageEach(resultDt, 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();
+ });
+ }
+ Logger.Scheduler.Info($"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"鐗╁搧杞崲鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
}
}
--
Gitblit v1.9.3