From 72d98fdd1b3a77e4883363108ca882da31227e57 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Tue, 4 Mar 2025 13:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PDA/PDA/components/Card.vue                   |  34 +-
 PDA/PDA/components/StocktakingCard.vue        |  14 +-
 PDA/PDA/components/TaskCard.vue               |  15 +-
 PDA/PDA/pages/bind/bind.vue                   |   2 +-
 PDA/PDA/pages/config/config.vue               |   2 +-
 .../dist/dev/app-plus/app-service.js          |  86 +++--
 WCS.BLL/Manager/DataProcessManager.cs         |  47 +++
 .../Controllers/PDAStocktakingController.cs   |   3 +-
 .../ViewModels/StocktakingDocumentViewModel.cs |   2 +-
 .../Views/MainWindows/MainWindow2.xaml        | 362 ------------------
 .../Views/MainWindows/MainWindow2.xaml.cs     |  55 ---
 11 files changed, 155 insertions(+), 467 deletions(-)
 create mode 100644 WCS.BLL/Manager/DataProcessManager.cs
 delete mode 100644 货架标准上位机/Views/MainWindows/MainWindow2.xaml
 delete mode 100644 货架标准上位机/Views/MainWindows/MainWindow2.xaml.cs

diff --git a/PDA/PDA/components/Card.vue b/PDA/PDA/components/Card.vue
index 3570c27..a232a7a 100644
--- a/PDA/PDA/components/Card.vue
+++ b/PDA/PDA/components/Card.vue
@@ -1,7 +1,10 @@
 <template>
 	<view class="card">
 		<view class="card-header">
-			<text>{{item.matCode}}&nbsp;&nbsp;{{currentIndex + 1}}/{{cardData.length}}</text>
+			<view class="content-combined">
+				<text class="center-element">{{item.matCode}}</text>
+				<text class="right-element">{{currentIndex + 1}}/{{cardData.length}}</text>
+			</view>
 		</view>
 		<view class="card-content">
 			<view class="content-item">
@@ -17,14 +20,14 @@
 				<text>{{item.matQty}}</text>
 			</view>
 			<view class="content-combined">
-			<view class="content-item" style="font-weight: 400;color: firebrick;">
-				<text>库位:</text>
-				<text>{{item.locationCode}}</text>
-			</view>
-			<view class="content-item" style="font-weight: 400;color: firebrick;">
-				<text>货架:</text>
-				<text>{{item.shelfCode}}</text>
-			</view>
+				<view class="content-item" style="font-weight: 400;color: firebrick;">
+					<text>库位:</text>
+					<text>{{item.locationCode}}</text>
+				</view>
+				<view class="content-item" style="font-weight: 400;color: firebrick;">
+					<text>货架:</text>
+					<text>{{item.shelfCode}}</text>
+				</view>
 			</view>
 			<view class="content-combined">
 				<view class="content-item" style="font-weight: 600;color: violet;">
@@ -32,7 +35,7 @@
 					<text>{{item.modifyUser}}</text>
 				</view>
 				<view class="content-time">
-					<text>最后更新时间:</text>
+					<text>更新时间:</text>
 					<text>{{item.modifyTime}}</text>
 				</view>
 			</view>
@@ -83,7 +86,7 @@
 
 	.content-time {
 		margin-bottom: 0rpx;
-		font-size: 18rpx;
+		font-size: 19rpx;
 		display: flex;
 		align-items: center;
 	}
@@ -91,6 +94,15 @@
 	.content-combined {
 		display: flex;
 		justify-content: space-between;
+		align-items: center;
 		margin-bottom: 5rpx;
 	}
+
+	.center-element {
+		align-items: center;
+	}
+
+	.right-element {
+		margin-left: auto;
+	}
 </style>
\ No newline at end of file
diff --git a/PDA/PDA/components/StocktakingCard.vue b/PDA/PDA/components/StocktakingCard.vue
index 51d73e5..2c32723 100644
--- a/PDA/PDA/components/StocktakingCard.vue
+++ b/PDA/PDA/components/StocktakingCard.vue
@@ -1,7 +1,10 @@
 <template>
 	<view>
 		<view class="card-header">
-			<text>{{item.matCode}}&nbsp;&nbsp;{{currentIndex + 1}}/{{cardData.length}}</text>
+			<view class="content-combined">
+				<text>{{item.matCode}}</text>
+				<text>{{currentIndex + 1}}/{{cardData.length}}</text>
+			</view>
 		</view>
 		<view class="card-content">
 			<view class="content-item">
@@ -90,6 +93,15 @@
 	.content-combined {
 		display: flex;
 		justify-content: space-between;
+		align-items: center;
 		margin-bottom: 5rpx;
 	}
+
+	.center-element {
+		align-items: center;
+	}
+
+	.right-element {
+		margin-left: auto;
+	}
 </style>
\ No newline at end of file
diff --git a/PDA/PDA/components/TaskCard.vue b/PDA/PDA/components/TaskCard.vue
index 80f7787..579c1da 100644
--- a/PDA/PDA/components/TaskCard.vue
+++ b/PDA/PDA/components/TaskCard.vue
@@ -1,17 +1,20 @@
 <template>
 	<view class="card">
 		<view class="card-header">
-			<text>{{item.matCode}}&nbsp;&nbsp;{{currentIndex + 1}}/{{cardData.length}}</text>
+			<view class="content-combined">
+				<text>{{item.taskCode}}</text>
+				<text>{{currentIndex + 1}}/{{cardData.length}}</text>
+			</view>
 		</view>
 		<view class="card-content">
-			<view class="content-item">
-				<text>AGV编号:</text>
-				<text>{{item.agvCode}}</text>
-			</view>
 			<view class="content-item">
 				<text>任务单号:</text>
 				<text>{{item.taskCode}}</text>
 			</view>
+			<view class="content-item">
+				<text>AGV编号:</text>
+				<text>{{item.agvCode}}</text>
+			</view>
 			<view class="content-item">
 				<text>任务状态:</text>
 				<text>{{item.taskStatusStr}}</text>
@@ -46,6 +49,8 @@
 	import {
 		ref
 	} from 'vue';
+
+	
 	const props = defineProps({
 		item: {
 			type: Object,
diff --git a/PDA/PDA/pages/bind/bind.vue b/PDA/PDA/pages/bind/bind.vue
index 8309567..cf34894 100644
--- a/PDA/PDA/pages/bind/bind.vue
+++ b/PDA/PDA/pages/bind/bind.vue
@@ -110,7 +110,7 @@
 				<view style="flex: 35;">物料数量：</view>
 
 				<view class="uni-input-wrapper" style="flex: 50;">
-					<input class="uni-input" style="font-size: 40rpx; " placeholder="请输入物料数量" v-model="matQty"></input>
+					<input class="uni-input" type="number" style="font-size: 40rpx; " placeholder="请输入物料数量" v-model="matQty"></input>
 				</view>
 
 				<view style="flex: 40;">
diff --git a/PDA/PDA/pages/config/config.vue b/PDA/PDA/pages/config/config.vue
index b4e06ee..c82a223 100644
--- a/PDA/PDA/pages/config/config.vue
+++ b/PDA/PDA/pages/config/config.vue
@@ -31,7 +31,7 @@
 			};
 		},
 		onLoad:function() {
-			this.serverIP = getConfig('serverIP', '127.0.0.1');
+			this.serverIP = getConfig('serverIP', '192.168.18.153');
 			this.serverPort = getConfig('serverPort', '8888');
 		},
 		methods: {
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index f5bd62b..b480af6 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -330,7 +330,7 @@ if (uni.restoreGlobal) {
       };
     },
     onLoad: function() {
-      this.serverIP = getConfig("serverIP", "127.0.0.1");
+      this.serverIP = getConfig("serverIP", "192.168.18.153");
       this.serverPort = getConfig("serverPort", "8888");
     },
     methods: {
@@ -1349,6 +1349,7 @@ if (uni.restoreGlobal) {
               "input",
               {
                 class: "uni-input",
+                type: "number",
                 style: { "font-size": "40rpx" },
                 placeholder: "请输入物料数量",
                 "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.matQty = $event)
@@ -2188,13 +2189,22 @@ if (uni.restoreGlobal) {
   function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "card" }, [
       vue.createElementVNode("view", { class: "card-header" }, [
-        vue.createElementVNode(
-          "text",
-          null,
-          vue.toDisplayString($props.item.matCode) + "  " + vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
-          1
-          /* TEXT */
-        )
+        vue.createElementVNode("view", { class: "content-combined" }, [
+          vue.createElementVNode(
+            "text",
+            { class: "center-element" },
+            vue.toDisplayString($props.item.matCode),
+            1
+            /* TEXT */
+          ),
+          vue.createElementVNode(
+            "text",
+            { class: "right-element" },
+            vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
+            1
+            /* TEXT */
+          )
+        ])
       ]),
       vue.createElementVNode("view", { class: "card-content" }, [
         vue.createElementVNode("view", { class: "content-item" }, [
@@ -2273,7 +2283,7 @@ if (uni.restoreGlobal) {
             )
           ]),
           vue.createElementVNode("view", { class: "content-time" }, [
-            vue.createElementVNode("text", null, "最后更新时间:"),
+            vue.createElementVNode("text", null, "更新时间:"),
             vue.createElementVNode(
               "text",
               null,
@@ -3305,13 +3315,22 @@ if (uni.restoreGlobal) {
   function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", null, [
       vue.createElementVNode("view", { class: "card-header" }, [
-        vue.createElementVNode(
-          "text",
-          null,
-          vue.toDisplayString($props.item.matCode) + "  " + vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
-          1
-          /* TEXT */
-        )
+        vue.createElementVNode("view", { class: "content-combined" }, [
+          vue.createElementVNode(
+            "text",
+            null,
+            vue.toDisplayString($props.item.matCode),
+            1
+            /* TEXT */
+          ),
+          vue.createElementVNode(
+            "text",
+            null,
+            vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
+            1
+            /* TEXT */
+          )
+        ])
       ]),
       vue.createElementVNode("view", { class: "card-content" }, [
         vue.createElementVNode("view", { class: "content-item" }, [
@@ -5446,25 +5465,24 @@ if (uni.restoreGlobal) {
   function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "card" }, [
       vue.createElementVNode("view", { class: "card-header" }, [
-        vue.createElementVNode(
-          "text",
-          null,
-          vue.toDisplayString($props.item.matCode) + "  " + vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
-          1
-          /* TEXT */
-        )
-      ]),
-      vue.createElementVNode("view", { class: "card-content" }, [
-        vue.createElementVNode("view", { class: "content-item" }, [
-          vue.createElementVNode("text", null, "AGV编号:"),
+        vue.createElementVNode("view", { class: "content-combined" }, [
           vue.createElementVNode(
             "text",
             null,
-            vue.toDisplayString($props.item.agvCode),
+            vue.toDisplayString($props.item.taskCode),
+            1
+            /* TEXT */
+          ),
+          vue.createElementVNode(
+            "text",
+            null,
+            vue.toDisplayString($props.currentIndex + 1) + "/" + vue.toDisplayString($props.cardData.length),
             1
             /* TEXT */
           )
-        ]),
+        ])
+      ]),
+      vue.createElementVNode("view", { class: "card-content" }, [
         vue.createElementVNode("view", { class: "content-item" }, [
           vue.createElementVNode("text", null, "任务单号:"),
           vue.createElementVNode(
@@ -5475,6 +5493,16 @@ if (uni.restoreGlobal) {
             /* TEXT */
           )
         ]),
+        vue.createElementVNode("view", { class: "content-item" }, [
+          vue.createElementVNode("text", null, "AGV编号:"),
+          vue.createElementVNode(
+            "text",
+            null,
+            vue.toDisplayString($props.item.agvCode),
+            1
+            /* TEXT */
+          )
+        ]),
         vue.createElementVNode("view", { class: "content-item" }, [
           vue.createElementVNode("text", null, "任务状态:"),
           vue.createElementVNode(
diff --git a/WCS.BLL/Manager/DataProcessManager.cs b/WCS.BLL/Manager/DataProcessManager.cs
new file mode 100644
index 0000000..1f223ab
--- /dev/null
+++ b/WCS.BLL/Manager/DataProcessManager.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WCS.BLL.DbModels;
+using WCS.DAL.Db;
+using WCS.DAL.DbModels;
+
+namespace WCS.BLL.Manager
+{
+    /// <summary>
+    /// 数据处理
+    /// </summary>
+    public static class DataProcessManager
+    {
+        public static object flag = new object();
+        public static void UpdateShelfStatus()
+        {
+            lock (flag)
+            {
+                var shelfIds = DbHelp.db.Queryable<MatDetailCurrentInfo>()
+                                        .Select(t => t.ShelfId)
+                                        .Distinct()
+                                        .ToList();
+                var shelfInfos = DbHelp.db.Queryable<ShelfInfo>().ToList();
+
+                var notEmptyToEmpty = shelfInfos.Where(t => t.ShelfStatus == ShelfStatusEnum.非空货架)
+                                             .Where(t => !shelfIds.Contains(t.Id))
+                                             .ToList();
+                notEmptyToEmpty.ForEach(t => t.ShelfStatus = ShelfStatusEnum.空货架);
+
+                var emptyToNotEmpty = shelfInfos.Where(t => t.ShelfStatus == ShelfStatusEnum.空货架)
+                                               .Where(t => shelfIds.Contains(t.Id))
+                                                .ToList();
+                emptyToNotEmpty.ForEach(t => t.ShelfStatus = ShelfStatusEnum.非空货架);
+
+                DbHelp.db.Updateable(notEmptyToEmpty)
+                         .UpdateColumns(t => new { t.ShelfStatus })
+                         .ExecuteCommand();
+                DbHelp.db.Updateable(emptyToNotEmpty)
+                         .UpdateColumns(t => new { t.ShelfStatus })
+                         .ExecuteCommand();
+            }
+        }
+    }
+}
diff --git a/WCS.WebApi/Controllers/PDAStocktakingController.cs b/WCS.WebApi/Controllers/PDAStocktakingController.cs
index 910f539..3a81b5a 100644
--- a/WCS.WebApi/Controllers/PDAStocktakingController.cs
+++ b/WCS.WebApi/Controllers/PDAStocktakingController.cs
@@ -87,7 +87,8 @@ namespace WCS.WebApi.Controllers
         [HttpPost(Name = "exportStocktakingInfos")]
         public async Task<IActionResult> exportStocktakingInfos(GetStocktakingInfosRequest request)
         {
-            var result = await _stockTakingService.exportStocktakingInfos(request);
+            var result = await _stockTakingService.exportStocktakingInfos
+                (request);
             var data = result.Data?.Lists;
             var columns = new[]
             {
diff --git a/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs b/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs
index f7e9d94..6c1e735 100644
--- a/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs
+++ b/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs
@@ -292,7 +292,7 @@ namespace 智慧物流软件系统.ViewModels
                 {
                     //成功后直接跳转
                     MainWindow1.viewModel.GoToStockTakingView = true;
-                    MainWindow2.viewModel.SelectedValue = "物料盘点";
+                    //MainWindow2.viewModel.SelectedValue = "物料盘点";
                     Growl.Success("已跳转到物料盘点页面！");
                 }
                 else if (Result != null)
diff --git a/货架标准上位机/Views/MainWindows/MainWindow2.xaml b/货架标准上位机/Views/MainWindows/MainWindow2.xaml
deleted file mode 100644
index eb6c747..0000000
--- a/货架标准上位机/Views/MainWindows/MainWindow2.xaml
+++ /dev/null
@@ -1,362 +0,0 @@
-<hc:Window xmlns:View="clr-namespace:智慧物流软件系统"  x:Class="智慧物流软件系统.MainWindow2"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:智慧物流软件系统"
-        xmlns:hc="https://handyorg.github.io/handycontrol"
-        xmlns:pi="https://github.com/ping9719/wpfex"
-        xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
-        mc:Ignorable="d"
-        Title="{Binding Title}" NonClientAreaBackground="#FFDCEEFF" Height="800" Width="1280" Icon="/Resources/Logo.ico"
-        Background="#FFDCEEFF" WindowStartupLocation="CenterScreen" Loaded="load">
-    <!--标题栏-->
-    <hc:Window.NonClientAreaContent>
-        <StackPanel HorizontalAlignment="Right">
-            <Menu Height="29" Background="#FFDCEEFF">
-                <!--<MenuItem Height="29" Command="{Binding OpenUserCommand}" Visibility="{Binding IsLogin,Converter={StaticResource Boolean2VisibilityConverter}}">-->
-                <MenuItem Height="29" Command="{Binding OpenUserCommand}">
-                    <MenuItem.Header>
-                        <TextBlock Text="{Binding LoginName,Source={x:Static local:UserInfoView.viewModel},TargetNullValue=登录}" Foreground="DimGray" Margin="-5,0"></TextBlock>
-                    </MenuItem.Header>
-                    <MenuItem.Icon>
-                        <TextBlock Text="&#xe649;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <!--<MenuItem Height="29" Width="35" Header="">
-                    <MenuItem.Icon>
-                        <TextBlock Text="&#xe62b;" FontSize="15" FontFamily="{StaticResource IconFont}"></TextBlock>
-                    </MenuItem.Icon>
-                    <MenuItem Width="120" Header="蓝色">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe604;" Foreground="Blue" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Width="120" Header="紫色">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe604;" Foreground="Purple" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Width="120" Header="黑夜">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe604;" Foreground="Black" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </MenuItem>-->
-                <MenuItem Height="29" Width="35" Header="">
-                    <MenuItem.Icon>
-                        <TextBlock Text="&#xe609;" FontSize="15" FontFamily="{StaticResource IconFont}"></TextBlock>
-                    </MenuItem.Icon>
-                    <MenuItem Width="120" Header="日志" Command="{Binding OpenLogCommand}">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe61d;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Width="120" Header="帮助" Command="{Binding OpenHelpCommand}">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe60b;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Width="120" Header="关于" Command="{Binding OpenWeCommand}">
-                        <MenuItem.Icon>
-                            <TextBlock Text="&#xe608;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </MenuItem>
-            </Menu>
-        </StackPanel>
-    </hc:Window.NonClientAreaContent>
-    <!--内容-->
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="auto"></RowDefinition>
-        </Grid.RowDefinitions>
-        <!--菜单、内容-->
-        <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-            </Grid.ColumnDefinitions>
-            <!--菜单-->
-            <Border Margin="5,3" Style="{StaticResource BorderRegion}" Padding="0" BorderThickness="1">
-                <hc:TransitioningContentControl TransitionMode="Left2Right">
-                    <hc:SideMenu ExpandMode="ShowOne" SelectionChanged="menuSelect">
-                        <!--内部资源样式-->
-                        <hc:SideMenu.Resources>
-                            <ResourceDictionary>
-                                <Style TargetType="Image">
-                                    <Setter Property="Width" Value="24"></Setter>
-                                    <Setter Property="Height" Value="24"></Setter>
-                                </Style>
-                                <Style TargetType="TextBlock">
-                                    <Setter Property="FontFamily" Value="{StaticResource IconFont}"></Setter>
-                                    <Setter Property="FontSize" Value="22"></Setter>
-                                    <Setter Property="TextAlignment" Value="Center"></Setter>
-                                </Style>
-                            </ResourceDictionary>
-                        </hc:SideMenu.Resources>
-                        <!--列表-->
-                        <hc:SideMenuItem Header="主页" IsSelected="True" MinWidth="140">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/主页.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="主页" Tag="主页">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe603;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-                        <hc:SideMenuItem Header="入库"  Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/入库.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="物料入库" Tag="物料入库">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe681;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="出库" >
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/出库.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="出库单据" Tag="出库单据">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe6e2;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="物料出库" Tag="物料出库">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe67d;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="盘点" >
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/盘点.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="盘点单据" Tag="盘点单据">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe65f;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="物料盘点" Tag="物料盘点">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe65e;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="查询" Tag="查询" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/查询.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="库存查询" Tag="库存查询" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe609;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="出入记录" Tag="出入记录" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe60b;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="库位" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/货架.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="货架管理" Tag="货架管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe608;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="模组管理" Tag="模组管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe6f1;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="库位管理" Tag="库位管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe6d5;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="物料" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/物料.png"/>
-                            </hc:SideMenuItem.Icon>
-
-                            <hc:SideMenuItem Header="物料维护" Tag="物料维护" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe605;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-
-                            <hc:SideMenuItem Header="物料明细" Tag="物料明细" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe60e;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="权限" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/权限.png"/>
-                            </hc:SideMenuItem.Icon>
-
-                            <hc:SideMenuItem Header="角色管理" Tag="角色管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe60c;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-
-                            <hc:SideMenuItem Header="用户管理" Tag="用户管理" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe61c;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                        <hc:SideMenuItem Header="调试" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.权限},Converter={StaticResource AuthVisConverter}}">
-                            <hc:SideMenuItem.Icon>
-                                <Image Source="/Resources/调试.png"/>
-                            </hc:SideMenuItem.Icon>
-                            <hc:SideMenuItem Header="调试" Tag="调试" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe61e;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="设置" Tag="设置" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe601;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                            <hc:SideMenuItem Header="接口记录" Tag="接口记录" Visibility="{Binding Auth,Source={x:Static local:UserInfoView.viewModel},ConverterParameter={x:Static local:AuthEnum.调试},Converter={StaticResource AuthVisConverter}}">
-                                <hc:SideMenuItem.Icon>
-                                    <TextBlock Text="&#xe61f;"/>
-                                </hc:SideMenuItem.Icon>
-                            </hc:SideMenuItem>
-                        </hc:SideMenuItem>
-
-                    </hc:SideMenu>
-                </hc:TransitioningContentControl>
-            </Border>
-            <!--内容-->
-            <Border Margin="0,3,5,3" Grid.Column="1" Style="{StaticResource BorderRegion}" Padding="0" BorderThickness="1">
-                <TabControl Style="{x:Null}" Margin="1,-3,1,1" BorderThickness="0" SelectedValue="{Binding SelectedValue}" SelectedValuePath="Header" PreviewKeyDown="tabControl_PreviewKeyDown">
-                    <TabItem Header="主页" IsSelected="True"  Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:HomeView />
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                    <TabItem Header="物料入库" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:InInventoryView />
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                    <TabItem Header="出库单据" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:OutInventoryDocumentView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="物料出库" IsSelected="{Binding GoToOutVentoryView}" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:OutVentoryView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                    <TabItem Header="盘点单据" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:StocktakingDocumentView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="物料盘点" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:StockTakingView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                    <TabItem Header="库存查询" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:MatInventoryDetailView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="出入记录" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:InOutRecordView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="货架管理"
-                             Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:ShelfInfoView />
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="物料维护" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:MatBaseInfoView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="物料明细" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:MatInfoView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                    <TabItem Header="角色管理" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:RoleView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="用户管理" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:UserView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-
-                    <TabItem Header="接口记录" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:InterfaceRecordView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="调试" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:DeviceView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-                    <TabItem Header="设置" Height="{Binding TabItemHeight}">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
-                            <View:SetView/>
-                        </hc:TransitioningContentControl>
-                    </TabItem>
-
-                </TabControl>
-            </Border>
-        </Grid>
-        <!--状态栏-->
-        <Border Margin="5,3" Grid.Row="1" Grid.ColumnSpan="2" Background="AliceBlue" CornerRadius="3">
-            <hc:TransitioningContentControl TransitionMode="Top2Bottom">
-                <Grid>
-                    <StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Left">
-                    </StackPanel>
-                    <StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Right">
-                        <TextBlock Margin="0,0" Text="{Binding Time,StringFormat=yyyy-MM-dd HH:mm:ss,FallbackValue=2000-01-01 00:00:00}" Foreground="#FF3A90C1" VerticalAlignment="Center"></TextBlock>
-                    </StackPanel>
-                </Grid>
-            </hc:TransitioningContentControl>
-        </Border>
-        <!--全局提示-->
-        <ScrollViewer Background="{x:Null}" Grid.Row="0" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Right" VerticalAlignment="Top">
-            <StackPanel Background="{x:Null}" hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10" HorizontalAlignment="Right"/>
-        </ScrollViewer>
-    </Grid>
-</hc:Window>
\ No newline at end of file
diff --git a/货架标准上位机/Views/MainWindows/MainWindow2.xaml.cs b/货架标准上位机/Views/MainWindows/MainWindow2.xaml.cs
deleted file mode 100644
index 1d9e221..0000000
--- a/货架标准上位机/Views/MainWindows/MainWindow2.xaml.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using HandyControl.Controls;
-using 智慧物流软件系统.ViewModel;
-
-namespace 智慧物流软件系统
-{
-    /// <summary>
-    /// MainWindow2.xaml 的交互逻辑
-    /// </summary>
-    public partial class MainWindow2 : HandyControl.Controls.Window
-    {
-        public static MainViewModel viewModel = MainWindow.viewModel;
-        public MainWindow2()
-        {
-            if (!viewModel.InitAgo())
-                this.Close();
-
-            InitializeComponent();
-            this.DataContext = viewModel;
-        }
-
-        private void load(object sender, RoutedEventArgs e)
-        {
-            viewModel.Init(this);
-        }
-
-        private void tabControl_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            //取消tabControl快捷键切换
-            if (e.Key == Key.LeftCtrl || e.Key == Key.LeftCtrl || e.Key == Key.Tab)
-                e.Handled = true;
-        }
-
-        private void menuSelect(object sender, HandyControl.Data.FunctionEventArgs<object> e)
-        {
-            viewModel.SelectedValue = ((SideMenuItem)e.Info).Tag.ToString();
-        }
-    }
-}