From d2f57e228f8ba8e606d89b3501ce9558c81246dd Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期五, 07 三月 2025 11:16:52 +0800
Subject: [PATCH] 送货单ASN接口同步
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 174 ++++++++++++++++++++++++++++++++++
Tiger.IBusiness/iERP/IU9C_MES.cs | 1
Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetAsn.cs | 71 ++++++++++++++
Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs | 7 +
4 files changed, 251 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index d62b012..01d5969 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -12,13 +12,12 @@
using SqlSugar;
using System.Collections;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using static IronPython.Modules.PythonDateTime;
namespace Tiger.Business.WMS
{
public partial class U9C_WMS: IU9C_WMS
{
-
-
/// <summary>
/// 鍚屾鐗╂枡鏉＄爜淇℃伅
/// </summary>
@@ -78,6 +77,177 @@
return action;
}
+ /// <summary>
+ /// 鍚屾閫佽揣鍗旳sn淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_DocASN(U9C_Base_Input input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"閫佽揣鍗旳sn淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ 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();
+ List<BIZ_U9_ASN_SN> sns = new();
+
+ if (list != null && list.Count > 0)
+ {
+ asns = list
+ .GroupBy(x => new { x.DocNo })
+ .Select(x => new BIZ_U9_ASN
+ {
+ STATUS= BIZ_U9_ASN.STATUSs.Imported.GetValue(),
+ ORDER_NO = x.Key.DocNo,
+ ID= x.Max(t => t.AsnId),
+ 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",
+ UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_USER = "U9C_In_DocASN",
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
+ HANDLED=0,
+ HANDLED_DATE=DateTime.Now,
+ })
+ .ToList();
+ Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{asns.Count}]");
+ foreach (var item in list)
+ {
+ 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,//--鏃堕棿涓嶆洿鏂�
+ CREATE_USER = "U9C_In_DocASN",
+ UPDATE_TIME = item.ModifiedOn,
+ UPDATE_USER = "U9C_In_DocASN",
+ };
+ 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();
+ foreach (var item in snlist)
+ {
+ 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",
+ UPDATE_TIME = DateTime.Now,
+ UPDATE_USER = "U9C_In_DocASN",
+ };
+ 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)
+ {
+ 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")
+ .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();
+ }
+ }
+ if (items.Any())
+ {
+ if (items.Count > 100)
+ {
+ 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 })
+ .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();
+ }
+ }
+ if (sns.Any())
+ {
+ if (sns.Count > 100)
+ {
+ 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")
+ .WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, 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();
+ }
+ }
+
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
+ Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]");
+ action.Message = $"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{asns.Count}]";
+ }
+ return action;
+ }
+
}
}
diff --git a/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetAsn.cs b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetAsn.cs
new file mode 100644
index 0000000..c9afcea
--- /dev/null
+++ b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetAsn.cs
@@ -0,0 +1,71 @@
+锘縰sing FluentScheduler;
+using Rhea.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tiger.IBusiness;
+using Tiger.Model;
+
+namespace Tiger.Business.WMS
+{
+ /// <summary>
+ /// 浠嶶9C鑾峰彇閫佽揣鍗旳sn淇℃伅
+ /// </summary>
+ public class U9C_WMS_GetAsnDocInfo : TigerJobBase, ITJob
+ {
+ public string Id { get; set; } = Guid.NewGuid().ToString("N");
+ public string Tag { get; set; }
+ public string Name { get; set; }
+ public U9C_WMS_GetAsnDocInfo()
+ {
+ Id = Guid.NewGuid().ToString("N");
+ Tag = "U9C_WMS_GetAsnDocInfo Interface Job";
+ GetJob(typeof(U9C_WMS_GetAsnDocInfo).Name);
+ Name = Job.JobName;
+ }
+
+ public void Execute()
+ {
+ #region 鍥哄畾鍐欐硶
+ Logger.Scheduler.Info($"/**\r\n *杩涘叆璁″垝璋冨害(鍚嶇О: {Name} )....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ Schedule = JobManager.GetSchedule(Name); //鍥哄畾鍐欐硶
+ StartTime = DateTime.Now; //鍥哄畾鍐欐硶
+ #endregion
+ try
+ {
+ string msg = "";
+ string status = "Successed";
+ GetJob(typeof(U9C_WMS_GetAsnDocInfo).Name);
+ TskJobInput tskJobInput = CheckHowToDo();
+ if (tskJobInput.result)
+ {
+ var result = DI.Resolve<IU9C_WMS>().In_DocASN(tskJobInput.input);
+ if (!result.IsSuccessed)
+ {
+ msg = $"鑾峰彇閫佽揣鍗旳sn淇℃伅寮傚父:{result.Message}";
+ Logger.Scheduler.Error(msg);
+ status = "Failed";
+ }
+ else
+ {
+ msg = $"浠嶶9C鑾峰彇閫佽揣鍗旳sn淇℃伅鎴愬姛:{result.Message}";
+ //鍥哄畾鍐欐硶
+ Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
+ Trig.NextRunTime = Schedule.NextRun;
+ }
+ }
+ SaveFluentSchedulerLog(status, $"{msg}");
+ Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚锛岃繑鍥炰俊鎭�:{msg}\r\n");
+ }
+ catch (System.Exception ex)
+ {
+ Logger.Scheduler.Fatal(ex, "鑾峰彇閫佽揣鍗旳sn淇℃伅寮傚父");
+ SaveFluentSchedulerLog("Failed", ex.Message);
+ }
+ Logger.Scheduler.Info($"/* 璁″垝璋冨害(鍚嶇О:{Name})缁撴潫 */\r\n"); //鍥哄畾鍐欐硶
+ }
+ }
+}
+
diff --git a/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs b/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs
index 49ff208..b7a8993 100644
--- a/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs
+++ b/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs
@@ -17,5 +17,12 @@
/// <param name="input"></param>
/// <returns></returns>
public ApiAction In_BySync(U9C_Base_Input input);
+
+ /// <summary>
+ /// 鍚屾閫佽揣鍗旳sn淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_DocASN(U9C_Base_Input input);
}
}
diff --git a/Tiger.IBusiness/iERP/IU9C_MES.cs b/Tiger.IBusiness/iERP/IU9C_MES.cs
index 5417c7b..f6f9622 100644
--- a/Tiger.IBusiness/iERP/IU9C_MES.cs
+++ b/Tiger.IBusiness/iERP/IU9C_MES.cs
@@ -17,5 +17,6 @@
public Task<ApiAction> GetBasWo(GetWoInput input);
public ApiAction GetCustBarCode(U9C_Base_Input input);
public ApiAction GetU9CBasWo(U9C_Base_Input input);
+
}
}
--
Gitblit v1.9.3