cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r603

Browse Source 
SVN-Revision: r603
This commit is contained in:
wyf
2025-05-17 09:26:34 +00:00
parent 3967394d6b
commit 33f893d218
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBomImport/FrmProgress.cs
+20 -7
View File
@@ -572,7 +572,7 @@ namespace Lskj.PubBomImport
string sName = fileRow != null ? fileRow["sName"] + "" : "";
if (string.IsNullOrEmpty(webpath))
{
throw new Exception($"{fileName}的明细附件不存在\r\nBom导入失败");
//throw new Exception($"{fileName}的明细附件不存在\r\nBom导入失败");
}
else
{
@@ -626,7 +626,20 @@ namespace Lskj.PubBomImport
FileInfo childInfo = new FileInfo(tempFileName);
if (childInfo == null)
{
throw new Exception($"MX明细中不包含文件{childCode}");
//throw new Exception($"MX明细中不包含文件{childCode}");
GetFileCodeInfo(childCode, out string childsourceCode, out string childsourceName, out string childsourceBB, out int childsourceBC);
if (childCode.StartsWith("QD"))
{
DataRow childRow = childTable.NewRow();
childRow["ProductId"] = childCode;
childRow["appellation"] = parentRow["名称"] + "";
childRow["bak"] = childCode;
childRow["bombb"] = childsourceBB;
childRow["bombc"] = 0;
childRow["tamount"] = parentRow["套数"] + "";
childRow["amount"] = parentRow["套数"] + "";
childTable.Rows.Add(childRow);
}
}
if (childInfo != null)
{
@@ -653,7 +666,7 @@ namespace Lskj.PubBomImport
foreach (DataRow zzqdItem in zzqdTable.Rows)
{
DataRow childRow = childTable.NewRow();
childRow["ProductId"] = zzqdItem["物料编码"] + "";
childRow["ProductId"] = (zzqdItem["物料编码"] + "").Trim();
childRow["appellation"] = zzqdItem["名称"] + "";
childRow["bak"] = childsourceCode;
childRow["bombb"] = childsourceBB;
@@ -667,7 +680,7 @@ namespace Lskj.PubBomImport
else if (childCode.StartsWith("QD"))
{
DataRow childRow = childTable.NewRow();
childRow["ProductId"] = parentRow["图号"] + "";
childRow["ProductId"] = childCode;
childRow["appellation"] = parentRow["名称"] + "";
childRow["bak"] = childsourceCode;
childRow["bombb"] = childsourceBB;
@@ -813,7 +826,7 @@ namespace Lskj.PubBomImport
}
if (addState.Equals("新增"))
{
DataRow billRow = BaseImpl.GetDataRowResult($"select qms_maddf_billdocument_id from qms_BillFileAddMaintab where qms_maddf_productid = '{productId}'");
DataRow billRow = BaseImpl.GetDataRowResult($"select qms_maddf_billdocument_id from qms_BillFileAddMaintab where qms_maddf_productid = '{productId}' and isnull(qms_maddf_addMode,'0') = '0'");
if (billRow != null)
{
throw new Exception($"物料编码{productId}的BOM新增单已存在审批流\r\n请进行审批");
@@ -970,7 +983,7 @@ namespace Lskj.PubBomImport
foreach (DataRow zzqdItem in zzqdTable.Rows)
{
DataRow childRow = childTable.NewRow();
childRow["ProductId"] = zzqdItem["物料编码"] + "";
childRow["ProductId"] = (zzqdItem["物料编码"] + "").Trim();
childRow["appellation"] = zzqdItem["名称"] + "";
childRow["bak"] = childsourceCode;
childRow["bombb"] = childsourceBB;
@@ -984,7 +997,7 @@ namespace Lskj.PubBomImport
else if (code.StartsWith("QD"))
{
DataRow childRow = childTable.NewRow();
childRow["ProductId"] = parentRow["图号"] + "";
childRow["ProductId"] = code;
childRow["appellation"] = parentRow["名称"] + "";
childRow["bak"] = childsourceCode;
childRow["bombb"] = childsourceBB;