From 43b2af8956d54dc3a53f211c53d8af582806b6ba Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 08 四月 2025 11:18:58 +0800
Subject: [PATCH] 备料任务合并发料只适用于包装车间工单发料 备料任务增加根据发料类型，调用相应发料单据的ERP接口
---
Tiger.Business.WMS/Extensions/Yada/OutExtension.cs | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 367 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.WMS/Extensions/Yada/OutExtension.cs b/Tiger.Business.WMS/Extensions/Yada/OutExtension.cs
index 3967d44..c66af5a 100644
--- a/Tiger.Business.WMS/Extensions/Yada/OutExtension.cs
+++ b/Tiger.Business.WMS/Extensions/Yada/OutExtension.cs
@@ -1,12 +1,19 @@
锘縰sing MailKit.Search;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
+using Org.BouncyCastle.Asn1.X509;
using Rhea.Common;
+using SqlSugar;
using System;
using System.IO;
+using Tiger.Business.WMS.Transaction;
+using Tiger.IBusiness;
using Tiger.Model;
using Tiger.Model.Base;
+using Tiger.Model.Entitys.MES.U9C;
using Tiger.Model.MES.Yada;
+using static IronPython.SQLite.PythonSQLite;
+using static Microsoft.Scripting.Hosting.Shell.ConsoleHostOptions;
namespace Tiger.Business.WMS.Extensions
{
@@ -72,5 +79,364 @@
}
return pickList;
}
- }
+
+ /// <summary>
+ /// 瀹為檯闇�姹傛暟閲忚绠楁柟娉�
+ /// </summary>
+ /// <param name="type"></param>
+ /// <param name="dtl"></param>
+ /// <returns></returns>
+ public static double GetActReqQty(this BIZ_WMS_PREP.BIZ_TYPEs type, BIZ_WMS_PREP_DTL dtl)
+ {
+ switch (type)
+ {
+ case BIZ_WMS_PREP.BIZ_TYPEs.Others:
+ case BIZ_WMS_PREP.BIZ_TYPEs.WorkOrder:
+ case BIZ_WMS_PREP.BIZ_TYPEs.Outsourcing:
+ case BIZ_WMS_PREP.BIZ_TYPEs.Requisition:
+ default:
+ return dtl.QTY_REQ;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍙戞枡绫诲瀷锛岃皟鐢ㄧ浉搴斿彂鏂欏崟鎹殑ERP鎺ュ彛
+ /// </summary>
+ /// <param name="type"></param>
+ /// <param name="trans"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public static async Task<ApiAction> CommitToERP(this BIZ_WMS_PREP.BIZ_TYPEs type, Out_BIZ_WMS_PREP trans, BaseInput input)
+ {
+ switch (type)
+ {
+ case BIZ_WMS_PREP.BIZ_TYPEs.Others:
+ return await MiscShipApprove(trans, input);
+ case BIZ_WMS_PREP.BIZ_TYPEs.WorkOrder:
+ return await CreateIssueDoc(trans, input);
+ case BIZ_WMS_PREP.BIZ_TYPEs.Outsourcing:
+ return await CreatePMIssueDoc(trans, input);
+ case BIZ_WMS_PREP.BIZ_TYPEs.Requisition:
+ default:
+ throw new NotImplementedException($"鍙戞枡鍗曟嵁绫诲瀷[{type.GetDesc()}]鏈疄鐜癊RP鎺ュ彛璋冪敤");
+ }
+ }
+
+ /// <summary>
+ /// U9鏉傚彂鍗曞鏍�
+ /// </summary>
+ /// <param name="trans"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private static async Task<ApiAction> MiscShipApprove(Out_BIZ_WMS_PREP trans, BaseInput input)
+ {
+ var action = new ApiAction();
+
+ var dtls = trans.MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ORDER_NO == trans.CurPREP.Order.ORDER_NO).ToList();
+ var noFinish = dtls.Where(q => q.QTY_PREP < BIZ_WMS_PREP.BIZ_TYPEs.Others.GetActReqQty(q));
+ if (noFinish.Any())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("澶囨枡浠诲姟[{0}]鏈兘鎻愪氦瀹℃牳锛屾湭澶囨枡瀹屾垚鐨勮濡備笅锛歿1}");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.MiscShipApprove.NoFinish", trans.CurPREP.Order.ORDER_NO, string.Join("锛�", noFinish.Select(q => q.ORDER_LINE)));
+ return action;
+ }
+
+ var iInput = new MiscShipApproveInput { MiscShipApproveParam = trans.CurPREP.Order.SourceOrders.Select(q => new MiscShipApproveParam() { Code = q.ORDER_NO }).ToList() };
+ var result = await DI.Resolve<IWMS_U9C>().MiscShipApprove(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+
+ var curBatch = trans.CurPREP.Order.CurBatch;
+ curBatch.STATUS = BIZ_WMS_PREP_BTH.STATUSs.Sended.GetValue();
+ curBatch.PREP_PERSON = trans.UserCode;
+ curBatch.FINISH_TIME = DateTime.Now;
+ curBatch.REQ_PERSON = trans.UserCode;
+ curBatch.DLVY_TIME = DateTime.Now;
+ foreach (var item in trans.CurPREP.Order.SourceDetails)
+ {
+ item.QTY_ACT_DLVY = item.QTY_ACT_REQ;
+ }
+ trans.CurPREP.Order.STATUS = BIZ_WMS_PREP.STATUSs.Sended.GetValue();
+ var orders = trans.MainDB.Queryable<BIZ_U9_MISC_OUT>().Where(q => trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER).Contains(q.ORDER_NO)).ToList();
+ foreach (var item in orders)
+ {
+ item.STATUS = BIZ_U9_MISC_OUT.STATUSs.Sended.GetValue();
+ item.PREP_PERSON = trans.UserCode;
+ item.FINISH_TIME = DateTime.Now;
+ item.REQ_PERSON = trans.UserCode;
+ item.DLVY_TIME = DateTime.Now;
+ }
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = trans.GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(trans.CurPREP.Order, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(trans.CurPREP.Order.SourceDetails, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_ACT_DLVY }).ExecuteCommand();
+ db.Updateable(curBatch, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.PREP_PERSON, q.FINISH_TIME, q.REQ_PERSON, q.DLVY_TIME }).ExecuteCommand();
+ db.Updateable(orders, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.PREP_PERSON, q.FINISH_TIME, q.REQ_PERSON, q.DLVY_TIME }).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ //action.LocaleMsg = Biz.L($"鏉傚彂鍗曞鏍告垚鍔燂紝鍗曞彿濡備笅锛歿0}");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.MiscShipApprove.Success", string.Join("锛�", trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER)));
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// U9鍒涘缓鐢熶骇棰嗘枡鍗�
+ /// </summary>
+ /// <param name="trans"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private static async Task<ApiAction> CreateIssueDoc(Out_BIZ_WMS_PREP trans, BaseInput input)
+ {
+ var action = new ApiAction();
+
+ var sns = trans.MainDB.Queryable<BIZ_WMS_PREP_SN>().Where(q => q.ORDER_NO == trans.CurPREP.Order.ORDER_NO && q.ORDER_BATCH == trans.CurPREP.Order.CurBatch.BATCH.ToString()).ToList();
+ if (!sns.Any())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍒涘缓鐢熶骇棰嗘枡鍗曞け璐ワ紝澶囨枡浠诲姟[{0}]鎵规[{1}]鏈壘鍒板凡涓嬫灦鐨勭墿鏂欐暟鎹�");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.CreateIssueDoc.NoSns", trans.CurPREP.Order.ORDER_NO, trans.CurPREP.Order.CurBatch.BATCH);
+ return action;
+ }
+ var wos = Biz.DataSource["YadaU9C"].Client.Queryable<mes_Mo>().Where(q => trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER).Contains(q.DocNo)).ToList();
+ var temp = sns.GroupBy(q => new { q.ITEM_CODE, q.UNIT, q.WH_CODE, q.LOCATION_CODE })
+ .Select(g => new PickListDTOs
+ {
+ Item = new() { Code = g.Key.ITEM_CODE },
+ IssueWh = new() { Code = g.Key.WH_CODE },
+ IssueBin = new() { code = g.Key.LOCATION_CODE },
+ IssueQty = g.Sum(q => q.QTY),
+ IssuedQty = g.Sum(q => q.QTY),
+ IssueUOM = new() { Code = g.Key.UNIT.IsNullOrEmpty("PCS") },
+ Lot = new() { code = g.Max(q => q.LOTNO) },
+ }).ToList();
+ var pickList = new List<PickListDTOs>();
+ var prepSrcList = new List<BIZ_WMS_PREP_SRC_DTL>();
+ foreach (var dtl in temp)
+ {
+ var remain = dtl.IssueQty;
+ var srcDtls = trans.CurPREP.Order.SourceDetails.Where(q => q.ITEM_CODE == dtl.Item.Code).ToList();
+ var count = srcDtls.Count;
+ foreach (var src in srcDtls)
+ {
+ var actQty = src.QTY_ACT_REQ - src.QTY_ACT_DLVY;
+ if (remain > 0 && actQty > 0)
+ {
+ //瀹為檯闇�姹傚ぇ浜庡墿浣欏緟鍒嗛厤鏁伴噺锛屾垨鑰呭綋鍓嶆槸鏈�鍚庝竴涓潵婧愭槑缁嗚锛屽垯鍒嗛厤鍓╀綑鏁伴噺
+ var dlvy = (actQty > remain || count == 1) ? remain : actQty;
+ src.QTY_ACT_DLVY += dlvy;
+ prepSrcList.Add(src);
+ var pick = new PickListDTOs
+ {
+ Item = dtl.Item,
+ IssueWh = dtl.IssueWh,
+ IssueBin = dtl.IssueBin,
+ IssueQty = dlvy,
+ IssuedQty = dlvy,
+ IssueUOM = dtl.IssueUOM,
+ MOPickList = src.SOURCE_ID.ToInt64(),
+ Lot = dtl.Lot,
+ };
+ pickList.Add(pick);
+ remain -= pick.IssueQty;
+ }
+ count--;
+ }
+ }
+
+ var iInput = new CreateProdMaterialReqInput {CreateProdMaterialReqParam = new() { new() {
+ MOs = trans.CurPREP.Order.SourceOrders.Select(q => new MOs { Code = q.SOURCE_ORDER }).ToList(),
+ PickListDTOs = pickList,
+ BusinessType = wos.First().BusinessType,
+ }}};
+ var result = await DI.Resolve<IWMS_U9C>().CreateProdMaterialReq(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+
+ var curBatch = trans.CurPREP.Order.CurBatch;
+ curBatch.STATUS = BIZ_WMS_PREP_BTH.STATUSs.Sended.GetValue();
+ curBatch.PREP_PERSON = trans.UserCode;
+ curBatch.FINISH_TIME = DateTime.Now;
+ curBatch.REQ_ID = string.Join(",", result.Data.Select(q => q.m_iD));
+ curBatch.REQ_ORDER = string.Join(",", result.Data.Select(q => q.m_code));
+ curBatch.REQ_PERSON = trans.UserCode;
+ curBatch.DLVY_TIME = DateTime.Now;
+
+ var dtls = trans.MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ORDER_NO == trans.CurPREP.Order.ORDER_NO).ToList();
+ var noFinish = dtls.Where(q => q.QTY_PREP < BIZ_WMS_PREP.BIZ_TYPEs.Others.GetActReqQty(q));
+ if (!noFinish.Any())
+ {
+ trans.CurPREP.Order.STATUS = BIZ_WMS_PREP.STATUSs.Sended.GetValue();
+ }
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = trans.GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(trans.CurPREP.Order, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(prepSrcList, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_ACT_DLVY }).ExecuteCommand();
+ db.Updateable(curBatch, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.PREP_PERSON, q.FINISH_TIME, q.REQ_ID, q.REQ_ORDER, q.REQ_PERSON, q.DLVY_TIME }).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ //action.LocaleMsg = Biz.L($"鍒涘缓鐢熶骇棰嗘枡鍗昜{0}]鎴愬姛锛屾潵婧愬崟鍙峰涓嬶細{1}");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.CreateIssueDoc.Success", curBatch.REQ_ORDER, string.Join("锛�", trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER)));
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// U9鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
+ /// </summary>
+ /// <param name="trans"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private static async Task<ApiAction> CreatePMIssueDoc(Out_BIZ_WMS_PREP trans, BaseInput input)
+ {
+ var action = new ApiAction();
+
+ var sns = trans.MainDB.Queryable<BIZ_WMS_PREP_SN>().Where(q => q.ORDER_NO == trans.CurPREP.Order.ORDER_NO && q.ORDER_BATCH == trans.CurPREP.Order.CurBatch.BATCH.ToString()).ToList();
+ if (!sns.Any())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍒涘缓濮斿鐢熶骇棰嗘枡鍗曞け璐ワ紝澶囨枡浠诲姟[{0}]鎵规[{1}]鏈壘鍒板凡涓嬫灦鐨勭墿鏂欐暟鎹�");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.CreatePMIssueDoc.NoSns", trans.CurPREP.Order.ORDER_NO, trans.CurPREP.Order.CurBatch.BATCH);
+ return action;
+ }
+ var temp = sns.GroupBy(q => new { q.ITEM_CODE, q.UNIT, q.WH_CODE, q.LOCATION_CODE })
+ .Select(g => new PickListDTOs2
+ {
+ Item = new() { Code = g.Key.ITEM_CODE },
+ IssueWh = new() { Code = g.Key.WH_CODE },
+ IssueBin = new() { code = g.Key.LOCATION_CODE },
+ IssueQty = g.Sum(q => q.QTY),
+ IssuedQty = g.Sum(q => q.QTY),
+ IssueUOM = new() { Code = g.Key.UNIT.IsNullOrEmpty("PCS") },
+ Lot = new() { code = g.Max(q => q.LOTNO) },
+ }).ToList();
+ var pickList = new List<PickListDTOs2>();
+ var prepSrcList = new List<BIZ_WMS_PREP_SRC_DTL>();
+ foreach (var dtl in temp)
+ {
+ var remain = dtl.IssueQty;
+ var srcDtls = trans.CurPREP.Order.SourceDetails.Where(q => q.ITEM_CODE == dtl.Item.Code).ToList();
+ var count = srcDtls.Count;
+ foreach (var src in srcDtls)
+ {
+ var actQty = src.QTY_ACT_REQ - src.QTY_ACT_DLVY;
+ if (remain > 0 && actQty > 0)
+ {
+ //瀹為檯闇�姹傚ぇ浜庡墿浣欏緟鍒嗛厤鏁伴噺锛屾垨鑰呭綋鍓嶆槸鏈�鍚庝竴涓潵婧愭槑缁嗚锛屽垯鍒嗛厤鍓╀綑鏁伴噺
+ var dlvy = (actQty > remain || count == 1) ? remain : actQty;
+ src.QTY_ACT_DLVY += dlvy;
+ prepSrcList.Add(src);
+ var pick = new PickListDTOs2
+ {
+ Item = dtl.Item,
+ IssueWh = dtl.IssueWh,
+ IssueBin = dtl.IssueBin,
+ IssueQty = dlvy,
+ IssuedQty = dlvy,
+ IssueUOM = dtl.IssueUOM,
+ SCMOPickList = src.SOURCE_ID.ToInt64(),
+ Lot = dtl.Lot,
+ };
+ pickList.Add(pick);
+ remain -= pick.IssueQty;
+ }
+ count--;
+ }
+ }
+
+ var iInput = new CreateOutProdMaterialReqInput { CreateOutProdMaterialReqParam = new() { new() {
+ POLine = trans.CurPREP.Order.SourceOrders.Select(q => new POLine { Code = q.SOURCE_ORDER }).ToList(),
+ BusinessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ PickListDTOs = pickList,
+ BusinessCreatedOn = DateTime.Now.ToString("yyyy-MM-dd"),
+ }}};
+ var result = await DI.Resolve<IWMS_U9C>().CreateOutProdMaterialReq(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+
+ var curBatch = trans.CurPREP.Order.CurBatch;
+ curBatch.STATUS = BIZ_WMS_PREP_BTH.STATUSs.Sended.GetValue();
+ curBatch.PREP_PERSON = trans.UserCode;
+ curBatch.FINISH_TIME = DateTime.Now;
+ curBatch.REQ_ID = string.Join(",", result.Data.Select(q => q.m_iD));
+ curBatch.REQ_ORDER = string.Join(",", result.Data.Select(q => q.m_code));
+ curBatch.REQ_PERSON = trans.UserCode;
+ curBatch.DLVY_TIME = DateTime.Now;
+
+ var dtls = trans.MainDB.Queryable<BIZ_WMS_PREP_DTL>().Where(q => q.ORDER_NO == trans.CurPREP.Order.ORDER_NO).ToList();
+ var noFinish = dtls.Where(q => q.QTY_PREP < BIZ_WMS_PREP.BIZ_TYPEs.Others.GetActReqQty(q));
+ var orders = new List<BIZ_U9_SCM_OUT>();
+ if (!noFinish.Any())
+ {
+ trans.CurPREP.Order.STATUS = BIZ_WMS_PREP.STATUSs.Sended.GetValue();
+ orders = trans.MainDB.Queryable<BIZ_U9_SCM_OUT>().Where(q => trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER).Contains(q.ORDER_NO)).ToList();
+ foreach (var item in orders)
+ {
+ item.STATUS = BIZ_U9_SCM_OUT.STATUSs.Sended.GetValue();
+ item.PREP_PERSON = trans.UserCode;
+ item.FINISH_TIME = DateTime.Now;
+ item.REQ_PERSON = trans.UserCode;
+ item.DLVY_TIME = DateTime.Now;
+ }
+ }
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = trans.GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(trans.CurPREP.Order, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(prepSrcList, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_ACT_DLVY }).ExecuteCommand();
+ db.Updateable(curBatch, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.PREP_PERSON, q.FINISH_TIME, q.REQ_ID, q.REQ_ORDER, q.REQ_PERSON, q.DLVY_TIME }).ExecuteCommand();
+ if (orders.Any())
+ {
+ db.Updateable(orders, trans.UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.PREP_PERSON, q.FINISH_TIME, q.REQ_PERSON, q.DLVY_TIME }).ExecuteCommand();
+ }
+ });
+ if (dbTran.IsSuccess)
+ {
+ //action.LocaleMsg = Biz.L($"鍒涘缓濮斿鐢熶骇棰嗘枡鍗昜{0}]鎴愬姛锛屾潵婧愬崟鍙峰涓嬶細{1}");
+ action.LocaleMsg = Biz.L("WMS.BIZ_WMS_PREP.CreatePMIssueDoc.Success", curBatch.REQ_ORDER, string.Join("锛�", trans.CurPREP.Order.SourceOrders.Select(s => s.SOURCE_ORDER)));
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ return action;
+ }
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3