2023-06-19
This commit is contained in:
parent
576de76520
commit
3aedbf975f
|
|
@ -342,7 +342,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||||
if (pds.Count > 0 && pds != null)
|
if (pds.Count > 0 && pds != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
for (int i = 0; i < pds.Count; i++)
|
for (int i = 1; i < pds.Count; i++)
|
||||||
{
|
{
|
||||||
HJGL_PipeLineMat item = new HJGL_PipeLineMat();
|
HJGL_PipeLineMat item = new HJGL_PipeLineMat();
|
||||||
|
|
||||||
|
|
@ -435,6 +435,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (result.Count > 0)
|
||||||
|
{
|
||||||
|
matList.Clear();
|
||||||
|
// result = result.Substring(0, result.LastIndexOf("|"));
|
||||||
|
errorInfos = string.Join("|", result.Distinct());
|
||||||
|
//Alert alert = new Alert();
|
||||||
|
//alert.Message = result;
|
||||||
|
//alert.Target = Target.Self;
|
||||||
|
//alert.Show();
|
||||||
|
responeData.code = 0;
|
||||||
|
responeData.message = errorInfos;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
errorInfos = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -638,7 +657,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||||
foreach (var item in matList)
|
foreach (var item in matList)
|
||||||
{
|
{
|
||||||
var pipeLineMat = from x in Funs.DB.HJGL_PipeLineMat where x.MaterialCode == item.MaterialCode && x.PipelineId == item.PipelineId &&x.PrefabricatedComponents==item.PrefabricatedComponents select x;
|
var pipeLineMat = from x in Funs.DB.HJGL_PipeLineMat where x.MaterialCode == item.MaterialCode && x.PipelineId == item.PipelineId &&x.PrefabricatedComponents==item.PrefabricatedComponents select x;
|
||||||
if (pipeLineMat.Count() == 0)
|
if (pipeLineMat.Count() == 0|| pipeLineMat==null)
|
||||||
{
|
{
|
||||||
item.PipeLineMatId = SQLHelper.GetNewID(typeof(Model.HJGL_PipeLineMat));
|
item.PipeLineMatId = SQLHelper.GetNewID(typeof(Model.HJGL_PipeLineMat));
|
||||||
BLL.PipelineMatService.AddPipeLineMat(item);
|
BLL.PipelineMatService.AddPipeLineMat(item);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue