From b532ba8806996246ab7a0896bf34b884c47dee7e Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期二, 14 四月 2026 14:06:25 +0800
Subject: [PATCH] 试生产版本
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/ToMes/ToMesService.cs | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/ToMes/ToMesService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/ToMes/ToMesService.cs"
index c204e40..208f03b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/ToMes/ToMesService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/ToMes/ToMesService.cs"
@@ -20,11 +20,18 @@
public class ToMesService
{
//http://172.21.1.117/barcode/Webservice/WebService_ZY/WebServiceZY.asmx;
- public static string POSTURL = "http://172.21.1.117/barcode/Webservice/WebService_ZY/Service_EQP.asmx";
+ //public static string POSTURL = "http://172.21.1.117/barcode/Webservice/WebService_ZY/Service_EQP.asmx";
+ //public static string POSTURL = "http://172.21.7.109/barcode/Webservice/Service_EQP.asmx";
+
+
+
+
+
+ public static string POSTURL = "http://192.168.22.83/barcode/Webservice/Service_EQP.asmx";
/// <summary>
/// 鑾峰彇杞存壙淇℃伅鎺ュ彛
/// </summary>
- /// <param name="saveModel">杞存壙鏉＄爜</param>
+ /// <param name="saveModel">杞存壙鏉＄爜</param> 20251217-0025
/// <returns></returns>
public static WebResponseContent Mes_GetBearingInfo(SaveModel saveModel)
{
@@ -93,23 +100,38 @@
xmlEntity = XMLSerializationTool.DeserializeXmlToObject<getInfoByJournalXMLEntity>(resultString);
if (xmlEntity.FLAG == "S")
{
- Data zzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸﹁酱棰堝钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
+ //Data zzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸﹁酱棰堝钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != zzjAVG) queryZCInfo.zzjAVG = decimal.Parse(zzjAVG.value).ToString("N3");
+ //Data zzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸﹁酱棰堢洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != zzjAVG) queryZCInfo.zzjAVG = decimal.Parse(zzjAVG.value).ToString("N3");
+
+ //Data yzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙宠酱棰堢洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != yzjAVG) queryZCInfo.yzjAVG = decimal.Parse(yzjAVG.value).ToString("N3");
+
+ //Data zfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸﹂槻灏樻澘搴х洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != zfcbAVG) queryZCInfo.zfcbAVG = decimal.Parse(zfcbAVG.value).ToString("N3");
+
+ //Data yfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙抽槻灏樻澘搴х洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != yfcbAVG) queryZCInfo.yfcbAVG = decimal.Parse(yfcbAVG.value).ToString("N3");
+
+
+ Data zzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "杞村彿绔酱棰堢洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
if (null != zzjAVG) queryZCInfo.zzjAVG = decimal.Parse(zzjAVG.value).ToString("N3");
- Data yzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙宠酱棰堝钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
+ Data yzjAVG = xmlEntity.Datas.Data.Where(r => r.name == "闈炶酱鍙风杞撮鐩村緞").OrderByDescending(r => r.time).FirstOrDefault();
if (null != yzjAVG) queryZCInfo.yzjAVG = decimal.Parse(yzjAVG.value).ToString("N3");
- Data zfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸﹂槻灏樻澘搴у钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
+ Data zfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "杞村彿绔槻灏樻澘搴х洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
if (null != zfcbAVG) queryZCInfo.zfcbAVG = decimal.Parse(zfcbAVG.value).ToString("N3");
- Data yfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙抽槻灏樻澘搴у钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
+ Data yfcbAVG = xmlEntity.Datas.Data.Where(r => r.name == "闈炶酱鍙风闃插皹鏉垮骇鐩村緞").OrderByDescending(r => r.time).FirstOrDefault();
if (null != yfcbAVG) queryZCInfo.yfcbAVG = decimal.Parse(yfcbAVG.value).ToString("N3");
- Data zydAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸︽补妗ｅ钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
- if (null != zydAVG) queryZCInfo.zydAVG = decimal.Parse(zydAVG.value).ToString("N3");
+ //Data zydAVG = xmlEntity.Datas.Data.Where(r => r.name == "宸︽补妗ｇ洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != zydAVG) queryZCInfo.zydAVG = decimal.Parse(zydAVG.value).ToString("N3");
- Data yydAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙虫补妗ｅ钩鍧囧��").OrderByDescending(r => r.time).FirstOrDefault();
- if (null != yydAVG) queryZCInfo.yydAVG = decimal.Parse(yydAVG.value).ToString("N3");
+ //Data yydAVG = xmlEntity.Datas.Data.Where(r => r.name == "鍙虫补妗ｇ洿寰�").OrderByDescending(r => r.time).FirstOrDefault();
+ //if (null != yydAVG) queryZCInfo.yydAVG = decimal.Parse(yydAVG.value).ToString("N3");
Data materiel = xmlEntity.Datas.Data.Where(r => r.name == "杞﹀瀷").OrderByDescending(r => r.time).FirstOrDefault();
if (null != materiel) queryZCInfo.materiel = materiel.value;
@@ -171,8 +193,9 @@
WebResponseContent content = new WebResponseContent();
try
{
- EndpointAddress address = new EndpointAddress("http://172.21.1.117/barcode/Webservice/WebService_ZY/Service_EQP.asmx");
+ //EndpointAddress address = new EndpointAddress("http://172.21.1.117/barcode/Webservice/WebService_ZY/Service_EQP.asmx");
//EndpointAddress address = new EndpointAddress(" http://172.21.1.117/barcode/Webservice/WebService_ZY/WebServiceZY.asmx");
+ EndpointAddress address = new EndpointAddress(POSTURL);
ErpWebService.Service_EQPSoapClient client = new ErpWebService.Service_EQPSoapClient(new BasicHttpBinding(), address);
Task<ErpWebService.WheelsetMatchResponse> res = client.WheelsetMatchAsync("", "", "");
string resultString = res.Result.Body.WheelsetMatchResult;
@@ -343,6 +366,50 @@
}
return content;
}
+
+
+ public WebResponseContent UploadMES2(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ foreach (var item in saveModel.DelKeys)
+ {
+ string resultString = string.Empty;
+ string recordData = string.Empty;
+ try
+ {
+ dt_selectionRecord selects = dt_selectionRecordRepository.Instance.FindFirst(r => r.record_id == Guid.Parse(item.ToString()));
+ string json = JsonConvert.SerializeObject(selects, Newtonsoft.Json.Formatting.Indented);
+ if (null == selects)
+ return content.Error("鏈壘鍒伴�夐厤璁板綍.");
+ recordData = json;
+ EndpointAddress address = new EndpointAddress(ToMesService.POSTURL);
+ ErpWebService.Service_EQPSoapClient client = new ErpWebService.Service_EQPSoapClient(new BasicHttpBinding(), address);
+ Task<ErpWebService.ReportToSCEResponse> res = client.ReportToSCEAsync(selects.record_materielNumber, json);
+ // resultString = res.Result.Body.ReportToSCEResult;
+ }
+ catch
+ {
+
+ }
+ finally
+ {
+ LogRecord.WriteLog((int)LogEnum.Mes, $"{UserContext.Current.UserTrueName}涓婁紶MES鍙傛暟:{recordData},缁撴灉锛歿resultString}");
+ }
+ }
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error("涓婁紶澶辫触:" + ex.Message);
+ }
+ finally
+ {
+
+ }
+ return content;
+ }
}
public class MeasureInfo
{
--
Gitblit v1.9.3