From d117611cf53edf6ba8025f2d65a0c52fb3ec7296 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 三月 2025 11:44:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 533 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 498 insertions(+), 35 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index a5c321c..b646743 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -7,12 +7,8 @@
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;
namespace Tiger.Business.WMS
{
@@ -40,7 +36,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;
}
//淇濆瓨鍒版暟鎹簱
@@ -90,7 +86,6 @@
DbClient db = Biz.DataSource["YadaU9C"].Client;
string UserCode = "U9C_In_DocASN";
var list = db.Queryable<mes_AsnDocInfo>().Where(x => x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
- //var list = db.Ado.SqlQuery<mes_AsnDocInfo>($"select * from mes_AsnDocInfo where ModifiedOn > '{input.startTime}' And ModifiedOn < '{input.endTime}'");
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BIZ_U9_ASN> asns = new();
List<BIZ_U9_ASN_DTL> items = new();
@@ -111,11 +106,11 @@
PLANARRIVED_DATE = x.Max(t => t.PlanArriveDate),
ORDER_DATE = x.Max(t => t.ModifiedOn),
CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- CREATE_USER = "U9C_In_DocASN",
+ CREATE_USER= UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
- UPDATE_USER = "U9C_In_DocASN",
+ UPDATE_USER = UserCode,
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
- HANDLED=0,
+ HANDLED=-1, //鏈鐞�
HANDLED_DATE=DateTime.Now,
})
.ToList();
@@ -135,40 +130,43 @@
LOTNO = item.LotMater,
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE,
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
- CREATE_USER = "U9C_In_DocASN",
+ CREATE_USER = UserCode,
UPDATE_TIME = item.ModifiedOn,
- UPDATE_USER = "U9C_In_DocASN",
- };
+ UPDATE_USER = UserCode };
items.Add(info);
}
Logger.Scheduler.Info($"閫佽揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
foreach (var asn in asns)
{
- var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO ).ToList();
+ var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
foreach (var item in snlist)
{
+ var barcode = new Barcode(item.Code);
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 = "U9C_In_DocASN",
+ CREATE_USER = UserCode,
UPDATE_TIME = DateTime.Now,
- UPDATE_USER = "U9C_In_DocASN",
+ UPDATE_USER = UserCode,
+ STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
+ ORDER_NO = barcode.OrderNo,
+ LINE_NO = barcode.OrderLine,
+ SN = barcode.SN,
+ META_SN = item.Code,
+ ITEM_CODE = barcode.ItemCode,
+ QTY = item.WhQty,
+ LOTNO = barcode.LotNo,
+ CARTON_NO = barcode.SN,
};
sns.Add(info);
}
+
Logger.Scheduler.Info($"閫佽揣鍗昜{asn.ORDER_NO}]鏉＄爜鏄庣粏淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{snlist.Count}]");
}
+
+
db = Biz.Db;
- //var dbTran = db.UseTran(() =>
- //{
if (asns.Any())
{
if (asns.Count > 100)
@@ -179,7 +177,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.CREATE_USER, q.UPDATE_TIME,q.AUTH_ORG ,q.UPDATE_USER , }).ExecuteCommand();
});
}
else
@@ -188,7 +186,7 @@
.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();
+ 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();
}
}
if (items.Any())
@@ -201,7 +199,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.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.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG,q.CREATE_USER, q.UPDATE_TIME ,q.UPDATE_USER, }).ExecuteCommand();
});
}
else
@@ -210,7 +208,7 @@
.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();
+ 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();
}
}
if (sns.Any())
@@ -235,19 +233,484 @@
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();
}
}
-
- //});
- //if (!dbTran.IsSuccess)
- //{
- // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- // Logger.Scheduler.Error(action.Message);
- //}
Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]");
action.Message = $"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]";
}
return action;
}
+ /// <summary>
+ /// 鍚屾鏀惰揣鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetReceipt(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_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 orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
+ List<BIZ_U9_RECEIPT> result = new();
+ List<BIZ_U9_RECEIPT_DTL> resultDt = new();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .Select(x => new BIZ_U9_RECEIPT
+ {
+ STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(),
+ ORDER_NO = x.Key.DocNo,
+ SUPP_CODE = x.Max(t => t.SupplierCode),
+ SUPP_NAME = x.Max(t => t.SupplierName),
+ ORDER_DATE = x.Max(t => t.ModifiedOn),
+ //RECEIVER 鏀惰揣浜�
+ //RECEIVE_DATE 鏀惰揣鏃ユ湡
+ CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
+ HANDLED = -1,
+ HANDLED_DATE = DateTime.Now,
+ })
+ .ToList();
+ Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{result.Count}]");
+ foreach (var item in list)
+ {
+ BIZ_U9_RECEIPT_DTL info = new()
+ {
+ STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ ORDER_NO = item.DocNo, //鍗曟嵁鍙�
+ LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
+ ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
+ QTY = item.RtnFillQtyTU.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
+ };
+ resultDt.Add(info);
+ }
+ Logger.Scheduler.Info($"鏀惰揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ if (result.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+ if (resultDt.Any())
+ {
+ if (resultDt.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+ Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]");
+ action.Message = $"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+
+ /// <summary>
+ /// 鍚屾閫�璐у崟淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetReturn(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_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();
+ if (list != null && list.Count > 0)
+ {
+ result = list
+ .GroupBy(x => new { x.DocNo })
+ .Select(x => new BIZ_U9_RETURN
+ {
+ STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(), //鐘舵��
+ ORDER_NO = x.Key.DocNo, //鍗曞彿
+ SUPP_CODE = x.Max(t => t.SupplierCode), //渚涘簲鍟嗙紪鐮�
+ SUPP_NAME = x.Max(t => t.SupplierName),//渚涘簲鍟嗗悕绉�
+ ORDER_DATE = x.Max(t => t.ModifiedOn), //鍗曟嵁鏃ユ湡
+ CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
+ CREATE_USER = UserCode,
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = UserCode,
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
+ HANDLED = -1,
+ HANDLED_DATE = DateTime.Now,
+ GHOST_ROW = false,
+ })
+ .ToList();
+ Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
+ foreach (var item in list)
+ {
+ BIZ_U9_RETURN_DTL info = new()
+ {
+ STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ ORDER_NO = item.DocNo, //鍗曟嵁鍙�
+ LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
+ ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
+ QTY = item.RtnFillQtyTU.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
+ };
+ resultDt.Add(info);
+ }
+ Logger.Scheduler.Info($"閫�璐у崟鏄庣粏琛屼俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{resultDt.Count}]");
+ db = Biz.Db;
+ if (result.Any())
+ {
+ if (result.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+
+ if (resultDt.Any())
+ {
+ if (resultDt.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+ Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"閫�璐у崟琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
+
+
+ /// <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())
+ {
+ if (result.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+
+ if (resultDt.Any())
+ {
+ if (resultDt.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+ 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_RETURN.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())
+ {
+ if (result.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+
+ if (resultDt.Any())
+ {
+ if (resultDt.Count > 100)
+ {
+ 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)
+ .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();
+ }
+ }
+ Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
+ action.Message = $"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]";
+ }
+ return action;
+ }
}
}
--
Gitblit v1.9.3