From 682eba0aaf922e69dfafe05fb6c1bbdbf3a0e04a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 29 9月 2025 14:35:53 +0800
Subject: [PATCH] 优化
---
DEmon/iWareLog/Report/Helper/R_InOutStorageDetailResultForMes.cs | 48 ++++++++++++++++
DEmon/iWareLog/iWareLog.csproj | 1
DEmon/iWareCc/SystemInteraction/mesDataTranfficForRealMesThread.cs | 20 ++++++
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 85 +++++++++++++++++++++++++++
DEmon/iWareCc/SystemInteraction/PushMesHandler.cs | 2
5 files changed, 152 insertions(+), 4 deletions(-)
diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index 6ee0b86..6aa50c6 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -178,8 +178,90 @@
}
+ ///// <summary>
+ ///// 瀵煎叆鍑哄簱鍗�-鐗堟湰1
+ ///// </summary>
+ ///// <param name="inputmaterials"></param>
+ ///// <returns></returns>
+ //[HttpPost]
+ //public ActionResult importOutOrder(List<InputMaterialEntity> inputmaterials)
+ //{
+ // var responseMessage = new ApiResponse<string>();
+ // try
+ // {
+ // var msg = "";
+
+ // #region 楠岃瘉
+ // if (inputmaterials?.Count() == 0)
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "鏁版嵁鏉℃暟涓�0",
+ // Data = null,
+ // };
+ // return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ // }
+ // if (inputmaterials.Select(x => x.ListNo).Distinct().Count() != 1)
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "鏈璇锋眰鍗曞彿蹇呴』涓哄悓涓�鍊�",
+ // Data = null,
+ // };
+ // return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ // }
+ // #endregion
+
+ // #region 涓氬姟澶勭悊
+
+ // string typeName = "鍑哄簱";
+ // handler_importOutOrder(typeName, inputmaterials, out msg);
+
+ // #endregion
+
+ // if (!string.IsNullOrEmpty(msg))
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "鐢熸垚鍑哄簱浠诲姟寮傚父:" + msg,
+ // Data = null,
+ // };
+ // }
+ // else
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 200,
+ // Success = true,
+ // Message = "鎴愬姛",
+ // Data = null,
+ // };
+ // }
+
+ // }
+ // catch (Exception ex)
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "寮傚父:" + ex.Message,
+ // Data = null,
+ // };
+ // }
+
+ // return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ //}
+
+
/// <summary>
- /// 瀵煎叆鍑哄簱鍗�
+ /// 瀵煎叆鍑哄簱鍗�-鐗堟湰2
/// </summary>
/// <param name="inputmaterials"></param>
/// <returns></returns>
@@ -258,7 +340,6 @@
return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
}
-
/// <summary>
/// 鍏叡瀵煎叆 鍏ュ簱鍗曟垨鍑哄簱鍗�
diff --git a/DEmon/iWareCc/SystemInteraction/PushMesHandler.cs b/DEmon/iWareCc/SystemInteraction/PushMesHandler.cs
index 994bf28..6cef9be 100644
--- a/DEmon/iWareCc/SystemInteraction/PushMesHandler.cs
+++ b/DEmon/iWareCc/SystemInteraction/PushMesHandler.cs
@@ -20,7 +20,7 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<string> Mes_InStockSend(InOutStorageDetailResultForMes pushData)
+ public static ApiResponse<string> Mes_InStockSend(R_InOutStorageDetailResultForMes pushData)
{
ApiResponse<string> res = null;
var funName = "Mes_InStockSend";
diff --git a/DEmon/iWareCc/SystemInteraction/mesDataTranfficForRealMesThread.cs b/DEmon/iWareCc/SystemInteraction/mesDataTranfficForRealMesThread.cs
index 743fcba..955e6a8 100644
--- a/DEmon/iWareCc/SystemInteraction/mesDataTranfficForRealMesThread.cs
+++ b/DEmon/iWareCc/SystemInteraction/mesDataTranfficForRealMesThread.cs
@@ -43,7 +43,25 @@
{
ApiResponse<string> ret = null;
itemTask.Timestamp = DateTime.Now;//鍙戦�佹椂闂存埑瀹炴椂
- ret = PushMesHandler.Mes_InStockSend(itemTask);
+
+ //杞崲
+ var str_OccurrenceTime = "";
+ if (itemTask.OccurrenceTime != null)
+ {
+ str_OccurrenceTime = ((DateTime)itemTask.OccurrenceTime).ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ R_InOutStorageDetailResultForMes r = new R_InOutStorageDetailResultForMes()
+ {
+ BusinessFlag = itemTask.BusinessFlag.ToString(),
+ Code = itemTask.Code,
+ IssueProjectNo = itemTask.IssueProjectNo,
+ PlaceCode = itemTask.PlaceCode,
+ SerialNo = itemTask.SerialNo,
+ Timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ OccurrenceTime = str_OccurrenceTime,
+ };
+
+ ret = PushMesHandler.Mes_InStockSend(r);
//鏌ユ壘瀵硅薄
var db_itemTask = mod.InOutStorageDetails.Where(x => x.id == itemTask.Id).FirstOrDefault();
diff --git a/DEmon/iWareLog/Report/Helper/R_InOutStorageDetailResultForMes.cs b/DEmon/iWareLog/Report/Helper/R_InOutStorageDetailResultForMes.cs
new file mode 100644
index 0000000..2fbe30d
--- /dev/null
+++ b/DEmon/iWareLog/Report/Helper/R_InOutStorageDetailResultForMes.cs
@@ -0,0 +1,48 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace iWareLog.Report.Helper
+{
+ // 寤鸿鏀惧湪 Models 鎴� DTOs 鏂囦欢澶逛笅
+ public class R_InOutStorageDetailResultForMes
+ {
+
+ /// <summary>
+ /// 鍨嬫潗鍞竴缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 鑸瑰彿/鍙戞斁宸ョ▼鍙�
+ /// </summary>
+ public string IssueProjectNo { get; set; }
+
+ /// <summary>
+ /// 鍒嗘鍙�
+ /// </summary>
+ public string SerialNo { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鏍囪瘑锛堟殏涓� A.type锛�
+ /// </summary>
+ public string BusinessFlag { get; set; }
+
+ /// <summary>
+ /// 搴撲綅缂栫爜锛堟殏涓� A.toplacecode锛岀洰鏍囧簱浣嶏級
+ /// </summary>
+ public string PlaceCode { get; set; }
+
+ /// <summary>
+ /// 鍙戦�佹椂闂存埑锛堟殏涓� A.createtime锛�
+ /// </summary>
+ public string Timestamp { get; set; }
+
+ /// <summary>
+ /// 鍙戠敓鏃堕棿锛堟殏涓� Timestamp 涓�鑷达紝鎴栧彲鏇挎崲涓哄叾瀹冨瓧娈碉級
+ /// </summary>
+ public string OccurrenceTime { get; set; }
+ }
+}
diff --git a/DEmon/iWareLog/iWareLog.csproj b/DEmon/iWareLog/iWareLog.csproj
index 24a74c1..1075dd8 100644
--- a/DEmon/iWareLog/iWareLog.csproj
+++ b/DEmon/iWareLog/iWareLog.csproj
@@ -93,6 +93,7 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Report\Helper\AlertHelper.cs" />
+ <Compile Include="Report\Helper\R_InOutStorageDetailResultForMes.cs" />
<Compile Include="Report\Helper\InOutStorageDetailResultForMes.cs" />
<Compile Include="Report\Helper\InOutHelper.cs" />
<Compile Include="Report\Service\AlertService.cs" />
--
Gitblit v1.9.3