From 7f75d4c1a1a3bd348042eb0fec8480f5df9cd1d2 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 07 四月 2025 10:38:27 +0800
Subject: [PATCH] 同步调拨单、委外发料、物品转换单据接口
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 319 +++++++++++++++++++++++++++++++
Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransferForm.cs | 71 +++++++
Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransfer.cs | 71 +++++++
Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetScmOut.cs | 71 +++++++
Tiger.Model.Net/Tiger.Model.Net.csproj | 2
Tiger.Business.WMS/ERP/WMS_U9C.cs | 2
Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs | 22 ++
7 files changed, 557 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 28f4a1d..1c9ac2e 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -676,5 +676,324 @@
}
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.BenefitDeptName, // 鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
+ //SOURCE_LINE = item.ReturnStorageReason,//
+ // ERP_ORDER = item.InStorageReason, // ERP鍗曟嵁鍙风爜
+ //REMARK 澶囨敞
+ 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.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.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.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;
+ }
}
}
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.cs b/Tiger.Business.WMS/ERP/WMS_U9C.cs
index 53f8f54..5cbd7b3 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.cs
@@ -263,7 +263,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = new($"鏀惰揣鍗� - 琛屽鏍告帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
- Logger.Interface.Info($"鏀惰揣鍗�-琛屽鏍告帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
+ Logger.Interface.Info($"鏀惰揣鍗�-琛屽鏍告帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(_params)}锛屽け璐�:{result.Data[0].ErrorMsg}");
}
}
}
diff --git a/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetScmOut.cs b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetScmOut.cs
new file mode 100644
index 0000000..44711aa
--- /dev/null
+++ b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetScmOut.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>
+ /// 浠嶶9鑾峰彇濮斿鍙戞枡鍗�
+ /// </summary>
+ public class U9C_WMS_GetScmOut: TigerJobBase, ITJob
+ {
+ public string Id { get; set; } = Guid.NewGuid().ToString("N");
+ public string Tag { get; set; }
+ public string Name { get; set; }
+ public U9C_WMS_GetScmOut()
+ {
+ Id = Guid.NewGuid().ToString("N");
+ Tag = "U9C_WMS_GetScmOut Interface Job";
+ GetJob(typeof(U9C_WMS_GetScmOut).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_GetScmOut).Name);
+ TskJobInput tskJobInput = CheckHowToDo();
+ if (tskJobInput.result)
+ {
+ var result = DI.Resolve<IU9C_WMS>().In_GetScmOut(tskJobInput.input);
+ if (!result.IsSuccessed)
+ {
+ msg = $"鑾峰彇濮斿鍙戞枡鍗曟嵁淇℃伅寮傚父:{result.Message}";
+ Logger.Scheduler.Error(msg);
+ status = "Failed";
+ }
+ else
+ {
+ msg = $"浠嶶9C鑾峰彇濮斿鍙戞枡鍗曟嵁淇℃伅鎴愬姛:{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, "鑾峰彇濮斿鍙戞枡鍗曟嵁淇℃伅寮傚父");
+ SaveFluentSchedulerLog("Failed", ex.Message);
+ }
+ Logger.Scheduler.Info($"/* 璁″垝璋冨害(鍚嶇О:{Name})缁撴潫 */\r\n"); //鍥哄畾鍐欐硶
+ }
+ }
+}
+
diff --git a/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransfer.cs b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransfer.cs
new file mode 100644
index 0000000..508542c
--- /dev/null
+++ b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransfer.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>
+ /// 浠嶶9鑾峰彇璋冩嫧鍗�
+ /// </summary>
+ public class U9C_WMS_GetTransfer: TigerJobBase, ITJob
+ {
+ public string Id { get; set; } = Guid.NewGuid().ToString("N");
+ public string Tag { get; set; }
+ public string Name { get; set; }
+ public U9C_WMS_GetTransfer()
+ {
+ Id = Guid.NewGuid().ToString("N");
+ Tag = "U9C_WMS_GetTransfer Interface Job";
+ GetJob(typeof(U9C_WMS_GetTransfer).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_GetTransfer).Name);
+ TskJobInput tskJobInput = CheckHowToDo();
+ if (tskJobInput.result)
+ {
+ var result = DI.Resolve<IU9C_WMS>().In_GetTransfer(tskJobInput.input);
+ if (!result.IsSuccessed)
+ {
+ msg = $"鑾峰彇璋冩嫧鍗曟嵁淇℃伅寮傚父:{result.Message}";
+ Logger.Scheduler.Error(msg);
+ status = "Failed";
+ }
+ else
+ {
+ msg = $"浠嶶9C鑾峰彇璋冩嫧鍗曟嵁淇℃伅鎴愬姛:{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, "鑾峰彇璋冩嫧鍗曟嵁淇℃伅寮傚父");
+ SaveFluentSchedulerLog("Failed", ex.Message);
+ }
+ Logger.Scheduler.Info($"/* 璁″垝璋冨害(鍚嶇О:{Name})缁撴潫 */\r\n"); //鍥哄畾鍐欐硶
+ }
+ }
+}
+
diff --git a/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransferForm.cs b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransferForm.cs
new file mode 100644
index 0000000..0e25770
--- /dev/null
+++ b/Tiger.Business.WMS/Task/ERP/Jobs.U9C_WMS_GetTransferForm.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>
+ /// 浠嶶9鑾峰彇鐗╁搧杞崲鍗�
+ /// </summary>
+ public class U9C_WMS_GetTransferForm: TigerJobBase, ITJob
+ {
+ public string Id { get; set; } = Guid.NewGuid().ToString("N");
+ public string Tag { get; set; }
+ public string Name { get; set; }
+ public U9C_WMS_GetTransferForm()
+ {
+ Id = Guid.NewGuid().ToString("N");
+ Tag = "U9C_WMS_GetTransferForm Interface Job";
+ GetJob(typeof(U9C_WMS_GetTransferForm).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_GetTransferForm).Name);
+ TskJobInput tskJobInput = CheckHowToDo();
+ if (tskJobInput.result)
+ {
+ var result = DI.Resolve<IU9C_WMS>().In_GetTransferForm(tskJobInput.input);
+ if (!result.IsSuccessed)
+ {
+ msg = $"鑾峰彇鐗╁搧杞崲鍗曟嵁淇℃伅寮傚父:{result.Message}";
+ Logger.Scheduler.Error(msg);
+ status = "Failed";
+ }
+ else
+ {
+ msg = $"浠嶶9C鑾峰彇鐗╁搧杞崲鍗曟嵁淇℃伅鎴愬姛:{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, "鑾峰彇鐗╁搧杞崲鍗曟嵁淇℃伅寮傚父");
+ 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 48771de..bd5a63d 100644
--- a/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs
+++ b/Tiger.IBusiness.WMS/iERP/IU9C_WMS.cs
@@ -55,5 +55,27 @@
/// <param name="input"></param>
/// <returns></returns>
public ApiAction In_GetMiscShip(U9C_Base_Input input);
+
+ /// <summary>
+ /// 鍚屾鑾峰彇濮斿鍙戞枡鍗�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetScmOut(U9C_Base_Input input);
+
+ /// <summary>
+ /// 鍚屾鑾峰彇璋冩嫧鍗�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetTransfer(U9C_Base_Input input);
+
+ /// <summary>
+ /// 鍚屾鑾峰彇鐗╁搧杞崲鍗�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction In_GetTransferForm(U9C_Base_Input input);
+
}
}
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 9aad9ee..da5901f 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -107,6 +107,8 @@
<Compile Include="Entitys\MES\YadaU9\mes_SCMPickList.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_TransferForm.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_TransferFormLine.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_TransferIn.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_TransInLine.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_Wh.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_WhLotCodeQtyInfo.cs" />
<Compile Include="Entitys\MQTTEntity.cs" />
--
Gitblit v1.9.3