From c1dbe3bb1724236f4c283cf5315e555df2026c6d Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 15 一月 2026 15:03:12 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs | 4
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs | 1
项目代码/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs | 65 +++++++++++++++-
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs | 2
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs | 1
项目代码/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs | 18 ++++
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs | 2
项目代码/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs | 5 +
项目代码/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs | 8 ++
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs | 1
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs | 2
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs | 1
项目代码/WMS/WMSServer/WIDESEA_Common/MES/pullLockInfo.cs | 59 ++++++++++++++
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs | 1
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs | 56 ++++++++++++++
15 files changed, 211 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Common/MES/pullLockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Common/MES/pullLockInfo.cs"
new file mode 100644
index 0000000..882e0b2
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Common/MES/pullLockInfo.cs"
@@ -0,0 +1,59 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.MES
+{
+ /// <summary>
+ /// MES鍙戣捣鎷夊姩閿佽溅璇锋眰
+ /// </summary>
+ public class pullLockInfo
+ {
+ /// <summary>
+ /// 鍞竴鏍囪瘑
+ /// </summary>
+ public string unionKey { get; set; }
+
+ /// <summary>
+ /// 宸ュ巶
+ /// </summary>
+ public string plantCode { get; set; }
+
+ /// <summary>
+ /// 閿佽溅杞﹁韩淇℃伅
+ /// </summary>
+ public List<LockInfo> data { get; set; }
+ }
+
+ public class LockInfo
+ {
+ /// <summary>
+ /// 鎬昏宸ュ崟鍙�
+ /// </summary>
+ public string workOrderNo { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟绫诲瀷
+ /// </summary>
+ public string workOrderType { get; set; }
+
+ /// <summary>
+ /// 褰╄溅韬墿鏂欏彿
+ /// </summary>
+ public string pbMaterial { get; set; }
+
+ /// <summary>
+ /// PVI鍙�(杞﹁韩涓�)
+ /// </summary>
+ public string pvi { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ public DateTime messageTime { get; set; }
+ }
+
+
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs"
index 0d0eebf..8374df0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs"
@@ -29,6 +29,11 @@
public string DevMessage { get; set; }
+ /// <summary>
+ /// 閿佽溅PVI
+ /// </summary>
+ public string lockpvi { get; set; }
+
public WebResponseContent OK()
{
Code = 1;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs"
index 185193c..e389fb0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs"
@@ -52,6 +52,22 @@
/// <param name="rfidPrint">RFID</param>
/// <param name="stationNo">绔欏彴璇锋眰鐐逛綅</param>
/// <returns></returns>
- WebResponseContent getCharacteristic(string rfidPrint, string stationNo);
+ WebResponseContent getCharacteristic(string stationNo, string rfidPrint);
+
+ /// <summary>
+ /// 宸ュ崟/璁㈠崟鎺掓挙
+ /// </summary>
+ /// <param name="jsonData"></param>
+ /// <returns></returns>
+ WebResponseContent removeWorkOrderInfo(object jsonData);
+
+ /// <summary>
+ /// MES鎷夊姩閿佽溅
+ /// </summary>
+ /// <param name="jsondata"></param>
+ /// <returns></returns>
+ WebResponseContent pullLock(object jsondata);
+
+ WebResponseContent syncOrderFeature(object json);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs"
index 7b79784..dfb3522 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs"
@@ -54,6 +54,14 @@
public string BodyStatus { get; set; }
/// <summary>
+ /// 鐒婅鍏ュ彛杩囩偣鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "鐒婅鍏ュ彛杩囩偣鏃堕棿")]
+ [ExporterHeader(DisplayName = "鐒婅鍏ュ彛杩囩偣鏃堕棿")]
+ [SugarColumn(IsNullable = true, Length = 40, ColumnDescription = "鐒婅鍏ュ彛杩囩偣鏃堕棿")]
+ public string biwInPassTime { get; set; }
+
+ /// <summary>
/// 鎻忚堪
/// </summary>
[ImporterHeader(Name = "鎻忚堪")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
index 5e820ad..c0fe362 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
@@ -20,7 +20,7 @@
{
throw new InvalidOperationException("WMS IP 鏈厤缃�");
}
- var wmsIpAddress = wmsBase + ipAddress;
+ var wmsIpAddress = wmsBase + ipAddress;
var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == stationCode);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
index a883af1..4ea73ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
@@ -21,7 +21,7 @@
{
public WebResponseContent bindWorkOrder(string stationNo, string rfid)
{
- WebResponseContent content = new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_MESIPAddress);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs"
index 4bb12f5..3897cee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs"
@@ -28,7 +28,7 @@
/// <param name="rfidPrint">RFID</param>
/// <param name="stationNo">绔欏彴璇锋眰鐐逛綅</param>
/// <returns></returns>
- public WebResponseContent getCharacteristic(string rfidPrint, string stationNo)
+ public WebResponseContent getCharacteristic(string stationNo, string rfidPrint)
{
WebResponseContent content = new WebResponseContent();
try
@@ -37,7 +37,7 @@
{
plantCode = "1052",
rfidPrint = rfidPrint,
- vin = vin,
+ vin = "",
messageTime = DateTime.Now.ToString(),
unionKey = Guid.NewGuid().ToString(),
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
index ded569a..2cefbc3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
@@ -21,7 +21,6 @@
/// </summary>
public partial class MESService
{
-
public WebResponseContent issuedCharacter(string rfidPrint, string vin, string stationNo)
{
WebResponseContent content = new WebResponseContent();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs"
index 62586aa..b8846ee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs"
@@ -15,7 +15,6 @@
namespace WIDESEA_StoragIntegrationServices
{
-
public partial class MESService
{
public WebResponseContent prebind(object json)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
new file mode 100644
index 0000000..8e62761
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
@@ -0,0 +1,56 @@
+锘縰sing AngleSharp.Common;
+using Masuit.Tools;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Common.MES;
+using WIDESEA_Common.MES.Request;
+using WIDESEA_Core;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
+using WIDESEAWCS_BasicInfoService;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEA_StoragIntegrationServices
+{
+ /// <summary>
+ /// 杞﹁韩缁戝畾宸ュ崟(鐒婅鐩撮�氭秱瑁�)
+ /// </summary>
+ public partial class MESService
+ {
+ public WebResponseContent pullLock(object jsondata)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (string.IsNullOrEmpty(jsondata.ToString())) throw new Exception("璇锋眰鍙傛暟涓虹┖");
+
+ var result = JsonConvert.DeserializeObject<pullLockInfo>(jsondata.ToString());
+
+ foreach (var item in result.data)
+ {
+ var carInfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi);
+ if (carInfo == null)
+ {
+ throw new Exception("鏈煡杞﹁韩");
+ }
+
+ content.lockpvi = carInfo.PVI;
+ }
+
+ LogFactory.GetLog("MES鎷夊姩閿佽溅").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("MES鎷夊姩閿佽溅").Info(true, jsondata.ToJsonString());
+
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
index 199cf98..2232232 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
@@ -18,7 +18,6 @@
namespace WIDESEA_StoragIntegrationServices
{
-
public partial class MESService
{
public WebResponseContent pushOrderInfo(object json)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
index d2f2daf..7413b91 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
@@ -22,7 +22,6 @@
{
public partial class MESService
{
-
public WebResponseContent pushWorkOrderInfo(object json)
{
WebResponseContent content = new WebResponseContent();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
index d16860a..0bd648c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
@@ -17,7 +17,7 @@
/// </summary>
public partial class MESService
{
- public WebResponseContent removeWorkOrderInfo(string jsonData)
+ public WebResponseContent removeWorkOrderInfo(object jsonData)
{
WebResponseContent content = new WebResponseContent();
try
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs"
index 8c876b6..9d59a77 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs"
@@ -26,6 +26,7 @@
//todo 淇敼瀵瑰簲鏁版嵁
+
return content;
}
catch (Exception ex)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
index b860861..07fa43e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
@@ -26,7 +26,7 @@
/// <param name="stationCode"></param>
/// <returns></returns>
[HttpPost, Route("PassPoint"), AllowAnonymous]
- public WebResponseContent PassPoint(string stationCode,string rfid)
+ public WebResponseContent PassPoint(string stationCode, string rfid)
{
return _MESService.PassPoint(stationCode, rfid);
}
@@ -43,6 +43,17 @@
}
/// <summary>
+ /// 娑傝宸ュ崟
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("pushWorkOrderInfo"), AllowAnonymous]
+ public WebResponseContent pushWorkOrderInfo([FromBody] object json)
+ {
+ return _MESService.pushWorkOrderInfo(json);
+ }
+
+ /// <summary>
/// 鎬昏宸ュ崟
/// </summary>
/// <param name="json"></param>
@@ -51,6 +62,17 @@
public WebResponseContent pushOrderInfo([FromBody] object json)
{
return _MESService.pushOrderInfo(json);
+ }
+
+ /// <summary>
+ /// 宸ュ崟鎺掓挙
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("removeWorkOrderInfo"), AllowAnonymous]
+ public WebResponseContent removeWorkOrderInfo([FromBody] object json)
+ {
+ return _MESService.removeWorkOrderInfo(json);
}
/// <summary>
@@ -65,13 +87,46 @@
}
/// <summary>
- /// 杞﹁韩杩囩偣
+ /// BDC璇锋眰杞﹁韩鐗瑰緛
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("getCharacteristic"), AllowAnonymous]
+ public WebResponseContent getCharacteristic([FromBody] string station, string rfid)
+ {
+ return _MESService.getCharacteristic(station, rfid);
+ }
+
+ /// <summary>
+ /// MES鎷夊姩閿佽溅
/// </summary>
/// <param name="stationCode"></param>
/// <returns></returns>
- [HttpPost, Route("PassPoint"), AllowAnonymous]
- public WebResponseContent PassPoint(string stationCode, string rfid)
+ [HttpPost, Route("pullLock"), AllowAnonymous]
+ public WebResponseContent pullLock([FromBody] object json)
{
- return _MESService.(stationCode, rfid);
+ return _MESService.pullLock(json);
+ }
+
+ /// <summary>
+ /// MES鍚屾璁㈠崟鐗瑰緛
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
+ [HttpPost, Route("syncOrderFeature"), AllowAnonymous]
+ public WebResponseContent syncOrderFeature([FromBody] object json)
+ {
+ return _MESService.syncOrderFeature(json);
+ }
+
+ /// <summary>
+ /// 鐩撮�氭秱瑁呯粦瀹氬伐鍗�
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
+ [HttpPost, Route("bindWorkOrder"), AllowAnonymous]
+ public WebResponseContent bindWorkOrder([FromBody] string station, string rfid)
+ {
+ return _MESService.bindWorkOrder(station, rfid);
}
}
\ No newline at end of file
--
Gitblit v1.9.3