From 8dfeb952db4c7a7b24ed658341c59d4b99f3494e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 11 三月 2025 09:24:31 +0800
Subject: [PATCH] 雅达-简化收货单创建逻辑并更新数据类型
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 256 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 232 insertions(+), 24 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 09bd897..346b9f2 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -13,6 +13,7 @@
using System.Collections;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
using static IronPython.Modules.PythonDateTime;
+using System.Net;
namespace Tiger.Business.WMS
{
@@ -90,7 +91,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();
@@ -102,20 +102,20 @@
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_U9_ASN
{
- STATUS= BIZ_U9_ASN.STATUSs.Imported.GetValue(),
+ STATUS = BIZ_U9_ASN.STATUSs.Imported.GetValue(),
ORDER_NO = x.Key.DocNo,
- ID= x.Max(t => t.AsnId).ToString(),
+ ID = x.Max(t => t.AsnId).ToString(),
SUPP_CODE = x.Max(t => t.SupplierCode),
SUPP_NAME = x.Max(t => t.SupplierName),
DELIVERY_DATE = x.Max(t => t.ShipDate),
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,10 +135,9 @@
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}]");
@@ -158,17 +157,15 @@
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,
};
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 +176,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 +185,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 +198,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 +207,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 +232,230 @@
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>
+ /// 鍚屾鏀惰揣鍗旳sn淇℃伅
+ /// </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>
+ /// 鍚屾閫�璐у崟Asn淇℃伅
+ /// </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;
+ }
+
}
}
--
Gitblit v1.9.3