change - 入库

Aucma.Scada.Business/InStoreBusiness.cs

@@ -4,6 +4,7 @@ using HighWayIot.Config;
 using HighWayIot.Log4net;
 using HighWayIot.Repository.service;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -170,12 +171,12 @@ namespace Aucma.Scada.Business
         /// <param name="e"></param>
         private void PassDownShellTask()
         {
-            RealTaskInfo taskInfo = GetAwaitSendTask(appConfig.shellStoreCode);
+            RealTaskInfo taskInfo = GetAwaitSendTask(appConfig.foamStoreCode);
             if (taskInfo != null)
             {
                 PrintLogInfoMessage($"下发泡后入库任务：{taskInfo.taskCode}；仓库{taskInfo.storeCode}；货道：{taskInfo.spaceCode}");
                 //taskHandle.SendShellTask_InStore(taskInfo);
-
+                Thread.Sleep(200);
                 if (taskHandle.SendShellTask_InStore(taskInfo))
                 {
                     PrintLogInfoMessage($"泡后入库任务：{taskInfo.taskCode}；下发成功，等待PLC执行反馈");
@@ -206,10 +207,8 @@ namespace Aucma.Scada.Business
             else
             {
                 PrintLogInfoMessage("未获取到需要下发的泡后入库任务");
-
-                Thread.Sleep(5000);
             }
-
+            Thread.Sleep(5000);
         }
 
         /// <summary>
@@ -225,11 +224,11 @@ namespace Aucma.Scada.Business
             {
                 taskInfo = _taskInfoService.GetTaskInfoByStoreCode(storeCode, 1);
 
-                if (taskInfo != null)
+                //if (taskInfo != null)
-                {
+                //{
-                    taskInfo.taskStatus = 2;
+                //    taskInfo.taskStatus = 2;
-                    _taskInfoService.UpdateTaskInfo(taskInfo);
+                //    _taskInfoService.UpdateTaskInfo(taskInfo);
-                }
+                //}
 
             }
             catch (Exception ex)
@@ -326,5 +325,10 @@ namespace Aucma.Scada.Business
 
             return result;
         }
+
+        public List<RealTaskInfo> GetInStoreTask()
+        {
+            return _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.foamStoreCode }, 1);
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-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;;

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/viewModel/InStoreInfo/InStoreInfoViewModel.cs

@@ -185,7 +185,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
             try
             {
-                listItems.Add($"{DateTime.Now.ToString("HH:mm:ss")}==>{message}");
+                listItems.Add($"{DateTime.Now.ToString("HH:mm:ss.ss")}==>{message}");
 
                 LogInfoListBox = listItems.OrderByDescending(x => x);
             }
@@ -200,6 +200,11 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// </summary>
         public void Query()
         {
+            var info = inStoreBusiness.GetInStoreTask();
+            if (info != null)
+            {
+                info.ForEach(x => RefreshInStoreTask(x));
+            }
             if (materialTypeCombox == "箱壳")
             {
                 materialTypeCombox = "X-001";
@@ -232,6 +237,8 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// </summary>
         public void Init()
         {
+            Query();
+
             MaterialNameList = new List<string>()
             {
                 "SC232",