diff --git a/JY.Inspection/App.config b/JY.Inspection/App.config
index 9fd7879..31c2908 100644
--- a/JY.Inspection/App.config
+++ b/JY.Inspection/App.config
@@ -45,6 +45,10 @@
+
+
+
+
diff --git a/JY.Inspection/Config/Configure.ini b/JY.Inspection/Config/Configure.ini
index c79c3bb..22f726a 100644
--- a/JY.Inspection/Config/Configure.ini
+++ b/JY.Inspection/Config/Configure.ini
@@ -13,11 +13,11 @@ TCP_IP=192.168.2.253
TCP_Port=1030
[MES]
-siteCode=18J
-lineCode=18J-BZ-181
-equipCode=EVEDL18BZWGJ02
-materialCode=81035332
-productType=test
+siteCode=17J
+lineCode=PW-174
+equipCode=174VIM02
+materialCode=
+productType=LF324
GradingMesUrl=http://10.22.167.141/core/api/public/eve/pm/eqm/new/grading
ResultProcessMesUrl=http://10.22.167.2/core/api/public/product/process/param/new/result
StationArrivalUrl=http://10.22.167.2/core/api/public/formation/section/arrival/bz
diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs
index ae35dc0..af91265 100644
--- a/JY.Inspection/Mes/MESDataCombin.cs
+++ b/JY.Inspection/Mes/MESDataCombin.cs
@@ -6,6 +6,7 @@ using JY.MES.MES;
using JY.Model;
using JY.Utility;
using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -91,7 +92,7 @@ namespace JY.Inspection.Mes
materiallotCodeList = new List() { BarCode }
};
- string p = JsonConvert.SerializeObject(gradingParam);
+ string p = JsonHelper.Serialize(gradingParam);
var sw = new Stopwatch();
sw.Start();
@@ -219,8 +220,8 @@ namespace JY.Inspection.Mes
//多个
pl.tagDataVOList = tdvls;
- prp.payload = JsonConvert.SerializeObject(pl);
- string p = JsonConvert.SerializeObject(prp);
+ prp.payload = JsonHelper.Serialize(pl);
+ string p = JsonHelper.Serialize(prp);
var sw = new Stopwatch();
sw.Start();
@@ -262,7 +263,7 @@ namespace JY.Inspection.Mes
try
{
- string reqJsonStr = JsonConvert.SerializeObject(req);
+ string reqJsonStr = JsonHelper.Serialize(req);
var sw = new Stopwatch();
sw.Start();
string mesRes = MESApiHelper.HttpPostJsonAPI(
@@ -298,7 +299,7 @@ namespace JY.Inspection.Mes
try
{
- string reqJsonStr = JsonConvert.SerializeObject(req);
+ string reqJsonStr = JsonHelper.Serialize(req);
var sw = new Stopwatch();
sw.Start();
string mesRes = MESApiHelper.HttpPostJsonAPI(
@@ -310,7 +311,7 @@ namespace JY.Inspection.Mes
resp = JsonConvert.DeserializeObject(mesRes);
- new MesLog().LogArrivalStation(currentTime, reqJsonStr, mesRes, sw.ElapsedMilliseconds);
+ new MesLog().LogExitStation(currentTime, reqJsonStr, mesRes, sw.ElapsedMilliseconds);
}
catch (Exception ex)
{
@@ -335,7 +336,7 @@ namespace JY.Inspection.Mes
try
{
- string reqJsonStr = JsonConvert.SerializeObject(req);
+ string reqJsonStr = JsonHelper.Serialize(req);
var sw = new Stopwatch();
sw.Start();
string mesRes = MESApiHelper.HttpPostJsonAPI(
diff --git a/JY.MES/MES/ReqExitStation.cs b/JY.MES/MES/ReqExitStation.cs
index 83c64a2..b14dc7e 100644
--- a/JY.MES/MES/ReqExitStation.cs
+++ b/JY.MES/MES/ReqExitStation.cs
@@ -40,6 +40,18 @@ namespace JY.MES.MES
/// 行信息
///
public List AssembleLineList { get; set; }
+
+ ///
+ /// 没什么用，只是为了凑json格式
+ ///
+ public MaterialLot[] MaterialLotList { get; set; } = new MaterialLot[] { new MaterialLot() };
+ }
+
+ public class MaterialLot
+ {
+ public string MaterialLotCode { get; set; } = string.Empty;
+
+ public string MaterialLotCodeLocator { get; set; } = string.Empty;
}
public class AssembleLine
diff --git a/JY.Utility/JY.Utility.csproj b/JY.Utility/JY.Utility.csproj
index 73418e6..b4def66 100644
--- a/JY.Utility/JY.Utility.csproj
+++ b/JY.Utility/JY.Utility.csproj
@@ -53,6 +53,9 @@
..\packages\Microsoft.IO.RecyclableMemoryStream.3.0.1\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
..\packages\NPOI.2.5.5\lib\net45\NPOI.dll
@@ -113,6 +116,7 @@
+
diff --git a/JY.Utility/JsonHelper.cs b/JY.Utility/JsonHelper.cs
new file mode 100644
index 0000000..ca4d7b2
--- /dev/null
+++ b/JY.Utility/JsonHelper.cs
@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JY.Utility
+{
+ public static class JsonHelper
+ {
+ private static readonly JsonSerializerSettings _settings = new JsonSerializerSettings
+ {
+ ContractResolver = new CamelCasePropertyNamesContractResolver()
+ };
+
+ public static string Serialize(object obj)
+ {
+ return JsonConvert.SerializeObject(obj, _settings);
+ }
+
+ public static T Deserialize(string json)
+ {
+ return JsonConvert.DeserializeObject(json, _settings);
+ }
+ }
+}
diff --git a/JY.Utility/packages.config b/JY.Utility/packages.config
index dfb4291..6308c06 100644
--- a/JY.Utility/packages.config
+++ b/JY.Utility/packages.config
@@ -8,6 +8,7 @@
+