优化

schangxiang@126.com

2025-09-29 682eba0aaf922e69dfafe05fb6c1bbdbf3a0e04a

优化

 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>
        /// å…¬å…±å¯¼å…¥ å…¥åº“单或出库单

 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";

 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();

 DEmon/iWareLog/Report/Helper/R_InOutStorageDetailResultForMes.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
using 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; }
    }
}

 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" />