change -添加过点数据，界面修改等

Aucma.Scada.Business/InStoreBusiness.cs

@@ -1,4 +1,5 @@
-using Aucma.Scada.HikRobot;
+using Aucma.Core.Scanner;
+using Aucma.Scada.HikRobot;
 using Aucma.Scada.Model.domain;
 using Aucma.Scada.Model.dto;
 using HighWayIot.Config;
@@ -38,7 +39,7 @@ namespace Aucma.Scada.Business
 
         private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance;
 
-        private GrabImage grabImage = GrabImage.Instance;
+       
         #endregion
 
         #region 接口引用
@@ -58,6 +59,11 @@ namespace Aucma.Scada.Business
         private IBaseBomInfoService _baseBomInfoService;
 
         private IRecordInStoreService _recordInStoreService;
+
+        private IPrintBarCodeServices _printBarCodeServices;
+        private IProductPlanInfoService _productPlanInfoServices;
+        // 过点数据表
+        private IMaterialCompletionServices _iMaterialCompletionServices;
         #endregion
 
         #region 委托事件
@@ -94,10 +100,11 @@ namespace Aucma.Scada.Business
             _baseSpaceDetailService = registerServices.GetService<IBaseSpaceDetailService>();
             _baseBomInfoService = registerServices.GetService<IBaseBomInfoService>();
             _recordInStoreService = registerServices.GetService<IRecordInStoreService>();
-
+            _printBarCodeServices = registerServices.GetService<IPrintBarCodeServices>();
+            _productPlanInfoServices = registerServices.GetService<IProductPlanInfoService>();
             taskHandle.InStoreFinsihEvent += FoamTaskFeedback;
-            grabImage.RefreshMaterialCodeStrEvent += InStore;
-            grabImage.RefreshLogMessageEvent += PrintLogInfoMessage;
+            MvCodeHelper.RefreshMaterialCodeStrEvent += InStore;
+            MvCodeHelper.RefreshLogMessageEvent += PrintLogInfoMessage;
             StartPassDown();
 
             //Task.Run(() =>
@@ -134,6 +141,21 @@ namespace Aucma.Scada.Business
                     {
                         //spaceInfo.onRouteAmount += 1; //通过PLC获取货道信息（在库、在途数量）时不需要修改在途数量
 
+                        #region 2023-12-15 更新过点数据,插入记录到MATERIAL_COMPLETION表 
+                        PrintBarCode print = _printBarCodeServices.query(materialCode);
+                        string planCode = _productPlanInfoServices.GetPlanCode(print.OrderCode, appConfig.stationCode);
+                        MaterialCompletion completion = new MaterialCompletion();
+                        completion.OrderCode = print.OrderCode;
+                        completion.MaterialBarcode = materialCode;
+                        completion.MaterialCode = print.MaterialCode;
+                        completion.MaterialName = print.MaterialName;
+                        completion.StationName = appConfig.stationCode;
+                        completion.CompleteDate = DateTime.Now;
+                        completion.planCode = planCode;
+                        _iMaterialCompletionServices.Add(completion);
+                        #endregion
+
+
                         _spaceInfoService.UpdateSpaceInfo(spaceInfo);
                     }
                 }

Aucma.Scada.Business/MainBusiness.cs

@@ -1,4 +1,5 @@
-using Aucma.Scada.HikRobot;
+using Aucma.Core.Scanner;
+using Aucma.Scada.HikRobot;
 using HighWayIot.Config;
 using HighWayIot.Plc;
 using System;
@@ -27,7 +28,6 @@ namespace Aucma.Scada.Business
 
         private PlcPool plcPool = PlcPool.Instance;
 
-        private GrabImage grabImage = GrabImage.Instance;
         #endregion
 
         private MainBusiness()
@@ -58,11 +58,13 @@ namespace Aucma.Scada.Business
         {
             try
             {
-                grabImage.InitHikRobot();
+                MvCodeHelper.DeviceListAcq();//获取创建设备
+                MvCodeHelper.StartGrab();  // 开启触发扫码接收数据
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                MvCodeHelper.CloseAllDevice();
+                InitHikRobot();
             }
         }
 
@@ -73,7 +75,7 @@ namespace Aucma.Scada.Business
         {
             try
             {
-                grabImage.ExitHikRobot();
+                MvCodeHelper.CloseAllDevice();
             }
             catch (Exception ex)
             {

Aucma.Scada.HikRobot/Aucma.Scada.HikRobot.csproj

@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GrabImage.cs" />
+    <Compile Include="MvCodeHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Aucma.Scada.HikRobot/Aucma.Scada.HikRobot.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>

Aucma.Scada.HikRobot/MvCodeHelper.cs

@@ -0,0 +1,380 @@
+using MvCodeReaderSDKNet;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using HighWayIot.Log4net;
+using HighWayIot.Config;
+using System.Security.Policy;
+namespace Aucma.Core.Scanner
+{
+    public class MvCodeHelper
+    {
+        private static AppConfig appConfig = AppConfig.Instance;
+        public static bool m_bGrabbing = true;
+        #region 委托事件
+        public delegate void RefreshMaterialCodeStr(string materialCodeStr);
+        public static event RefreshMaterialCodeStr RefreshMaterialCodeStrEvent;
+        /// <summary>
+        /// 日志信息刷新
+        /// </summary>
+        /// <param name="message"></param>
+        public delegate void RefreshLogMessage(string message);
+        public static event RefreshLogMessage RefreshLogMessageEvent;
+        #endregion
+
+        // 获取到的所有设备
+        public static MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST m_stDeviceList = new MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST();
+
+        // (成功创建)连接上的设备和其ip(string)集合
+        public static Dictionary<MvCodeReader, string> m_cMyDevices = new Dictionary<MvCodeReader, string>();
+
+        #region 设备连接状态
+        /// <summary>
+        /// 获取不到任务设备即连接失败
+        /// </summary>
+        /// <returns></returns>
+        public static bool ConnectionStatus(string ip)
+        {
+            // 遍历所有已打开相机
+            foreach (KeyValuePair<MvCodeReader, string> hashmap in m_cMyDevices)
+            {
+                if (ip.Equals(hashmap.Value))
+                {
+                    return true;
+                }
+            }
+            // 没有连接上，重新获取并创建设备
+            Task.Run(() =>
+            {
+                DeviceListAcq();
+            });
+            return false;
+        }
+        #endregion
+
+        #region 获取并创建设备列表
+        /// <summary>
+        /// 获取并创建设备列表
+        /// </summary>
+        public static void DeviceListAcq()
+        {
+            try
+            {
+                RefreshLogMessageEvent?.Invoke("获取扫码器设备列表,进入DeviceListAcq()方法");
+
+                System.GC.Collect();
+                m_stDeviceList.nDeviceNum = 0;
+                // 获取设备列表
+                int nRet = MvCodeReader.MV_CODEREADER_EnumDevices_NET(ref m_stDeviceList, MvCodeReader.MV_CODEREADER_GIGE_DEVICE);
+                if (0 != nRet)
+                {
+                    RefreshLogMessageEvent?.Invoke("获取扫码器列表失败,扫码器错误码:" + nRet);
+                    return;
+                }
+
+                if (0 == m_stDeviceList.nDeviceNum)
+                {
+                    RefreshLogMessageEvent?.Invoke("获取扫码器数量为0，请检查扫码器连接:");
+                    return;
+                }
+
+                MvCodeReader m_cMyDevice = new MvCodeReader();
+
+                //创建所有设备
+                for (int i = 0; i < m_stDeviceList.nDeviceNum; i++)
+                {
+                    MvCodeReader.MV_CODEREADER_DEVICE_INFO stDevInfo = (MvCodeReader.MV_CODEREADER_DEVICE_INFO)Marshal.PtrToStructure(m_stDeviceList.pDeviceInfo[i], typeof(MvCodeReader.MV_CODEREADER_DEVICE_INFO));
+                    if (stDevInfo.nTLayerType == MvCodeReader.MV_CODEREADER_GIGE_DEVICE)
+                    {
+                        IntPtr buffer = Marshal.UnsafeAddrOfPinnedArrayElement(stDevInfo.SpecialInfo.stGigEInfo, 0);
+                        MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO stGigEDeviceInfo = (MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO)Marshal.PtrToStructure(buffer, typeof(MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO));
+
+                        // 获取ip
+                        string ip = ((stGigEDeviceInfo.nCurrentIp & 0xff000000) >> 24) + "." + ((stGigEDeviceInfo.nCurrentIp & 0x00ff0000) >> 16) + "." + ((stGigEDeviceInfo.nCurrentIp & 0x0000ff00) >> 8) + "." + (stGigEDeviceInfo.nCurrentIp & 0x000000ff);
+                        //    Console.WriteLine($"打印扫码设备信息，下标：{i}；IP：{ip}"); 
+                        Console.Write("扫码器设备[" + i + "],ip:" + ip);
+                        // 创建第i个设备
+                        stDevInfo = (MvCodeReader.MV_CODEREADER_DEVICE_INFO)Marshal.PtrToStructure(m_stDeviceList.pDeviceInfo[i], typeof(MvCodeReader.MV_CODEREADER_DEVICE_INFO));
+                        nRet = m_cMyDevice.MV_CODEREADER_CreateHandle_NET(ref stDevInfo);//创建设备
+                        if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                        {
+                            Console.WriteLine("创建第" + i + "个扫码器设备失败,ip:" + ip);
+                            return;
+                        }
+                        // 打开设备
+                        nRet = m_cMyDevice.MV_CODEREADER_OpenDevice_NET();
+                        if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                        {
+                            m_cMyDevice.MV_CODEREADER_DestroyHandle_NET();
+                            Console.WriteLine("Device open fail!");
+                            return;
+                        }
+                        RefreshLogMessageEvent?.Invoke("创建并打开第" + i + "个扫码器设备成功,ip:" + ip);
+                        //设置触发模式
+                        nRet = m_cMyDevice.MV_CODEREADER_SetEnumValue_NET("TriggerMode", (uint)MvCodeReader.MV_CODEREADER_TRIGGER_MODE.MV_CODEREADER_TRIGGER_MODE_ON);
+                        if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                        {
+                            Console.WriteLine("设置触发模式失败");
+                            return;
+                        }
+                        //添加到集合
+                        m_cMyDevices.Add(m_cMyDevice, ip);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("获取和创建设备异常:" + ex);
+            }
+        }
+        #endregion
+
+
+        #region  光电触发扫码器接收条码处理业务
+        public static void StartGrab()
+        {
+            try
+            {
+                int nRet = MvCodeReader.MV_CODEREADER_OK;
+                // 3.开启抓图
+                int nCount = 0;
+                IntPtr pData = IntPtr.Zero;
+                MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2 stFrameInfoEx2 = new MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2();
+                IntPtr pstFrameInfoEx2 = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)));
+                Marshal.StructureToPtr(stFrameInfoEx2, pstFrameInfoEx2, false);
+
+                foreach (KeyValuePair<MvCodeReader, string> hashmap in m_cMyDevices)
+                {
+                    nRet = hashmap.Key.MV_CODEREADER_StartGrabbing_NET();
+                    while (m_bGrabbing)
+                    {
+                        // 光电触发了有图像
+                        nRet = hashmap.Key.MV_CODEREADER_GetOneFrameTimeoutEx2_NET(ref pData, pstFrameInfoEx2, 1000);
+                        // ch:获取一帧图像 | en:Get one image
+                        if (MvCodeReader.MV_CODEREADER_OK == nRet)
+                        {
+                            stFrameInfoEx2 = (MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)Marshal.PtrToStructure(pstFrameInfoEx2, typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2));
+                            // 分配条码内存空间
+                            MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2 stBcrResult = (MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2)Marshal.PtrToStructure(stFrameInfoEx2.UnparsedBcrList.pstCodeListEx2, typeof(MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2));
+                            for (int i = 0; i < stBcrResult.nCodeNum; ++i)
+                            {
+                                bool bIsValidUTF8 = IsTextUTF8(stBcrResult.stBcrInfoEx2[i].chCode);
+                                if (bIsValidUTF8)
+                                {
+                                    // string strCode = System.Text.Encoding.Default.GetString(stBcrResult.stBcrInfoEx2[i].chCode);
+                                    string strCode = Encoding.UTF8.GetString(stBcrResult.stBcrInfoEx2[i].chCode);
+                                    // logHelper.Info("bIsValidUTF8:: Get CodeNum: " + "CodeNum[" + i.ToString() + "], CodeString[" + strCode.Trim().TrimEnd('\0') + "]");
+                                }
+                                else
+                                {
+                                    byte[] buffer = new byte[22];
+                                    if (stBcrResult.stBcrInfoEx2[i].chCode.Length > 0)
+                                    {
+                                        Array.Copy(stBcrResult.stBcrInfoEx2[i].chCode, buffer, 22);
+                                    }
+                                    string strCode = Encoding.GetEncoding("UTF-8").GetString(buffer).Trim().TrimEnd('\0');
+                                    RefreshLogMessageEvent?.Invoke("相机ip:" + hashmap.Value + "   Get CodeNum: " + "CodeNum[" + i.ToString() + "], CodeString[" + strCode + "]");
+                                    if (!string.IsNullOrEmpty(strCode))
+                                    {
+                                        // 获取到条码处理业务                                     
+                                            RefreshMaterialCodeStrEvent?.Invoke(strCode);
+                                       
+                                    }
+                                }
+                            }
+                        }
+                        Thread.Sleep(500);
+
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("扫码异常:" + ex);
+            }
+        }
+        #endregion
+
+
+        #region 关闭所有设备
+        public static void CloseAllDevice()
+        {
+            try
+            {
+                Console.WriteLine("开始关闭所有设备");
+                int nRet = MvCodeReader.MV_CODEREADER_OK;
+                // 关闭所有已打开相机
+                foreach (KeyValuePair<MvCodeReader, string> hashmap in m_cMyDevices)
+                {
+                    // ch:停止抓图 | en:Stop grab image
+                    nRet = hashmap.Key.MV_CODEREADER_StopGrabbing_NET();
+                    if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                    {
+                        Console.WriteLine("设备ip:" + hashmap.Value + "停止抓图失败");
+                        Console.WriteLine("Stop grabbing failed{0:x8}", nRet);
+                    }
+                    // ch:关闭设备 | en:Close device
+                    nRet = hashmap.Key.MV_CODEREADER_CloseDevice_NET();
+                    if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                    {
+                        Console.WriteLine("设备ip:" + hashmap.Value + "关闭失败");
+
+                    }
+
+                    // ch:销毁设备 | en:Destroy device
+                    nRet = hashmap.Key.MV_CODEREADER_DestroyHandle_NET();
+                    if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                    {
+                        Console.WriteLine("设备ip:" + hashmap.Value + "销毁失败");
+                    }
+                    Console.WriteLine("设备ip:" + hashmap.Value + "关闭成功！");
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("设备关闭异常:" + ex);
+            }
+
+
+        }
+        #endregion
+
+        #region 关闭指定设备
+        public void CloseDevice(KeyValuePair<MvCodeReader, string> hashmap)
+        {
+            try
+            {
+                int nRet = MvCodeReader.MV_CODEREADER_OK;
+                // ch:停止抓图 | en:Stop grab image
+                nRet = hashmap.Key.MV_CODEREADER_StopGrabbing_NET();
+                if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                {
+                    Console.WriteLine("设备ip:" + hashmap.Value + "停止抓图失败");
+                    Console.WriteLine("Stop grabbing failed{0:x8}", nRet);
+                    return;
+                }
+                // ch:关闭设备 | en:Close device
+                nRet = hashmap.Key.MV_CODEREADER_CloseDevice_NET();
+                if (MvCodeReader.MV_CODEREADER_OK != nRet)
+                {
+                    Console.WriteLine("设备ip:" + hashmap.Value + "关闭失败");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("设备关闭异常:" + ex);
+            }
+        }
+        #endregion
+
+
+        #region 判断字符编码
+        /// <summary>
+        /// 判断字符编码
+        /// </summary>
+        /// <param name="inputStream"></param>
+        /// <returns></returns>
+        public static bool IsTextUTF8(byte[] inputStream)
+        {
+            int encodingBytesCount = 0;
+            bool allTextsAreASCIIChars = true;
+
+            for (int i = 0; i < inputStream.Length; i++)
+            {
+                byte current = inputStream[i];
+
+                if ((current & 0x80) == 0x80)
+                {
+                    allTextsAreASCIIChars = false;
+                }
+                // First byte
+                if (encodingBytesCount == 0)
+                {
+                    if ((current & 0x80) == 0)
+                    {
+                        // ASCII chars, from 0x00-0x7F
+                        continue;
+                    }
+
+                    if ((current & 0xC0) == 0xC0)
+                    {
+                        encodingBytesCount = 1;
+                        current <<= 2;
+
+                        // More than two bytes used to encoding a unicode char.
+                        // Calculate the real length.
+                        while ((current & 0x80) == 0x80)
+                        {
+                            current <<= 1;
+                            encodingBytesCount++;
+                        }
+                    }
+                    else
+                    {
+                        // Invalid bits structure for UTF8 encoding rule.
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Following bytes, must start with 10.
+                    if ((current & 0xC0) == 0x80)
+                    {
+                        encodingBytesCount--;
+                    }
+                    else
+                    {
+                        // Invalid bits structure for UTF8 encoding rule.
+                        return false;
+                    }
+                }
+            }
+            if (encodingBytesCount != 0)
+            {
+                // Invalid bits structure for UTF8 encoding rule.
+                // Wrong following bytes count.
+                return false;
+            }
+            // Although UTF8 supports encoding for ASCII chars, we regard as a input stream, whose contents are all ASCII as default encoding.
+            return !allTextsAreASCIIChars;
+        }
+
+        #endregion
+
+        #region 将Byte转换为结构体类型
+        //将Byte转换为结构体类型
+        public static object ByteToStruct(byte[] bytes, Type type)
+        {
+            int size = Marshal.SizeOf(type);
+            if (size > bytes.Length)
+            {
+                return null;
+            }
+            //分配结构体内存空间
+            IntPtr structPtr = Marshal.AllocHGlobal(size);
+            //将byte数组拷贝到分配好的内存空间
+            Marshal.Copy(bytes, 0, structPtr, size);
+            //将内存空间转换为目标结构体
+            object obj = Marshal.PtrToStructure(structPtr, type);
+            //释放内存空间
+            Marshal.FreeHGlobal(structPtr);
+            return obj;
+        }
+        #endregion
+
+
+
+    }
+}
+
+
+
+
+

Aucma.Scada.Model/Aucma.Scada.Model.csproj

@@ -44,6 +44,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="domain\MaterialCompletion.cs" />
+    <Compile Include="domain\PrintBarCode.cs" />
     <Compile Include="domain\BaseBomInfo.cs" />
     <Compile Include="domain\BaseSpaceDetail.cs" />
     <Compile Include="domain\BaseSpaceInfo.cs" />

Aucma.Scada.Model/domain/MaterialCompletion.cs

@@ -0,0 +1,59 @@
+using SqlSugar;
+using System;
+
+namespace Aucma.Scada.Model.domain
+{
+    /// <summary>
+    /// 物料完成记录
+    /// </summary>
+    [SugarTable("MATERIAL_COMPLETION", "AUCMA_SCADA")]
+    public class MaterialCompletion
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
+        public int ObjId { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        [SugarColumn(ColumnName = "ORDER_CODE")]
+        public string OrderCode { get; set; }
+
+        /// <summary>
+        /// 物料条码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_BARCODE")]
+        public string MaterialBarcode { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_NAME")]
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 所属工位
+        /// </summary>
+        [SugarColumn(ColumnName = "STATION_NAME")]
+        public string StationName { get; set; }
+
+        /// <summary>
+        /// 完成时间
+        /// </summary>
+        [SugarColumn(ColumnName = "COMPLETE_DATE")]
+        public DateTime CompleteDate { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_CODE")]
+        public string planCode { get; set; }
+    }
+}

Aucma.Scada.Model/domain/PrintBarCode.cs

@@ -0,0 +1,57 @@
+using SqlSugar;
+using System;
+
+namespace Aucma.Scada.Model.domain
+{
+    /// <summary>
+    /// 打印条码信息
+    /// </summary>
+    [SugarTable("PRINT_BARCODE", "AUCMA_SCADA")]
+    public class PrintBarCode
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
+        public int ObjId { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        [SugarColumn(ColumnName = "ORDER_CODE")]
+        public string OrderCode { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string MaterialCode { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_NAME")]
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 条码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_BARCODE")]
+        public string MaterialBarcode { get; set; }
+
+        /// <summary>
+        /// 打印时间
+        /// </summary>
+        [SugarColumn(ColumnName = "PRINT_TIME")]
+        public DateTime PrintTime { get; set; }
+
+        /// <summary>
+        /// 补打个数
+        /// </summary>
+        [SugarColumn(ColumnName = "SUPPLEMENT_MATERIAL")]
+        public int SupplementMaterial { get; set; }
+
+        /// <summary>
+        /// 打印类型：箱壳、内胆
+        /// </summary>
+        [SugarColumn(ColumnName = "PRINT_BARTYPE")]
+        public int PrintBarType { get; set; }
+    }
+}

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -258,10 +258,17 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Resource Include="templates\image\Green.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="templates\image\Red.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <Content Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -299,6 +306,10 @@
       <Project>{deabc30c-ec6f-472e-bd67-d65702fdaf74}</Project>
       <Name>HighWayIot.Log4net</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HighWayIot.Plc\HighWayIot.Plc.csproj">
+      <Project>{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}</Project>
+      <Name>HighWayIot.Plc</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HighWayIot.Repository\HighWayIot.Repository.csproj">
       <Project>{d0dc3cfb-6748-4d5e-b56a-76fdc72ab4b3}</Project>
       <Name>HighWayIot.Repository</Name>

Aucma.Scada.UI/MainWindow.xaml

@@ -77,10 +77,7 @@
                     <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
                 </Border.Effect>
                 <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
+                   
                     <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
                         <Button Content="入库监控" x:Name="instoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource  BUTTON_AGREE}"  Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
                         <Button Content="出库监控" x:Name="outstoreInfo"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource  BUTTON_AGREE}"   Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
@@ -94,111 +91,26 @@
                         <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource  BUTTON_AGREE}"   Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0" FontSize="17"/>
                     </StackPanel>
 
-                    <StackPanel Grid.Column="1" VerticalAlignment="Center"  HorizontalAlignment="Right" Orientation="Horizontal">
-
-                      
-                        <!--单行状态显示-->
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <StackPanel Grid.Column="0">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Ellipse Width="30" Height="30">
-                                            <Ellipse.Style>
-                                                <Style TargetType="Ellipse">
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="0">
-                                                            <Setter Property="Shape.Fill" Value="Orange"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="1">
-                                                            <Setter Property="Shape.Fill" Value="Green"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="2">
-                                                            <Setter Property="Shape.Fill" Value="Red"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Ellipse.Style>
-                                        </Ellipse>
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="箱壳扫码器" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-
-                            <StackPanel Grid.Column="1">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Ellipse Width="30" Height="30">
-                                            <Ellipse.Style>
-                                                <Style TargetType="Ellipse">
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="0">
-                                                            <Setter Property="Shape.Fill" Value="Orange"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="1">
-                                                            <Setter Property="Shape.Fill" Value="Green"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="2">
-                                                            <Setter Property="Shape.Fill" Value="Red"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Ellipse.Style>
-                                        </Ellipse>
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="内胆扫码器" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-
-                            <StackPanel Grid.Column="2">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Ellipse Width="30" Height="30">
-                                            <Ellipse.Style>
-                                                <Style TargetType="Ellipse">
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="0">
-                                                            <Setter Property="Shape.Fill" Value="Orange"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="1">
-                                                            <Setter Property="Shape.Fill" Value="Green"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="2">
-                                                            <Setter Property="Shape.Fill" Value="Red"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Ellipse.Style>
-                                        </Ellipse>
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="PLC状态" FontSize="20" Foreground="#FFFFFF" Margin="2,0,10,0"/>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-                        </Grid>
+                    <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
+                        <Border Width="30" Height="30" CornerRadius="15">
+                            <Border.Background>
+                                <ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
+                            </Border.Background>
+                        </Border>
+                        <TextBlock x:Name="MesDbStateTxt" Text="{Binding MesDbUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding MesDbUIColor}"  FontSize="15" Margin="10,0"/>
+                        <Border Width="30" Height="30" CornerRadius="15">
+                            <Border.Background>
+                                <ImageBrush x:Name="PlcStatus" ImageSource="{Binding PlcUIIcon}"/>
+                            </Border.Background>
+                        </Border>
+                        <TextBlock x:Name="PLCState" Text="{Binding PlcUIStatusWb}" VerticalAlignment="Center" Foreground="{Binding PlcUIColor}"  FontSize="15" Margin="10,0"/>
                         
+                        <Border Width="30" Height="30" CornerRadius="15">
+                            <Border.Background>
+                                <ImageBrush x:Name="Scanner1Status" ImageSource="{Binding Scanner1UIIcon}"/>
+                            </Border.Background>
+                        </Border>
+                        <TextBlock x:Name="Scanner1" Text="{Binding Scanner1UIStatusWb}" VerticalAlignment="Center" Foreground="{Binding Scanner1UIColor}" FontSize="15" Margin="10,0"/>
                     </StackPanel>
                 </Grid>
 

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -239,7 +239,7 @@
 
                 <!--日志信息-->
                 <Border Grid.Row="1" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
-                    <ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground= "#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
+                    <ListBox FontSize="20" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground= "#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
                 </Border>
             </Grid>
         </Border>

Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml

@@ -185,7 +185,7 @@
                         <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
                             <TextBlock Text="设备监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Border>
-                        <ListBox Grid.Row="1" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground= "#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
+                        <ListBox  FontSize="20" Grid.Row="1" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground= "#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
                     </Grid>
                 </Border>
             </Grid>

Aucma.Scada.UI/log4net.config

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
+  </configSections>
+  <appSettings>
+  </appSettings>
+  <log4net>
+    <!--错误日志类-->
+    <logger name="logerror">
+      <level value="ALL" />
+      <appender-ref ref="ErrorAppender" />
+    </logger>
+
+    <!--信息日志类-->
+    <logger name="loginfo">
+      <level value="ALL" />
+      <appender-ref ref="InfoAppender" />
+    </logger>
+
+    <!--PLC日志类-->
+    <logger name="plclog">
+      <level value="ALL" />
+      <appender-ref ref="PlcAppender" />
+    </logger>
+
+    <!--RFID日志类-->
+    <logger name="rfidlog">
+      <level value="ALL" />
+      <appender-ref ref="RfidAppender" />
+    </logger>
+
+    <!--RFID日志类-->
+    <logger name="viewlog">
+      <level value="ALL" />
+      <appender-ref ref="ViewAppender" />
+    </logger>
+
+    <!--Sql日志类-->
+    <logger name="sqllog">
+      <level value="ALL" />
+      <appender-ref ref="SqlAppender" />
+    </logger>
+
+    <!--信号量日志类-->
+    <logger name="semaphorelog">
+      <level value="ALL" />
+      <appender-ref ref="SemaphoreAppender" />
+    </logger>
+
+    <!--错误日志附加介质-->
+    <appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"LogError.html"'/>
+      <param name="RollingStyle" value="Date" />
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;HR COLOR=red&gt;%n异常时间：%d [%t] &lt;BR&gt;%n异常级别：%-5p &lt;BR&gt;%n异 常 类：%c [%x] &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;"  />
+      </layout>
+    </appender>
+
+    <!--信息日志附加介质-->
+    <appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"LogInfo.txt"'/>
+      <param name="RollingStyle" value="Date"/>
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+    <!--PLC日志附加介质-->
+    <appender name="PlcAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false"/>
+      <param name="DatePattern" value='yyyy-MM-dd/"PlcLog.txt"' />
+      <param name="RollingStyle" value="Date" />
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+    <!--Rfid日志附加介质-->
+    <appender name="RfidAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"RfidLog.txt"' />
+      <param name="RollingStyle" value="Date" />
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+    <appender name="ViewAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"ViewLog.txt"' />
+      <param name="RollingStyle" value="Date" />
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+    <appender name="SqlAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"SqlLog.txt"' />
+      <param name="RollingStyle" value="Date" />
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+    <appender name="SemaphoreAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="Log\" />
+      <param name="AppendToFile" value="true" />
+      <param name="MaxFileSize" value="10240" />
+      <param name="MaxSizeRollBackups" value="100" />
+      <param name="StaticLogFileName" value="false" />
+      <param name="DatePattern" value='yyyy-MM-dd/"SemaphoreLog.txt"' />
+      <param name="RollingStyle" value="Date" />
+      <!--信息日志布局-->
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
+      </layout>
+    </appender>
+
+  </log4net>
+</configuration>

Aucma.Scada.UI/obj/Debug/App.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B060CCE3C0EB2936A3B2B1DB0D293EE0DA9069BFA1CE2B91373FAA106625D31E"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E34CAD6C33D4FEB5D7FD9543E4D4E9B6E296BC4399F39B581E83385539C2A2EA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/App.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B060CCE3C0EB2936A3B2B1DB0D293EE0DA9069BFA1CE2B91373FAA106625D31E"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E34CAD6C33D4FEB5D7FD9543E4D4E9B6E296BC4399F39B581E83385539C2A2EA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-248466b6128f7caab048ae557a982f4b6936c03c
+4c5d9d88f1416d0e9142986b2c17d889d8a30a4e

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt

@@ -349,3 +349,113 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\P
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.g.cs
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.baml
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\log4net.config
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\MySql.Data.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\SqlSugar.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\MvCodeReaderSDK.Net.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HslCommunication.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Memory.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Threading.Tasks.Extensions.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Numerics.Vectors.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\System.Buffers.dll
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll.config
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\App.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_Content.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\App.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\MainWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\RecordControl.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\templates\style\resourceStyle.baml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.g.resources
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.Properties.Resources.resources
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.GenerateResource.cache
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_Content.g.cs

@@ -0,0 +1,13 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("log4net.config")]
+
+

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_Content.g.i.cs

@@ -8,6 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("templates/image/background.jpg")]
+[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("log4net.config")]
 
 

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\
 Aucma.Scada.UI
 none
 false
 DEBUG;TRACE
-E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml
+E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml
 18-1415767702
-
+1-1257182505
 42-446346919
-1361464425805
+1371426297053
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\AssemblyPlan\QuantityIssuedWindow.xaml;Page\AssemblyPlan\SearchCriteriaWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\MaterialStatisticsWindow.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 False

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref

@@ -1,21 +1,21 @@
-E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
-FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
+
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\LogInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\MainWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\RecordControl.xaml;;
+FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
 

Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,2 +1,62 @@
-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

Aucma.Scada.UI/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B15C169F20DE2B98A91F96AC06368EF3202682E27AE6BEFD75FE5C9339CA885E"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D678C222DE5CF58062DF1831D71C720F73DC6541FC104B5037CBA15510716763"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -41,7 +41,7 @@ namespace Aucma.Scada.UI {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 84 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button instoreInfo;
         
@@ -49,7 +49,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 83 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outstoreInfo;
         
@@ -57,7 +57,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 86 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button taskInfo;
         
@@ -65,7 +65,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 87 "..\..\MainWindow.xaml"
+        #line 85 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inventoryInfo;
         
@@ -73,7 +73,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 88 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button assemblyPlan;
         
@@ -81,7 +81,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 92 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Minimized;
         
@@ -89,13 +89,61 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 93 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Exit;
         
         #line default
         #line hidden
         
+        
+        #line 97 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush MesDbStatus;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 100 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock MesDbStateTxt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 103 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush PlcStatus;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 106 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock PLCState;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 110 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush Scanner1Status;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 113 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Scanner1;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -147,6 +195,24 @@ namespace Aucma.Scada.UI {
             case 7:
             this.Exit = ((System.Windows.Controls.Button)(target));
             return;
+            case 8:
+            this.MesDbStatus = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 9:
+            this.MesDbStateTxt = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 10:
+            this.PlcStatus = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 11:
+            this.PLCState = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 12:
+            this.Scanner1Status = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 13:
+            this.Scanner1 = ((System.Windows.Controls.TextBlock)(target));
+            return;
             }
             this._contentLoaded = true;
         }

Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B15C169F20DE2B98A91F96AC06368EF3202682E27AE6BEFD75FE5C9339CA885E"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D678C222DE5CF58062DF1831D71C720F73DC6541FC104B5037CBA15510716763"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -41,7 +41,7 @@ namespace Aucma.Scada.UI {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 84 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button instoreInfo;
         
@@ -49,7 +49,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 85 "..\..\MainWindow.xaml"
+        #line 83 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outstoreInfo;
         
@@ -57,7 +57,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 86 "..\..\MainWindow.xaml"
+        #line 84 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button taskInfo;
         
@@ -65,7 +65,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 87 "..\..\MainWindow.xaml"
+        #line 85 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inventoryInfo;
         
@@ -73,7 +73,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 88 "..\..\MainWindow.xaml"
+        #line 86 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button assemblyPlan;
         
@@ -81,7 +81,7 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 92 "..\..\MainWindow.xaml"
+        #line 90 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Minimized;
         
@@ -89,13 +89,61 @@ namespace Aucma.Scada.UI {
         #line hidden
         
         
-        #line 93 "..\..\MainWindow.xaml"
+        #line 91 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Exit;
         
         #line default
         #line hidden
         
+        
+        #line 97 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush MesDbStatus;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 100 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock MesDbStateTxt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 103 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush PlcStatus;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 106 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock PLCState;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 110 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Media.ImageBrush Scanner1Status;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 113 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Scanner1;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -147,6 +195,24 @@ namespace Aucma.Scada.UI {
             case 7:
             this.Exit = ((System.Windows.Controls.Button)(target));
             return;
+            case 8:
+            this.MesDbStatus = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 9:
+            this.MesDbStateTxt = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 10:
+            this.PlcStatus = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 11:
+            this.PLCState = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 12:
+            this.Scanner1Status = ((System.Windows.Media.ImageBrush)(target));
+            return;
+            case 13:
+            this.Scanner1 = ((System.Windows.Controls.TextBlock)(target));
+            return;
             }
             this._contentLoaded = true;
         }

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EF52C2BEBFAECDBC3118250032BAA8D00BC32174A8141D2A4D308EA94598D555"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "81BB58658FBF245B46897C7FED6C2717ED87387144DEA479AC0C7218AF0B119C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EF52C2BEBFAECDBC3118250032BAA8D00BC32174A8141D2A4D308EA94598D555"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "81BB58658FBF245B46897C7FED6C2717ED87387144DEA479AC0C7218AF0B119C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F286707ECA061A6BE81F11AB8F9B0A6620B1A029AA8EC1E46A74CCAC5DA304B8"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "67A36CB586D2F3B36539DC0916D8739A7C2D3C7A5603D4816DC265521C562725"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
         #line hidden
         
         
-        #line 76 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+        #line 139 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
         
@@ -93,7 +93,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
             case 2:
             this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 81 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+            #line 144 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
             this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown);
             
             #line default

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F286707ECA061A6BE81F11AB8F9B0A6620B1A029AA8EC1E46A74CCAC5DA304B8"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "67A36CB586D2F3B36539DC0916D8739A7C2D3C7A5603D4816DC265521C562725"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
         #line hidden
         
         
-        #line 76 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+        #line 139 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
         
@@ -93,7 +93,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
             case 2:
             this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 81 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+            #line 144 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
             this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown);
             
             #line default

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A51C0173382E23F6BDF3BBFA25E3B2691BB23C31E7312C858FC4A50E67F5C44"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C65B89F83DEDB61F4D6FBEF4698AD190D5986C6D1FE63858985DA50C9DB448FE"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/QuantityIssuedWindow.g.i.cs

@@ -1,5 +1,4 @@
-// Updated by XamlIntelliSenseFileGenerator 2023-12-07 11:06:34
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A51C0173382E23F6BDF3BBFA25E3B2691BB23C31E7312C858FC4A50E67F5C44"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C65B89F83DEDB61F4D6FBEF4698AD190D5986C6D1FE63858985DA50C9DB448FE"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -33,15 +32,18 @@ using System.Windows.Shapes;
 using System.Windows.Shell;
 
 
-namespace Aucma.Scada.UI.Page.AssemblyPlan
-{
+namespace Aucma.Scada.UI.Page.AssemblyPlan {
     
     
     /// <summary>
     /// QuantityIssuedWindow
     /// </summary>
-    public partial class QuantityIssuedWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
-    {
+    public partial class QuantityIssuedWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 8 "..\..\..\..\Page\AssemblyPlan\QuantityIssuedWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Aucma.Scada.UI.Page.AssemblyPlan.QuantityIssuedWindow window;
         
         #line default
         #line hidden
@@ -85,10 +87,8 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent()
-        {
-            if (_contentLoaded)
-            {
+        public void InitializeComponent() {
+            if (_contentLoaded) {
                 return;
             }
             _contentLoaded = true;
@@ -107,8 +107,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
-        {
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
             case 1:
@@ -129,8 +128,6 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan
             }
             this._contentLoaded = true;
         }
-
-        internal System.Windows.Window window;
     }
 }
 

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/SearchCriteriaWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\SearchCriteriaWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8F7B2A8C538FC615E65799F2C9BB5FEBEBDC6F92BAD8AE4701ED068F9BC86C7"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\SearchCriteriaWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4AB3219AC09898AE68E3E1657EDAE3075A61F440664C1B3E074969DE0FD52A21"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/SearchCriteriaWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\SearchCriteriaWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8F7B2A8C538FC615E65799F2C9BB5FEBEBDC6F92BAD8AE4701ED068F9BC86C7"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\SearchCriteriaWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4AB3219AC09898AE68E3E1657EDAE3075A61F440664C1B3E074969DE0FD52A21"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "799341851DF4A31059EBF44128122192259D792DA974B31DABB90BE7E2701C88"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "923C14CB4FB6F417B25F28806A661E0FB09C6F5B05C089A67BFCA9872CC2BE38"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 133 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 205 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         
@@ -51,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
         #line hidden
         
         
-        #line 170 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 242 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "799341851DF4A31059EBF44128122192259D792DA974B31DABB90BE7E2701C88"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "923C14CB4FB6F417B25F28806A661E0FB09C6F5B05C089A67BFCA9872CC2BE38"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 133 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 205 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         
@@ -51,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
         #line hidden
         
         
-        #line 170 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 242 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6B67F89C1C00153963276EA3F53AF7B22CBBC64511937421C72A9EA7FA1C2EF"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1629BFBCA37C42F2302D53D1C14261263DFBB5E8B24775432364A849E7B4B099"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6B67F89C1C00153963276EA3F53AF7B22CBBC64511937421C72A9EA7FA1C2EF"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1629BFBCA37C42F2302D53D1C14261263DFBB5E8B24775432364A849E7B4B099"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6A07B725F3EEFBCEA5B9596BE2B77F9059A2F7DD44CD789C7ED9CF566D5F4AEF"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2790778ABAF20BCADC1D796EB24F0115322802C65881B92CEA99075A451C86F7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6A07B725F3EEFBCEA5B9596BE2B77F9059A2F7DD44CD789C7ED9CF566D5F4AEF"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2790778ABAF20BCADC1D796EB24F0115322802C65881B92CEA99075A451C86F7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52F1FA50576B9312BB0D40AAF43F4F0EA42BA2B7976D208C439BF6DDE6A1A035"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E5D41FC24C272EC7191AA446C363979B3F005E6AC2EA18D247C1ED11CFB29033"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52F1FA50576B9312BB0D40AAF43F4F0EA42BA2B7976D208C439BF6DDE6A1A035"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E5D41FC24C272EC7191AA446C363979B3F005E6AC2EA18D247C1ED11CFB29033"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6115A2C17413027853AD6AD01ACA0BF1E9A9CE6A7FB8974C23DB19A81304037F"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B679D4B17100EEB1BD654A7535A71C0857A955CFA0EB5E7BDC2D6ACEF450324"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/MaterialStatisticsWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6115A2C17413027853AD6AD01ACA0BF1E9A9CE6A7FB8974C23DB19A81304037F"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\MaterialStatisticsWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B679D4B17100EEB1BD654A7535A71C0857A955CFA0EB5E7BDC2D6ACEF450324"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1E70D2F62B23FA702C1CCB710B21A0169710AE3363B9F085A058C1DCA4C3F5DE"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F6ACAEB4B23118300FA19B928ADC2832BE5A66F98284DE9D1DDE501C2A520B2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1E70D2F62B23FA702C1CCB710B21A0169710AE3363B9F085A058C1DCA4C3F5DE"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F6ACAEB4B23118300FA19B928ADC2832BE5A66F98284DE9D1DDE501C2A520B2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D9ED6B85D9AED019513FD7ED55B2B09E5774A2891B1F28DF6AA7A43EAA53529"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3E1064711550570F013C0020A953CAE5006BAE2AC20C42C63BB46E83D3B7B7D0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -49,7 +49,7 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
         #line hidden
         
         
-        #line 34 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
+        #line 97 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
         

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D9ED6B85D9AED019513FD7ED55B2B09E5774A2891B1F28DF6AA7A43EAA53529"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3E1064711550570F013C0020A953CAE5006BAE2AC20C42C63BB46E83D3B7B7D0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -49,7 +49,7 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
         #line hidden
         
         
-        #line 34 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
+        #line 97 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
         

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92BE1A0063A804A68D5909EE90F2A9BF449D90516828AB384E8E40ED6580691A"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B40B749E130D1C75C21A96FD39EB3BCB1CEC2D6D6A130A6615B7AE24768E377A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
     public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 126 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 188 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
         #line hidden
         
         
-        #line 169 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 231 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92BE1A0063A804A68D5909EE90F2A9BF449D90516828AB384E8E40ED6580691A"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B40B749E130D1C75C21A96FD39EB3BCB1CEC2D6D6A130A6615B7AE24768E377A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
     public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 126 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 188 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
         #line hidden
         
         
-        #line 169 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 231 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "478CF6BCD99092E5CB5464E722BEA3029C03566C37DA32D94252741B6BC61907"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9552E612915B5FA6E96947C1AD6BBC5E6D5FDAAAA05D0210164A46A18520A9FF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 20 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 82 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inStore;
         
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         #line hidden
         
         
-        #line 21 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 83 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outStore;
         

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "478CF6BCD99092E5CB5464E722BEA3029C03566C37DA32D94252741B6BC61907"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9552E612915B5FA6E96947C1AD6BBC5E6D5FDAAAA05D0210164A46A18520A9FF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 20 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 82 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inStore;
         
@@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         #line hidden
         
         
-        #line 21 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 83 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outStore;
         

Aucma.Scada.UI/obj/Debug/RecordControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\RecordControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "757B77B262E5881CE54F124A3ACA7CD1D311F3A854B839C3265BAED89751ECF3"
+#pragma checksum "..\..\RecordControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5C6CBEC1C10C22B5C4F1D0F570B8191706CFF7B87E63694CCD14D0F441661EF7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/RecordControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\RecordControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "757B77B262E5881CE54F124A3ACA7CD1D311F3A854B839C3265BAED89751ECF3"
+#pragma checksum "..\..\RecordControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5C6CBEC1C10C22B5C4F1D0F570B8191706CFF7B87E63694CCD14D0F441661EF7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/viewModel/MainViewModel.cs

@@ -1,18 +1,27 @@
-using Aucma.Scada.UI.Page.AssemblyPlan;
+using Aucma.Core.Scanner;
+using Aucma.Scada.UI.Page.AssemblyPlan;
 using Aucma.Scada.UI.Page.InStoreInfo;
 using Aucma.Scada.UI.Page.InventoryInfo;
 using Aucma.Scada.UI.Page.OutStoreInfo;
 using Aucma.Scada.UI.Page.TaskInfo;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using HighWayIot.Config;
 using HighWayIot.Log4net;
+using HighWayIot.Plc;
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Windows;
 
 namespace Aucma.Scada.UI.viewModel
 {
     public class MainViewModel : ViewModelBase
     {
+        private AppConfig appConfig = AppConfig.Instance;
+        private PlcPool _pool = PlcPool.Instance;
+        private Dictionary<string, IPlc> _plcDictionary = new Dictionary<string, IPlc>();
         private LogHelper logHelper = LogHelper.Instance;
         private readonly LogInfoControl logInfoControl = new LogInfoControl();
         private readonly InStoreInfoControl inStoreInfoControl = new InStoreInfoControl();
@@ -30,6 +39,7 @@ namespace Aucma.Scada.UI.viewModel
             FormControlCommand = new RelayCommand<object>(obj => FormControl(obj));
 
             UserContent = inStoreInfoControl;
+            init();
         }
 
         #region 参数定义
@@ -138,11 +148,17 @@ namespace Aucma.Scada.UI.viewModel
         {
             try
             {
-                MessageBox.Show("打开系统键盘");
+                Process proc = new Process();
+                proc.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "osk.exe");
+                proc.StartInfo.UseShellExecute = true;
+                proc.StartInfo.Verb = "runas";
+                proc.Start();
             }
             catch (Exception ex)
             {
                 logHelper.Error("打开系统键盘逻辑异常", ex);
+
+                MessageBox.Show($"系统键盘打开异常:{ex.Message}", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
             }
         }
 
@@ -191,5 +207,244 @@ namespace Aucma.Scada.UI.viewModel
             }
         }
 
+
+        public void init()
+        {
+            // 设备状态刷新定时器
+            System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
+            timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
+            timer.AutoReset = true;
+            timer.Enabled = true;
+            timer.Start();
+        }
+
+
+        #region 设备状态刷新
+        /// <summary>
+        /// 设备状态刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshStatus(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            RefreshMesDb();
+            RefreshPlc();
+            RefreshScanner();
+
+        }
+        /// <summary>
+        /// 数据库状态刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshMesDb()
+        {
+            MesDbState(true);
+        }
+
+        /// <summary>
+        /// plc状态刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshPlc()
+        {
+            _plcDictionary = _pool.GetAll();
+            // 箱壳状态
+            _plcDictionary.TryGetValue(appConfig.foamStoreCode, out IPlc _plc);
+            if (_plc != null)
+            {
+                PlcState(true);
+            }
+            else
+            {
+                PlcState(false);
+            }
+          
+        }
+        /// <summary>
+        /// 扫码器状态刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshScanner()
+        {
+            string ip1 = appConfig.foamHikRobotIp;    
+            bool flag1 = MvCodeHelper.ConnectionStatus(ip1);
+            Scanner1State(flag1);
+           
+        }
+        #endregion
+
+        #region MES数据库状态
+        /// <summary>
+        /// MES数据库-文字
+        /// </summary>
+        public string _mesDbUIStatusWb;
+        public string MesDbUIStatusWb
+        {
+            get => _mesDbUIStatusWb;
+            set { _mesDbUIStatusWb = value; RaisePropertyChanged(nameof(MesDbUIStatusWb)); }
+        }
+        /// <summary>
+        /// MES数据库-颜色
+        /// </summary>
+        public string _mesDbUIColor;
+        public string MesDbUIColor
+        {
+            get => _mesDbUIColor;
+            set { _mesDbUIColor = value; RaisePropertyChanged(nameof(MesDbUIColor)); }
+
+        }
+        /// <summary>
+        /// MES数据库-图标
+        /// </summary>
+        public string _mesUIIcon;
+        public string MesUIIcon
+        {
+            get => _mesUIIcon;
+            set { _mesUIIcon = value; RaisePropertyChanged(nameof(MesUIIcon)); }
+        }
+
+        /// <summary>
+        /// MES数据库连接状态
+        /// </summary>
+        /// <param name="type"></param>
+        public void MesDbState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    MesDbUIStatusWb = "MES数据库连接成功";
+                    MesDbUIColor = "Green";
+                    MesUIIcon = "templates/image/Green.png";
+                }
+                else
+                {
+                    MesDbUIStatusWb = "MES数据库异常";
+                    MesDbUIColor = "Red";
+                    MesUIIcon = "templates/image/Red.png";
+                }
+            });
+        }
+        #endregion
+
+        #region plc 状态
+        /// <summary>
+        /// UI plc 展示状态-文字
+        /// </summary>
+        public string _plcUIStatusWb;
+        public string PlcUIStatusWb
+        {
+            get => _plcUIStatusWb;
+            set { _plcUIStatusWb = value; RaisePropertyChanged(nameof(PlcUIStatusWb)); }
+
+        }
+        /// <summary>
+        /// UI plc 展示状态-颜色
+        /// </summary>
+        public string _plcUIColor;
+        public string PlcUIColor
+        {
+            get => _plcUIColor;
+            set { _plcUIColor = value; RaisePropertyChanged(nameof(PlcUIColor)); }
+        }
+        /// <summary>
+        /// UI plc 展示状态-图标
+        /// </summary>
+        public string _plcUIIcon;
+        public string PlcUIIcon
+        {
+            get => _plcUIIcon;
+            set { _plcUIIcon = value; RaisePropertyChanged(nameof(PlcUIIcon)); }
+        }
+
+        /// <summary>
+        /// PLC连接状态-true:连接成功；false:失败
+        /// </summary>
+        /// <param name="type"></param>
+        public void PlcState(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    PlcUIStatusWb = "PLC连接成功";
+                    PlcUIColor = "Green";
+                    PlcUIIcon = "templates/image/Green.png";
+                }
+                else
+                {
+                    PlcUIStatusWb = "PLC状态异常";
+                    PlcUIColor = "Red";
+                    PlcUIIcon = "templates/image/Red.png";
+                }
+            });
+        }
+        #endregion
+
+        #region 扫码器1状态
+        /// <summary>
+        /// UI  展示状态-文字
+        /// </summary>
+        public string _scanner1UIStatusWb;
+        public string Scanner1UIStatusWb
+        {
+            //get { return plcUIStatusWb; }
+            //set { plcUIStatusWb = value; RaisePropertyChanged("PlcUIStatusWb"); }
+            get => _scanner1UIStatusWb;
+            set { _scanner1UIStatusWb = value; RaisePropertyChanged(nameof(Scanner1UIStatusWb)); }
+        }
+        /// <summary>
+        /// UI  展示状态-颜色
+        /// </summary>
+        public string _scanner1UIColor;
+        public string Scanner1UIColor
+        {
+            //get { return plcUIColor; }
+            //set { plcUIColor = value; RaisePropertyChanged("PlcUIColor"); }
+            get => _scanner1UIColor;
+            set { _scanner1UIColor = value; RaisePropertyChanged(nameof(Scanner1UIColor)); }
+
+        }
+        /// <summary>
+        /// UI  展示状态-图标
+        /// </summary>
+        public string _scanner1UIIcon;
+        public string Scanner1UIIcon
+        {
+            //get { return plcUIIcon; }
+            //set { plcUIIcon = value; RaisePropertyChanged("plcUIIcon"); }
+            get => _scanner1UIIcon;
+            set { _scanner1UIIcon = value; RaisePropertyChanged(nameof(Scanner1UIIcon)); }
+
+        }
+
+        /// <summary>
+        /// 扫码器1连接状态-true:连接成功；false:失败
+        /// </summary>
+        /// <param name="type"></param>
+        public void Scanner1State(bool type)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (type)
+                {
+                    Scanner1UIStatusWb = "扫码器1连接成功";
+                    Scanner1UIColor = "Green";
+                    Scanner1UIIcon = "templates/image/Green.png";
+                }
+                else
+                {
+                    Scanner1UIStatusWb = "扫码器1状态异常";
+                    Scanner1UIColor = "Red";
+                    Scanner1UIIcon = "templates/image/Red.png";
+                }
+            });
+        }
+        #endregion
+
+      
     }
 }

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-5946610343a3730e363647ba2151707ce22f641a
+cc485710ee7abbf37329b9de5fbe565ab0eced44

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt

@@ -70,3 +70,15 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debu
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb

HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2e5578ef355ebd86a51e35872287d736e1b032e2
+071e6bee6b7b08fc187cd293e005ec97edd9a03b

HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt

@@ -40,3 +40,17 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debu
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
 E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\log4net.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.AssemblyReference.cache
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb

HighWayIot.Log4net/HighWayIot.Log4net.csproj

@@ -48,8 +48,5 @@
     <Compile Include="LogHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="config\log4net.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>