2222

schangxiang@126.com

2025-09-02 8b3046790fd09138da072edd4ef48fdeb16e1879

2222

 wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs

@@ -19,6 +19,16 @@
    /// </summary>
    public class MyExtend
    {

        /// <summary>
        /// 消息时间字符串
        /// </summary>
        /// <returns></returns>
        public static string MsgTimeStr()
        {
            return "[消息时间:" + DateTimeHelper.ConvertToStringForOnlyShowTime(DateTime.Now) + "]";
        }

        /// <summary>
        /// 是否是 物料库存的转移
        /// </summary>

 wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs

@@ -95,7 +95,7 @@
            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
            this.pictureBox1.Name = "pictureBox1";
            this.pictureBox1.Size = new System.Drawing.Size(782, 149);
            this.pictureBox1.Size = new System.Drawing.Size(1234, 149);
            this.pictureBox1.TabIndex = 2;
            this.pictureBox1.TabStop = false;
            // 
@@ -135,7 +135,7 @@
            this.panel1.Location = new System.Drawing.Point(0, 222);
            this.panel1.Margin = new System.Windows.Forms.Padding(2);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(782, 425);
            this.panel1.Size = new System.Drawing.Size(1234, 425);
            this.panel1.TabIndex = 3;
            // 
            // lbl_msg_mesDataTranffic_V2
@@ -458,7 +458,7 @@
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.SystemColors.Control;
            this.ClientSize = new System.Drawing.Size(782, 647);
            this.ClientSize = new System.Drawing.Size(1234, 647);
            this.Controls.Add(this.panel1);
            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.label_PLC);

 wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs

@@ -9,6 +9,7 @@
using yunneiWCS.EnumDefine;
using yunneiWCS.ExtendFunction;
using yunneiWCS.SystemInteraction.mes2.dto;
using static WZ.Useful.Commons.NativeMethods;

namespace yunneiWCS.mes
{
@@ -38,8 +39,20 @@
                string paprm = JsonConvert.SerializeObject(mesRequest);
                Log4NetHelper.WriteInfoLog(_logType, $"{funName},准备参数:{paprm}");
                Guid guid = System.Guid.NewGuid();
                res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid));
                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{res}");

                //模拟
                if (Form1.isvirtual)
                {//模拟环境
                    res = new ApiResponse<object>();
                    res.Success = true;
                    res.Message = "系统模拟完成";
                }
                else
                {
                    res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid));
                }

                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{JsonConvert.SerializeObject(res)}");
            }
            catch (Exception ex)
            {
@@ -69,8 +82,19 @@
                string paprm = JsonConvert.SerializeObject(mesRequest);
                Log4NetHelper.WriteInfoLog(_logType, $"{funName},准备参数:{paprm}");
                Guid guid = System.Guid.NewGuid();
                res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid));
                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{res}");
                //模拟
                if (Form1.isvirtual)
                {//模拟环境
                    res = new ApiResponse<object>();
                    res.Success = true;
                    res.Message = "系统模拟完成";
                }
                else
                {
                    res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid));
                }

                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{JsonConvert.SerializeObject(res)}");
            }
            catch (Exception ex)
            {
@@ -98,8 +122,21 @@

                string paprm = JsonConvert.SerializeObject(mesRequest);
                Guid guid = System.Guid.NewGuid();
                res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{res}");

                //模拟
                if (Form1.isvirtual)
                {//模拟环境
                    res = new ApiResponse<object>();
                    res.Success = true;
                    res.Message = "系统模拟完成";
                }
                else
                {
                    res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
                }


                Log4NetHelper.WriteInfoLog(_logType, $"{funName},参数:{paprm},返回:{JsonConvert.SerializeObject(res)}");
            }
            catch (Exception ex)
            {

 wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs

@@ -33,6 +33,7 @@

                        if (sendMesData.Count > 0)
                        {
                            SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},要推送{sendMesData.Count()}条!";
                            foreach (var itemTask in sendMesData)
                            {
                                try
@@ -58,27 +59,20 @@
                                        });
                                    }

                                    if (Form1.isvirtual)
                                    {//模拟环境
                                        ret = new ApiResponse<object>();
                                        ret.Success = true;
                                        ret.Message = "系统模拟完成";
                                    }
                                    else

                                    switch (itemTask.outInFlag)
                                    {
                                        switch (itemTask.outInFlag)
                                        {
                                            case (int)OutInFlag.入库:
                                                ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
                                                break;
                                            case (int)OutInFlag.出库:
                                                ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
                                                break;
                                            default:
                                                break;
                                        }
                                        case (int)OutInFlag.入库:
                                            ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
                                            break;
                                        case (int)OutInFlag.出库:
                                            ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
                                            break;
                                        default:
                                            break;
                                    }

                                    SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},已推送结束，返回:{JsonConvert.SerializeObject(ret)}";
                                    if (ret.Success)
                                    {
                                        itemTask.isSendToMes = 1;
@@ -95,20 +89,20 @@
                                }
                                catch (Exception ex)
                                {
                                    SystemWarningMsg.msg_mesDataTranfficForRealMes = "推送给MES数据异常:" + JsonConvert.SerializeObject(ex);
                                    SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},推送给MES数据异常:" + JsonConvert.SerializeObject(ex);
                                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
                                }
                            }
                        }
                        else
                        {
                            SystemWarningMsg.msg_mesDataTranfficForRealMes = "没有数据要推送给MES!";
                            SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},没有数据要推送给MES!";
                        }
                    }
                }
                catch (Exception ex)
                {
                    SystemWarningMsg.msg_mesDataTranfficForRealMes = "数据要推送给MES出现异常:" + ex.Message;
                    SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},数据要推送给MES出现异常:" + ex.Message;
                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
                }
            }

 wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs

@@ -33,6 +33,7 @@

                        if (sendMesData.Count > 0)
                        {
                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},要推送{sendMesData.Count()}条!";
                            ApiResponse<object> ret = null;
                            List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
                            foreach (var itemTask in sendMesData)
@@ -52,26 +53,18 @@
                                });

                            }
                            if (Form1.isvirtual)
                            {//模拟环境
                                ret = new ApiResponse<object>();
                                ret.Success = true;
                                ret.Message = "系统模拟完成";
                            }
                            else
                            {
                                ret = PushMesHandler.Mes_StockSend(pushData, _logType);
                            }
                            ret = PushMesHandler.Mes_StockSend(pushData, _logType);
                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},已推送结束，{sendMesData.Count()}条!返回:{JsonConvert.SerializeObject(ret)}";
                        }
                        else
                        {
                            SystemWarningMsg.mesStockDataForRealMes = "没有数据要推送给MES!";
                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},没有数据要推送给MES!";
                        }
                    }
                }
                catch (Exception ex)
                {
                    SystemWarningMsg.mesStockDataForRealMes = "数据要推送给MES出现异常:" + ex.Message;
                    SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},数据要推送给MES出现异常:" + ex.Message;
                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.mesStockDataForRealMes, ex);
                }
                finally