|
@@ -1,16 +1,10 @@
|
|
using System;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.Data.SqlClient;
|
|
using System.Data.SqlClient;
|
|
-using System.Linq;
|
|
|
|
-using System.Text;
|
|
|
|
-using DirectService.Tools;
|
|
|
|
using JLHHJSvr.BLL;
|
|
using JLHHJSvr.BLL;
|
|
using JLHHJSvr.Com;
|
|
using JLHHJSvr.Com;
|
|
using JLHHJSvr.Com.Model;
|
|
using JLHHJSvr.Com.Model;
|
|
using JLHHJSvr.Helper;
|
|
using JLHHJSvr.Helper;
|
|
-using JLHHJSvr.LJException;
|
|
|
|
-using JLHHJSvr.LJFramework.Tools;
|
|
|
|
-using JLHHJSvr.Tools;
|
|
|
|
using LJLib.DAL.SQL;
|
|
using LJLib.DAL.SQL;
|
|
using LJLib.Net.SPI.Server;
|
|
using LJLib.Net.SPI.Server;
|
|
using Newtonsoft.Json.Linq;
|
|
using Newtonsoft.Json.Linq;
|
|
@@ -46,10 +40,20 @@ namespace JLHHJSvr.Excutor
|
|
rslt.ErrMsg = "床垫报价单匹配失败";
|
|
rslt.ErrMsg = "床垫报价单匹配失败";
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
|
|
|
|
+ l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
|
|
|
|
+
|
|
|
|
+ l1Helper.CheckLogin();
|
|
|
|
+
|
|
if (mattress.erp_mtrlid <= 0)
|
|
if (mattress.erp_mtrlid <= 0)
|
|
{
|
|
{
|
|
- rslt.ErrMsg = "床垫清单还没匹配L1成品";
|
|
|
|
- return;
|
|
|
|
|
|
+ var errMsg = l1Helper.SaveMtrldef(mattress);
|
|
|
|
+ if (!string.IsNullOrEmpty(errMsg))
|
|
|
|
+ {
|
|
|
|
+ rslt.ErrMsg = errMsg;
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
|
|
var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
|
|
@@ -145,10 +149,6 @@ namespace JLHHJSvr.Excutor
|
|
i++;
|
|
i++;
|
|
}
|
|
}
|
|
|
|
|
|
- var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
|
|
|
|
- l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
|
|
|
|
-
|
|
|
|
- l1Helper.CheckLogin();
|
|
|
|
l1Req.token = GlobalVar.ERP_TOKEN;
|
|
l1Req.token = GlobalVar.ERP_TOKEN;
|
|
|
|
|
|
var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
|
|
var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
|