Merge pull request #18 from Random96/feature/Globalization

Feature/globalization

.github/workflows/dotnet.yml

@@ -1,51 +0,0 @@
-# 该工作流用于构建 .NET 项目
-# 更多信息参考：https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
-
-# 工作流名称
-name: .NET
-
-# 触发条件：指定事件触发工作流
-on:
-  # 1. 当代码推送到 master 分支时触发
-  push:
-    branches: [ "master" ]
-  # 2. 当向 master 分支提交拉取请求（PR）时触发
-  pull_request:
-    branches: [ "master" ]
-
-# 定义作业（Job）：一个工作流可包含多个作业，默认串行执行
-jobs:
-  # 作业名称：build（构建）
-  build:
-    # 作业运行环境：基于最新版 Ubuntu 系统
-    runs-on: ubuntu-latest
-
-    # 作业步骤：按顺序执行的具体操作
-    steps:
-      # 步骤1：拉取代码仓库到运行环境
-      # 使用官方 action：actions/checkout@v4，负责获取仓库源码
-      - uses: actions/checkout@v4
-
-        # 步骤2：配置 .NET 环境
-        # 使用官方 action：actions/setup-dotnet@v4，安装指定版本 .NET SDK
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          # 指定要安装的 .NET 版本（9.0.x 表示最新的 9.0 系列版本）
-          dotnet-version: 9.0.x
-
-        # 步骤3：还原项目依赖
-        # 执行 dotnet restore 命令，恢复项目所需的 NuGet 包
-      - name: Restore dependencies
-        run: dotnet restore ./src/KopSoftWms
-
-        # 步骤4：构建项目
-        # 执行 dotnet build 命令构建项目，--no-restore 表示跳过依赖还原（已单独执行过）
-      - name: Build
-        run: dotnet build ./src/KopSoftWms --no-restore
-
-        # 步骤5：测试项目（已注释，暂不执行）
-        # 执行 dotnet test 命令运行单元测试，--no-build 表示跳过构建（已单独执行过）
-        # --verbosity normal 表示输出普通详细程度的日志
-    # - name: Test
-    #   run: dotnet test ./src/KopSoftWms --no-build --verbosity normal

.gitignore

@@ -26,7 +26,7 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
-#.vscode/
+.vscode/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 

.vscode/launch.json

@@ -1,4 +1,7 @@
 {
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
    "version": "0.2.0",
    "configurations": [
         {
@@ -6,7 +9,8 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/KopSoftWms/bin/Debug/net9.0/KopSoftWms.dll",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/src/KopSoftWms/bin/Debug/netcoreapp3.0/KopSoftWms.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/KopSoftWms",
             "stopAtEntry": false,
@@ -20,7 +24,6 @@
                 "/Views": "${workspaceFolder}/Views"
             }
         },
-
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

.vscode/tasks.json

@@ -13,17 +13,13 @@
         },
         {
             "label": "publish",
-            "command":"dotnet",
+            "command": "dotnet",
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/src/KopSoftWms/KopSoftWms.csproj",
+                "${workspaceFolder}/src/KopSoftWms/KopSoftWms.csproj"
             ],
-            "problemMatcher": "$tsc",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
+            "problemMatcher": "$tsc"
         },
         {
             "label": "watch",
@@ -34,9 +30,6 @@
                 "run",
                 "${workspaceFolder}/src/KopSoftWms/KopSoftWms.csproj"
             ],
-            "options": {
-                "cwd": "${workspaceFolder}/src/KopSoftWms"
-            },
             "problemMatcher": "$tsc"
         }
     ]

DB/mysql/kopsoftwms.sql

@@ -1,657 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : localhost_3306
- Source Server Type    : MySQL
- Source Server Version : 50739
- Source Host           : localhost:3306
- Source Schema         : kopsoftwms
-
- Target Server Type    : MySQL
- Target Server Version : 50739
- File Encoding         : 65001
-
- Date: 08/12/2022 20:46:25
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sys_dept
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dept`;
-CREATE TABLE `sys_dept`  (
-                             `DeptId` bigint(20) NOT NULL,
-                             `DeptNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `DeptName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                             `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                             `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                             `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                             `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                             PRIMARY KEY (`DeptId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_dept
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_dict
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dict`;
-CREATE TABLE `sys_dict`  (
-                             `DictId` bigint(20) NOT NULL,
-                             `DictNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `DictName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `DictType` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                             `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                             `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                             `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                             `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                             PRIMARY KEY (`DictId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_dict
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_log`;
-CREATE TABLE `sys_log`  (
-                            `LogId` bigint(20) NOT NULL,
-                            `LogType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                            `Description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
-                            `Url` varchar(150) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                            `Browser` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                            `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                            `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                            `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                            `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                            `LogIp` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                            PRIMARY KEY (`LogId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_menu_wms
--- ----------------------------
-DROP TABLE IF EXISTS `sys_menu_wms`;
-CREATE TABLE `sys_menu_wms`  (
-                                 `MenuId` bigint(20) NOT NULL,
-                                 `MenuName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                 `MenuUrl` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                 `MenuIcon` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                 `MenuParent` bigint(20) NULL DEFAULT NULL,
-                                 `Sort` int(11) NULL DEFAULT NULL,
-                                 `Status` tinyint(4) NULL DEFAULT NULL COMMENT '启用1 禁用0',
-                                 `MenuType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'menu btn',
-                                 `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`MenuId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_menu_wms
--- ----------------------------
-INSERT INTO `sys_menu_wms` VALUES (1, '系统管理', '#', NULL, -1, 1, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:10:42', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (2, '用户管理', '/User', NULL, 1, 4, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:12:56', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (3, '部门管理', '/Dept', NULL, 1, 3, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:14:38', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (4, '角色管理', '/Role', NULL, 1, 2, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:14:57', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (5, '数据字典', '/Dict', NULL, 1, 5, 1, 'menu', 1, NULL, NULL, '2018-10-21 14:44:30', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (6, '基础资料', '#', NULL, -1, 6, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:19:07', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (7, '物料管理', '/Material', NULL, 6, 7, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:37', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (8, '客户管理', '/Customer', NULL, 6, 8, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:44', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (9, '供应商管理', '/Supplier', NULL, 6, 9, 1, 'menu', 1, NULL, NULL, '2018-10-21 10:25:53', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (10, '承运商管理', '/Carrier', NULL, 6, 10, 1, 'menu', 1, NULL, NULL, '2018-10-21 10:25:58', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (11, '仓库管理', '#', NULL, -1, 11, 1, 'menu', 1, NULL, NULL, '2018-12-18 23:01:36', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (12, '仓库管理', '/Warehouse', NULL, 11, 12, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:48:09', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (13, '库区管理', '/ReservoirArea', NULL, 11, 13, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:49:11', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (14, '货架管理', '/StorageRack', '', 11, 14, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:49:14', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (15, '设备管理', '#', '', -1, 15, 1, 'menu', 1, NULL, NULL, '2018-11-25 22:32:33', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (16, '设备单元', '/Device', NULL, 15, 16, 1, 'menu', 1, NULL, NULL, '2018-11-26 22:28:25', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (17, '生产管理', '#', '', -1, 17, 1, 'menu', 1, NULL, NULL, '2018-11-30 21:22:54', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (18, '生产工单', '/ProductionOrder', NULL, 17, 18, 1, 'menu', 1, NULL, NULL, '2018-11-30 21:24:22', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (19, '工艺管理', '#', NULL, -1, 19, 1, 'menu', 1, NULL, NULL, '2018-12-06 15:43:58', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (20, 'BOM管理', '/BOM', NULL, 19, 20, 1, 'menu', 1, NULL, NULL, '2018-12-06 15:44:58', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (21, '工艺路线', '/Routing', NULL, 19, 21, 1, 'menu', 1, NULL, NULL, '2018-12-17 23:04:45', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (22, '日志管理', '#', '', -1, 22, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:51', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (23, '系统日志', '/Log', NULL, 22, 23, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:54', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (24, '入库管理', '/StockIn', NULL, 11, 24, 1, 'menu', 1, NULL, NULL, '2018-12-19 14:09:08', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (25, '条码系统', '#', NULL, -1, 25, 1, 'menu', 1, NULL, NULL, '2018-12-26 14:26:25', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (26, '报表管理', '#', NULL, -1, 26, 1, 'menu', 1, NULL, NULL, '2018-12-26 14:29:30', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (27, '出库管理', '/StockOut', NULL, 11, 27, 1, 'menu', 1, NULL, NULL, '2019-01-22 11:06:17', NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (28, '设备报修', '/Devicerepair', NULL, 15, 28, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (29, '库存查询', '/Inventory', NULL, 11, 29, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (30, '库存记录', '/InventoryRecord', NULL, 11, 30, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (31, '登录统计', '/Log/Bar', NULL, 22, 31, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (32, '发货记录', '/Delivery', NULL, 11, 32, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu_wms` VALUES (33, '库存移动', '/InventoryMove', NULL, 11, 33, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
-
--- ----------------------------
--- Table structure for sys_role
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role`  (
-                             `RoleId` bigint(20) NOT NULL,
-                             `RoleName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `RoleType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'admin #',
-                             `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                             `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                             `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                             `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                             `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间'
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_role
--- ----------------------------
-INSERT INTO `sys_role` VALUES (494712986628259840, '系统管理员', 'admin', 1, '系统管理员', 491786087098744832, '2018-09-27 11:32:43', 504990858139926528, '2019-03-03 20:46:05');
-
--- ----------------------------
--- Table structure for sys_rolemenu
--- ----------------------------
-DROP TABLE IF EXISTS `sys_rolemenu`;
-CREATE TABLE `sys_rolemenu`  (
-                                 `RoleMenuId` bigint(20) NOT NULL,
-                                 `RoleId` bigint(20) NULL DEFAULT NULL,
-                                 `MenuId` bigint(20) NULL DEFAULT NULL,
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`RoleMenuId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_rolemenu
--- ----------------------------
-INSERT INTO `sys_rolemenu` VALUES (494712986762477568, 494712986628259840, 1, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
-INSERT INTO `sys_rolemenu` VALUES (494712986762477569, 494712986628259840, 2, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
-INSERT INTO `sys_rolemenu` VALUES (494712986762477570, 494712986628259840, 3, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
-INSERT INTO `sys_rolemenu` VALUES (494712986762477571, 494712986628259840, 4, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
-INSERT INTO `sys_rolemenu` VALUES (494712986762477572, 494712986628259840, 5, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681041502208, 494712986628259840, 6, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681083445248, 494712986628259840, 7, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681137971200, 494712986628259840, 8, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681158942720, 494712986628259840, 9, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681188302848, 494712986628259840, 12, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
-INSERT INTO `sys_rolemenu` VALUES (499030681217662976, 494712986628259840, 10, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (499030681247023104, 494712986628259840, 11, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (499030681272188928, 494712986628259840, 13, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (499030681427378176, 494712986628259840, 14, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (503408458121347072, 494712986628259840, 15, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (503408458222010368, 494712986628259840, 16, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:02');
-INSERT INTO `sys_rolemenu` VALUES (503408458251370496, 494712986628259840, 17, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:03');
-INSERT INTO `sys_rolemenu` VALUES (503466471221886976, 494712986628259840, 18, 491786087098744832, '2018-10-21 15:16:01', 491786087098744832, '2018-12-11 22:26:03');
-INSERT INTO `sys_rolemenu` VALUES (517164210220695552, 494712986628259840, 19, 504990858139926528, '2018-11-28 10:25:56', 491786087098744832, '2018-12-11 22:26:03');
-INSERT INTO `sys_rolemenu` VALUES (517164210333941760, 494712986628259840, 20, 504990858139926528, '2018-11-28 10:25:56', 491786087098744832, '2018-12-11 22:26:03');
-INSERT INTO `sys_rolemenu` VALUES (522056475653177344, 494712986628259840, 21, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (522056476315877376, 494712986628259840, 22, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (522056476953411584, 494712986628259840, 23, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (522056477603528704, 494712986628259840, 24, 491786087098744832, '2018-12-11 22:26:04', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (524603534847508480, 494712986628259840, 26, 504990858139926528, '2018-12-18 23:07:09', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (524603762120065024, 494712986628259840, 25, 504990858139926528, '2018-12-18 23:08:04', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (537140827936260096, 494712986628259840, 28, 504990858139926528, '2019-01-22 13:25:53', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (537141837408763904, 494712986628259840, 29, 504990858139926528, '2019-01-22 13:29:54', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (537141837408763905, 494712986628259840, 30, 504990858139926528, '2019-01-22 13:29:54', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (537177594374651904, 494712986628259840, 27, 504990858139926528, '2019-01-22 15:51:59', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (537507366317326336, 494712986628259840, 31, 504990858139926528, '2019-01-23 13:42:23', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (548367997115301888, 494712986628259840, 32, 504990858139926528, '2019-02-22 12:58:39', NULL, NULL);
-INSERT INTO `sys_rolemenu` VALUES (551747124224589824, 494712986628259840, 33, 504990858139926528, '2019-03-03 20:46:05', NULL, NULL);
-
--- ----------------------------
--- Table structure for sys_serialnum
--- ----------------------------
-DROP TABLE IF EXISTS `sys_serialnum`;
-CREATE TABLE `sys_serialnum`  (
-                                  `SerialNumberId` int(11) NOT NULL,
-                                  `SerialNumber` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                  `SerialCount` int(11) NULL DEFAULT NULL,
-                                  `TableName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表名',
-                                  `Prefix` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前缀',
-                                  `Digit` int(11) NULL DEFAULT NULL COMMENT '位数',
-                                  `Mantissa` int(11) NULL DEFAULT NULL COMMENT '尾数',
-                                  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                                  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                  `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                  `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                  PRIMARY KEY (`SerialNumberId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_serialnum
--- ----------------------------
-INSERT INTO `sys_serialnum` VALUES (1, 'R20190301002520000001', 1, 'Wms_stockin', 'R', 22, 6, 1, '入库单', 1, '2019-01-07 11:16:09', 504990858139926528, '2019-03-01 00:25:20');
-INSERT INTO `sys_serialnum` VALUES (2, 'C20190303212032000001', 1, 'Wms_stockout', 'C', 22, 6, 1, '出库单', 1, '2019-02-13 09:24:58', 504990858139926528, '2019-03-03 21:20:32');
-INSERT INTO `sys_serialnum` VALUES (3, 'M20190304224033000002', 2, 'Wms_inventorymove', 'M', 22, 6, 1, '库存移动', 1, '2019-03-03 13:16:43', 504990858139926528, '2019-03-04 22:40:34');
-
--- ----------------------------
--- Table structure for sys_user
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user`  (
-                             `UserId` bigint(20) NOT NULL,
-                             `UserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `UserNickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Pwd` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Sort` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Tel` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Mobile` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `Sex` tinyint(4) NULL DEFAULT NULL COMMENT '0男 1女',
-                             `DeptId` bigint(20) NULL DEFAULT NULL,
-                             `LoginIp` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `LoginDate` datetime NULL DEFAULT NULL,
-                             `LoginTime` int(11) NULL DEFAULT NULL,
-                             `IsEabled` tinyint(4) NULL DEFAULT NULL COMMENT '1 启用 0 禁用',
-                             `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
-                             `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                             `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                             `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                             `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                             `RoleId` bigint(20) NULL DEFAULT NULL,
-                             `HeadImg` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                             PRIMARY KEY (`UserId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of sys_user
--- ----------------------------
-INSERT INTO `sys_user` VALUES (491786087098744832, 'admin', 'admin', '1616c059c4a731ede06e26d3373bdd54', NULL, 'william.yang@kopsoft.cn', '15262337653', NULL, 1, 0, '127.0.0.1', '2022-12-08 20:45:26', 1, 1, 1, '系统管理员', 491786087098744832, '2018-09-19 09:42:20', 491786087098744832, '2022-12-08 20:15:34', 494712986628259840, 'upload\\head\\666633556364425888df1a11bdc083da.jpg');
-
--- ----------------------------
--- Table structure for wms_delivery
--- ----------------------------
-DROP TABLE IF EXISTS `wms_delivery`;
-CREATE TABLE `wms_delivery`  (
-                                 `DeliveryId` bigint(20) NOT NULL COMMENT '发货主键',
-                                 `StockOutId` bigint(20) NULL DEFAULT NULL COMMENT '出库单主表Id',
-                                 `CarrierId` bigint(20) NULL DEFAULT NULL COMMENT '承运商Id',
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                 `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 `DeliveryDate` datetime NULL DEFAULT NULL COMMENT '发货日期',
-                                 `TrackingNo` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '快递单号',
-                                 PRIMARY KEY (`DeliveryId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_delivery
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_inventory
--- ----------------------------
-DROP TABLE IF EXISTS `wms_inventory`;
-CREATE TABLE `wms_inventory`  (
-                                  `InventoryId` bigint(20) NOT NULL,
-                                  `MaterialId` bigint(20) NULL DEFAULT NULL,
-                                  `StoragerackId` bigint(20) NULL DEFAULT NULL,
-                                  `Qty` decimal(18, 2) NULL DEFAULT NULL,
-                                  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                  `IsDel` tinyint(4) NOT NULL COMMENT '1 0',
-                                  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                  `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                  `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                  PRIMARY KEY (`InventoryId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_inventory
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_inventorymove
--- ----------------------------
-DROP TABLE IF EXISTS `wms_inventorymove`;
-CREATE TABLE `wms_inventorymove`  (
-                                      `InventorymoveId` bigint(20) NOT NULL COMMENT '库存移动主键',
-                                      `InventorymoveNo` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '库存移动编号',
-                                      `SourceStoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '原货架Id',
-                                      `AimStoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '目标货架',
-                                      `Status` tinyint(4) NULL DEFAULT NULL COMMENT '状态',
-                                      `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                      `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                      `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                      `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                      `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                      PRIMARY KEY (`InventorymoveId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_inventorymove
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_inventoryrecord
--- ----------------------------
-DROP TABLE IF EXISTS `wms_inventoryrecord`;
-CREATE TABLE `wms_inventoryrecord`  (
-                                        `InventoryrecordId` bigint(20) NOT NULL,
-                                        `StockInDetailId` bigint(20) NULL DEFAULT NULL,
-                                        `Qty` decimal(18, 2) NULL DEFAULT NULL,
-                                        `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                        `IsDel` tinyint(4) NOT NULL COMMENT '1 0',
-                                        `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                        `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                        `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                        `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                        PRIMARY KEY (`InventoryrecordId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_inventoryrecord
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_invmovedetail
--- ----------------------------
-DROP TABLE IF EXISTS `wms_invmovedetail`;
-CREATE TABLE `wms_invmovedetail`  (
-                                      `MoveDetailId` bigint(20) NOT NULL COMMENT '主键',
-                                      `InventorymoveId` bigint(20) NULL DEFAULT NULL COMMENT '库存移动Id',
-                                      `Status` tinyint(4) NULL DEFAULT NULL,
-                                      `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
-                                      `PlanQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
-                                      `ActQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
-                                      `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
-                                      `AuditinTime` datetime NULL DEFAULT NULL COMMENT '审核时间',
-                                      `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                      `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                      `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                      `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                      `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                      PRIMARY KEY (`MoveDetailId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_invmovedetail
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_material
--- ----------------------------
-DROP TABLE IF EXISTS `wms_material`;
-CREATE TABLE `wms_material`  (
-                                 `MaterialId` bigint(20) NOT NULL,
-                                 `MaterialNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品编号',
-                                 `MaterialName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品名称',
-                                 `MaterialType` bigint(20) NULL DEFAULT NULL COMMENT '产品类型',
-                                 `Unit` bigint(20) NULL DEFAULT NULL COMMENT '单位',
-                                 `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属货架',
-                                 `ReservoirAreaId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属库区',
-                                 `WarehouseId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属仓库',
-                                 `Qty` decimal(18, 0) NULL DEFAULT NULL COMMENT '安全库存',
-                                 `ExpiryDate` decimal(18, 0) NULL DEFAULT NULL COMMENT '有效期',
-                                 `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`MaterialId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_material
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_reservoirarea
--- ----------------------------
-DROP TABLE IF EXISTS `wms_reservoirarea`;
-CREATE TABLE `wms_reservoirarea`  (
-                                      `ReservoirAreaId` bigint(20) NOT NULL COMMENT '主键',
-                                      `ReservoirAreaNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '库区编号',
-                                      `ReservoirAreaName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '库区名称',
-                                      `WarehouseId` bigint(20) NOT NULL COMMENT '所属仓库ID',
-                                      `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                      `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                      `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                      `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                      `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                      PRIMARY KEY (`ReservoirAreaId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_reservoirarea
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_stockin
--- ----------------------------
-DROP TABLE IF EXISTS `wms_stockin`;
-CREATE TABLE `wms_stockin`  (
-                                `StockInId` bigint(20) NOT NULL COMMENT '主键',
-                                `StockInNo` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库单号',
-                                `StockInType` bigint(20) NULL DEFAULT NULL COMMENT '入库类型',
-                                `SupplierId` bigint(20) NULL DEFAULT NULL COMMENT '供应商',
-                                `OrderNo` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '订单号',
-                                `StockInStatus` tinyint(4) NULL DEFAULT NULL,
-                                `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                PRIMARY KEY (`StockInId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_stockin
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_stockindetail
--- ----------------------------
-DROP TABLE IF EXISTS `wms_stockindetail`;
-CREATE TABLE `wms_stockindetail`  (
-                                      `StockInDetailId` bigint(20) NOT NULL COMMENT '主键',
-                                      `StockInId` bigint(20) NULL DEFAULT NULL COMMENT '入库单号',
-                                      `Status` tinyint(4) NULL DEFAULT NULL,
-                                      `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
-                                      `PlanInQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
-                                      `ActInQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
-                                      `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '货架',
-                                      `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
-                                      `AuditinTime` datetime NULL DEFAULT NULL COMMENT '审核时间',
-                                      `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                      `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                      `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                      `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                      `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                      PRIMARY KEY (`StockInDetailId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_stockindetail
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_stockout
--- ----------------------------
-DROP TABLE IF EXISTS `wms_stockout`;
-CREATE TABLE `wms_stockout`  (
-                                 `StockOutId` bigint(20) NOT NULL,
-                                 `StockOutNo` varchar(22) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库单，系统自动生成',
-                                 `OrderNo` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库订单',
-                                 `StockOutType` bigint(20) NULL DEFAULT NULL COMMENT '出库类型',
-                                 `CustomerId` bigint(20) NULL DEFAULT NULL COMMENT '客户',
-                                 `StockOutStatus` tinyint(4) NULL DEFAULT NULL,
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                 `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`StockOutId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_stockout
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_stockoutdetail
--- ----------------------------
-DROP TABLE IF EXISTS `wms_stockoutdetail`;
-CREATE TABLE `wms_stockoutdetail`  (
-                                       `StockOutDetailId` bigint(20) NOT NULL COMMENT '主键',
-                                       `StockOutId` bigint(20) NULL DEFAULT NULL COMMENT '出库单',
-                                       `Status` tinyint(4) NULL DEFAULT NULL,
-                                       `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
-                                       `PlanOutQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
-                                       `ActOutQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
-                                       `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '货架',
-                                       `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
-                                       `AuditinTime` datetime NULL DEFAULT NULL COMMENT '审核时间',
-                                       `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                       `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                       `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                       `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                       `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                       `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                       PRIMARY KEY (`StockOutDetailId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_stockoutdetail
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_storagerack
--- ----------------------------
-DROP TABLE IF EXISTS `wms_storagerack`;
-CREATE TABLE `wms_storagerack`  (
-                                    `StorageRackId` bigint(20) NOT NULL COMMENT '货架Id',
-                                    `StorageRackNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '货架编号',
-                                    `StorageRackName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '货架名称',
-                                    `ReservoirAreaId` bigint(20) NOT NULL COMMENT '所属库区',
-                                    `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                    `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                    `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                    `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                    `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                    `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                    `WarehouseId` bigint(20) NULL DEFAULT NULL,
-                                    PRIMARY KEY (`StorageRackId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_storagerack
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_warehouse
--- ----------------------------
-DROP TABLE IF EXISTS `wms_warehouse`;
-CREATE TABLE `wms_warehouse`  (
-                                  `WarehouseId` bigint(20) NOT NULL,
-                                  `WarehouseNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '仓库编号',
-                                  `WarehouseName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '仓库名称',
-                                  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '是否删除 1未删除  0删除',
-                                  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                  `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                  `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                  PRIMARY KEY (`WarehouseId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of wms_warehouse
--- ----------------------------
-
--- ----------------------------
--- Table structure for wms_supplier
--- ----------------------------
-DROP TABLE IF EXISTS `wms_supplier`;
-CREATE TABLE `wms_supplier`  (
-                                 `SupplierId` bigint(20) NOT NULL,
-                                 `SupplierNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '供应商编号',
-                                 `SupplierName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '供应商名称',
-                                 `Address` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供应商地址',
-                                 `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
-                                 `SupplierPerson` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
-                                 `SupplierLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
-                                 `Email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                 `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`SupplierId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Table structure for wms_carrier
--- ----------------------------
-DROP TABLE IF EXISTS `wms_carrier`;
-CREATE TABLE `wms_carrier`  (
-                                `CarrierId` bigint(20) NOT NULL,
-                                `CarrierNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '承运商编号',
-                                `CarrierName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '承运商名称',
-                                `Address` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '承运商地址',
-                                `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
-                                `CarrierPerson` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
-                                `CarrierLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
-                                `Email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
-                                `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                PRIMARY KEY (`CarrierId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Table structure for wms_customer
--- ----------------------------
-DROP TABLE IF EXISTS `wms_customer`;
-CREATE TABLE `wms_customer`  (
-                                 `CustomerId` bigint(20) NOT NULL,
-                                 `CustomerNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户编号',
-                                 `CustomerName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户名称',
-                                 `Address` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户地址',
-                                 `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
-                                 `CustomerPerson` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
-                                 `CustomerLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
-                                 `Email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
-                                 `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                 `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
-                                 `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
-                                 `CreateDate` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                 `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
-                                 `ModifiedDate` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                 PRIMARY KEY (`CustomerId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
-SET FOREIGN_KEY_CHECKS = 1;

Directory.Build.props

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup>
-    <LatestDevTFM>net9.0</LatestDevTFM>
-    <ReleaseTFMs>net6.0;net7.0;net8.0;net9.0</ReleaseTFMs>
-    <TestTFMs>net6.0;net7.0;net8.0;net9.0</TestTFMs>
-  </PropertyGroup>
-</Project>

README.md

@@ -1,30 +1,63 @@
 [![Build Status](https://lysilver.visualstudio.com/kopsoftwms/_apis/build/status/lysilver.KopSoftWms?branchName=master)](https://lysilver.visualstudio.com/kopsoftwms/_build/latest?definitionId=3&branchName=master)
 
-## DotNet开源免费WMS仓库管理系统
-
-* kopSoftWMS仓库管理系统 http://wms.kopsoft.cn/
-* Gitee https://gitee.com/yulou/kopSoftWMS
-* GitHub https://github.com/lysilver/kopSoftWMS
+****
+* KopSoft标签打印软件 http://tuoshui.net.cn/Print/
+* GitHub https://github.com/williamyang1984/KopSoftPrint
+* 码云 https://gitee.com/williamyang1984/KopSoftPrint
+*
+* KopSoft仓库管理系统 http://wms.kopsoft.cn/
+* GitHub https://github.com/lysilver/KopSoftWms
+* 码云 https://gitee.com/yulou/KopSoftWms
 *
-* 开源不易，更多商业产品（ERP企业资源计划,WMS仓库管理系统,MES制造执行系统,EMS设备管理系统,QMS质量管理系统）请移步 http://mom.kopsoft.cn/
+* 技术QQ群 421635
+* 技术论坛 http://tangqiao.net.cn/forum.php?mod=forumdisplay&fid=47
+****
 
-## kopSoftWMS功能模块
+|  版本   | 分支  |
+|  ----  | ----  |
+| netcore2.2  | master |
+| netcore3.0  | netcore3.0 |
+| netcore3.1  | netcore3.1 |
 
-* 用户管理，部门管理，角色管理，物料管理，供应商管理，
-* 入库管理（采购入库、生产入库、销售退货、拆包装入库），
-* 出库管理（生产领料、采购退货、销售发货、拆包装出库、报废出库），
-* 盘点管理等，
+## 功能模块
+- [x] 用户管理
+- [x] 部门管理
+- [x] 角色管理
+- [x] 数据字典
+- [x] 物料管理
+- [x] 客户管理
+- [x] 供应商管理
+- [x] 承运商管理
+- [x] 仓库管理
+- [x] 库区管理
+- [x] 货架管理
+- [x] 入库管理
+- [x] 出库管理
+- [x] 库存查询
+- [x] 库存记录
+- [x] 发货记录
+- [x] 库存移动
+- [x] 系统日志
+- [x] 登陆统计
+  
 
-## 技术栈
+## 技术
+`net core`
+
+* 基于.Net Core 2.2~3.1开发；
+
+* 支持sqlserver、mysql数据库，其他数据库未测试，脚本在docs/sql；
+
+* 前端采用 vue、polyfill、qs、 axios、 bootstrap、adminlte、layer、bootstrap-datetimepicker、bootstrap-table、bootstrap-select等
+
+* 后端采用 asp.net mvc core、sqlsugar、fluentValidation、nlog、Jil、DI、Ganss、雪花算法、Xunit、npoi（因在linux上报错，后期替换掉，bug修复（https://www.cnblogs.com/Robbery/p/10115234.html））等
 
-* 基于微软.NET 9.0开发，支持 sqlserver、mysql  等主流数据库，ORM  采用国内开源 ORM  框架 SqlSugar ；
-* 前端采用 bootstrap、adminlte、layer、bootstrap-datetimepicker、bootstrap-table、bootstrap-select等；
-* 后端采用 asp.net mvc core、fluentValidation、nlog、Jil、DI、Ganss 、雪花算法、Xunit、npoi等；
 
-|  版本   | 分支  |
-|  ----  | ----  |
-| netcore9.0  | master |
 
 ## 申明
+* 本代码只做学习交流使用！
+* 写的不好请谅解！
+
+## 使用
+* 该架子在某顺风车业务使用
 
-* 本项目仅供个人学习使用，商业授权请联系kopSoft原作者。

azure-pipelines.yml

@@ -11,21 +11,14 @@ steps:
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk'
-    version: '9.0.304'
+    version: '2.2.203'
     includePreviewVersions: true
 
-- task: DeleteFiles@1
-  displayName: 'Remove unneeded files'
-  inputs:
-    contents: |
-      **/bin/*
-      **/obj/*
-
 - task: DotNetCoreCLI@2
   displayName: Build
   inputs:
     command: build
     projects: '**/*.csproj'
-    arguments: '--configuration $(buildConfiguration)'
+    arguments: '--configuration Release'
 
 

docs/sql/KopWms_mysql.sql

@@ -0,0 +1,913 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local-mysql
+ Source Server Type    : MySQL
+ Source Server Version : 50713
+ Source Host           : localhost:3306
+ Source Schema         : kopwms
+
+ Target Server Type    : MySQL
+ Target Server Version : 50713
+ File Encoding         : 65001
+
+ Date: 05/03/2019 15:26:58
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dept`;
+CREATE TABLE `sys_dept`  (
+  `DeptId` bigint(20) NOT NULL,
+  `DeptNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `DeptName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`DeptId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_dept
+-- ----------------------------
+INSERT INTO `sys_dept` VALUES (492573722524254208, NULL, '技术一部', 1, '负责机台1', 491786087098744832, '2018-09-22 09:36:33', 491786087098744832, '2018-09-22 10:01:39');
+INSERT INTO `sys_dept` VALUES (492616866888417280, NULL, '技术二部', 1, '负责机台2', 491786087098744832, '2018-09-21 16:42:56', 491786087098744832, '2018-09-22 15:49:11');
+INSERT INTO `sys_dept` VALUES (492617342476353536, NULL, '技术三部', 1, '负责机台3', 491786087098744832, '2018-09-21 16:44:19', 491786087098744832, '2018-09-22 15:48:28');
+INSERT INTO `sys_dept` VALUES (492967145194389504, NULL, '技术四部', 1, '负责机台4', 491786087098744832, '2018-09-22 15:55:26', 491786087098744832, '2018-09-23 10:45:55');
+INSERT INTO `sys_dept` VALUES (493254990471626752, NULL, '1111111111111111111111111111111', 0, NULL, 491786087098744832, '2018-09-23 10:55:59', 491786087098744832, '2018-09-23 13:30:32');
+INSERT INTO `sys_dept` VALUES (493259536275079168, '4', '技术五部', 1, '机台5', 491786087098744832, '2018-09-23 11:15:10', 504990858139926528, '2019-02-17 17:06:23');
+INSERT INTO `sys_dept` VALUES (493293212589359104, NULL, 'asd', 0, NULL, 491786087098744832, '2018-09-23 13:31:07', 491786087098744832, '2018-09-23 13:35:05');
+INSERT INTO `sys_dept` VALUES (493293262740652032, NULL, 'asdas', 0, NULL, 491786087098744832, '2018-09-23 13:31:13', 491786087098744832, '2018-09-23 13:35:08');
+INSERT INTO `sys_dept` VALUES (518051525495357440, 'kt004', '销售部门', 1, '销售部门', 504990858139926528, '2018-11-30 21:11:54', 504990858139926528, '2018-12-22 19:42:25');
+INSERT INTO `sys_dept` VALUES (518051575634067456, 'kt003', '采购部门', 1, '采购部门', 504990858139926528, '2018-11-30 21:12:06', 504990858139926528, '2018-12-22 19:42:13');
+INSERT INTO `sys_dept` VALUES (518053174372728832, 'kt002', '制造一部', 1, '制造一部', 504990858139926528, '2018-11-30 21:18:28', 504990858139926528, '2018-12-22 19:42:00');
+INSERT INTO `sys_dept` VALUES (518053238646243328, 'kt001', '制造二部', 1, '制造二部', 504990858139926528, '2018-11-30 21:18:43', 504990858139926528, '2018-12-22 19:41:49');
+INSERT INTO `sys_dept` VALUES (528063722858479616, 'RD', 'RD', 1, NULL, 504990858139926528, '2018-12-28 12:16:42', NULL, NULL);
+INSERT INTO `sys_dept` VALUES (550212648847802368, '12', '12', 0, '12', 504990858139926528, '2019-02-27 15:08:36', 504990858139926528, '2019-02-27 17:01:57');
+INSERT INTO `sys_dept` VALUES (550244912524689408, '333', '333', 0, '333344', 504990858139926528, '2019-02-27 17:16:49', 504990858139926528, '2019-02-27 17:27:40');
+INSERT INTO `sys_dept` VALUES (550312768192905216, 'YBS', '饮冰室', 1, 'YBS', 504990858139926528, '2019-02-27 21:46:27', 491786087098744832, '2019-02-27 22:16:15');
+INSERT INTO `sys_dept` VALUES (551031800911101952, 'T001', '天心堂', 0, '天心堂', 504990858139926528, '2019-03-01 21:23:38', 504990858139926528, '2019-03-01 21:24:18');
+INSERT INTO `sys_dept` VALUES (552087637804974080, '89', '89', 1, '89', 504990858139926528, '2019-03-04 19:14:01', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for sys_dict
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dict`;
+CREATE TABLE `sys_dict`  (
+  `DictId` bigint(20) NOT NULL,
+  `DictNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `DictName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `DictType` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`DictId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_dict
+-- ----------------------------
+INSERT INTO `sys_dict` VALUES (503747692996853760, NULL, '件', '1', 1, NULL, 491786087098744832, '2018-10-22 09:53:29', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (503752972895780864, NULL, '采购入库单', '3', 1, NULL, 491786087098744832, '2018-10-22 10:14:27', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (503753018307510272, NULL, '成品出库单', '4', 1, NULL, 491786087098744832, '2018-10-22 10:14:39', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507099447742693376, NULL, 'A级物料', '2', 1, 'A级物料', 491786087098744832, '2018-10-31 15:52:09', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507099512351752192, NULL, '普通材料', '2', 1, NULL, 491786087098744832, '2018-10-31 15:52:25', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507099602579619840, NULL, '耗材类', '2', 1, NULL, 491786087098744832, '2018-10-31 15:52:47', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507100062879318016, NULL, '包材料', '2', 1, NULL, 491786087098744832, '2018-10-31 15:54:36', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507100561112301568, NULL, '危险品料', '2', 1, NULL, 491786087098744832, '2018-10-31 15:56:35', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507100596751302656, NULL, '成品类', '2', 1, NULL, 491786087098744832, '2018-10-31 15:56:44', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507100629949218816, NULL, '冶工具 ', '2', 1, NULL, 491786087098744832, '2018-10-31 15:56:52', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507100659967852544, NULL, '设备', '2', 1, NULL, 491786087098744832, '2018-10-31 15:56:59', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507452557040287744, NULL, '台', '1', 1, '台', 491786087098744832, '2018-11-01 15:15:17', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (507477339421016064, NULL, '个', '1', 1, NULL, 491786087098744832, '2018-11-01 16:53:46', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517162885743378432, NULL, '自有', '6', 1, NULL, 504990858139926528, '2018-11-28 10:20:39', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517162936238604288, NULL, '租赁', '6', 1, NULL, 504990858139926528, '2018-11-28 10:20:52', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517163878539329536, NULL, '专业生产用设备', '5', 1, NULL, 504990858139926528, '2018-11-28 10:24:37', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517163903772262400, NULL, '动能发生设备', '5', 1, NULL, 504990858139926528, '2018-11-28 10:24:43', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517163985334697984, NULL, '电器设备', '5', 1, NULL, 504990858139926528, '2018-11-28 10:25:03', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (517164060874113024, NULL, '锻压设备', '5', 1, '1', 504990858139926528, '2018-11-28 10:25:21', 491786087098744832, '2018-11-28 16:23:44');
+INSERT INTO `sys_dict` VALUES (524588722197364736, NULL, 'A物料', '2', 1, NULL, 504990858139926528, '2018-12-18 22:08:18', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (524838103836262400, '1', 'stockin', '0', 2, '勿动，入库单编号', 504990858139926528, '2018-12-19 14:39:14', NULL, '1900-01-01 00:00:00');
+INSERT INTO `sys_dict` VALUES (524838556393275392, '1', 'stockout', '0', 2, '勿动，出库单编号', 504990858139926528, '2018-12-19 14:41:03', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (525173270467575808, NULL, '退货入库单', '3', 1, NULL, 504990858139926528, '2018-12-20 12:51:02', NULL, NULL);
+INSERT INTO `sys_dict` VALUES (525175016191426560, NULL, '试用入库', '3', 1, 'YOU SHEN ME YONG NE ?', 504990858139926528, '2018-12-20 12:58:01', 504990858139926528, '2018-12-28 12:17:18');
+INSERT INTO `sys_dict` VALUES (539715276204146688, NULL, '光年', '1', 0, NULL, 504990858139926528, '2019-01-29 15:55:49', 504990858139926528, '2019-01-29 15:56:11');
+
+-- ----------------------------
+-- Table structure for sys_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_log`;
+CREATE TABLE `sys_log`  (
+  `LogId` bigint(20) NOT NULL,
+  `LogType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+  `Url` varchar(150) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Browser` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `LogIp` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`LogId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_menu_wms
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu_wms`;
+CREATE TABLE `sys_menu_wms`  (
+  `MenuId` bigint(20) NOT NULL,
+  `MenuName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `MenuUrl` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `MenuIcon` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `MenuParent` bigint(20) NULL DEFAULT NULL,
+  `Sort` int(11) NULL DEFAULT NULL,
+  `Status` tinyint(4) NULL DEFAULT NULL COMMENT '启用1 禁用0',
+  `MenuType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'menu btn',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`MenuId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_menu_wms
+-- ----------------------------
+INSERT INTO `sys_menu_wms` VALUES (1, '系统管理', '#', NULL, -1, 1, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:10:42', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (2, '用户管理', '/User', NULL, 1, 4, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:12:56', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (3, '部门管理', '/Dept', NULL, 1, 3, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:14:38', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (4, '角色管理', '/Role', NULL, 1, 2, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:14:57', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (5, '数据字典', '/Dict', NULL, 1, 5, 1, 'menu', 1, NULL, NULL, '2018-10-21 14:44:30', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (6, '基础资料', '#', NULL, -1, 6, 1, 'menu', 1, NULL, NULL, '2018-09-24 12:19:07', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (7, '物料管理', '/Material', NULL, 6, 7, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:37', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (8, '客户管理', '/Customer', NULL, 6, 8, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:44', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (9, '供应商管理', '/Supplier', NULL, 6, 9, 1, 'menu', 1, NULL, NULL, '2018-10-21 10:25:53', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (10, '承运商管理', '/Carrier', NULL, 6, 10, 1, 'menu', 1, NULL, NULL, '2018-10-21 10:25:58', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (11, '仓库管理', '#', NULL, -1, 11, 1, 'menu', 1, NULL, NULL, '2018-12-18 23:01:36', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (12, '仓库管理', '/Warehouse', NULL, 11, 12, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:48:09', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (13, '库区管理', '/ReservoirArea', NULL, 11, 13, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:49:11', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (14, '货架管理', '/StorageRack', '', 11, 14, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:49:14', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (15, '设备管理', '#', '', -1, 15, 1, 'menu', 1, NULL, NULL, '2018-11-25 22:32:33', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (16, '设备单元', '/Device', NULL, 15, 16, 1, 'menu', 1, NULL, NULL, '2018-11-26 22:28:25', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (17, '生产管理', '#', '', -1, 17, 1, 'menu', 1, NULL, NULL, '2018-11-30 21:22:54', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (18, '生产工单', '/ProductionOrder', NULL, 17, 18, 1, 'menu', 1, NULL, NULL, '2018-11-30 21:24:22', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (19, '工艺管理', '#', NULL, -1, 19, 1, 'menu', 1, NULL, NULL, '2018-12-06 15:43:58', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (20, 'BOM管理', '/BOM', NULL, 19, 20, 1, 'menu', 1, NULL, NULL, '2018-12-06 15:44:58', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (21, '工艺路线', '/Routing', NULL, 19, 21, 1, 'menu', 1, NULL, NULL, '2018-12-17 23:04:45', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (22, '日志管理', '#', '', -1, 22, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:51', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (23, '系统日志', '/Log', NULL, 22, 23, 1, 'menu', 1, NULL, NULL, '2018-10-09 08:50:54', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (24, '入库管理', '/StockIn', NULL, 11, 24, 1, 'menu', 1, NULL, NULL, '2018-12-19 14:09:08', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (25, '条码系统', '#', NULL, -1, 25, 1, 'menu', 1, NULL, NULL, '2018-12-26 14:26:25', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (26, '报表管理', '#', NULL, -1, 26, 1, 'menu', 1, NULL, NULL, '2018-12-26 14:29:30', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (27, '出库管理', '/StockOut', NULL, 11, 27, 1, 'menu', 1, NULL, NULL, '2019-01-22 11:06:17', NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (28, '设备报修', '/Devicerepair', NULL, 15, 28, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (29, '库存查询', '/Inventory', NULL, 11, 29, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (30, '库存记录', '/InventoryRecord', NULL, 11, 30, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (31, '登录统计', '/Log/Bar', NULL, 22, 31, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (32, '发货记录', '/Delivery', NULL, 11, 32, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu_wms` VALUES (33, '库存移动', '/InventoryMove', NULL, 11, 33, 1, 'menu', 1, NULL, NULL, NULL, NULL, NULL);
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role`  (
+  `RoleId` bigint(20) NOT NULL,
+  `RoleName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `RoleType` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'admin #',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间'
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_role
+-- ----------------------------
+INSERT INTO `sys_role` VALUES (494712986628259840, '系统管理员', 'admin', 1, '系统管理员', 491786087098744832, '2018-09-27 11:32:43', 504990858139926528, '2019-03-03 20:46:05');
+INSERT INTO `sys_role` VALUES (518052696645697536, '工艺工程师', '#', 1, '工艺工程师', 504990858139926528, '2018-11-30 21:16:34', NULL, NULL);
+INSERT INTO `sys_role` VALUES (551034449270145024, '1', '#', 0, '12', 504990858139926528, '2019-03-01 21:33:51', 504990858139926528, '2019-03-03 20:45:47');
+INSERT INTO `sys_role` VALUES (551035289351487488, '123', '#', 0, '1231', 504990858139926528, '2019-03-01 21:37:21', 504990858139926528, '2019-03-03 20:45:44');
+INSERT INTO `sys_role` VALUES (518052825163366400, '仓库管理员', '#', 1, '仓库管理员', 504990858139926528, '2018-11-30 21:17:04', 504990858139926528, '2018-12-19 13:53:39');
+INSERT INTO `sys_role` VALUES (518052895468290048, '设备工程师', '#', 1, '设备工程师', 504990858139926528, '2018-11-30 21:17:21', NULL, NULL);
+INSERT INTO `sys_role` VALUES (551052717045317632, 'aaa', '#', 0, 'aaaa', 504990858139926528, '2019-03-01 22:46:46', 504990858139926528, '2019-03-03 20:45:41');
+INSERT INTO `sys_role` VALUES (551290503941849088, '111111', '#', 0, '111', 504990858139926528, '2019-03-02 14:29:44', 504990858139926528, '2019-03-03 20:45:38');
+INSERT INTO `sys_role` VALUES (552120536675647488, '16', '#', 1, '1', 504990858139926528, '2019-03-04 21:29:53', NULL, NULL);
+INSERT INTO `sys_role` VALUES (551291650308046848, '3', '#', 0, '3', 504990858139926528, '2019-03-02 14:34:13', 504990858139926528, '2019-03-03 20:45:35');
+INSERT INTO `sys_role` VALUES (551295610691518464, '90io', '#', 0, '8990', 504990858139926528, '2019-03-02 14:51:56', 504990858139926528, '2019-03-03 20:45:32');
+
+-- ----------------------------
+-- Table structure for sys_rolemenu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_rolemenu`;
+CREATE TABLE `sys_rolemenu`  (
+  `RoleMenuId` bigint(20) NOT NULL,
+  `RoleId` bigint(20) NULL DEFAULT NULL,
+  `MenuId` bigint(20) NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`RoleMenuId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_rolemenu
+-- ----------------------------
+INSERT INTO `sys_rolemenu` VALUES (494712986762477568, 494712986628259840, 1, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
+INSERT INTO `sys_rolemenu` VALUES (494712986762477569, 494712986628259840, 2, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
+INSERT INTO `sys_rolemenu` VALUES (494712986762477570, 494712986628259840, 3, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
+INSERT INTO `sys_rolemenu` VALUES (494712986762477571, 494712986628259840, 4, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:00');
+INSERT INTO `sys_rolemenu` VALUES (494712986762477572, 494712986628259840, 5, 491786087098744832, '2018-09-27 11:32:47', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681041502208, 494712986628259840, 6, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681083445248, 494712986628259840, 7, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681137971200, 494712986628259840, 8, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681158942720, 494712986628259840, 9, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681188302848, 494712986628259840, 12, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:01');
+INSERT INTO `sys_rolemenu` VALUES (499030681217662976, 494712986628259840, 10, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (499030681247023104, 494712986628259840, 11, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (499030681272188928, 494712986628259840, 13, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (499030681427378176, 494712986628259840, 14, 491786087098744832, '2018-10-09 09:29:46', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (503408458121347072, 494712986628259840, 15, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (503408458222010368, 494712986628259840, 16, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:02');
+INSERT INTO `sys_rolemenu` VALUES (503408458251370496, 494712986628259840, 17, 491786087098744832, '2018-10-21 11:25:29', 491786087098744832, '2018-12-11 22:26:03');
+INSERT INTO `sys_rolemenu` VALUES (503466471221886976, 494712986628259840, 18, 491786087098744832, '2018-10-21 15:16:01', 491786087098744832, '2018-12-11 22:26:03');
+INSERT INTO `sys_rolemenu` VALUES (517164210220695552, 494712986628259840, 19, 504990858139926528, '2018-11-28 10:25:56', 491786087098744832, '2018-12-11 22:26:03');
+INSERT INTO `sys_rolemenu` VALUES (517164210333941760, 494712986628259840, 20, 504990858139926528, '2018-11-28 10:25:56', 491786087098744832, '2018-12-11 22:26:03');
+INSERT INTO `sys_rolemenu` VALUES (518052697090293760, 518052696645697536, 16, 504990858139926528, '2018-11-30 21:16:34', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (518052697090293761, 518052696645697536, 17, 504990858139926528, '2018-11-30 21:16:34', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (518052895870943232, 518052895468290048, 19, 504990858139926528, '2018-11-30 21:17:21', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (518052895870943233, 518052895468290048, 20, 504990858139926528, '2018-11-30 21:17:21', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522056475653177344, 494712986628259840, 21, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522056476315877376, 494712986628259840, 22, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522056476953411584, 494712986628259840, 23, 491786087098744832, '2018-12-11 22:26:03', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522056477603528704, 494712986628259840, 24, 491786087098744832, '2018-12-11 22:26:04', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522229689423495168, 522229689289277440, 1, 491786087098744832, '2018-12-12 09:54:21', 504990858139926528, '2018-12-12 10:26:48');
+INSERT INTO `sys_rolemenu` VALUES (522229689423495169, 522229689289277440, 2, 491786087098744832, '2018-12-12 09:54:21', 504990858139926528, '2018-12-12 10:26:48');
+INSERT INTO `sys_rolemenu` VALUES (522229689423495171, 522229689289277440, 4, 491786087098744832, '2018-12-12 09:54:21', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522229689423495172, 522229689289277440, 18, 491786087098744832, '2018-12-12 09:54:21', 504990858139926528, '2018-12-12 10:26:48');
+INSERT INTO `sys_rolemenu` VALUES (522229689423495173, 522229689289277440, 24, 491786087098744832, '2018-12-12 09:54:21', 504990858139926528, '2018-12-12 10:26:48');
+INSERT INTO `sys_rolemenu` VALUES (522229689423495174, 522229689289277440, 23, 491786087098744832, '2018-12-12 09:54:21', 504990858139926528, '2018-12-12 10:26:48');
+INSERT INTO `sys_rolemenu` VALUES (522237859453730816, 522229689289277440, 6, 504990858139926528, '2018-12-12 10:26:48', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522237859717971968, 522229689289277440, 5, 504990858139926528, '2018-12-12 10:26:48', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522260001876606976, 522229689289277440, 3, 504990858139926528, '2018-12-12 11:54:48', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (522279678459772928, 522229689289277440, 7, 504990858139926528, '2018-12-12 13:12:59', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524603534847508480, 494712986628259840, 26, 504990858139926528, '2018-12-18 23:07:09', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524603762120065024, 494712986628259840, 25, 504990858139926528, '2018-12-18 23:08:04', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364288, 522229689289277440, 12, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364289, 522229689289277440, 13, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364290, 522229689289277440, 14, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364291, 522229689289277440, 15, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364292, 522229689289277440, 16, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364293, 522229689289277440, 17, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364294, 522229689289277440, 20, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364295, 522229689289277440, 19, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364296, 522229689289277440, 21, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364297, 522229689289277440, 22, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364298, 522229689289277440, 25, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364299, 522229689289277440, 8, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524810211492364300, 522229689289277440, 26, 504990858139926528, '2018-12-19 12:48:25', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524826629831131136, 518052825163366400, 11, 504990858139926528, '2018-12-19 13:53:39', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524826629831131137, 518052825163366400, 13, 504990858139926528, '2018-12-19 13:53:39', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524826629831131138, 518052825163366400, 12, 504990858139926528, '2018-12-19 13:53:39', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (524826629831131139, 518052825163366400, 14, 504990858139926528, '2018-12-19 13:53:39', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999744, 527401452621004800, 2, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999745, 527401452621004800, 3, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999746, 527401452621004800, 4, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999747, 527401452621004800, 5, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999748, 527401452621004800, 12, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (527401452771999749, 527401452621004800, 13, 504990858139926528, '2018-12-26 16:25:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (537140827936260096, 494712986628259840, 28, 504990858139926528, '2019-01-22 13:25:53', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (537141837408763904, 494712986628259840, 29, 504990858139926528, '2019-01-22 13:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (537141837408763905, 494712986628259840, 30, 504990858139926528, '2019-01-22 13:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (537177594374651904, 494712986628259840, 27, 504990858139926528, '2019-01-22 15:51:59', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (537507366317326336, 494712986628259840, 31, 504990858139926528, '2019-01-23 13:42:23', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (548367997115301888, 494712986628259840, 32, 504990858139926528, '2019-02-22 12:58:39', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (551747124224589824, 494712986628259840, 33, 504990858139926528, '2019-03-03 20:46:05', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555136, 552120536675647488, 1, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555137, 552120536675647488, 2, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555138, 552120536675647488, 3, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555139, 552120536675647488, 4, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555140, 552120536675647488, 5, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555141, 552120536675647488, 6, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555142, 552120536675647488, 7, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555143, 552120536675647488, 8, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555144, 552120536675647488, 9, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555145, 552120536675647488, 10, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555146, 552120536675647488, 11, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555147, 552120536675647488, 12, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555148, 552120536675647488, 13, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555149, 552120536675647488, 14, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555150, 552120536675647488, 24, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555151, 552120536675647488, 27, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555152, 552120536675647488, 29, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555153, 552120536675647488, 30, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555154, 552120536675647488, 32, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555155, 552120536675647488, 33, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555156, 552120536675647488, 15, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555157, 552120536675647488, 16, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555158, 552120536675647488, 28, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555159, 552120536675647488, 17, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555160, 552120536675647488, 18, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555161, 552120536675647488, 19, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555162, 552120536675647488, 20, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555163, 552120536675647488, 21, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555164, 552120536675647488, 22, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555165, 552120536675647488, 23, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555166, 552120536675647488, 31, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555167, 552120536675647488, 25, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+INSERT INTO `sys_rolemenu` VALUES (552120537774555168, 552120536675647488, 26, 504990858139926528, '2019-03-04 21:29:54', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for sys_serialnum
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_serialnum`;
+CREATE TABLE `sys_serialnum`  (
+  `SerialNumberId` int(11) NOT NULL,
+  `SerialNumber` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `SerialCount` int(11) NULL DEFAULT NULL,
+  `TableName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表名',
+  `Prefix` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前缀',
+  `Digit` int(11) NULL DEFAULT NULL COMMENT '位数',
+  `Mantissa` int(11) NULL DEFAULT NULL COMMENT '尾数',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`SerialNumberId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_serialnum
+-- ----------------------------
+INSERT INTO `sys_serialnum` VALUES (1, 'R20190301002520000001', 1, 'Wms_stockin', 'R', 22, 6, 1, '入库单', 1, '2019-01-07 11:16:09', 504990858139926528, '2019-03-01 00:25:20');
+INSERT INTO `sys_serialnum` VALUES (2, 'C20190303212032000001', 1, 'Wms_stockout', 'C', 22, 6, 1, '出库单', 1, '2019-02-13 09:24:58', 504990858139926528, '2019-03-03 21:20:32');
+INSERT INTO `sys_serialnum` VALUES (3, 'M20190304224033000002', 2, 'Wms_inventorymove', 'M', 22, 6, 1, '库存移动', 1, '2019-03-03 13:16:43', 504990858139926528, '2019-03-04 22:40:34');
+
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user`  (
+  `UserId` bigint(20) NOT NULL,
+  `UserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `UserNickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Pwd` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Sort` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Tel` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Mobile` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `Sex` tinyint(4) NULL DEFAULT NULL COMMENT '0男 1女',
+  `DeptId` bigint(20) NULL DEFAULT NULL,
+  `LoginIp` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `LoginDate` datetime(0) NULL DEFAULT NULL,
+  `LoginTime` int(11) NULL DEFAULT NULL,
+  `IsEabled` tinyint(4) NULL DEFAULT NULL COMMENT '1 启用 0 禁用',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1未删除   0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `RoleId` bigint(20) NULL DEFAULT NULL,
+  `HeadImg` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`UserId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_user
+-- ----------------------------
+INSERT INTO `sys_user` VALUES (491786087098744832, 'admin', 'admin', '202cb962ac59075b964b07152d234b70', NULL, NULL, '15678676789', NULL, 1, 0, '127.0.0.1', '2019-02-27 22:10:00', 1060, 1, 1, '系统管理员', 491786087098744832, '2018-09-19 09:42:20', NULL, NULL, 494712986628259840, NULL);
+INSERT INTO `sys_user` VALUES (504990858139926528, 'william', 'william', '670b14728ad9902aecba32e22fa4f6bd', NULL, 'william.yang@kopsoft.cn', '13921987606', NULL, 1, 492573722524254208, '127.0.0.1', '2019-03-05 13:10:43', 1253, 1, 1, NULL, 491786087098744832, '2018-10-25 20:13:22', 504990858139926528, '2019-02-20 15:44:50', 494712986628259840, 'upload\\head\\1e11d35856fd4dd49b5a4e7885b2f2bb.jpg');
+INSERT INTO `sys_user` VALUES (516802046381260800, 'linux', 'linux', 'e206a54e97690cce50cc872dd70ee896', NULL, NULL, NULL, NULL, 1, 492573722524254208, NULL, NULL, 0, 1, 1, NULL, 504990858139926528, '2018-11-27 10:26:49', 504990858139926528, '2018-11-30 14:34:49', 494712986628259840, NULL);
+INSERT INTO `sys_user` VALUES (516804767092047872, 'windows', 'windows', '0f4137ed1502b5045d6083aa258b5c42', NULL, NULL, NULL, NULL, 1, 492967145194389504, '127.0.0.1', '2018-11-27 11:07:11', 1, 1, 1, NULL, 491786087098744832, '2018-11-27 10:37:31', 504990858139926528, '2018-11-28 10:45:18', 494712986628259840, NULL);
+INSERT INTO `sys_user` VALUES (522229805278560256, 'test', 'test', '098f6bcd4621d373cade4e832627b4f6', NULL, '1', '1', NULL, 1, 492573722524254208, NULL, NULL, 0, 1, 1, 'test', 491786087098744832, '2018-12-12 09:54:48', 504990858139926528, '2018-12-26 10:22:49', 522229689289277440, NULL);
+
+-- ----------------------------
+-- Table structure for wms_carrier
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_carrier`;
+CREATE TABLE `wms_carrier`  (
+  `CarrierId` bigint(20) NOT NULL,
+  `CarrierNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '承运商编号',
+  `CarrierName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '承运商名称',
+  `Address` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '承运商地址',
+  `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `CarrierPerson` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `CarrierLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
+  `Email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`CarrierId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_carrier
+-- ----------------------------
+INSERT INTO `wms_carrier` VALUES (506719708456681472, '123456', '承运商名称', '这是地址', '15346400808', '联系人', '1', '1459607@qq.com', '这是测试数据     备注', 1, 491786087098744832, '2018-10-30 14:43:13', 491786087098744832, '2018-10-30 14:46:09');
+INSERT INTO `wms_carrier` VALUES (506721877532606464, '11', '11', '11', '11', '11', '3', '11', '11', 0, 491786087098744832, '2018-10-30 14:51:50', 491786087098744832, '2018-10-30 14:51:58');
+INSERT INTO `wms_carrier` VALUES (506722066527944704, '00000000', 'ycy', '11地址', '15300000000', '11', '2', '11', '11', 1, 491786087098744832, '2018-10-30 14:52:35', 491786087098744832, '2018-10-31 16:04:23');
+INSERT INTO `wms_carrier` VALUES (517506395298332672, '1', '1', '1', '1', '1', '1', '1', '1', 1, 504990858139926528, '2018-11-29 09:05:39', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wms_customer
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_customer`;
+CREATE TABLE `wms_customer`  (
+  `CustomerId` bigint(20) NOT NULL,
+  `CustomerNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户编号',
+  `CustomerName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户名称',
+  `Address` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户地址',
+  `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `CustomerPerson` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `CustomerLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
+  `Email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`CustomerId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_customer
+-- ----------------------------
+INSERT INTO `wms_customer` VALUES (507101850562985984, '客户编号', '客户名称', '地址', '15346400800', '联系人', '2', '1450000000@qq.com', '备注', 1, 491786087098744832, '2018-10-31 16:01:42', 491786087098744832, '2018-10-31 16:40:15');
+INSERT INTO `wms_customer` VALUES (511381500994781184, '001', '45', '.', NULL, NULL, '1', NULL, NULL, 0, 491786087098744832, '2018-11-12 11:27:31', 504990858139926528, '2018-12-22 19:54:05');
+INSERT INTO `wms_customer` VALUES (525552041037135872, 'CP001', 'K', '苏州', '123456', '开始', '2', 'lol@163.com', NULL, 1, 504990858139926528, '2018-12-21 13:56:11', 504990858139926528, '2018-12-22 19:50:25');
+INSERT INTO `wms_customer` VALUES (525994765464895488, 'CP002', 'K', '苏州', '123456', '开始', '1', 'lol@163.com', NULL, 1, 504990858139926528, '2018-12-22 19:15:24', 504990858139926528, '2018-12-22 19:50:16');
+INSERT INTO `wms_customer` VALUES (527043444330201088, '11', '11', '11', '11', '11', '1', '11', '1111', 0, 504990858139926528, '2018-12-25 16:42:29', 504990858139926528, '2019-02-13 14:53:05');
+INSERT INTO `wms_customer` VALUES (527043582989697024, '111', '111·', '11', '11', '111', '1', '11', '11', 0, 504990858139926528, '2018-12-25 16:43:02', 504990858139926528, '2019-02-13 14:53:02');
+INSERT INTO `wms_customer` VALUES (527399666271125504, '3', '3', '3', '3', '3', NULL, NULL, NULL, 0, 504990858139926528, '2018-12-26 16:17:59', 504990858139926528, '2019-02-13 14:53:11');
+INSERT INTO `wms_customer` VALUES (527399816389459968, '5', '5', '5', '5', '5', '3', '5', NULL, 0, 504990858139926528, '2018-12-26 16:18:35', 504990858139926528, '2019-02-13 14:53:14');
+INSERT INTO `wms_customer` VALUES (527399860224131072, '6', '6', '6', '6', '6', '2', '6', '6', 1, 504990858139926528, '2018-12-26 16:18:45', NULL, NULL);
+INSERT INTO `wms_customer` VALUES (527399921968480256, '7', '7', '7', '7', '7', '1', '7', '7', 1, 504990858139926528, '2018-12-26 16:19:00', NULL, NULL);
+INSERT INTO `wms_customer` VALUES (527400052788822016, '8', '8', '8', '8', '8', '2', '8', NULL, 1, 504990858139926528, '2018-12-26 16:19:31', NULL, NULL);
+INSERT INTO `wms_customer` VALUES (527400214684762112, '545', '454', '545', '454', '545', NULL, '454', '45', 0, 504990858139926528, '2018-12-26 16:20:10', 504990858139926528, '2019-02-13 14:52:52');
+INSERT INTO `wms_customer` VALUES (527400253612097536, '6565', '656', '56', '565', '656', NULL, '56', NULL, 0, 504990858139926528, '2018-12-26 16:20:19', 504990858139926528, '2019-02-13 14:52:55');
+INSERT INTO `wms_customer` VALUES (545520460960366592, 'fsdfs', 'sfdsdf', 'sdfsdf', 'sdfsdf', 'sdfd', '1', 'sdfdf', 'sdfsdfd', 0, 504990858139926528, '2019-02-14 16:23:33', 504990858139926528, '2019-02-14 16:24:15');
+
+-- ----------------------------
+-- Table structure for wms_delivery
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_delivery`;
+CREATE TABLE `wms_delivery`  (
+  `DeliveryId` bigint(20) NOT NULL COMMENT '发货主键',
+  `StockOutId` bigint(20) NULL DEFAULT NULL COMMENT '出库单主表Id',
+  `CarrierId` bigint(20) NULL DEFAULT NULL COMMENT '承运商Id',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `DeliveryDate` datetime(0) NULL DEFAULT NULL COMMENT '发货日期',
+  `TrackingNo` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '快递单号',
+  PRIMARY KEY (`DeliveryId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_delivery
+-- ----------------------------
+INSERT INTO `wms_delivery` VALUES (548371079165378560, 547623989808201728, 506722066527944704, '111111', 1, 504990858139926528, '2019-02-22 13:10:52', NULL, NULL, '2019-02-23 00:00:00', '111111111');
+INSERT INTO `wms_delivery` VALUES (548372903721172992, 547939801051955200, 506722066527944704, 'q', 1, 504990858139926528, '2019-02-22 13:18:09', 504990858139926528, '2019-02-25 13:55:34', '2019-02-25 00:00:00', '23232522');
+
+-- ----------------------------
+-- Table structure for wms_inventory
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_inventory`;
+CREATE TABLE `wms_inventory`  (
+  `InventoryId` bigint(20) NOT NULL,
+  `MaterialId` bigint(20) NULL DEFAULT NULL,
+  `StoragerackId` bigint(20) NULL DEFAULT NULL,
+  `Qty` decimal(18, 2) NULL DEFAULT NULL,
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`InventoryId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_inventory
+-- ----------------------------
+INSERT INTO `wms_inventory` VALUES (537139717875957760, 524427831757766656, 524427598718042112, 17.00, NULL, 1, 504990858139926528, '2019-01-22 13:21:25', 504990858139926528, '2019-01-30 20:08:12');
+INSERT INTO `wms_inventory` VALUES (537800351957385216, 524427831757766656, 537155079308836864, 11.00, NULL, 1, 504990858139926528, '2019-01-24 09:06:36', 504990858139926528, '2019-02-13 16:27:53');
+INSERT INTO `wms_inventory` VALUES (546584097309327360, 546583803775156224, 537155079308836864, 110.00, NULL, 1, 504990858139926528, '2019-02-17 14:50:04', 504990858139926528, '2019-03-04 22:41:08');
+INSERT INTO `wms_inventory` VALUES (552138199883841536, 546583803775156224, 524427598718042112, 17.00, NULL, 1, 504990858139926528, '2019-03-04 22:40:05', 504990858139926528, '2019-03-04 22:41:08');
+
+-- ----------------------------
+-- Table structure for wms_inventorymove
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_inventorymove`;
+CREATE TABLE `wms_inventorymove`  (
+  `InventorymoveId` bigint(20) NOT NULL COMMENT '库存移动主键',
+  `InventorymoveNo` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '库存移动编号',
+  `SourceStoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '原货架Id',
+  `AimStoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '目标货架',
+  `Status` tinyint(4) NULL DEFAULT NULL COMMENT '状态',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`InventorymoveId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_inventorymove
+-- ----------------------------
+INSERT INTO `wms_inventorymove` VALUES (551753603845455872, 'M20190303211150000001', 537155079308836864, 524427598718042112, 2, NULL, 1, 504990858139926528, '2019-03-03 21:11:49', 504990858139926528, '2019-03-04 22:31:57');
+INSERT INTO `wms_inventorymove` VALUES (551754446187528192, 'M20190303211510000002', 537155079308836864, 524427598718042112, 2, NULL, 1, 504990858139926528, '2019-03-03 21:15:10', 504990858139926528, '2019-03-04 22:29:36');
+INSERT INTO `wms_inventorymove` VALUES (552136732728885248, 'M20190304223415000001', 537155079308836864, 524427598718042112, 2, NULL, 1, 504990858139926528, '2019-03-04 22:33:55', 504990858139926528, '2019-03-04 22:40:05');
+INSERT INTO `wms_inventorymove` VALUES (552138320176480256, 'M20190304224033000002', 537155079308836864, 524427598718042112, 2, NULL, 1, 504990858139926528, '2019-03-04 22:40:31', 504990858139926528, '2019-03-04 22:41:08');
+
+-- ----------------------------
+-- Table structure for wms_inventoryrecord
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_inventoryrecord`;
+CREATE TABLE `wms_inventoryrecord`  (
+  `InventoryrecordId` bigint(20) NOT NULL,
+  `StockInDetailId` bigint(20) NULL DEFAULT NULL,
+  `Qty` decimal(18, 2) NULL DEFAULT NULL,
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NOT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`InventoryrecordId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_inventoryrecord
+-- ----------------------------
+INSERT INTO `wms_inventoryrecord` VALUES (537139743784173568, 537135004975628288, 2.00, NULL, 1, 504990858139926528, '2019-01-22 13:21:34', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537139853909819392, 537135063733633024, 3.00, NULL, 1, 504990858139926528, '2019-01-22 13:22:01', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537140944793763840, 537140846764490752, 3.00, NULL, 1, 504990858139926528, '2019-01-22 13:26:21', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537140945032839168, 537140925772595200, 2.00, NULL, 1, 504990858139926528, '2019-01-22 13:26:21', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537189739795578880, 537187999872450560, 5.00, NULL, 1, 504990858139926528, '2019-01-22 16:40:14', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537800352204849152, 537800270038433792, 5.00, NULL, 1, 504990858139926528, '2019-01-24 09:06:36', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (537800393669738496, 537800318184849408, 5.00, NULL, 1, 504990858139926528, '2019-01-24 09:06:46', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (540141176775245824, 540141151437455360, 2.00, NULL, 1, 504990858139926528, '2019-01-30 20:08:12', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (545159163773190144, 545159143325958144, 1.00, NULL, 1, 504990858139926528, '2019-02-13 16:27:53', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (546584097506459648, 546583917986054144, 99.00, NULL, 1, 504990858139926528, '2019-02-17 14:50:04', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (546585270565208064, 546585243549696000, 22.00, NULL, 1, 504990858139926528, '2019-02-17 14:54:44', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (547607042362179584, 547595001488474112, 6.00, NULL, 1, 504990858139926528, '2019-02-20 10:34:53', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (547607042513174528, 547606991200059392, 7.00, NULL, 1, 504990858139926528, '2019-02-20 10:34:53', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (547612919097982976, 547607808099483648, 6.00, NULL, 1, 504990858139926528, '2019-02-20 10:58:13', NULL, NULL);
+INSERT INTO `wms_inventoryrecord` VALUES (547612919303503872, 547607855021162496, 4.00, NULL, 1, 504990858139926528, '2019-02-20 10:58:14', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wms_invmovedetail
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_invmovedetail`;
+CREATE TABLE `wms_invmovedetail`  (
+  `MoveDetailId` bigint(20) NOT NULL COMMENT '主键',
+  `InventorymoveId` bigint(20) NULL DEFAULT NULL COMMENT '库存移动Id',
+  `Status` tinyint(4) NULL DEFAULT NULL,
+  `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
+  `PlanQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
+  `ActQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
+  `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
+  `AuditinTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`MoveDetailId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_invmovedetail
+-- ----------------------------
+INSERT INTO `wms_invmovedetail` VALUES (552098474703716352, 551753603845455872, 2, 546583803775156224, NULL, 9, 504990858139926528, '2019-03-04 22:31:49', 1, '000', 504990858139926528, '2019-03-04 20:01:57', 504990858139926528, '2019-03-04 22:31:49');
+INSERT INTO `wms_invmovedetail` VALUES (552098474737270784, 551753603845455872, 2, 524427831757766656, NULL, 9, 504990858139926528, '2019-03-04 22:31:49', 1, '000', 504990858139926528, '2019-03-04 20:01:57', 504990858139926528, '2019-03-04 22:31:49');
+INSERT INTO `wms_invmovedetail` VALUES (552099592179548160, 551754446187528192, 1, 546583803775156224, NULL, 8, NULL, NULL, 0, 'ppp', 504990858139926528, '2019-03-04 20:06:39', 504990858139926528, '2019-03-04 21:11:00');
+INSERT INTO `wms_invmovedetail` VALUES (552115883426709504, 551754446187528192, 1, 546583803775156224, NULL, 6, NULL, NULL, 0, '6', 504990858139926528, '2019-03-04 21:11:24', 504990858139926528, '2019-03-04 22:27:53');
+INSERT INTO `wms_invmovedetail` VALUES (552128608588529664, NULL, 1, 524427831757766656, NULL, 9, NULL, NULL, 1, '', 504990858139926528, '2019-03-04 22:01:58', NULL, NULL);
+INSERT INTO `wms_invmovedetail` VALUES (552128608970211328, 551754446187528192, 1, 546583803775156224, NULL, 6, NULL, NULL, 0, '6', 504990858139926528, '2019-03-04 22:01:58', 504990858139926528, '2019-03-04 22:02:21');
+INSERT INTO `wms_invmovedetail` VALUES (552135175849377792, 551754446187528192, 2, 546583803775156224, NULL, 6, 504990858139926528, '2019-03-04 22:29:36', 1, '6', 504990858139926528, '2019-03-04 22:28:04', 504990858139926528, '2019-03-04 22:29:36');
+INSERT INTO `wms_invmovedetail` VALUES (552136855953342464, 552136732728885248, 2, 546583803775156224, NULL, 7, 504990858139926528, '2019-03-04 22:40:05', 1, '7', 504990858139926528, '2019-03-04 22:34:45', 504990858139926528, '2019-03-04 22:40:05');
+INSERT INTO `wms_invmovedetail` VALUES (552138437935759360, 552138320176480256, 2, 546583803775156224, NULL, 10, 504990858139926528, '2019-03-04 22:41:08', 1, '10', 504990858139926528, '2019-03-04 22:41:02', 504990858139926528, '2019-03-04 22:41:08');
+
+-- ----------------------------
+-- Table structure for wms_material
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_material`;
+CREATE TABLE `wms_material`  (
+  `MaterialId` bigint(20) NOT NULL,
+  `MaterialNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品编号',
+  `MaterialName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品名称',
+  `MaterialType` bigint(20) NULL DEFAULT NULL COMMENT '产品类型',
+  `Unit` bigint(20) NULL DEFAULT NULL COMMENT '单位',
+  `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属货架',
+  `ReservoirAreaId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属库区',
+  `WarehouseId` bigint(20) NULL DEFAULT NULL COMMENT '默认所属仓库',
+  `Qty` decimal(18, 0) NULL DEFAULT NULL COMMENT '安全库存',
+  `ExpiryDate` decimal(18, 0) NULL DEFAULT NULL COMMENT '有效期',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`MaterialId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_material
+-- ----------------------------
+INSERT INTO `wms_material` VALUES (524427831757766656, 'CP001', '电脑', 507099512351752192, 507452557040287744, 524427598718042112, 524427482141556736, 524427389061562368, 10, 1000, 1, NULL, 504990858139926528, '2018-12-18 11:28:58', 504990858139926528, '2019-01-22 14:37:39');
+INSERT INTO `wms_material` VALUES (527386502016008192, '3', '3', 507099512351752192, 503747692996853760, 524427598718042112, 524427482141556736, 524427389061562368, 4, 4, 1, '4', 504990858139926528, '2018-12-26 15:25:40', NULL, NULL);
+INSERT INTO `wms_material` VALUES (546583803775156224, 'a', '双飞燕鼠标', 524588722197364736, 503747692996853760, 537155079308836864, 524427482141556736, 524427389061562368, 1, 1, 1, NULL, 504990858139926528, '2019-02-17 14:48:54', 504990858139926528, '2019-02-17 15:00:05');
+INSERT INTO `wms_material` VALUES (549870694884704256, 'ABC', 'ABC', 507099447742693376, 503747692996853760, 537155079308836864, 524427482141556736, 524427389061562368, 123, 123, 1, NULL, 504990858139926528, '2019-02-26 16:29:48', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wms_reservoirarea
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_reservoirarea`;
+CREATE TABLE `wms_reservoirarea`  (
+  `ReservoirAreaId` bigint(20) NOT NULL COMMENT '主键',
+  `ReservoirAreaNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '库区编号',
+  `ReservoirAreaName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '库区名称',
+  `WarehouseId` bigint(20) NOT NULL COMMENT '所属仓库ID',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`ReservoirAreaId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_reservoirarea
+-- ----------------------------
+INSERT INTO `wms_reservoirarea` VALUES (524427482141556736, 'YA001', '原材料库区', 524427389061562368, '原材料库区', 1, 504990858139926528, '2018-12-18 11:27:35', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wms_stockin
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_stockin`;
+CREATE TABLE `wms_stockin`  (
+  `StockInId` bigint(20) NOT NULL COMMENT '主键',
+  `StockInNo` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库单号',
+  `StockInType` bigint(20) NULL DEFAULT NULL COMMENT '入库类型',
+  `SupplierId` bigint(20) NULL DEFAULT NULL COMMENT '供应商',
+  `OrderNo` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '订单号',
+  `StockInStatus` tinyint(4) NULL DEFAULT NULL,
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`StockInId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_stockin
+-- ----------------------------
+INSERT INTO `wms_stockin` VALUES (537108339251740672, 'R20190122111638000001', 503752972895780864, 516603607227826176, '1', 2, NULL, 1, 504990858139926528, '2019-01-22 11:16:19', 504990858139926528, '2019-01-22 11:17:14');
+INSERT INTO `wms_stockin` VALUES (537134955403149312, 'R20190122130232000002', 503752972895780864, 524934728818622464, '2', 2, NULL, 1, 504990858139926528, '2019-01-22 13:02:22', 504990858139926528, '2019-01-22 13:22:07');
+INSERT INTO `wms_stockin` VALUES (537140728858411008, 'R20190122132529000003', 503752972895780864, 516603607227826176, '3', 2, NULL, 1, 504990858139926528, '2019-01-22 13:25:28', 504990858139926528, '2019-01-22 13:26:21');
+INSERT INTO `wms_stockin` VALUES (537187938673360896, 'R20190122163305000004', 503752972895780864, 516603607227826176, '4', 2, NULL, 1, 504990858139926528, '2019-01-22 16:33:04', 504990858139926528, '2019-01-22 16:40:15');
+INSERT INTO `wms_stockin` VALUES (537800200954052608, 'R20190124090559000001', 503752972895780864, 524934728818622464, '5', 2, NULL, 1, 504990858139926528, '2019-01-24 09:05:58', 504990858139926528, '2019-01-24 09:06:46');
+INSERT INTO `wms_stockin` VALUES (537869335801102336, 'R20190124134042000002', 503752972895780864, 524934728818622464, '6', 1, NULL, 1, 504990858139926528, '2019-01-24 13:40:41', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (539713158118375424, 'R20190129154724000001', 503752972895780864, 516603607227826176, '12', 1, NULL, 1, 504990858139926528, '2019-01-29 15:47:24', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (539716994845376512, 'R20190129160239000002', 503752972895780864, 516603607227826176, '11', 1, NULL, 1, 504990858139926528, '2019-01-29 16:02:37', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (539717642739515392, 'R20190129160513000003', 503752972895780864, 516603607227826176, '13', 1, NULL, 1, 504990858139926528, '2019-01-29 16:05:13', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (539723783821328384, 'R20190129162937000004', 503752972895780864, 516603607227826176, '14', 1, '14', 1, 504990858139926528, '2019-01-29 16:29:37', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (540141040410034176, 'R20190130200739000001', 503752972895780864, 516603607227826176, 'fff', 2, '7777', 0, 504990858139926528, '2019-01-30 20:07:39', 504990858139926528, '2019-02-13 16:33:40');
+INSERT INTO `wms_stockin` VALUES (545155893105262592, 'R20190213161453000001', 503752972895780864, 516603607227826176, NULL, 1, NULL, 0, 504990858139926528, '2019-02-13 16:14:53', 504990858139926528, '2019-02-13 16:33:46');
+INSERT INTO `wms_stockin` VALUES (545155924675788800, 'R20190213161500000001', 525173270467575808, 516603607227826176, NULL, 1, NULL, 0, 504990858139926528, '2019-02-13 16:15:01', 504990858139926528, '2019-02-13 16:33:48');
+INSERT INTO `wms_stockin` VALUES (545156477673799680, 'R20190213161712000002', 503752972895780864, 516603607227826176, NULL, 2, NULL, 0, 504990858139926528, '2019-02-13 16:17:12', 504990858139926528, '2019-02-13 16:27:57');
+INSERT INTO `wms_stockin` VALUES (546583490531950592, 'R20190217144739000001', 503752972895780864, 516603607227826176, 'a', 2, 'a', 1, 504990858139926528, '2019-02-17 14:47:38', 504990858139926528, '2019-02-17 14:50:04');
+INSERT INTO `wms_stockin` VALUES (546585150750720000, 'R20190217145414000002', 503752972895780864, 524934728818622464, 'b', 2, 'b', 1, 504990858139926528, '2019-02-17 14:54:15', 504990858139926528, '2019-02-17 14:54:44');
+INSERT INTO `wms_stockin` VALUES (547594949290360832, 'R20190220094649000001', 503752972895780864, 516603607227826176, 'ui', 2, NULL, 1, 504990858139926528, '2019-02-20 09:46:48', 504990858139926528, '2019-02-20 10:34:53');
+INSERT INTO `wms_stockin` VALUES (547607738297876480, 'R20190220103738000002', 503752972895780864, 516603607227826176, '7', 2, NULL, 1, 504990858139926528, '2019-02-20 10:37:37', 504990858139926528, '2019-02-20 10:58:14');
+INSERT INTO `wms_stockin` VALUES (549524779011407872, 'R20190225173516000001', 503752972895780864, 516603607227826176, '1211', 1, NULL, 1, 504990858139926528, '2019-02-25 17:35:16', NULL, NULL);
+INSERT INTO `wms_stockin` VALUES (550715135702859776, 'R20190301002520000001', 503752972895780864, 516603607227826176, 'dfdfdfdf', 1, 'dfsdfsdfsdf', 0, 504990858139926528, '2019-03-01 00:25:20', 504990858139926528, '2019-03-03 20:44:19');
+
+-- ----------------------------
+-- Table structure for wms_stockindetail
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_stockindetail`;
+CREATE TABLE `wms_stockindetail`  (
+  `StockInDetailId` bigint(20) NOT NULL COMMENT '主键',
+  `StockInId` bigint(20) NULL DEFAULT NULL COMMENT '入库单号',
+  `Status` tinyint(4) NULL DEFAULT NULL,
+  `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
+  `PlanInQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
+  `ActInQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
+  `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '货架',
+  `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
+  `AuditinTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`StockInDetailId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_stockindetail
+-- ----------------------------
+INSERT INTO `wms_stockindetail` VALUES (537108438593830912, 537108339251740672, 2, 524427831757766656, 1, 1, 524427598718042112, 504990858139926528, '2019-01-22 11:17:14', 1, '1', 504990858139926528, '2019-01-22 11:17:11', 504990858139926528, '2019-01-22 11:17:14');
+INSERT INTO `wms_stockindetail` VALUES (537135004975628288, 537134955403149312, 2, 524427831757766656, 2, 2, 524427598718042112, 504990858139926528, '2019-01-22 13:22:05', 1, '1', 504990858139926528, '2019-01-22 13:02:45', 504990858139926528, '2019-01-22 13:22:05');
+INSERT INTO `wms_stockindetail` VALUES (537135063733633024, 537134955403149312, 2, 524427831757766656, 3, 3, 524427598718042112, 504990858139926528, '2019-01-22 13:22:05', 1, '1', 504990858139926528, '2019-01-22 13:02:59', 504990858139926528, '2019-01-22 13:22:05');
+INSERT INTO `wms_stockindetail` VALUES (537140846764490752, 537140728858411008, 2, 524427831757766656, 3, 3, 524427598718042112, 504990858139926528, '2019-01-22 13:26:21', 1, NULL, 504990858139926528, '2019-01-22 13:25:57', 504990858139926528, '2019-01-22 13:26:21');
+INSERT INTO `wms_stockindetail` VALUES (537140925772595200, 537140728858411008, 2, 524427831757766656, 2, 2, 524427598718042112, 504990858139926528, '2019-01-22 13:26:21', 1, NULL, 504990858139926528, '2019-01-22 13:26:16', 504990858139926528, '2019-01-22 13:26:21');
+INSERT INTO `wms_stockindetail` VALUES (537187999872450560, 537187938673360896, 2, 524427831757766656, 5, 5, 524427598718042112, 504990858139926528, '2019-01-22 16:40:15', 1, NULL, 504990858139926528, '2019-01-22 16:33:20', 504990858139926528, '2019-01-22 16:40:15');
+INSERT INTO `wms_stockindetail` VALUES (537800270038433792, 537800200954052608, 2, 524427831757766656, 5, 5, 537155079308836864, 504990858139926528, '2019-01-24 09:06:46', 1, NULL, 504990858139926528, '2019-01-24 09:06:16', 504990858139926528, '2019-01-24 09:06:46');
+INSERT INTO `wms_stockindetail` VALUES (537800318184849408, 537800200954052608, 2, 524427831757766656, 5, 5, 537155079308836864, 504990858139926528, '2019-01-24 09:06:46', 1, NULL, 504990858139926528, '2019-01-24 09:06:28', 504990858139926528, '2019-01-24 09:06:46');
+INSERT INTO `wms_stockindetail` VALUES (537869389718880256, 537869335801102336, 1, 524427831757766656, 6, 6, 537155079308836864, NULL, NULL, 1, NULL, 504990858139926528, '2019-01-24 13:40:56', NULL, NULL);
+INSERT INTO `wms_stockindetail` VALUES (539723973068324864, 539723783821328384, 1, 524427831757766656, 12, 12, 537155079308836864, NULL, NULL, 1, '12', 504990858139926528, '2019-01-29 16:30:23', 504990858139926528, '2019-01-29 16:30:35');
+INSERT INTO `wms_stockindetail` VALUES (540141151437455360, 540141040410034176, 2, 524427831757766656, 1, 2, 524427598718042112, 504990858139926528, '2019-01-30 20:08:12', 0, '2', 504990858139926528, '2019-01-30 20:08:06', 504990858139926528, '2019-02-13 16:33:39');
+INSERT INTO `wms_stockindetail` VALUES (545159143325958144, 545156477673799680, 2, 524427831757766656, 1, 1, 537155079308836864, 504990858139926528, '2019-02-13 16:27:53', 0, NULL, 504990858139926528, '2019-02-13 16:27:48', 504990858139926528, '2019-02-13 16:27:57');
+INSERT INTO `wms_stockindetail` VALUES (546583917986054144, 546583490531950592, 2, 546583803775156224, 99, 99, 537155079308836864, 504990858139926528, '2019-02-17 14:50:04', 1, NULL, 504990858139926528, '2019-02-17 14:49:21', 504990858139926528, '2019-02-17 14:50:04');
+INSERT INTO `wms_stockindetail` VALUES (546585243549696000, 546585150750720000, 2, 546583803775156224, 22, 22, 537155079308836864, 504990858139926528, '2019-02-17 14:54:44', 1, '22', 504990858139926528, '2019-02-17 14:54:37', 504990858139926528, '2019-02-17 14:54:44');
+INSERT INTO `wms_stockindetail` VALUES (547595001488474112, 547594949290360832, 2, 546583803775156224, 6, 6, 537155079308836864, 504990858139926528, '2019-02-20 10:34:53', 1, NULL, 504990858139926528, '2019-02-20 09:47:02', 504990858139926528, '2019-02-20 10:34:53');
+INSERT INTO `wms_stockindetail` VALUES (547606991200059392, 547594949290360832, 2, 546583803775156224, 7, 7, 537155079308836864, 504990858139926528, '2019-02-20 10:34:53', 1, NULL, 504990858139926528, '2019-02-20 10:34:40', 504990858139926528, '2019-02-20 10:34:53');
+INSERT INTO `wms_stockindetail` VALUES (547607808099483648, 547607738297876480, 2, 546583803775156224, 6, 6, 537155079308836864, 504990858139926528, '2019-02-20 10:58:14', 1, NULL, 504990858139926528, '2019-02-20 10:37:56', 504990858139926528, '2019-02-20 10:58:14');
+INSERT INTO `wms_stockindetail` VALUES (547607855021162496, 547607738297876480, 2, 546583803775156224, 4, 4, 537155079308836864, 504990858139926528, '2019-02-20 10:58:14', 1, NULL, 504990858139926528, '2019-02-20 10:38:07', 504990858139926528, '2019-02-20 10:58:14');
+INSERT INTO `wms_stockindetail` VALUES (549524823173234688, 549524779011407872, 1, 546583803775156224, 1, 1, 537155079308836864, NULL, NULL, 1, NULL, 504990858139926528, '2019-02-25 17:35:27', NULL, NULL);
+INSERT INTO `wms_stockindetail` VALUES (551746644366852096, 550715135702859776, 1, 549870694884704256, 2, 2, 537155079308836864, NULL, NULL, 0, NULL, 504990858139926528, '2019-03-03 20:44:10', 504990858139926528, '2019-03-03 20:44:19');
+
+-- ----------------------------
+-- Table structure for wms_stockout
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_stockout`;
+CREATE TABLE `wms_stockout`  (
+  `StockOutId` bigint(20) NOT NULL,
+  `StockOutNo` varchar(22) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库单，系统自动生成',
+  `OrderNo` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库订单',
+  `StockOutType` bigint(20) NULL DEFAULT NULL COMMENT '出库类型',
+  `CustomerId` bigint(20) NULL DEFAULT NULL COMMENT '客户',
+  `StockOutStatus` tinyint(4) NULL DEFAULT NULL,
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`StockOutId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_stockout
+-- ----------------------------
+INSERT INTO `wms_stockout` VALUES (547623989808201728, 'C20190220114213000002', '1', 503753018307510272, 525552041037135872, 5, '1', 1, 504990858139926528, '2019-02-20 11:42:13', NULL, NULL);
+INSERT INTO `wms_stockout` VALUES (547939801051955200, 'C20190221083708000001', '2', 503753018307510272, 527399860224131072, 5, NULL, 1, 504990858139926528, '2019-02-21 08:37:07', NULL, NULL);
+INSERT INTO `wms_stockout` VALUES (551755793792237568, 'C20190303212032000001', '12111', 503753018307510272, 525552041037135872, 1, NULL, 1, 504990858139926528, '2019-03-03 21:20:32', NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wms_stockoutdetail
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_stockoutdetail`;
+CREATE TABLE `wms_stockoutdetail`  (
+  `StockOutDetailId` bigint(20) NOT NULL COMMENT '主键',
+  `StockOutId` bigint(20) NULL DEFAULT NULL COMMENT '出库单',
+  `Status` tinyint(4) NULL DEFAULT NULL,
+  `MaterialId` bigint(20) NULL DEFAULT NULL COMMENT '物料',
+  `PlanOutQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '计划数量',
+  `ActOutQty` decimal(18, 0) NULL DEFAULT NULL COMMENT '实际数量',
+  `StoragerackId` bigint(20) NULL DEFAULT NULL COMMENT '货架',
+  `AuditinId` bigint(20) NULL DEFAULT NULL COMMENT '审核人',
+  `AuditinTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`StockOutDetailId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_stockoutdetail
+-- ----------------------------
+INSERT INTO `wms_stockoutdetail` VALUES (547624041066790912, 547623989808201728, 2, 546583803775156224, 11, 11, 537155079308836864, 504990858139926528, '2019-02-20 11:42:35', 1, '11', 504990858139926528, '2019-02-20 11:42:26', 504990858139926528, '2019-02-20 11:42:35');
+INSERT INTO `wms_stockoutdetail` VALUES (547978395552579584, 547939801051955200, 2, 546583803775156224, 2, 2, 537155079308836864, 504990858139926528, '2019-02-22 13:17:57', 1, NULL, 504990858139926528, '2019-02-21 11:10:29', 504990858139926528, '2019-02-22 13:17:57');
+
+-- ----------------------------
+-- Table structure for wms_storagerack
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_storagerack`;
+CREATE TABLE `wms_storagerack`  (
+  `StorageRackId` bigint(20) NOT NULL COMMENT '货架Id',
+  `StorageRackNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '货架编号',
+  `StorageRackName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '货架名称',
+  `ReservoirAreaId` bigint(20) NOT NULL COMMENT '所属库区',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `WarehouseId` bigint(20) NULL DEFAULT NULL,
+  PRIMARY KEY (`StorageRackId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_storagerack
+-- ----------------------------
+INSERT INTO `wms_storagerack` VALUES (524427598718042112, 'YA0001', '原材料货架', 524427482141556736, NULL, 1, 504990858139926528, '2018-12-18 11:28:03', NULL, NULL, 524427389061562368);
+INSERT INTO `wms_storagerack` VALUES (537155079308836864, 'Y001', 'Y001', 524427482141556736, NULL, 1, 504990858139926528, '2019-01-22 14:22:30', NULL, NULL, 524427389061562368);
+
+-- ----------------------------
+-- Table structure for wms_supplier
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_supplier`;
+CREATE TABLE `wms_supplier`  (
+  `SupplierId` bigint(20) NOT NULL,
+  `SupplierNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '供应商编号',
+  `SupplierName` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '供应商名称',
+  `Address` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供应商地址',
+  `Tel` varchar(13) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `SupplierPerson` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `SupplierLevel` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '级别',
+  `Email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Email',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '1 0',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`SupplierId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_supplier
+-- ----------------------------
+INSERT INTO `wms_supplier` VALUES (516603607227826176, 'A', 'A', NULL, NULL, NULL, '1', NULL, NULL, 1, 516234783362121728, '2019-01-22 21:18:18', NULL, NULL);
+INSERT INTO `wms_supplier` VALUES (524934728818622464, 'B', 'B', NULL, NULL, NULL, '1', NULL, NULL, 1, 504990858139926528, '2019-01-22 21:03:11', 504990858139926528, '2018-12-19 21:41:53');
+
+-- ----------------------------
+-- Table structure for wms_warehouse
+-- ----------------------------
+DROP TABLE IF EXISTS `wms_warehouse`;
+CREATE TABLE `wms_warehouse`  (
+  `WarehouseId` bigint(20) NOT NULL,
+  `WarehouseNo` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '仓库编号',
+  `WarehouseName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '仓库名称',
+  `IsDel` tinyint(4) NULL DEFAULT NULL COMMENT '是否删除 1未删除  0删除',
+  `Remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `CreateBy` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `CreateDate` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `ModifiedBy` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+  `ModifiedDate` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`WarehouseId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wms_warehouse
+-- ----------------------------
+INSERT INTO `wms_warehouse` VALUES (524427389061562368, 'A001', '原材料仓库', 1, '原材料仓库', 504990858139926528, '2018-12-18 11:27:12', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (539713274233487360, 'AC', 'AC', 1, 'AC', 504990858139926528, '2019-01-29 15:47:52', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550520278032056320, '1', '1', 1, '4；\n4242】\n2】\n\n‘\n1’', 504990858139926528, '2019-02-28 11:31:02', 504990858139926528, '2019-02-28 11:31:48');
+INSERT INTO `wms_warehouse` VALUES (550520346348879872, '2', '2', 1, '4444444', 504990858139926528, '2019-02-28 11:31:19', 504990858139926528, '2019-02-28 11:31:34');
+INSERT INTO `wms_warehouse` VALUES (550523447063609344, '3', '3', 1, '3', 504990858139926528, '2019-02-28 11:43:38', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523474897010688, '4', '4', 1, NULL, 504990858139926528, '2019-02-28 11:43:45', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523501019136000, '5', '5', 1, '5', 504990858139926528, '2019-02-28 11:43:51', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523530240851968, '6', '6', 1, '6', 504990858139926528, '2019-02-28 11:43:58', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523561538748416, '7', '7', 1, NULL, 504990858139926528, '2019-02-28 11:44:05', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523594736664576, '8', '8', 1, '8', 504990858139926528, '2019-02-28 11:44:13', NULL, NULL);
+INSERT INTO `wms_warehouse` VALUES (550523629612302336, '9', '9', 0, NULL, 504990858139926528, '2019-02-28 11:44:22', 504990858139926528, '2019-02-28 11:45:26');
+INSERT INTO `wms_warehouse` VALUES (550523660037783552, '10', '010', 0, NULL, 504990858139926528, '2019-02-28 11:44:29', 504990858139926528, '2019-02-28 11:45:23');
+INSERT INTO `wms_warehouse` VALUES (550523686336069632, '11', '11', 0, NULL, 504990858139926528, '2019-02-28 11:44:35', 504990858139926528, '2019-02-28 11:45:19');
+INSERT INTO `wms_warehouse` VALUES (550523716635721728, '12', '12', 0, NULL, 504990858139926528, '2019-02-28 11:44:42', 504990858139926528, '2019-02-28 11:45:16');
+INSERT INTO `wms_warehouse` VALUES (550524170518134784, '15', '15', 1, '2', 504990858139926528, '2019-02-28 11:46:30', NULL, NULL);
+
+SET FOREIGN_KEY_CHECKS = 1;

src/Dockerfile

@@ -1,9 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0 AS base
 WORKDIR /app
 EXPOSE 5000
-ENV ASPNETCORE_URLS http://+5000
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build
 WORKDIR /src
 COPY ["KopSoftWms/KopSoftWms.csproj", "KopSoftWms/"]
 COPY ["Orm/Orm.csproj", "Orm/"]
@@ -27,4 +26,4 @@ RUN dotnet publish "KopSoftWms.csproj" -c Release -o /app
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "KopSoftWms.dll", "--urls","http://*:5000"]
+ENTRYPOINT ["dotnet", "KopSoftWms.dll"]

src/Dto/Dto.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(LatestDevTFM)</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>YL.Core.Dto</RootNamespace>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Dto/IssuePie.cs

@@ -1,4 +1,8 @@
-namespace YL.Core.Dto
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace YL.Core.Dto
 {
     public class IssuePie
     {

src/Dto/LineChart.cs

@@ -1,4 +1,8 @@
-namespace YL.Core.Dto
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace YL.Core.Dto
 {
     public class LineChart
     {

src/Dto/MenuDto.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace YL.Core.Dto
 {

src/Dto/RoleMenuDto.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using YL.Core.Entity;
 
 namespace YL.Core.Dto

src/Dto/ServerSentEventsDto.cs

@@ -1,5 +1,9 @@
-using System.Text.Json.Serialization;
-
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+using Jil;
+
 namespace YL.Core.Dto
 {
     /// <summary>
@@ -11,25 +15,25 @@ namespace YL.Core.Dto
         /// <summary>
         /// 表示该行用来声明事件的类型。浏览器在收到数据时，会产生对应类型的事件
         /// </summary>
-        [JsonPropertyName("event")]
+        [JilDirective("event")]
         public string Event { get; set; }
 
         /// <summary>
         /// 表示该行包含的是数据。以 data 开头的行可以出现多次。所有这些行都是该事件的数据。
         /// </summary>
-        [JsonPropertyName("data")]
+        [JilDirective("data")]
         public string Data { get; set; }
 
         /// <summary>
         ///表示该行用来声明事件的标识符（即数据的编号），不常用
         /// </summary>
-        [JsonPropertyName("id")]
+        [JilDirective("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// 表示该行用来声明浏览器在连接断开之后进行再次连接之前的等待时间
         /// </summary>
-        [JsonPropertyName("retry")]
+        [JilDirective("retry")]
         public string Retry { get; set; }
     }
 }

src/Dto/Wms_invmovedetailDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 using YL.Core.Entity;
 
 namespace YL.Core.Dto

src/Entity/BaseEntity.cs

@@ -1,11 +1,13 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace YL.Core.Entity
 {
     public class BaseEntity
     {
         /// <summary>
-        /// Desc:1未删除
+        /// Desc:1未删除   0 Delete
         /// Default:
         /// Nullable:True
         /// </summary>

src/Entity/Entity.csproj

@@ -1,15 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(LatestDevTFM)</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>YL.Core.Entity</RootNamespace>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="12.0.0" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
-    <PackageReference Include="MediatR" Version="12.5.0" />
-    <PackageReference Include="sqlSugarCore" Version="5.1.4.199" />
+    <PackageReference Include="FluentValidation" Version="8.6.2" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
+    <PackageReference Include="MediatR" Version="8.0.1" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.13" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

src/Entity/Fluent.Validation/CarrierFluent.cs

@@ -6,7 +6,7 @@ namespace YL.Core.Entity.Fluent.Validation
     {
         public CarrierFluent()
         {
-            RuleFor(x => x.CarrierNo).NotNull().NotEmpty().WithMessage("承运商编号不能为空").Length(1, 20).WithMessage("承运商编号长度不能超过20");
+            RuleFor(x => x.CarrierNo).NotNull().NotEmpty().WithMessage(Properties.Resources.OPERATION_NOTNULL).Length(1, 20).WithMessage("承运商编号长度不能超过20");
             RuleFor(x => x.CarrierName).NotNull().NotEmpty().WithMessage("承运商名称不能为空").Length(1, 50).WithMessage("承运商编号长度不能超过50");
             RuleFor(x => x.Remark).MaximumLength(200).WithMessage("备注长度不能超过200");
         }

src/Entity/Fluent.Validation/DeliveryFluent.cs

@@ -1,4 +1,7 @@
 using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace YL.Core.Entity.Fluent.Validation
 {

src/Entity/Fluent.Validation/InventoryMoveFluent.cs

@@ -1,4 +1,7 @@
-using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
 
 namespace YL.Core.Entity.Fluent.Validation
 {

src/Entity/Fluent.Validation/StockInFluent.cs

@@ -1,4 +1,7 @@
-using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
 
 namespace YL.Core.Entity.Fluent.Validation
 {

src/Entity/Fluent.Validation/StockOutFluent.cs

@@ -1,4 +1,7 @@
-using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
 
 namespace YL.Core.Entity.Fluent.Validation
 {

src/Entity/Fluent.Validation/SupplierFluent.cs

@@ -7,8 +7,8 @@ namespace YL.Core.Entity.Fluent.Validation
         public SupplierFluent()
         {
             RuleFor(x => x.SupplierNo).NotNull().NotEmpty().WithMessage("供应商编号不能为空").Length(1, 20).WithMessage("供应商编号长度不能超过20");
-            RuleFor(x => x.SupplierName).NotNull().NotEmpty().WithMessage("供应商名称不能为空").Length(1, 50).WithMessage("供应商名称长度不能超过50");
+            RuleFor(x => x.SupplierName).NotNull().NotEmpty().WithMessage("供应商名称不能为空").Length(1, 50).WithMessage("供应商编号长度不能超过50");
             RuleFor(x => x.Remark).MaximumLength(200).WithMessage("备注长度不能超过200");
         }
     }
-}
+}

src/Entity/Fluent.Validation/SysLogFluent.cs

@@ -1,4 +1,7 @@
 using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace YL.Core.Entity.Fluent.Validation
 {

src/Entity/Properties/Resource.cn.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="OPERATION_NOTNULL" xml:space="preserve">
+    <value>承运商编号不能为空</value>
+  </data>
+</root>

src/Entity/Properties/Resource.ru.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="OPERATION_NOTNULL" xml:space="preserve">
+    <value>Поле "оператор" не может быть пустым</value>
+  </data>
+</root>

src/Entity/Properties/Resources.Designer.cs

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace YL.Core.Entity.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("YL.Core.Entity.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на Operator name can&apos;t be null.
+        /// </summary>
+        internal static string OPERATION_NOTNULL {
+            get {
+                return ResourceManager.GetString("OPERATION_NOTNULL", resourceCulture);
+            }
+        }
+    }
+}

src/Entity/Properties/Resources.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="OPERATION_NOTNULL" xml:space="preserve">
+    <value>Operator name can't be null</value>
+  </data>
+</root>

src/Entity/Sys_dept.cs

@@ -4,10 +4,8 @@ using System;
 namespace YL.Core.Entity
 {
     ///<summary>
-///
-
+    ///
     ///</summary>
-    [SugarTable(tableName: "sys_dept")]
     public partial class Sys_dept
     {
         public Sys_dept()
@@ -37,7 +35,7 @@ namespace YL.Core.Entity
         public string DeptName { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Delete
         /// Default:
         /// Nullable:True
         /// </summary>

src/Entity/Sys_dict.cs

@@ -6,12 +6,11 @@ namespace YL.Core.Entity
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_dict")]
     public partial class Sys_dict
     {
         public Sys_dict()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
         }
 
@@ -20,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long DictId { get; set; }
 
         /// <summary>
@@ -45,7 +44,7 @@ namespace YL.Core.Entity
         public string DictType { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Delete
         /// Default:1
         /// Nullable:False
         /// </summary>

src/Entity/Sys_log.cs

@@ -7,7 +7,6 @@ namespace YL.Core.Entity
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_log")]
     public partial class Sys_log : INotification
     {
         public Sys_log()
@@ -19,7 +18,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:True
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long LogId { get; set; }
 
         /// <summary>

src/Entity/Sys_menu.cs

@@ -6,7 +6,6 @@ namespace YL.Core.Entity
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_menu_wms")]
     public partial class Sys_menu
     {
         public Sys_menu()
@@ -18,7 +17,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long MenuId { get; set; }
 
         /// <summary>
@@ -71,7 +70,7 @@ namespace YL.Core.Entity
         public string MenuType { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Delete
         /// Default:
         /// Nullable:True
         /// </summary>

src/Entity/Sys_role.cs

@@ -1,17 +1,18 @@
 using SqlSugar;
 using System;
+using System.Linq;
+using System.Text;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_role")]
     public partial class Sys_role
     {
         public Sys_role()
         {
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
             CreateDate = DateTime.Now;
         }
 
@@ -20,7 +21,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long RoleId { get; set; }
 
         /// <summary>
@@ -38,7 +39,7 @@ namespace YL.Core.Entity
         public string RoleType { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Delete
         /// Default:1
         /// Nullable:False
         /// </summary>

src/Entity/Sys_rolemenu.cs

@@ -6,7 +6,6 @@ namespace YL.Core.Entity
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_rolemenu")]
     public partial class Sys_rolemenu
     {
         public Sys_rolemenu()
@@ -19,7 +18,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long RoleMenuId { get; set; }
 
         /// <summary>

src/Entity/Sys_serialnum.cs

@@ -1,17 +1,18 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_serialnum")]
     public partial class Sys_serialnum
     {
         public Sys_serialnum()
         {
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
             CreateDate = DateTime.Now;
         }
 
@@ -20,7 +21,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public int SerialNumberId { get; set; }
 
         /// <summary>
@@ -61,7 +62,7 @@ namespace YL.Core.Entity
         public int? Mantissa { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除  0 Deleted
         /// Default:
         /// Nullable:False
         /// </summary>

src/Entity/Sys_user.cs

@@ -1,12 +1,13 @@
 using SqlSugar;
 using System;
+using System.Linq;
+using System.Text;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "sys_user")]
     public partial class Sys_user
     {
         public Sys_user()
@@ -18,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long UserId { get; set; }
 
         /// <summary>
@@ -117,7 +118,7 @@ namespace YL.Core.Entity
         public byte? Sex { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Deleted
         /// Default:
         /// Nullable:True
         /// </summary>

src/Entity/Wms_Carrier.cs

@@ -1,14 +1,13 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
-    [SugarTable(tableName: "wms_carrier")]
     public partial class Wms_Carrier
     {
         public Wms_Carrier()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
         }
 
@@ -17,7 +16,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long CarrierId { get; set; }
 
         /// <summary>
@@ -70,7 +69,7 @@ namespace YL.Core.Entity
         public string Tel { get; set; }
 
         /// <summary>
-        /// Desc:是否删除 1未删除  0删除
+        /// Desc:是否删除 1未删除  0 Deleted
         /// Default:1
         /// Nullable:True
         /// </summary>
@@ -111,4 +110,4 @@ namespace YL.Core.Entity
         /// </summary>
         public DateTime? ModifiedDate { get; set; }
     }
-}
+}

src/Entity/Wms_Customer.cs

@@ -1,114 +1,96 @@
-using SqlSugar;
-using System;
-
-namespace YL.Core.Entity
-{
-    [SugarTable(tableName: "wms_customer")]
-    public class Wms_Customer
-    {
-        public Wms_Customer()
-        {
-            this.IsDel = 1;
-            this.CreateDate = DateTime.Now;
-        }
-
-        /// <summary>
-        /// Desc:客户id
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
-        public long CustomerId { get; set; }
-
-        /// <summary>
-        /// Desc:客户编号
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string CustomerNo { get; set; }
-
-        /// <summary>
-        /// Desc:客户名称
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string CustomerName { get; set; }
-
-        /// <summary>
-        /// Desc:地址
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string Address { get; set; }
-
-        /// <summary>
-        /// Desc:联系人
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string CustomerPerson { get; set; }
-
-        /// <summary>
-        /// Desc:级别
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string CustomerLevel { get; set; }
-
-        /// <summary>
-        /// Desc:邮件
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Desc:电话
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string Tel { get; set; }
-
-        /// <summary>
-        /// Desc:是否删除 1未删除  0删除
-        /// Default:1
-        /// Nullable:True
-        /// </summary>
-        public byte? IsDel { get; set; }
-
-        /// <summary>
-        /// Desc:备注
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// Desc:创建人
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public long? CreateBy { get; set; }
-
-        /// <summary>
-        /// Desc:创建时间
-        /// Default:DateTime.Now
-        /// Nullable:True
-        /// </summary>
-        public DateTime? CreateDate { get; set; }
-
-        /// <summary>
-        /// Desc:修改人
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public long? ModifiedBy { get; set; }
-
-        /// <summary>
-        /// Desc:修改时间
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public DateTime? ModifiedDate { get; set; }
-    }
-}
+using System;
+using SqlSugar;
+
+namespace YL.Core.Entity
+{
+    public class Wms_Customer
+    {
+        public Wms_Customer()
+        {
+            this.IsDel = Convert.ToByte("1");
+            this.CreateDate = DateTime.Now;
+        }
+        /// <summary>
        /// Desc:客户id
        /// Default:
        /// Nullable:False
        /// </summary>
        [SugarColumn(IsPrimaryKey = true)]
        public long CustomerId { get; set; }
+
+        /// <summary>
        /// Desc:客户编号
        /// Default:
        /// Nullable:False
        /// </summary>
        public string CustomerNo { get; set; }
+
+        /// <summary>
        /// Desc:客户名称
        /// Default:
        /// Nullable:False
        /// </summary>
        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// Desc:地址
+        /// Default:
+        /// Nullable:False
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// Desc:联系人
+        /// Default:
+        /// Nullable:False
+        /// </summary>
+        public string CustomerPerson { get; set; }
+
+        /// <summary>
+        /// Desc:级别
+        /// Default:
+        /// Nullable:False
+        /// </summary>
+        public string CustomerLevel { get; set; }
+
+        /// <summary>
+        /// Desc:邮件
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public string Email { get; set; }
+
+        /// <summary>
+        /// Desc:电话
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public string Tel { get; set; }
+
+        /// <summary>
+        /// Desc:是否删除 1未删除  0 Deleted
+        /// Default:1
+        /// Nullable:True
+        /// </summary>
+        public byte? IsDel { get; set; }
+
+        /// <summary>
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// Desc:创建人
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public long? CreateBy { get; set; }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:DateTime.Now
+        /// Nullable:True
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+
+        /// <summary>
+        /// Desc:修改人
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public long? ModifiedBy { get; set; }
+
+        /// <summary>
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public DateTime? ModifiedDate { get; set; }
+    }
+}

src/Entity/Wms_delivery.cs

@@ -6,13 +6,12 @@ namespace YL.Core.Entity
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_delivery")]
     public partial class Wms_delivery
     {
         public Wms_delivery()
         {
             CreateDate = DateTime.Now;
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
         }
 
         /// <summary>
@@ -20,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long DeliveryId { get; set; }
 
         /// <summary>

src/Entity/Wms_device.cs

@@ -1,18 +1,17 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
-{
+{
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_device")]
     public partial class Wms_device
     {
         public Wms_device()
         {
             this.CreateDate = DateTime.Now;
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
         }
 
         /// <summary>
@@ -20,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long DeviceId { get; set; }
 
         /// <summary>
@@ -89,7 +88,7 @@ namespace YL.Core.Entity
         public DateTime? ModifiedDate { get; set; }
 
         /// <summary>
-        /// Desc:1未删除   0删除
+        /// Desc:1未删除   0 Deleted
         /// Default:1
         /// Nullable:False
         /// </summary>

src/Entity/Wms_inventory.cs

@@ -1,17 +1,18 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_inventory")]
     public partial class Wms_inventory
     {
         public Wms_inventory()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
         }
 
@@ -20,7 +21,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long InventoryId { get; set; }
 
         /// <summary>

src/Entity/Wms_inventorymove.cs

@@ -1,18 +1,17 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
-     ///<summary>
+    ///<summary>
     ///库存移动
     ///</summary>
-    [SugarTable(tableName: "wms_inventorymove")]
     public partial class Wms_inventorymove
     {
         public Wms_inventorymove()
         {
             CreateDate = DateTime.Now;
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
         }
 
         /// <summary>

src/Entity/Wms_inventoryrecord.cs

@@ -1,17 +1,18 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
-      ///</summary>
-    [SugarTable(tableName: "wms_inventoryrecord")]
+    ///</summary>
     public partial class Wms_inventoryrecord
     {
         public Wms_inventoryrecord()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
         }
 

src/Entity/Wms_invmovedetail.cs

@@ -1,18 +1,17 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_invmovedetail")]
     public partial class Wms_invmovedetail
     {
         public Wms_invmovedetail()
         {
             CreateDate = DateTime.Now;
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
         }
 
         /// <summary>
@@ -20,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long MoveDetailId { get; set; }
 
         /// <summary>

src/Entity/Wms_material.cs

@@ -1,17 +1,18 @@
 using SqlSugar;
 using System;
+using System.Linq;
+using System.Text;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_material")]
     public partial class Wms_material
     {
         public Wms_material()
         {
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
             CreateDate = DateTime.Now;
         }
 
@@ -20,7 +21,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long MaterialId { get; set; }
 
         /// <summary>

src/Entity/Wms_reservoirarea.cs

@@ -2,16 +2,15 @@
 using System;
 
 namespace YL.Core.Entity
-{
+{
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_reservoirarea")]
     public partial class Wms_reservoirarea
     {
         public Wms_reservoirarea()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
         }
 
@@ -20,7 +19,7 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long ReservoirAreaId { get; set; }
 
         /// <summary>

src/Entity/Wms_stockin.cs

@@ -1,95 +1,104 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
-    /// <summary>
-    /// 入库单表实体类，映射数据库中的"wms_stockin"表
-    /// 用于存储入库单的主表信息，包括入库单号、类型、状态等核心数据
-    /// </summary>
-    [SugarTable(tableName: "wms_stockin")] // 指定数据库表名
+    ///<summary>
+    ///
+    ///</summary>
     public partial class Wms_stockin
     {
-        /// <summary>
-        /// 构造函数，初始化默认值
-        /// </summary>
         public Wms_stockin()
         {
-            IsDel = 1; // 默认未删除（1：未删除，0：已删除）
-            CreateDate = DateTime.Now; // 默认创建时间为当前时间
+            IsDel = Convert.ToByte("1");
+            CreateDate = DateTime.Now;
         }
 
         /// <summary>
-        /// 入库单ID（主键）
+        /// Desc:主键
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>自增主键或雪花ID，唯一标识入库单记录</remarks>
-        [SugarColumn(IsPrimaryKey = true)] // 标记为主键
+        [SugarColumn(IsPrimaryKey = true)]
         public long StockInId { get; set; }
 
         /// <summary>
-        /// 入库单号
+        /// Desc:入库单号
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>系统生成的唯一入库单据编号，用于业务流转和查询</remarks>
         public string StockInNo { get; set; }
 
         /// <summary>
-        /// 入库类型ID
+        /// Desc:入库类型
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，通常关联字典表中的入库类型数据（如采购入库、退货入库等）</remarks>
         public long? StockInType { get; set; }
 
         /// <summary>
-        /// 供应商ID
+        /// Desc:供应商
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到供应商表的主键，标识该入库单对应的供应商（适用于采购入库等场景）</remarks>
         public long? SupplierId { get; set; }
 
         /// <summary>
-        /// 外部订单号
+        /// Desc:订单号
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联的外部系统订单编号（如采购订单号），用于跨系统追溯</remarks>
         public string OrderNo { get; set; }
 
         /// <summary>
-        /// 入库单状态
+        /// Desc:
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联状态枚举（如初始、已审核、已完成等），用字节类型存储，控制业务流程</remarks>
         public byte? StockInStatus { get; set; }
 
         /// <summary>
-        /// 备注信息
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>存储入库单的整体说明，如特殊处理要求、异常情况记录等</remarks>
         public string Remark { get; set; }
 
         /// <summary>
-        /// 是否删除标识
+        /// Desc:1 0
+        /// Default:1
+        /// Nullable:True
         /// </summary>
-        /// <remarks>1：未删除，0：已删除（逻辑删除，保留数据用于追溯）</remarks>
         public byte? IsDel { get; set; }
 
         /// <summary>
-        /// 创建人ID
+        /// Desc:创建人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到用户表的主键，记录创建该入库单的用户</remarks>
         public long? CreateBy { get; set; }
 
         /// <summary>
-        /// 创建时间
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>入库单的创建时间，默认值为当前时间</remarks>
         public DateTime? CreateDate { get; set; }
 
         /// <summary>
-        /// 修改人ID
+        /// Desc:修改人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到用户表的主键，记录最后修改该入库单的用户</remarks>
         public long? ModifiedBy { get; set; }
 
         /// <summary>
-        /// 修改时间
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>入库单的最后修改时间，为空表示未修改过</remarks>
         public DateTime? ModifiedDate { get; set; }
     }
 }

src/Entity/Wms_stockindetail.cs

@@ -1,113 +1,123 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
-    /// <summary>
-    /// 入库单明细表实体类，映射数据库中的"wms_stockindetail"表
-    /// 用于存储入库单的明细信息，包括物料、数量、货架    货架等具体数据
-    /// </summary>
-    [SugarTable(tableName: "wms_stockindetail")] // 指定数据库表名
+    ///<summary>
+    ///
+    ///</summary>
     public partial class Wms_stockindetail
     {
-        /// <summary>
-        /// 构造函数，初始化默认值
-        /// </summary>
         public Wms_stockindetail()
         {
-            IsDel = 1; // 默认未删除（1：未删除，0：已删除）
-            CreateDate = DateTime.Now; // 默认创建时间为当前时间
+            IsDel = Convert.ToByte("1");
+            CreateDate = DateTime.Now;
         }
 
         /// <summary>
-        /// 入库明细ID（主键）
+        /// Desc:主键
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>自增主键或雪花ID，唯一标识入库明细记录</remarks>
-        [SugarColumn(IsPrimaryKey = true)] // 标记为主键
+        [SugarColumn(IsPrimaryKey = true)]
         public long StockInDetailId { get; set; }
 
         /// <summary>
-        /// 关联的入库单ID
+        /// Desc:入库单号
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到入库单表（wms_stockin）的主键，标识所属入库单</remarks>
         public long? StockInId { get; set; }
 
         /// <summary>
-        /// 明细状态
+        /// Desc:
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>通常关联状态枚举（如初始、已审核、已完成等），用字节类型存储</remarks>
         public byte? Status { get; set; }
 
         /// <summary>
-        /// 物料ID
+        /// Desc:物料
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到物料表的主键，标识入库的物料</remarks>
         public long? MaterialId { get; set; }
 
         /// <summary>
-        /// 计划入库数量
+        /// Desc:计划数量
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>预期入库的物料数量，用于与实际入库数量对比</remarks>
         public decimal? PlanInQty { get; set; }
 
         /// <summary>
-        /// 实际入库数量
+        /// Desc:实际数量
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>实际完成入库的物料数量，可能与计划数量存在差异</remarks>
         public decimal? ActInQty { get; set; }
 
         /// <summary>
-        /// 货架ID
+        /// Desc:货架
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到货架表（wms_storagerack）的主键，标识物料存放的货架</remarks>
         public long? StoragerackId { get; set; }
 
         /// <summary>
-        /// 审核人ID
+        /// Desc:审核人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到用户表的主键，记录审核该明细的用户</remarks>
         public long? AuditinId { get; set; }
 
         /// <summary>
-        /// 审核时间
+        /// Desc:审核时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>该明细的审核完成时间，为空表示未审核</remarks>
         public DateTime? AuditinTime { get; set; }
 
         /// <summary>
-        /// 是否删除标识
+        /// Desc:1 0
+        /// Default:1
+        /// Nullable:True
         /// </summary>
-        /// <remarks>1：未删除，0：已删除（逻辑删除，不实际从数据库删除记录）</remarks>
         public byte? IsDel { get; set; }
 
         /// <summary>
-        /// 备注信息
+        /// Desc:
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>存储该入库明细的额外说明，如物料特殊情况、处理备注等</remarks>
         public string Remark { get; set; }
 
         /// <summary>
-        /// 创建人ID
+        /// Desc:创建人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到用户表的主键，记录创建该明细的用户</remarks>
         public long? CreateBy { get; set; }
 
         /// <summary>
-        /// 创建时间
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>明细记录的创建时间，默认值为当前时间</remarks>
         public DateTime? CreateDate { get; set; }
 
         /// <summary>
-        /// 修改人ID
+        /// Desc:修改人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>外键，关联到用户表的主键，记录最后修改该明细的用户</remarks>
         public long? ModifiedBy { get; set; }
 
         /// <summary>
-        /// 修改时间
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>明细记录的最后修改时间，为空表示未修改过</remarks>
         public DateTime? ModifiedDate { get; set; }
     }
 }

src/Entity/Wms_stockout.cs

@@ -1,17 +1,18 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_stockout")]
     public partial class Wms_stockout
     {
         public Wms_stockout()
         {
-            IsDel = 1;
+            IsDel = Convert.ToByte("1");
             CreateDate = DateTime.Now;
         }
 
@@ -93,7 +94,7 @@ namespace YL.Core.Entity
         /// </summary>
         public long? ModifiedBy { get; set; }
 
-         /// <summary>
+        /// <summary>
         /// Desc:修改时间
         /// Default:
         /// Nullable:True

src/Entity/Wms_stockoutdetail.cs

@@ -1,17 +1,17 @@
-using SqlSugar;
-using System;
+using System;
+using System.Linq;
+using System.Text;
 
 namespace YL.Core.Entity
 {
     ///<summary>
     ///
     ///</summary>
-    [SugarTable(tableName: "wms_stockoutdetail")]
     public partial class Wms_stockoutdetail
     {
         public Wms_stockoutdetail()
         {
-            IsDel = 1; ;
+            IsDel = Convert.ToByte("1");
             CreateDate = DateTime.Now;
         }
 
@@ -20,7 +20,6 @@ namespace YL.Core.Entity
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
         public long StockOutDetailId { get; set; }
 
         /// <summary>

src/Entity/Wms_storagerack.cs

@@ -3,87 +3,93 @@ using System;
 
 namespace YL.Core.Entity
 {
-    /// <summary>
-    /// 货架实体类，映射数据库中的"wms_storagerack"表
-    /// 用于存储货架的基本信息，包括所属仓库、库区等关联关系
-    /// </summary>
-    [SugarTable(tableName: "wms_storagerack")] // 指定数据库表名
+    ///<summary>
+    ///
+    ///</summary>
     public partial class Wms_storagerack
     {
-        /// <summary>
-        /// 构造函数，初始化默认值
-        /// </summary>
         public Wms_storagerack()
         {
-            this.IsDel = 1; // 默认未删除（1：未删除，0：已删除）
-            this.CreateDate = DateTime.Now; // 默认创建时间为当前时间
+            this.IsDel = Convert.ToByte("1");
+            this.CreateDate = DateTime.Now;
         }
 
         /// <summary>
-        /// 货架ID（主键）
+        /// Desc:货架Id
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>自增主键或雪花ID，唯一标识货架记录</remarks>
-        [SugarColumn(IsPrimaryKey = true)] // 标记为主键
+        [SugarColumn(IsPrimaryKey = true)]
         public long StorageRackId { get; set; }
 
         /// <summary>
-        /// 货架编号
+        /// Desc:货架编号
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>货架的唯一编号，用于系统内识别（如A01、B02等）</remarks>
         public string StorageRackNo { get; set; }
 
         /// <summary>
-        /// 货架名称
+        /// Desc:货架名称
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>货架的显示名称，用于界面展示（可为空）</remarks>
         public string StorageRackName { get; set; }
 
         /// <summary>
-        /// 所属仓库ID
+        /// Desc:所属仓库
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>关联到仓库表（wms_warehouse）的主键，标识货架所属仓库</remarks>
         public long? WarehouseId { get; set; }
 
         /// <summary>
-        /// 所属库区ID
+        /// Desc:所属库区
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>关联到储位区表（wms_reservoirarea）的主键，标识货架所属库区</remarks>
         public long? ReservoirAreaId { get; set; }
 
         /// <summary>
-        /// 备注信息
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>存储货架的额外说明，如位置描述、用途等</remarks>
         public string Remark { get; set; }
 
         /// <summary>
-        /// 是否删除标识
+        /// Desc:1 0
+        /// Default:1
+        /// Nullable:True
         /// </summary>
-        /// <remarks>1：未删除，0：已删除（逻辑删除）</remarks>
         public byte? IsDel { get; set; }
 
         /// <summary>
-        /// 创建人ID
+        /// Desc:创建人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联到用户表的用户ID，记录创建该货架的用户</remarks>
         public long? CreateBy { get; set; }
 
         /// <summary>
-        /// 创建时间
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>货架记录的创建时间，默认值为当前时间</remarks>
         public DateTime? CreateDate { get; set; }
 
         /// <summary>
-        /// 修改人ID
+        /// Desc:修改人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联到用户表的用户ID，记录最后修改该货架的用户</remarks>
         public long? ModifiedBy { get; set; }
 
         /// <summary>
-        /// 修改时间
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>货架记录的最后修改时间，为空表示未修改过</remarks>
         public DateTime? ModifiedDate { get; set; }
     }
 }

src/Entity/Wms_supplier.cs

@@ -1,23 +1,23 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
-{
-    [SugarTable(tableName: "wms_supplier")]
+{
     public class Wms_supplier
     {
         public Wms_supplier()
         {
-            this.IsDel = 1;
+            this.IsDel = Convert.ToByte("1");
             this.CreateDate = DateTime.Now;
-        }
-
+        }
+
+
         /// <summary>
         /// Desc:供应商id
         /// Default:
         /// Nullable:False
         /// </summary>
-        [SugarColumn(IsPrimaryKey = true)]
+        [SugarColumn(IsPrimaryKey = true)]
         public long SupplierId { get; set; }
 
         /// <summary>
@@ -77,7 +77,7 @@ namespace YL.Core.Entity
         public string Remark { get; set; }
 
         /// <summary>
-        /// Desc:是否删除 1未删除  0删除
+        /// Desc:是否删除 1未删除  0 Deleted
         /// Default:1
         /// Nullable:True
         /// </summary>
@@ -111,4 +111,4 @@ namespace YL.Core.Entity
         /// </summary>
         public DateTime? ModifiedDate { get; set; }
     }
-}
+}

src/Entity/Wms_warehouse.cs

@@ -1,77 +1,81 @@
-using SqlSugar;
-using System;
+using System;
+using SqlSugar;
 
 namespace YL.Core.Entity
 {
-    /// <summary>
-    /// 仓库实体类，映射数据库中的"wms_warehouse"表
-    /// 用于存储仓库的基本信息，如编号、名称、状态等
-    /// </summary>
-    [SugarTable(tableName: "wms_warehouse")] // 指定数据库表名
+    ///<summary>
+    ///
+    ///</summary>
     public partial class Wms_warehouse
     {
-        /// <summary>
-        /// 构造函数，初始化默认值
-        /// </summary>
         public Wms_warehouse()
         {
-            this.IsDel = 1; // 默认未删除（1：未删除，0：已删除）
-            this.CreateDate = DateTime.Now; // 默认创建时间为当前时间
+            this.IsDel = Convert.ToByte("1");
+            this.CreateDate = DateTime.Now;
         }
 
         /// <summary>
-        /// 仓库ID（主键）
+        /// Desc:
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>自增主键或雪花ID，唯一标识仓库记录</remarks>
-        [SugarColumn(IsPrimaryKey = true)] // 标记为主键
+        [SugarColumn(IsPrimaryKey = true)]
         public long WarehouseId { get; set; }
 
         /// <summary>
-        /// 仓库编号
+        /// Desc:仓库编号
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>仓库的唯一编号，用于系统内识别</remarks>
         public string WarehouseNo { get; set; }
 
         /// <summary>
-        /// 仓库名称
+        /// Desc:仓库名称
+        /// Default:
+        /// Nullable:False
         /// </summary>
-        /// <remarks>仓库的显示名称，用于界面展示</remarks>
         public string WarehouseName { get; set; }
 
         /// <summary>
-        /// 是否删除标识
+        /// Desc:是否删除 1未删除  0 Deleted
+        /// Default:1
+        /// Nullable:True
         /// </summary>
-        /// <remarks>1：未删除，0：已删除（逻辑删除）</remarks>
         public byte? IsDel { get; set; }
 
         /// <summary>
-        /// 备注信息
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>存储仓库的额外说明或备注内容</remarks>
         public string Remark { get; set; }
 
         /// <summary>
-        /// 创建人ID
+        /// Desc:创建人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联到用户表的用户ID，记录创建该仓库的用户</remarks>
         public long? CreateBy { get; set; }
 
         /// <summary>
-        /// 创建时间
+        /// Desc:创建时间
+        /// Default:DateTime.Now
+        /// Nullable:True
         /// </summary>
-        /// <remarks>仓库记录的创建时间，默认值为当前时间</remarks>
         public DateTime? CreateDate { get; set; }
 
         /// <summary>
-        /// 修改人ID
+        /// Desc:修改人
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>关联到用户表的用户ID，记录最后修改该仓库的用户</remarks>
         public long? ModifiedBy { get; set; }
 
         /// <summary>
-        /// 修改时间
+        /// Desc:修改时间
+        /// Default:
+        /// Nullable:True
         /// </summary>
-        /// <remarks>仓库记录的最后修改时间，为空表示未修改过</remarks>
         public DateTime? ModifiedDate { get; set; }
     }
 }

src/IRepository/IBaseRepository.cs

@@ -10,389 +10,129 @@ using YL.Utils.Table;
 
 namespace IRepository
 {
-    /// <summary>
-    /// 基础仓储接口，定义通用数据访问操作
-    /// 继承 IDependency 接口，标记为可注入服务（依赖注入支持）
-    /// 泛型约束：T 必须是类且具有无参构造函数（对应数据库实体类）
-    /// </summary>
-    /// <typeparam name="T">实体类型（与数据库表映射）</typeparam>
     public interface IBaseRepository<T> : IDependency where T : class, new()
     {
-        #region 新增操作（Add）
+        #region add
 
-        /// <summary>
-        /// 插入单条实体
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="IgnoreNullColumn">是否忽略空值列（默认true：仅插入非空字段）</param>
-        /// <returns>是否插入成功</returns>
         bool Insert(T t, bool IgnoreNullColumn = true);
 
-        /// <summary>
-        /// 异步插入单条实体
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="IgnoreNullColumn">是否忽略空值列</param>
-        /// <returns>是否插入成功（Task包装）</returns>
-        Task<bool> InsertAsync(T t, bool IgnoreNullColumn = true);
-
-        /// <summary>
-        /// 插入单条实体（强制忽略空值列）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(T t);
 
-        /// <summary>
-        /// 插入单条实体（指定列忽略空值）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="columns">指定需处理的列名数组</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(T t, params string[] columns);
 
-        /// <summary>
-        /// 使用外部SqlSugar客户端插入单条实体
-        /// （用于事务共享连接或多库操作场景）
-        /// </summary>
-        /// <param name="client">外部SqlSugar客户端实例</param>
-        /// <param name="t">实体对象</param>
-        /// <returns>是否插入成功</returns>
         bool Insert(SqlSugarClient client, T t);
 
-        /// <summary>
-        /// 插入单条实体并返回大整数类型的自增主键
-        /// （适用于主键为bigint类型的表）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>自增主键值</returns>
         long InsertBigIdentity(T t);
 
-        /// <summary>
-        /// 批量插入实体列表
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>是否插入成功</returns>
         bool Insert(List<T> t);
 
-        /// <summary>
-        /// 批量插入实体列表（忽略空值列）
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(List<T> t);
 
-        /// <summary>
-        /// 批量插入实体列表（指定列忽略空值）
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <param name="columns">指定需处理的列名数组</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(List<T> t, params string[] columns);
 
-        /// <summary>
-        /// 事务中插入单条实体
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>事务执行结果（包含是否成功、影响行数等）</returns>
         DbResult<bool> InsertTran(T t);
 
-        /// <summary>
-        /// 事务中批量插入实体列表
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>事务执行结果</returns>
         DbResult<bool> InsertTran(List<T> t);
 
-        /// <summary>
-        /// 插入实体并返回插入后的实体（包含自增主键）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>插入后的实体</returns>
         T InsertReturnEntity(T t);
 
-        /// <summary>
-        /// 插入实体并返回插入后的实体（带锁机制）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="sqlWith">锁类型（如SqlWith.UpdLock表示更新锁）</param>
-        /// <returns>插入后的实体</returns>
         T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock);
 
-        /// <summary>
-        /// 执行SQL命令（带参数化查询，防止注入）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">参数对象（匿名类或实体）</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, object parameters);
 
-        /// <summary>
-        /// 执行SQL命令（使用SugarParameter参数）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">SugarParameter参数数组</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, params SugarParameter[] parameters);
 
-        /// <summary>
-        /// 执行SQL命令（使用SugarParameter参数列表）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">SugarParameter参数列表</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, List<SugarParameter> parameters);
 
-        #endregion 新增操作
+        #endregion add
 
-        #region 更新操作（Update）
+        #region update
 
-        /// <summary>
-        /// 更新实体（根据主键）
-        /// </summary>
-        /// <param name="entity">实体对象（需包含主键值）</param>
-        /// <returns>是否更新成功</returns>
         bool UpdateEntity(T entity);
 
-        /// <summary>
-        /// 根据条件更新实体
-        /// </summary>
-        /// <param name="entity">实体对象（包含要更新的字段值）</param>
-        /// <param name="expression">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, Expression<Func<T, bool>> expression);
 
         /// <summary>
-        /// 只更新指定表达式中的字段
+        /// 只更新表达式的值
         /// </summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="expression">指定要更新的字段表达式</param>
-        /// <returns>是否更新成功</returns>
+        /// <param name="entity"></param>
+        /// <param name="expression"></param>
+        /// <returns></returns>
         bool Update(T entity, Expression<Func<T, object>> expression);
 
-        /// <summary>
-        /// 根据条件更新指定字段
-        /// </summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="expression">要更新的字段表达式</param>
-        /// <param name="where">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, Expression<Func<T, object>> expression, Expression<Func<T, bool>> where);
 
-        /// <summary>
-        /// 使用外部SqlSugar客户端更新指定字段（事务共享场景）
-        /// </summary>
-        /// <param name="client">外部SqlSugar客户端实例</param>
-        /// <param name="entity">实体对象</param>
-        /// <param name="expression">要更新的字段表达式</param>
-        /// <param name="where">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(SqlSugarClient client, T entity, Expression<Func<T, object>> expression, Expression<Func<T, bool>> where);
 
         /// <summary>
-        /// 更新实体（可指定忽略字段和空值处理）
+        ///
         /// </summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="list">需要忽略更新的字段名列表</param>
-        /// <param name="isNull">是否忽略空值字段（true：不更新null值字段）</param>
-        /// <returns>是否更新成功</returns>
+        /// <param name="entity">T</param>
+        /// <param name="list">忽略更新</param>
+        /// <param name="isNull">Null不更新</param>
+        /// <returns></returns>
         bool Update(T entity, List<string> list = null, bool isNull = true);
 
-        /// <summary>
-        /// 批量更新实体列表（根据主键）
-        /// </summary>
-        /// <param name="entity">实体列表（需包含主键值）</param>
-        /// <returns>是否更新成功</returns>
         bool Update(List<T> entity);
 
-        #endregion 更新操作
+        #endregion update
 
-        /// <summary>
-        /// 执行事务（封装Action中的操作）
-        /// </summary>
-        /// <param name="action">事务内要执行的操作</param>
-        /// <returns>事务执行结果</returns>
         DbResult<bool> UseTran(Action action);
 
-        /// <summary>
-        /// 使用外部SqlSugar客户端执行事务
-        /// </summary>
-        /// <param name="client">外部SqlSugar客户端实例</param>
-        /// <param name="action">事务内要执行的操作</param>
-        /// <returns>事务执行结果</returns>
         DbResult<bool> UseTran(SqlSugarClient client, Action action);
 
-        /// <summary>
-        /// 执行事务（无返回结果包装）
-        /// </summary>
-        /// <param name="action">事务内要执行的操作</param>
-        /// <returns>是否执行成功</returns>
         bool UseTran2(Action action);
 
-        #region 删除操作（Delete）
+        #region delete
 
-        /// <summary>
-        /// 根据条件删除数据
-        /// </summary>
-        /// <param name="expression">删除条件表达式</param>
-        /// <returns>是否删除成功</returns>
         bool Delete(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据主键数组删除数据
-        /// </summary>
-        /// <typeparam name="PkType">主键类型</typeparam>
-        /// <param name="primaryKeyValues">主键值数组</param>
-        /// <returns>是否删除成功</returns>
         bool Delete<PkType>(PkType[] primaryKeyValues);
 
-        /// <summary>
-        /// 根据实体对象删除数据（根据主键）
-        /// </summary>
-        /// <param name="obj">实体对象（需包含主键值）</param>
-        /// <returns>是否删除成功</returns>
         bool Delete(object obj);
 
-        #endregion 删除操作
+        #endregion delete
 
-        #region 查询操作（Query）
+        #region query
 
-        /// <summary>
-        /// 判断是否存在符合条件的记录
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>是否存在</returns>
         bool IsAny(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 获取查询器（用于构建复杂查询）
-        /// </summary>
-        /// <returns>SqlSugar查询器</returns>
         ISugarQueryable<T> Queryable();
 
-        /// <summary>
-        /// 获取动态对象查询器（指定表名和别名）
-        /// （适用于查询动态表或多表关联场景）
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <param name="shortName">表别名</param>
-        /// <returns>动态对象查询器</returns>
         ISugarQueryable<ExpandoObject> Queryable(string tableName, string shortName);
 
-        // 注释：多表关联查询示例（泛型参数为关联表实体）
-        // ISugarQueryable<T, T1, T2> Queryable<T1, T2>() where T1 : class where T2 : new();
+        //ISugarQueryable<T, T1, T2> Queryable<T1, T2>() where T1 : class where T2 : new();
 
-        /// <summary>
-        /// 根据条件查询并返回实体列表
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体列表</returns>
         List<T> QueryableToList(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 异步根据条件查询并返回实体列表
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体列表（Task包装）</returns>
         Task<List<T>> QueryableToListAsync(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据条件查询并返回JSON字符串
-        /// </summary>
-        /// <param name="select">要查询的字段（逗号分隔）</param>
-        /// <param name="expressionWhere">查询条件表达式</param>
-        /// <returns>JSON字符串</returns>
         string QueryableToJson(string select, Expression<Func<T, bool>> expressionWhere);
 
-        /// <summary>
-        /// 根据表名查询并返回实体列表
-        /// （适用于动态表名场景）
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <returns>实体列表</returns>
         List<T> QueryableToList(string tableName);
 
-        /// <summary>
-        /// 根据条件查询并返回单个实体（第一条）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体对象（无结果则为null）</returns>
         T QueryableToEntity(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据表名和条件查询并返回实体列表
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体列表</returns>
         List<T> QueryableToList(string tableName, Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 分页查询（基础版）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="pageIndex">页码（从0开始）</param>
-        /// <param name="pageSize">每页条数</param>
-        /// <returns>元组：(当前页数据列表, 总记录数)</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 分页查询（带排序字符串）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="order">排序字符串（如"Id DESC, Name ASC"）</param>
-        /// <param name="pageIndex">页码</param>
-        /// <param name="pageSize">每页条数</param>
-        /// <returns>元组：(当前页数据列表, 总记录数)</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, string order, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 分页查询（带排序字段和排序方向）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="orderFiled">排序字段表达式</param>
-        /// <param name="orderBy">排序方向（"ASC"或"DESC"）</param>
-        /// <param name="pageIndex">页码</param>
-        /// <param name="pageSize">每页条数</param>
-        /// <returns>元组：(当前页数据列表, 总记录数)</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Expression<Func<T, object>> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 分页查询（基于Bootstrap分页参数）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="bootstrap">Bootstrap分页参数对象（包含页码、页大小、排序等）</param>
-        /// <returns>元组：(当前页数据列表, 总记录数)</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Bootstrap.BootstrapParams bootstrap);
 
-        /// <summary>
-        /// 执行SQL查询并返回实体列表
-        /// </summary>
-        /// <param name="sql">SQL查询语句</param>
-        /// <param name="obj">参数对象（可选）</param>
-        /// <returns>实体列表</returns>
         List<T> SqlQueryToList(string sql, object obj = null);
 
-        #endregion 查询操作
+        #endregion query
 
-        #region 存储过程（Procedure）
+        #region Procedure
 
-        /// <summary>
-        /// 执行存储过程并返回DataTable
-        /// </summary>
-        /// <param name="procedureName">存储过程名称</param>
-        /// <param name="parameters">存储过程参数列表</param>
-        /// <returns>查询结果DataTable</returns>
         DataTable UseStoredProcedureToDataTable(string procedureName, List<SugarParameter> parameters);
 
-        /// <summary>
-        /// 执行存储过程并返回结果集和输出参数
-        /// </summary>
-        /// <param name="procedureName">存储过程名称</param>
-        /// <param name="parameters">存储过程参数列表（包含输入/输出参数）</param>
-        /// <returns>元组：(查询结果DataTable, 输出参数列表)</returns>
         (DataTable, List<SugarParameter>) UseStoredProcedureToTuple(string procedureName, List<SugarParameter> parameters);
 
-        #endregion 存储过程
+        #endregion Procedure
     }
 }

src/IRepository/IRepository.csproj

@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(LatestDevTFM)</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="sqlSugarCore" Version="5.1.4.199" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.13" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Entity\Entity.csproj" />
     <ProjectReference Include="..\NetCore\YL.NetCore.csproj" />
+    <ProjectReference Include="..\YL.Utils\YL.Utils.csproj" />
   </ItemGroup>
 </Project>

src/IRepository/IWms_CarrierRepository.cs

@@ -5,4 +5,4 @@ namespace IRepository
     public interface IWms_CarrierRepository : IBaseRepository<Wms_Carrier>
     {
     }
-}
+}

src/IRepository/IWms_CustomerRepository.cs

@@ -5,4 +5,4 @@ namespace IRepository
     public interface IWms_CustomerRepository : IBaseRepository<Wms_Customer>
     {
     }
-}
+}

src/IRepository/IWms_stockoutRepository.cs

@@ -1,8 +1,11 @@
 using YL.Core.Entity;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace IRepository
-{
-    public interface IWms_stockoutRepository : IBaseRepository<Wms_stockout>
+{
+   public interface IWms_stockoutRepository : IBaseRepository<Wms_stockout>
     {
     }
 }

src/IRepository/IWms_stockoutdetailRepository.cs

@@ -1,8 +1,11 @@
 using YL.Core.Entity;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace IRepository
-{
-    public interface IWms_stockoutdetailRepository : IBaseRepository<Wms_stockoutdetail>
+{
+   public interface IWms_stockoutdetailRepository : IBaseRepository<Wms_stockoutdetail>
     {
     }
 }

src/IRepository/IWms_supplierRepository.cs

@@ -5,4 +5,4 @@ namespace IRepository
     public interface IWms_supplierRepository : IBaseRepository<Wms_supplier>
     {
     }
-}
+}

src/IServices/IBaseServices.cs

@@ -10,370 +10,112 @@ using YL.Utils.Table;
 
 namespace IServices
 {
-    /// <summary>
-    /// 基础服务接口，定义了通用的数据访问操作方法
-    /// 泛型T表示实体类型，约束为类且具有无参构造函数
-    /// 继承IDependency接口，表明该接口需要依赖注入容器管理
-    /// </summary>
-    /// <typeparam name="T">实体类型</typeparam>
     public interface IBaseServices<T> : IDependency where T : class, new()
     {
-        #region 新增操作
-
-        /// <summary>
-        /// 插入单个实体
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="IgnoreNullColumn">是否忽略空值列（默认true）</param>
-        /// <returns>是否插入成功</returns>
+        #region add
+
         bool Insert(T t, bool IgnoreNullColumn = true);
 
-        /// <summary>
-        /// 插入单个实体（忽略空值列）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(T t);
 
-        /// <summary>
-        /// 插入单个实体（忽略空值列，并指定特定列）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="columns">指定要插入的列</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(T t, params string[] columns);
 
-        /// <summary>
-        /// 使用指定的SqlSugar客户端插入单个实体
-        /// </summary>
-        /// <param name="client">SqlSugar客户端实例</param>
-        /// <param name="t">实体对象</param>
-        /// <returns>是否插入成功</returns>
         bool Insert(SqlSugarClient client, T t);
 
-        /// <summary>
-        /// 插入单个实体并返回大整数类型的自增ID
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>自增ID</returns>
         long InsertBigIdentity(T t);
 
-        /// <summary>
-        /// 批量插入实体列表
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>是否插入成功</returns>
         bool Insert(List<T> t);
 
-        /// <summary>
-        /// 批量插入实体列表（忽略空值列）
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(List<T> t);
 
-        /// <summary>
-        /// 批量插入实体列表（忽略空值列，并指定特定列）
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <param name="columns">指定要插入的列</param>
-        /// <returns>是否插入成功</returns>
         bool InsertIgnoreNullColumn(List<T> t, params string[] columns);
 
-        /// <summary>
-        /// 事务中插入单个实体
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>包含执行结果的DbResult对象</returns>
         DbResult<bool> InsertTran(T t);
 
-        /// <summary>
-        /// 事务中批量插入实体列表
-        /// </summary>
-        /// <param name="t">实体列表</param>
-        /// <returns>包含执行结果的DbResult对象</returns>
         DbResult<bool> InsertTran(List<T> t);
 
-        /// <summary>
-        /// 插入实体并返回插入后的实体（包含自增ID等数据库生成的值）
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <returns>插入后的实体</returns>
         T InsertReturnEntity(T t);
 
-        /// <summary>
-        /// 插入实体并返回插入后的实体，支持指定SQL锁
-        /// </summary>
-        /// <param name="t">实体对象</param>
-        /// <param name="sqlWith">SQL锁类型（默认更新锁）</param>
-        /// <returns>插入后的实体</returns>
         T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock);
 
-        /// <summary>
-        /// 执行SQL命令（带参数对象）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">参数对象</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, object parameters);
 
-        /// <summary>
-        /// 执行SQL命令（带SugarParameter参数数组）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">SugarParameter参数数组</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, params SugarParameter[] parameters);
 
-        /// <summary>
-        /// 执行SQL命令（带SugarParameter参数列表）
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="parameters">SugarParameter参数列表</param>
-        /// <returns>是否执行成功</returns>
         bool ExecuteCommand(string sql, List<SugarParameter> parameters);
 
-        #endregion 新增操作
+        #endregion add
 
-        #region 更新操作
+        #region update
 
-        /// <summary>
-        /// 更新实体（根据主键）
-        /// </summary>
-        /// <param name="entity">实体对象</param>
-        /// <returns>是否更新成功</returns>
         bool UpdateEntity(T entity);
 
-        /// <summary>
-        /// 根据条件更新实体
-        /// </summary>
-        /// <param name="entity">实体对象（含更新值）</param>
-        /// <param name="expression">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 更新实体的指定列（全表更新）
-        /// </summary>
-        /// <param name="entity">实体对象（含更新值）</param>
-        /// <param name="expression">指定要更新的列</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, Expression<Func<T, object>> expression);
 
-        /// <summary>
-        /// 根据条件更新实体的指定列
-        /// </summary>
-        /// <param name="entity">实体对象（含更新值）</param>
-        /// <param name="expression">指定要更新的列</param>
-        /// <param name="where">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, Expression<Func<T, object>> expression, Expression<Func<T, bool>> where);
 
-        /// <summary>
-        /// 使用指定的SqlSugar客户端，根据条件更新实体的指定列
-        /// </summary>
-        /// <param name="client">SqlSugar客户端实例</param>
-        /// <param name="entity">实体对象（含更新值）</param>
-        /// <param name="expression">指定要更新的列</param>
-        /// <param name="where">更新条件表达式</param>
-        /// <returns>是否更新成功</returns>
         bool Update(SqlSugarClient client, T entity, Expression<Func<T, object>> expression, Expression<Func<T, bool>> where);
 
-        /// <summary>
-        /// 更新实体（可指定列和空值处理）
-        /// </summary>
-        /// <param name="entity">实体对象</param>
-        /// <param name="list">指定要更新的列（null则更新所有列）</param>
-        /// <param name="isNull">是否忽略空值（true：不更新空值列）</param>
-        /// <returns>是否更新成功</returns>
         bool Update(T entity, List<string> list = null, bool isNull = true);
 
-        /// <summary>
-        /// 批量更新实体列表
-        /// </summary>
-        /// <param name="entity">实体列表</param>
-        /// <returns>是否更新成功</returns>
         bool Update(List<T> entity);
 
-        #endregion 更新操作
+        #endregion update
 
-        /// <summary>
-        /// 在事务中执行操作
-        /// </summary>
-        /// <param name="action">要执行的操作</param>
-        /// <returns>包含事务执行结果的DbResult对象</returns>
         DbResult<bool> UseTran(Action action);
 
-        /// <summary>
-        /// 使用指定的SqlSugar客户端在事务中执行操作
-        /// </summary>
-        /// <param name="client">SqlSugar客户端实例</param>
-        /// <param name="action">要执行的操作</param>
-        /// <returns>包含事务执行结果的DbResult对象</returns>
         DbResult<bool> UseTran(SqlSugarClient client, Action action);
 
-        /// <summary>
-        /// 另一种事务执行方式（可能是自定义实现）
-        /// </summary>
-        /// <param name="action">要执行的操作</param>
-        /// <returns>是否执行成功</returns>
         bool UseTran2(Action action);
 
-        #region 删除操作
+        #region delete
 
-        /// <summary>
-        /// 根据条件删除数据
-        /// </summary>
-        /// <param name="expression">删除条件表达式</param>
-        /// <returns>是否删除成功</returns>
         bool Delete(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据主键数组删除数据
-        /// </summary>
-        /// <typeparam name="PkType">主键类型</typeparam>
-        /// <param name="primaryKeyValues">主键值数组</param>
-        /// <returns>是否删除成功</returns>
         bool Delete<PkType>(PkType[] primaryKeyValues);
 
-        /// <summary>
-        /// 根据实体对象删除数据（根据主键）
-        /// </summary>
-        /// <param name="obj">实体对象（含主键）</param>
-        /// <returns>是否删除成功</returns>
         bool Delete(object obj);
 
-        #endregion 删除操作
+        #endregion delete
 
-        #region 查询操作
+        #region query
 
-        /// <summary>
-        /// 判断是否存在符合条件的数据
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>是否存在</returns>
         bool IsAny(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 获取查询对象（用于链式查询）
-        /// </summary>
-        /// <returns>ISugarQueryable查询对象</returns>
         ISugarQueryable<T> Queryable();
 
-        /// <summary>
-        /// 根据表名获取动态查询对象（返回ExpandoObject）
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <param name="shortName">表别名</param>
-        /// <returns>动态查询对象</returns>
         ISugarQueryable<ExpandoObject> Queryable(string tableName, string shortName);
 
-        /// <summary>
-        /// 根据条件查询并返回实体列表
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体列表</returns>
+        //ISugarQueryable<T, T1, T2> Queryable<T1, T2>() where T1 : class where T2 : new();
+
         List<T> QueryableToList(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 异步根据条件查询并返回实体列表
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>包含实体列表的Task</returns>
         Task<List<T>> QueryableToListAsync(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据条件查询并返回JSON字符串
-        /// </summary>
-        /// <param name="select">要查询的列</param>
-        /// <param name="expressionWhere">查询条件表达式</param>
-        /// <returns>JSON字符串</returns>
         string QueryableToJson(string select, Expression<Func<T, bool>> expressionWhere);
 
-        /// <summary>
-        /// 根据表名查询并返回实体列表
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <returns>实体列表</returns>
         List<T> QueryableToList(string tableName);
 
-        /// <summary>
-        /// 根据条件查询并返回单个实体（第一条）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体对象</returns>
         T QueryableToEntity(Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 根据表名和条件查询并返回实体列表
-        /// </summary>
-        /// <param name="tableName">表名</param>
-        /// <param name="expression">查询条件表达式</param>
-        /// <returns>实体列表</returns>
         List<T> QueryableToList(string tableName, Expression<Func<T, bool>> expression);
 
-        /// <summary>
-        /// 分页查询
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="pageIndex">页码（默认0）</param>
-        /// <param name="pageSize">页大小（默认10）</param>
-        /// <returns>元组（当前页数据列表，总条数）</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 带排序的分页查询
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="order">排序字符串（如"Id DESC"）</param>
-        /// <param name="pageIndex">页码（默认0）</param>
-        /// <param name="pageSize">页大小（默认10）</param>
-        /// <returns>元组（当前页数据列表，总条数）</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, string order, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 带排序字段和排序方式的分页查询
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="orderFiled">排序字段表达式</param>
-        /// <param name="orderBy">排序方式（如"ASC"或"DESC"）</param>
-        /// <param name="pageIndex">页码（默认0）</param>
-        /// <param name="pageSize">页大小（默认10）</param>
-        /// <returns>元组（当前页数据列表，总条数）</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Expression<Func<T, object>> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10);
 
-        /// <summary>
-        /// 根据Bootstrap参数进行分页查询（适配前端分页组件）
-        /// </summary>
-        /// <param name="expression">查询条件表达式</param>
-        /// <param name="bootstrap">Bootstrap分页参数对象</param>
-        /// <returns>元组（当前页数据列表，总条数）</returns>
         (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Bootstrap.BootstrapParams bootstrap);
 
-        /// <summary>
-        /// 执行SQL查询并返回实体列表
-        /// </summary>
-        /// <param name="sql">SQL语句</param>
-        /// <param name="obj">参数对象（可选）</param>
-        /// <returns>实体列表</returns>
         List<T> SqlQueryToList(string sql, object obj = null);
 
-        #endregion 查询操作
+        #endregion query
 
-        /// <summary>
-        /// 执行存储过程并返回DataTable
-        /// </summary>
-        /// <param name="procedureName">存储过程名</param>
-        /// <param name="parameters">存储过程参数列表</param>
-        /// <returns>查询结果DataTable</returns>
         DataTable UseStoredProcedureToDataTable(string procedureName, List<SugarParameter> parameters);
 
-        /// <summary>
-        /// 执行存储过程并返回DataTable和输出参数
-        /// </summary>
-        /// <param name="procedureName">存储过程名</param>
-        /// <param name="parameters">存储过程参数列表（含输出参数）</param>
-        /// <returns>元组（查询结果DataTable，包含输出值的参数列表）</returns>
         (DataTable, List<SugarParameter>) UseStoredProcedureToTuple(string procedureName, List<SugarParameter> parameters);
     }
-}
+}

src/IServices/IServices.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(LatestDevTFM)</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="sqlSugarCore" Version="5.1.4.199" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.13" />
   </ItemGroup>
 
   <ItemGroup>

src/IServices/ISys_dictServices.cs

@@ -1,5 +1,5 @@
-using YL.Core.Dto;
 using YL.Core.Entity;
+using YL.Core.Dto;
 
 namespace IServices
 {

src/IServices/ISys_roleServices.cs

@@ -1,5 +1,7 @@
 using SqlSugar;
+using System;
 using System.Collections.Generic;
+using System.Text;
 using YL.Core.Dto;
 using YL.Core.Entity;
 using YL.Utils.Table;

src/IServices/ISys_userServices.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using YL.Core.Dto;
 using YL.Core.Entity;
 using YL.Utils.Table;

src/IServices/IWms_CarrierServices.cs

@@ -3,8 +3,8 @@ using YL.Utils.Table;
 
 namespace IServices
 {
-    public interface IWms_CarrierServices : IBaseServices<Wms_Carrier>
+    public interface IWms_CarrierServices: IBaseServices<Wms_Carrier>
     {
         string PageList(Bootstrap.BootstrapParams bootstrap);
     }
-}
+}

src/IServices/IWms_deviceServices.cs

@@ -1,5 +1,5 @@
-using YL.Core.Dto;
 using YL.Core.Entity;
+using YL.Core.Dto;
 
 namespace IServices
 {

src/IServices/IWms_inventorymoveServices.cs

@@ -1,4 +1,5 @@
 using YL.Core.Entity;
+using YL.Utils.Pub;
 using YL.Utils.Table;
 
 namespace IServices

src/IServices/IWms_stockinServices.cs

@@ -1,3 +1,5 @@
+using System;
+using SqlSugar;
 using YL.Core.Dto;
 using YL.Core.Entity;
 

src/IServices/IWms_storagerackServices.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Linq.Expressions;
 using YL.Core.Entity;
 using YL.Utils.Table;
 

src/IServices/IWms_supplierServices.cs

@@ -7,4 +7,4 @@ namespace IServices
     {
         string PageList(Bootstrap.BootstrapParams bootstrap);
     }
-}
+}

src/KopSoftWms.sln

@@ -1,124 +1,134 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33205.214
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "kopSoftWMS", "KopSoftWms\kopSoftWMS.csproj", "{AB10278E-541F-43A6-BB31-360B8F43AE92}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Core", "YL.Core", "{0C5095D0-6E22-4148-89A3-B44D6DFC29E3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dto", "Dto\Dto.csproj", "{34D767FD-4446-401D-9F1C-98081D88B615}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orm", "Orm\Orm.csproj", "{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Services", "YL.Services", "{8FA3375D-7742-471C-8012-99F882F13CE0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Repository", "YL.Repository", "{06B1CF6E-C674-476C-8CD5-D10C0FB0B319}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Util", "YL.Util", "{BC25B864-6322-4879-BD44-B12C9ADD29F4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRepository", "IRepository\IRepository.csproj", "{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IServices", "IServices\IServices.csproj", "{9D3314A5-67C9-4AD4-AC50-881B4510DA19}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.Utils", "YL.Utils\YL.Utils.csproj", "{489B84BB-ED00-4DB7-8D1E-117A6F774968}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.NetCore", "YL.NetCore", "{37A7799B-1F85-4746-A9EA-B0F219831CDA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.NetCore", "NetCore\YL.NetCore.csproj", "{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.NetCoreApp", "NetCoreApp\YL.NetCoreApp.csproj", "{FCA45070-6064-40DB-A5E8-4778E0C99E2D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{34B22F89-6684-4AD7-B92A-8C452BA1AFB9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{113E9737-A3EA-493C-9C39-2F044C12C41C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitTestKopSoftWms", "..\test\XUnitTestKopSoftWms\XUnitTestKopSoftWms.csproj", "{27CB3914-2BBB-4E13-84B6-14B5E397A28C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services", "Services\Services.csproj", "{5ECAA16F-5715-4310-B2C9-68C4BA72B432}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34D767FD-4446-401D-9F1C-98081D88B615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34D767FD-4446-401D-9F1C-98081D88B615}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34D767FD-4446-401D-9F1C-98081D88B615}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34D767FD-4446-401D-9F1C-98081D88B615}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27CB3914-2BBB-4E13-84B6-14B5E397A28C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27CB3914-2BBB-4E13-84B6-14B5E397A28C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27CB3914-2BBB-4E13-84B6-14B5E397A28C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27CB3914-2BBB-4E13-84B6-14B5E397A28C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AB10278E-541F-43A6-BB31-360B8F43AE92} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{0C5095D0-6E22-4148-89A3-B44D6DFC29E3} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{34D767FD-4446-401D-9F1C-98081D88B615} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
-		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
-		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
-		{8FA3375D-7742-471C-8012-99F882F13CE0} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{06B1CF6E-C674-476C-8CD5-D10C0FB0B319} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{BC25B864-6322-4879-BD44-B12C9ADD29F4} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650} = {06B1CF6E-C674-476C-8CD5-D10C0FB0B319}
-		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59} = {06B1CF6E-C674-476C-8CD5-D10C0FB0B319}
-		{9D3314A5-67C9-4AD4-AC50-881B4510DA19} = {8FA3375D-7742-471C-8012-99F882F13CE0}
-		{489B84BB-ED00-4DB7-8D1E-117A6F774968} = {BC25B864-6322-4879-BD44-B12C9ADD29F4}
-		{37A7799B-1F85-4746-A9EA-B0F219831CDA} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
-		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7} = {37A7799B-1F85-4746-A9EA-B0F219831CDA}
-		{FCA45070-6064-40DB-A5E8-4778E0C99E2D} = {37A7799B-1F85-4746-A9EA-B0F219831CDA}
-		{27CB3914-2BBB-4E13-84B6-14B5E397A28C} = {113E9737-A3EA-493C-9C39-2F044C12C41C}
-		{5ECAA16F-5715-4310-B2C9-68C4BA72B432} = {8FA3375D-7742-471C-8012-99F882F13CE0}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D493867C-D775-4AEC-9F0A-298A298D9FFE}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KopSoftWms", "KopSoftWms\KopSoftWms.csproj", "{AB10278E-541F-43A6-BB31-360B8F43AE92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Core", "YL.Core", "{0C5095D0-6E22-4148-89A3-B44D6DFC29E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dto", "Dto\Dto.csproj", "{34D767FD-4446-401D-9F1C-98081D88B615}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orm", "Orm\Orm.csproj", "{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Services", "YL.Services", "{8FA3375D-7742-471C-8012-99F882F13CE0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Repository", "YL.Repository", "{06B1CF6E-C674-476C-8CD5-D10C0FB0B319}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.Util", "YL.Util", "{BC25B864-6322-4879-BD44-B12C9ADD29F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRepository", "IRepository\IRepository.csproj", "{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IServices", "IServices\IServices.csproj", "{9D3314A5-67C9-4AD4-AC50-881B4510DA19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.Utils", "YL.Utils\YL.Utils.csproj", "{489B84BB-ED00-4DB7-8D1E-117A6F774968}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YL.NetCore", "YL.NetCore", "{37A7799B-1F85-4746-A9EA-B0F219831CDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.NetCore", "NetCore\YL.NetCore.csproj", "{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YL.NetCoreApp", "NetCoreApp\YL.NetCoreApp.csproj", "{FCA45070-6064-40DB-A5E8-4778E0C99E2D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{34B22F89-6684-4AD7-B92A-8C452BA1AFB9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{113E9737-A3EA-493C-9C39-2F044C12C41C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services", "Services\Services.csproj", "{5ECAA16F-5715-4310-B2C9-68C4BA72B432}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitTestKopSoftWms", "..\test\XUnitTestKopSoftWms\XUnitTestKopSoftWms.csproj", "{B3B2E6B4-3457-449F-9144-6030A795D2AD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization", "Localization", "{7E7171C5-F87E-4384-AC36-1FBE90D7714B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YL.Localization", "YL.Localization\YL.Localization.csproj", "{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB10278E-541F-43A6-BB31-360B8F43AE92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34D767FD-4446-401D-9F1C-98081D88B615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34D767FD-4446-401D-9F1C-98081D88B615}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34D767FD-4446-401D-9F1C-98081D88B615}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34D767FD-4446-401D-9F1C-98081D88B615}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D3314A5-67C9-4AD4-AC50-881B4510DA19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{489B84BB-ED00-4DB7-8D1E-117A6F774968}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCA45070-6064-40DB-A5E8-4778E0C99E2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5ECAA16F-5715-4310-B2C9-68C4BA72B432}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3B2E6B4-3457-449F-9144-6030A795D2AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3B2E6B4-3457-449F-9144-6030A795D2AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3B2E6B4-3457-449F-9144-6030A795D2AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3B2E6B4-3457-449F-9144-6030A795D2AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{AB10278E-541F-43A6-BB31-360B8F43AE92} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{0C5095D0-6E22-4148-89A3-B44D6DFC29E3} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{34D767FD-4446-401D-9F1C-98081D88B615} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
+		{8F99EFFD-A2A3-413A-9EC4-4ADDFA1A978B} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
+		{0FA88DA9-FA21-4F08-AF7F-5D9DE772DD79} = {0C5095D0-6E22-4148-89A3-B44D6DFC29E3}
+		{8FA3375D-7742-471C-8012-99F882F13CE0} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{06B1CF6E-C674-476C-8CD5-D10C0FB0B319} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{BC25B864-6322-4879-BD44-B12C9ADD29F4} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{FD70BC30-5AEB-4EA0-A701-D3293BAC4650} = {06B1CF6E-C674-476C-8CD5-D10C0FB0B319}
+		{D566D03B-E6E0-4BEE-9544-6B1A37E4DD59} = {06B1CF6E-C674-476C-8CD5-D10C0FB0B319}
+		{9D3314A5-67C9-4AD4-AC50-881B4510DA19} = {8FA3375D-7742-471C-8012-99F882F13CE0}
+		{489B84BB-ED00-4DB7-8D1E-117A6F774968} = {BC25B864-6322-4879-BD44-B12C9ADD29F4}
+		{37A7799B-1F85-4746-A9EA-B0F219831CDA} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{5B9D28EC-6ACE-464E-AF09-141ED6E451F7} = {37A7799B-1F85-4746-A9EA-B0F219831CDA}
+		{FCA45070-6064-40DB-A5E8-4778E0C99E2D} = {37A7799B-1F85-4746-A9EA-B0F219831CDA}
+		{5ECAA16F-5715-4310-B2C9-68C4BA72B432} = {8FA3375D-7742-471C-8012-99F882F13CE0}
+		{B3B2E6B4-3457-449F-9144-6030A795D2AD} = {113E9737-A3EA-493C-9C39-2F044C12C41C}
+		{7E7171C5-F87E-4384-AC36-1FBE90D7714B} = {34B22F89-6684-4AD7-B92A-8C452BA1AFB9}
+		{0C9FDC64-F7C7-4B35-B314-3DA67DBCDBCC} = {7E7171C5-F87E-4384-AC36-1FBE90D7714B}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D493867C-D775-4AEC-9F0A-298A298D9FFE}
+	EndGlobalSection
+EndGlobal

src/KopSoftWms/Attributes/CheckMenuAttribute.cs

@@ -3,78 +3,50 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Security.Claims;
 using YL.Utils.Extensions;
+using YL.Utils.Pub;
 
 namespace YL.NetCore.Attributes
 {
-    /// <summary>
-    /// 菜单检查与数据注入过滤器
-    /// 作用：在控制器动作执行前，加载用户权限菜单、页面元信息等，传递到ViewData/ViewBag供视图使用
-    /// </summary>
     public class CheckMenuAttribute : ActionFilterAttribute
     {
-        /// <summary>
-        /// 构造函数（无参，使用默认配置）
-        /// </summary>
         public CheckMenuAttribute()
         {
         }
 
-        /// <summary>
-        /// 动作执行前触发（核心方法）
-        /// 执行时机：控制器动作方法执行前，模型绑定完成后
-        /// </summary>
-        /// <param name="context">动作执行上下文（包含请求、控制器、动作描述等信息）</param>
         public override void OnActionExecuting(ActionExecutingContext context)
         {
-            // 获取控制器的ViewData（用于向视图传递数据）
             var viewData = (context.Controller as Controller)?.ViewData;
-            // 获取控制器的ViewBag（动态向视图传递数据）
             var viewBag = (context.Controller as Controller)?.ViewBag;
-            // 获取依赖注入服务提供器（用于获取缓存、业务服务等）
             var services = context.HttpContext.RequestServices;
-            // 获取当前动作的属性集合（存储在Startup中配置的页面元信息，如keywords、description等）
+            //var log = services.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
+            //ILogger<CheckMenuAttribute> logger = log.CreateLogger<CheckMenuAttribute>();
+            //logger.LogInformation("");
+
             var properties = context.ActionDescriptor.Properties;
-            // 获取当前登录用户的Claims身份信息（包含用户ID、角色、昵称等认证数据）
             var claims = context.HttpContext.User?.Claims;
-            // 从服务提供器获取内存缓存服务（用于缓存用户菜单，减少数据库查询）
             var cache = services.GetService(typeof(IMemoryCache)) as IMemoryCache;
-            // 从服务提供器获取角色相关业务服务（用于查询用户权限菜单）
             var roleServices = services.GetService(typeof(ISys_roleServices)) as ISys_roleServices;
-
-            // 向ViewData注入用户权限菜单
             if (viewData != null)
             {
-                // 验证当前用户是否已登录（User不为空）
                 if (context.HttpContext.User != null)
                 {
-                    // 从Claims中获取用户ID（ClaimTypes.Sid对应存储的用户唯一标识）
-                    var UserId = claims.SingleOrDefault(c => c.Type == ClaimTypes.Sid)?.Value;
-                    // 从缓存获取用户菜单：缓存存在则直接使用，不存在则通过角色服务查询并缓存
-                    // 缓存键格式：menu_+用户ID（确保不同用户菜单隔离）
-                    viewData["menu"] = cache.Get("menu_" + UserId)
-                        ?? roleServices?.GetMenu(claims.SingleOrDefault(c => c.Type == ClaimTypes.Role).Value.ToInt64());
+                    var UserId = claims.SingleOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+                    viewData["menu"] = cache.Get("menu_" + UserId) ?? roleServices?.GetMenu(claims.SingleOrDefault(c => c.Type == ClaimTypes.Role).Value.ToInt64());
                 }
+                // ReSharper disable once PossibleNullReferenceException
             }
-
-            // 向ViewBag注入页面元信息和用户信息
             if (viewBag != null)
             {
-                // 注入页面关键词（从动作属性中获取，Startup中通过ApplicationDescription配置）
-                viewBag.keywords = properties["keywords"].ToString();
-                // 注入页面描述（同上）
-                viewBag.description = properties["description"].ToString();
-                // 注入公司名称（同上）
+                viewBag.title = properties["title"].ToString();
                 viewBag.company = properties["company"].ToString();
-                // 从Claims中获取用户昵称（ClaimTypes.Name对应存储的用户昵称）
-                viewBag.nickname = claims.SingleOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
-                // 从Claims中获取用户头像地址（ClaimTypes.Uri对应存储的头像URL）
-                viewBag.headimg = claims.SingleOrDefault(c => c.Type == ClaimTypes.Uri)?.Value;
+                viewBag.customer = properties["customer"].ToString();
+                viewBag.nickname = claims.SingleOrDefault(c => c.Type == ClaimTypes.Name).Value;
+                viewBag.headimg = claims.SingleOrDefault(c => c.Type == ClaimTypes.Uri).Value;
             }
-
-            // 调用基类方法，确保过滤器链正常执行
             base.OnActionExecuting(context);
         }
     }

src/KopSoftWms/Attributes/OperationLogAttribute.cs

@@ -5,147 +5,90 @@ using Microsoft.Extensions.Configuration;
 using System;
 using System.Linq;
 using System.Security.Claims;
-using YL.Core.Entity.Fluent.Validation; // 日志实体验证规则
-using YL.Utils.Env; // 环境与全局工具类
-using YL.Utils.Extensions; // 扩展方法
-using YL.Utils.Http; // HTTP相关工具
-using YL.Utils.Pub; // 公共常量与工具
+using YL.Core.Entity.Fluent.Validation;
+using YL.Utils.Env;
+using YL.Utils.Extensions;
+using YL.Utils.Http;
+using YL.Utils.Pub;
 
 namespace YL.NetCore.Attributes
 {
-    /// <summary>
-    /// 操作日志记录过滤器
-    /// 作用：在动作执行结果返回后，自动记录用户操作日志（如添加、修改、查询等）
-    /// 特性：密封类，防止被继承重写
-    /// </summary>
     public sealed class OperationLogAttribute : ResultFilterAttribute
     {
-        /// <summary>
-        /// 是否忽略日志记录（默认true：不忽略，即记录日志）
-        /// </summary>
         public bool Ignore { get; set; } = true;
-
-        /// <summary>
-        /// 日志类型（如添加、修改、查询等，通过枚举定义）
-        /// </summary>
         public LogType LogType { get; set; }
 
-        /// <summary>
-        /// 无参构造函数（使用默认配置）
-        /// </summary>
         public OperationLogAttribute()
         {
         }
 
-        /// <summary>
-        /// 构造函数：指定是否忽略日志记录
-        /// </summary>
-        /// <param name="ignore">是否忽略</param>
         public OperationLogAttribute(bool ignore)
         {
             Ignore = ignore;
         }
 
-        /// <summary>
-        /// 构造函数：指定日志类型
-        /// </summary>
-        /// <param name="logType">日志类型</param>
         public OperationLogAttribute(LogType logType)
         {
             LogType = logType;
         }
 
-        /// <summary>
-        /// 构造函数：同时指定是否忽略和日志类型
-        /// </summary>
-        /// <param name="ignore">是否忽略</param>
-        /// <param name="logType">日志类型</param>
         public OperationLogAttribute(bool ignore, LogType logType)
         {
             Ignore = ignore;
             LogType = logType;
         }
 
-        /// <summary>
-        /// 结果执行前触发（核心方法）
-        /// 执行时机：控制器动作执行完成，结果返回给客户端前
-        /// </summary>
-        /// <param name="context">结果执行上下文（包含动作结果、请求信息等）</param>
         public override void OnResultExecuting(ResultExecutingContext context)
         {
-            // 获取依赖注入服务提供器（用于获取配置、日志服务等）
             var services = context.HttpContext.RequestServices;
-            // 获取配置服务（读取appsettings.json中的日志开关配置）
             var config = services.GetService(typeof(IConfiguration)) as IConfiguration;
-            // 获取当前登录用户的Claims身份信息（包含用户ID等）
             var claims = context.HttpContext.User.Claims;
-
-            // 从配置中读取操作日志开关（Log:operationlog节点，默认关闭）
             string flag = config["Log:operationlog"];
             if (string.IsNullOrWhiteSpace(flag))
             {
-                flag = "false"; // 配置未设置时默认关闭
+                flag = "false";
             }
-
-            // 仅当开关开启（"true"）且不忽略记录时，执行日志记录逻辑
             if (flag.Equals("true", StringComparison.OrdinalIgnoreCase))
             {
                 if (Ignore)
-                {
-                    // 1. 读取请求参数和上下文信息（通过扩展方法获取）
+                {//传入参数
                     var parameters = context.ReadResultExecutingContext();
-                    // parameters.Item1：请求参数（表单/JSON数据）
-                    // parameters.Item2：请求URL
-                    // parameters.Item3：请求方法（GET/POST等）
-
-                    // 2. 解析动作执行结果（根据不同结果类型提取关键信息）
+                    //result
                     var result = context.Result;
-                    object res = null; // 存储结果信息
+                    object res = null;
                     if (result is ObjectResult objectResult)
                     {
-                        // 对象结果（如API返回的JSON对象）
                         res = objectResult.Value;
                     }
                     else if (result is ContentResult contentResult)
                     {
-                        // 文本结果（如纯文本响应）
                         res = contentResult.Content;
                     }
                     else if (result is EmptyResult emptyResult)
                     {
-                        // 空结果
                         res = emptyResult;
                     }
                     else if (result is StatusCodeResult statusCodeResult)
                     {
-                        // 状态码结果（如404、500等）
                         res = statusCodeResult;
                     }
                     else if (result is JsonResult jsonResult)
                     {
-                        // JSON结果
                         res = jsonResult.Value.ToString();
                     }
                     else if (result is FileResult fileResult)
                     {
-                        // 文件结果（记录文件名或内容类型）
                         res = fileResult.FileDownloadName.IsEmpty() ? fileResult.ContentType : fileResult.FileDownloadName;
                     }
                     else if (result is ViewResult viewResult)
                     {
-                        // 视图结果（记录模型数据）
                         res = viewResult.Model;
                     }
                     else if (result is RedirectResult redirectResult)
                     {
-                        // 重定向结果（记录目标URL）
                         res = redirectResult.Url;
                     }
-
-                    // 3. 获取日志服务（用于将日志写入数据库）
                     var log = services.GetService(typeof(ISys_logServices)) as ISys_logServices;
-
-                    // 4. 动态修正日志类型（如果是"新增或修改"类型，根据结果内容判断具体类型）
                     if (LogType == LogType.addOrUpdate)
                     {
                         if (res.ToString().Contains("修改"))
@@ -157,46 +100,34 @@ namespace YL.NetCore.Attributes
                             LogType = LogType.add;
                         }
                     }
-
-                    // 5. 构建日志描述信息（根据日志类型拼接不同内容）
                     string des = "";
                     if (LogType == LogType.select)
                     {
-                        // 查询类型日志：记录参数和请求方法
                         des = parameters.Item1 + ";" + parameters.Item3;
                     }
                     else
                     {
-                        // 其他类型（增删改等）：记录结果、参数和请求方法
                         des = res.ToString() + ";" + parameters.Item1 + ";" + parameters.Item3;
                     }
-
-                    // 6. 构建日志实体对象
                     var model = new Core.Entity.Sys_log
                     {
-                        Browser = GlobalCore.GetBrowser(), // 获取客户端浏览器信息
-                        CreateBy = claims.SingleOrDefault(c => c.Type == ClaimTypes.Sid).Value.ToInt64(), // 操作人ID（从Claims获取）
-                        CreateDate = DateTimeExt.DateTime, // 操作时间（当前时间）
-                        Description = des, // 操作描述
-                        LogId = PubId.SnowflakeId, // 日志ID（雪花算法生成唯一ID）
-                        LogIp = GlobalCore.GetIp(), // 操作IP地址
-                        LogType = LogType.EnumToString(), // 日志类型（枚举转字符串）
-                        Url = parameters.Item2 // 操作URL
+                        Browser = GlobalCore.GetBrowser(),
+                        CreateBy = claims.First(c => c.Type == ClaimTypes.Sid).ToInt64(),
+                        CreateDate = DateTimeExt.DateTime,
+                        Description = des,
+                        LogId = PubId.SnowflakeId,
+                        LogIp = GlobalCore.GetIp(),
+                        LogType = LogType.EnumToString(),
+                        Url = parameters.Item2
                     };
-
-                    // 7. 验证日志实体（使用FluentValidation验证规则）
                     SysLogFluent rules = new SysLogFluent();
                     var validationResult = rules.Validate(model);
-
-                    // 8. 验证通过则插入日志
                     if (validationResult.IsValid)
                     {
                         log.Insert(model);
                     }
                 }
             }
-
-            // 调用基类方法，确保过滤器链正常执行
             base.OnResultExecuting(context);
         }
     }

src/KopSoftWms/Attributes/TempDataBagAttribute.cs

@@ -1,6 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Caching.Memory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace KopSoftWms.Attributes
 {

src/KopSoftWms/Controllers/CarrierController.cs

@@ -1,126 +1,84 @@
-// 引入IServices命名空间，包含服务接口定义
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，用于控制器、视图等功能
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar命名空间，用于ORM数据库操作
 using SqlSugar;
-// 引入LINQ相关命名空间，用于集合查询操作
 using System.Linq;
-// 引入YL.Core.Entity命名空间，包含核心实体类定义
 using YL.Core.Entity;
-// 引入YL.Core.Entity.Fluent.Validation命名空间，包含实体验证相关类
 using YL.Core.Entity.Fluent.Validation;
-// 引入YL.NetCore.Attributes命名空间，包含自定义特性
 using YL.NetCore.Attributes;
-// 引入YL.NetCore.NetCoreApp命名空间，包含.NET Core应用相关功能
 using YL.NetCore.NetCoreApp;
-// 引入YL.Utils.Extensions命名空间，包含工具类扩展方法
 using YL.Utils.Extensions;
-// 引入YL.Utils.Pub命名空间，包含公共常量、枚举等定义
 using YL.Utils.Pub;
-// 引入YL.Utils.Table命名空间，包含表格相关工具类
 using YL.Utils.Table;
 
-// 定义控制器所在的命名空间
 namespace KopSoftWms.Controllers
 {
-    // 定义承运商控制器，继承自BaseController（基础控制器，可能包含通用功能）
     public class CarrierController : BaseController
     {
-        // 声明承运商服务接口的私有字段，用于依赖注入
         private readonly IWms_CarrierServices _carrierServices;
 
-        // 构造函数，通过依赖注入获取承运商服务实例
         public CarrierController(IWms_CarrierServices carrierServices)
         {
             _carrierServices = carrierServices;
         }
 
-        // 定义HTTP GET请求的Index方法，用于显示承运商列表页面
         [HttpGet]
-        [CheckMenu] // 自定义特性，可能用于检查用户是否有权限访问该菜单
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 返回Index视图
             return View();
         }
 
-        // 定义HTTP POST请求的List方法，用于获取承运商列表数据（支持分页、排序等）
         [HttpPost]
-        [OperationLog(LogType = LogType.select)] // 记录操作日志，类型为查询
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [OperationLog(LogType = LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用服务层的分页列表方法，获取符合条件的承运商数据
             var sd = _carrierServices.PageList(bootstrap);
-            // 将结果以ContentResult形式返回（通常为JSON字符串）
             return Content(sd);
         }
 
-        // 定义HTTP GET请求的Add方法，用于显示添加或编辑承运商的表单页面
         [HttpGet]
         public IActionResult Add(string id)
         {
-            // 实例化一个新的承运商对象
             var model = new Wms_Carrier();
-            // 如果id为空，说明是添加操作，直接返回空模型的视图
             if (id.IsEmpty())
             {
                 return View(model);
             }
             else
             {
-                // 如果id不为空，说明是编辑操作，查询对应的承运商实体
                 model = _carrierServices.QueryableToEntity(c => c.CarrierId == SqlFunc.ToInt64(id));
-                // 返回包含该实体数据的视图
                 return View(model);
             }
         }
 
-        // 定义HTTP POST请求的AddOrUpdate方法，用于处理添加或更新承运商的表单提交
         [HttpPost]
-        [FilterXss] // 自定义特性，用于过滤XSS攻击脚本
-        [OperationLog(LogType = LogType.addOrUpdate)] // 记录操作日志，类型为添加或更新
-        public IActionResult AddOrUpdate([FromForm] Wms_Carrier model, [FromForm] string id)
+        [FilterXss]
+        [OperationLog(LogType = LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_Carrier model, [FromForm]string id)
         {
-            // 实例化承运商验证器
             var validator = new CarrierFluent();
-            // 对模型进行验证
             var results = validator.Validate(model);
-            // 获取验证是否成功的标志
             var success = results.IsValid;
-            // 如果验证失败
             if (!success)
             {
-                // 拼接所有验证错误信息
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 返回包含错误信息的JSON结果（失败状态）
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-            // 如果id为空或为0，说明是添加操作
             if (id.IsEmptyZero())
             {
-                // 检查是否存在相同的承运商编号或名称
                 if (_carrierServices.IsAny(c => c.CarrierNo == model.CarrierNo || c.CarrierName == model.CarrierName))
                 {
-                    // 返回已存在的提示信息
                     return BootJsonH((false, PubConst.Carrier1));
                 }
-                // 生成雪花算法ID作为承运商ID
                 model.CarrierId = PubId.SnowflakeId;
-                // 设置创建人ID（从缓存中获取当前用户ID）
                 model.CreateBy = UserDtoCache.UserId;
-                // 调用服务层插入方法
                 bool flag = _carrierServices.Insert(model);
-                // 根据操作结果返回对应的提示信息
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
             else
             {
-                // 如果id不为空，说明是更新操作，设置承运商ID
                 model.CarrierId = id.ToInt64();
-                // 设置修改人ID（从缓存中获取当前用户ID）
                 model.ModifiedBy = UserDtoCache.UserId;
-                // 设置修改时间（当前时间）
                 model.ModifiedDate = DateTimeExt.DateTime;
                 var flag = _carrierServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
@@ -128,18 +86,10 @@ namespace KopSoftWms.Controllers
         }
 
         [HttpGet]
-        [OperationLog(LogType = LogType.delete)] // 记录操作日志，类型为删除
+        [OperationLog(LogType = LogType.delete)]
         public IActionResult Delete(string id)
         {
-            var flag = _carrierServices.Update(
-                new Wms_Carrier {
-                    CarrierId = SqlFunc.ToInt64(id),
-                    IsDel = 0, // 这里可能是逻辑删除标志（0表示已删除，具体需看业务定义）
-                    ModifiedBy = UserDtoCache.UserId,
-                    ModifiedDate = DateTimeExt.DateTime
-                },
-                c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate }
-            );
+            var flag = _carrierServices.Update(new Wms_Carrier { CarrierId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
             return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
         }
 

src/KopSoftWms/Controllers/CustomerController.cs

@@ -1,215 +1,142 @@
-// 引入服务接口命名空间
-using IServices;
-// 引入ASP.NET Core HTTP相关命名空间（处理文件上传等）
+using IServices;
 using Microsoft.AspNetCore.Http;
-// 引入ASP.NET Core MVC核心命名空间
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间
 using SqlSugar;
-// 引入IO操作相关命名空间
 using System.IO;
-// 引入LINQ查询相关命名空间
 using System.Linq;
-// 引入核心实体类命名空间
 using YL.Core.Entity;
-// 引入实体类验证相关命名空间
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间
 using YL.NetCore.Attributes;
-// 引入.NET Core应用相关命名空间
 using YL.NetCore.NetCoreApp;
-// 引入委托工具类命名空间
 using YL.Utils.Delegate;
-// 引入Excel操作工具类命名空间
 using YL.Utils.Excel;
-// 引入扩展方法命名空间
 using YL.Utils.Extensions;
-// 引入文件操作工具类命名空间
 using YL.Utils.Files;
-// 引入JSON操作工具类命名空间
 using YL.Utils.Json;
-// 引入公共常量/枚举命名空间
 using YL.Utils.Pub;
-// 引入表格工具类命名空间
 using YL.Utils.Table;
 
-// 定义控制器所在命名空间
 namespace KopSoftWms.Controllers
 {
-    // 客户控制器，继承自基础控制器（包含通用功能）
     public class CustomerController : BaseController
     {
-        // 客户服务接口私有字段（依赖注入）
         private readonly IWms_CustomerServices _customerServices;
 
-        // 构造函数：通过依赖注入初始化客户服务
         public CustomerController(IWms_CustomerServices customerServices)
         {
             _customerServices = customerServices;
         }
 
-        // HTTP GET请求：显示客户列表页面
         [HttpGet]
-        [CheckMenu] // 检查菜单访问权限的自定义特性
+        [CheckMenu]
         public IActionResult Index()
         {
-            return View(); // 返回Index视图
+            return View();
         }
 
-        // HTTP POST请求：获取客户分页列表数据
         [HttpPost]
-        [OperationLog(LogType.select)] // 记录查询操作日志
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用服务层获取分页数据
             var sd = _customerServices.PageList(bootstrap);
-            return Content(sd); // 以ContentResult形式返回数据（通常为JSON）
+            return Content(sd);
         }
 
-        // HTTP GET请求：显示添加/编辑客户表单
         [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化客户实体
             var model = new Wms_Customer();
-            // 如果id为空，返回空模型（添加操作）
             if (id.IsEmpty())
             {
                 return View(model);
             }
             else
             {
-                // 如果id不为空，查询对应客户数据（编辑操作）
                 model = _customerServices.QueryableToEntity(c => c.CustomerId == SqlFunc.ToInt64(id));
-                return View(model); // 返回带数据的视图
+                return View(model);
             }
         }
 
-        // HTTP POST请求：处理添加/编辑客户提交
         [HttpPost]
-        [FilterXss] // 过滤XSS攻击脚本的特性
-        [OperationLog(LogType.addOrUpdate)] // 记录添加/更新操作日志
-        public IActionResult AddOrUpdate([FromForm] Wms_Customer model, [FromForm] string id)
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_Customer model, [FromForm]string id)
         {
-            // 初始化客户验证器
             var validator = new CustomerFluent();
-            // 执行模型验证
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 如果验证失败，返回错误信息
             if (!success)
             {
-                // 拼接所有验证错误信息
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // 如果id为空或0，执行添加操作
             if (id.IsEmptyZero())
             {
-                // 检查客户编号或名称是否已存在
                 if (_customerServices.IsAny(c => c.CustomerNo == model.CustomerNo || c.CustomerName == model.CustomerName))
                 {
-                    return BootJsonH((false, PubConst.Customer1)); // 返回已存在提示
+                    return BootJsonH((false, PubConst.Customer1));
                 }
-
-                // 设置新增客户的基础信息
-                model.CustomerId = PubId.SnowflakeId; // 生成雪花算法ID
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID
-                bool flag = _customerServices.Insert(model); // 执行插入操作
-
-                // 根据操作结果返回对应提示
+                model.CustomerId = PubId.SnowflakeId;
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _customerServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
             else
             {
-                // 执行更新操作：设置客户ID和修改信息
                 model.CustomerId = id.ToInt64();
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间
-                var flag = _customerServices.Update(model); // 执行更新操作
-
-                // 根据操作结果返回对应提示
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _customerServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        // HTTP GET请求：删除客户（逻辑删除）
         [HttpGet]
-        [OperationLog(LogType.delete)] // 记录删除操作日志
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 执行逻辑删除：更新删除标志、修改人、修改时间
-            var flag = _customerServices.Update(
-                new Wms_Customer {
-                    CustomerId = SqlFunc.ToInt64(id),
-                    IsDel = 0, // 逻辑删除标志（0表示已删除，具体看业务定义）
-                    ModifiedBy = UserDtoCache.UserId,
-                    ModifiedDate = DateTimeExt.DateTime
-                },
-                c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 指定更新的字段
-            );
-
-            // 根据操作结果返回对应提示
+            var flag = _customerServices.Update(new Wms_Customer { CustomerId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
             return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
         }
 
-        // HTTP GET请求：下载客户模板Excel
         [HttpGet]
         public IActionResult Download()
         {
-            // 打开模板文件流（路径：wwwroot/excel/customer.xlsx）
             var stream = System.IO.File.OpenRead(Path.Combine(WebRoot, "excel", "customer.xlsx"));
-            // 返回文件流（指定MIME类型为Excel，下载文件名为customer.xlsx）
             return File(stream, ContentType.ContentTypeExcel, "customer.xlsx");
         }
 
-        // HTTP GET请求：显示导入客户页面
         [HttpGet]
         public IActionResult Import()
         {
-            return View(); // 返回导入视图
+            return View();
         }
 
-        // HTTP POST请求：处理Excel导入客户数据
         [HttpPost]
         public IActionResult ImportExcel(IFormFile file)
         {
-            // 检查文件是否为空
             if (file == null || file.Length <= 0)
             {
-                return BootJsonH((false, PubConst.File1)); // 返回文件为空提示
+                return BootJsonH((false, PubConst.File1));
             }
-
-            // 获取文件扩展名并转为小写
             string fileExt = Path.GetExtension(file.FileName).ToLower();
-            // 检查是否为Excel文件（.xls或.xlsx）
             if (!NpoiUtil.excel.Contains(fileExt))
             {
-                return BootJsonH((false, PubConst.File2)); // 返回文件类型错误提示
+                return BootJsonH((false, PubConst.File2));
             }
-
-            // 生成服务器端保存路径（wwwroot/upload/UUID+扩展名）
-            string filepath = Path.Combine(WebRoot, "upload", PubId.GetUuid()) + fileExt;
-
-            // 使用委托工具类执行导入逻辑（包含异常处理）
+            var filepath = Path.Combine(WebRoot, "upload", PubId.GetUuid()) + fileExt;
+            //1 直接通过流
             return DelegateUtil.TryExecute<IActionResult>(() =>
-            {
-                // 通过内存流处理文件（不落地保存）
-                using (var st = new MemoryStream())
-                {
-                    file.CopyTo(st); // 将上传文件复制到内存流
-                    var dt = NpoiUtil.Import(st, fileExt); // 解析Excel为DataTable
-                    // 调用服务层导入方法，并将结果转为JSON
-                    var json = _customerServices.Import(dt, UserDtoCache.UserId).JilToJson();
-                    return Content(json); // 返回处理结果
-                }
-            }, BootJsonH((false, PubConst.File3))); // 异常时返回文件处理失败提示
-
-
-            // 以下为注释掉的备选实现：
-            // 1. 直接通过流处理（与上面委托内逻辑相同）
+             {
+                 using (var st = new MemoryStream())
+                 {
+                     file.CopyTo(st);
+                     var dt = NpoiUtil.Import(st, fileExt);
+                     var json = _customerServices.Import(dt, UserDtoCache.UserId).JilToJson();
+                     return Content(json);
+                 }
+             }, BootJsonH((false, PubConst.File3))
+             );
             //using (var st = new MemoryStream())
             //{
             //    file.CopyTo(st);
@@ -217,35 +144,30 @@ namespace KopSoftWms.Controllers
             //    var json = _customerServices.Import(dt, UserDtoCache.UserId).JilToJson();
             //    return Content(json);
             //}
-
-            // 2. 先保存文件到服务器，再读取解析（落地处理）
+            //2 先上传到服务器，然后在读取
             //using (var stream = new FileStream(filepath, FileMode.CreateNew))
             //{
             //    file.CopyTo(stream);
             //}
             //var dt = NpoiUtil.Import(filepath);
-            //FileUtil.Delete(filepath); // 解析后删除临时文件
+            //FileUtil.Delete(filepath);
             //var json = _customerServices.Import(dt, UserDtoCache.UserId).JilToJson();
             //return Content(json);
         }
 
-        // HTTP GET请求：搜索客户（用于下拉选择等场景）
         [HttpGet]
         public IActionResult Search(string text)
         {
-            // 初始化分页参数（查询前100条，按创建时间降序）
             var bootstrap = new Bootstrap.BootstrapParams
             {
                 limit = 100,
                 offset = 0,
                 sort = "CreateDate",
-                search = text, // 搜索关键词
+                search = text,
                 order = "desc"
             };
-
-            // 调用服务层获取搜索结果
             var json = _customerServices.PageList(bootstrap);
-            return Content(json); // 返回搜索结果
+            return Content(json);
         }
     }
-}
+}

src/KopSoftWms/Controllers/DeliveryController.cs

@@ -1,200 +1,102 @@
-// 引入服务接口命名空间，包含发货单服务的接口定义
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询与操作
 using SqlSugar;
-// 引入LINQ相关命名空间，支持集合的查询操作
 using System.Linq;
-// 引入核心实体类命名空间，包含Wms_delivery发货单实体
 using YL.Core.Entity;
-// 引入实体验证相关命名空间，包含发货单的FluentValidation验证类
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础功能命名空间，提供项目通用基础能力
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展方法命名空间，提供字符串、类型转换等扩展方法
 using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含项目通用的常量和枚举定义
 using YL.Utils.Pub;
-// 引入表格工具命名空间，包含Bootstrap表格相关参数模型
 using YL.Utils.Table;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 发货单控制器，专门处理发货单相关的HTTP请求（列表查询、添加、编辑、删除等）
-    /// 继承自BaseController，复用基础控制器的通用功能（如用户缓存、统一返回格式等）
-    /// </summary>
     public class DeliveryController : BaseController
     {
-        // 声明发货单服务接口的私有只读字段，用于后续调用服务层业务逻辑
         private readonly IWms_deliveryServices _deliveryServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入获取发货单服务实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建服务对象
-        /// </summary>
-        /// <param name="deliveryServices">发货单服务接口实例，提供发货单相关业务逻辑</param>
         public DeliveryController(
             IWms_deliveryServices deliveryServices
             )
         {
-            // 给私有字段赋值，初始化服务实例
             _deliveryServices = deliveryServices;
         }
 
-        /// <summary>
-        /// 发货单列表页面的HTTP GET请求处理方法
-        /// 用于返回发货单列表的视图页面
-        /// </summary>
-        /// <returns>返回发货单列表对应的Razor视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，检查当前用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 返回Index视图（默认对应Views/Delivery/Index.cshtml）
             return View();
         }
 
-        /// <summary>
-        /// 分页查询发货单列表数据的HTTP POST请求处理方法
-        /// 接收Bootstrap表格的分页、排序、查询参数，返回对应的数据结果
-        /// </summary>
-        /// <param name="bootstrap">Bootstrap表格参数对象，包含页码、页大小、排序字段、查询关键词等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用服务层的分页列表方法，传入表格参数，获取分页数据（JSON格式字符串）
             var sd = _deliveryServices.PageList(bootstrap);
-            // 以ContentResult形式返回数据，供前端Bootstrap表格渲染
             return Content(sd);
         }
 
-        /// <summary>
-        /// 发货单添加/编辑页面的HTTP GET请求处理方法
-        /// 根据是否传入ID区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">发货单ID，为空时表示添加操作，不为空时表示编辑操作</param>
-        /// <param name="stockOutId">出库单ID，添加发货单时用于关联对应的出库单</param>
-        /// <returns>返回添加/编辑视图及对应的发货单模型数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id, string stockOutId)
         {
-            // 初始化发货单实体模型
             var model = new Wms_delivery();
 
-            // 判断ID是否为空（为空表示添加操作）
             if (id.IsEmpty())
             {
-                // 给新发货单模型赋值关联的出库单ID（将字符串转为长整型）
                 model.StockOutId = stockOutId.ToInt64();
-                // 返回添加视图及空模型（仅携带出库单ID）
                 return View(model);
             }
-            // ID不为空（表示编辑操作）
             else
             {
-                // 调用服务层方法，根据发货单ID查询对应的实体数据（SqlFunc.ToInt64将字符串ID转为长整型）
                 model = _deliveryServices.QueryableToEntity(c => c.DeliveryId == SqlFunc.ToInt64(id));
-                // 返回编辑视图及查询到的发货单模型数据
                 return View(model);
             }
         }
 
-        /// <summary>
-        /// 处理发货单添加或更新操作的HTTP POST请求方法
-        /// 接收表单提交的发货单数据，完成数据验证、业务逻辑处理并返回结果
-        /// </summary>
-        /// <param name="model">表单提交的发货单实体模型，包含发货单相关字段数据</param>
-        /// <param name="id">发货单ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_delivery model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_delivery model, [FromForm]string id)
         {
-            // 初始化发货单数据验证器（FluentValidation实现）
             var validator = new DeliveryFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
-            // 判断验证是否通过
             var success = results.IsValid;
-
-            // 验证失败（数据不符合规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（每个错误换行显示）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 以统一的JSON格式返回失败结果及错误信息
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（表示添加操作）
             if (id.IsEmptyZero())
             {
-                // 判断物流单号是否不为空（不为空时需检查唯一性）
                 if (!model.TrackingNo.IsEmpty())
                 {
-                    // 调用服务层方法，检查该物流单号是否已存在
                     if (_deliveryServices.IsAny(c => c.TrackingNo == model.TrackingNo))
                     {
-                        // 物流单号已存在，返回失败提示（PubConst.Delivery3为预定义常量）
                         return BootJsonH((false, PubConst.Delivery3));
                     }
                 }
-
-                // 给新增发货单赋值必要字段
-                model.DeliveryId = PubId.SnowflakeId; // 生成雪花算法ID（全局唯一）作为发货单ID
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID（从当前登录用户缓存中获取）
-                // 调用服务层的发货方法（可能包含出库单状态更新等业务逻辑）
+                model.DeliveryId = PubId.SnowflakeId;
+                model.CreateBy = UserDtoCache.UserId;
                 bool flag = _deliveryServices.Delivery(model);
-
-                // 根据操作结果返回对应提示（成功返回添加成功，失败返回添加失败）
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（表示更新操作）
             else
             {
-                // 给更新的发货单赋值必要字段
-                model.DeliveryId = id.ToInt64(); // 设置发货单ID（确保更新的是指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间，通过工具类获取）
-                // 调用服务层的更新方法，更新发货单数据
+                model.DeliveryId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
                 var flag = _deliveryServices.Update(model);
-
-                // 根据操作结果返回对应提示（成功返回更新成功，失败返回更新失败）
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 处理发货单删除操作的HTTP GET请求方法（逻辑删除）
-        /// 不物理删除数据，仅更新删除标识、修改人、修改时间
-        /// </summary>
-        /// <param name="id">要删除的发货单ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 调用服务层的更新方法，执行逻辑删除
-            var flag = _deliveryServices.Update(
-                new Wms_delivery
-                {
-                    DeliveryId = SqlFunc.ToInt64(id), // 要删除的发货单ID（字符串转长整型）
-                    IsDel = 0, // 逻辑删除标识（0表示已删除，1表示正常，具体以业务定义为准）
-                    ModifiedBy = UserDtoCache.UserId, // 删除操作人ID（当前登录用户）
-                    ModifiedDate = DateTimeExt.DateTime // 删除操作时间（当前时间）
-                },
-                c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 指定仅更新这三个字段，提高性能
-            );
-
-            // 根据操作结果返回对应提示（成功返回删除成功，失败返回删除失败）
+            var flag = _deliveryServices.Update(new Wms_delivery { DeliveryId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
             return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
         }
     }

src/KopSoftWms/Controllers/DeptController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using IServices;
+using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using System.Linq;
 using YL.Core.Entity;
@@ -8,28 +9,33 @@ using YL.NetCore.NetCoreApp;
 using YL.Utils.Extensions;
 using YL.Utils.Pub;
 using YL.Utils.Table;
+
 namespace KopSoftWms.Controllers
 {
     public class DeptController : BaseController
     {
         private readonly ISys_deptServices _deptServices;
+
         public DeptController(ISys_deptServices deptServices)
         {
             _deptServices = deptServices;
         }
+
         [HttpGet]
         [CheckMenu]
         public IActionResult Index()
         {
             return View();
         }
+
         [HttpPost]
         [OperationLog(LogType = LogType.select)]
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
             var sd = _deptServices.PageList(bootstrap);
             return Content(sd);
         }
+
         [HttpGet]
         public IActionResult Add(string id)
         {
@@ -44,10 +50,11 @@ namespace KopSoftWms.Controllers
                 return View(dept);
             }
         }
+
         [HttpPost]
         [FilterXss]
         [OperationLog(LogType = LogType.addOrUpdate)]
-        public IActionResult AddOrUpdate([FromForm] Sys_dept dept, [FromForm] string id)
+        public IActionResult AddOrUpdate([FromForm]Sys_dept dept, [FromForm]string id)
         {
             var validator = new SysDeptFluent();
             var results = validator.Validate(dept);
@@ -55,7 +62,10 @@ namespace KopSoftWms.Controllers
             if (!success)
             {
                 string msg = results.Errors.Aggregate("", (current, item) => (item.ErrorMessage + "</br>"));
-
+                //foreach (var item in results.Errors)
+                //{
+                //    msg += item.ErrorMessage + "</br>";
+                //}
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
             if (id.IsEmptyZero())
@@ -78,6 +88,7 @@ namespace KopSoftWms.Controllers
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
+
         [HttpGet]
         [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)

src/KopSoftWms/Controllers/DeviceController.cs

@@ -1,52 +1,24 @@
-// 引入服务接口命名空间，包含设备、部门、字典相关服务的接口定义
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询与类型转换
 using SqlSugar;
-// 引入系统基础命名空间，提供日期、转换等基础功能
 using System;
-// 引入LINQ相关命名空间，支持集合的查询操作
 using System.Linq;
-// 引入数据传输对象命名空间，包含设备分页查询专用参数类
 using YL.Core.Dto;
-// 引入核心实体类命名空间，包含Wms_device设备实体定义
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含设备实体的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、类型转换等扩展方法
 using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含字典类型、操作提示等公共定义
 using YL.Utils.Pub;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 设备管理控制器
-    /// 负责处理设备相关的HTTP请求，包括列表展示、添加、编辑、删除等核心操作
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class DeviceController : BaseController
     {
-        // 设备服务接口实例，用于调用设备相关业务逻辑（注入方式初始化）
         private readonly IWms_deviceServices _deviceServices;
-        // 部门服务接口实例，用于查询部门相关数据（注入方式初始化）
         private readonly ISys_deptServices _deptServices;
-        // 字典服务接口实例，用于查询数据字典相关数据（注入方式初始化）
         private readonly ISys_dictServices _dictServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化三个服务实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建服务对象
-        /// </summary>
-        /// <param name="dictServices">字典服务接口，提供数据字典查询功能</param>
-        /// <param name="deptServices">部门服务接口，提供部门数据查询功能</param>
-        /// <param name="deviceServices">设备服务接口，提供设备相关业务逻辑处理</param>
         public DeviceController(ISys_dictServices dictServices, ISys_deptServices deptServices, IWms_deviceServices deviceServices)
         {
             _dictServices = dictServices;
@@ -54,62 +26,32 @@ namespace KopSoftWms.Controllers
             _deptServices = deptServices;
         }
 
-        /// <summary>
-        /// 设备管理首页的HTTP GET请求处理方法
-        /// 向视图传递部门列表、设备类型字典、设备属性字典等下拉选择数据
-        /// </summary>
-        /// <returns>返回设备管理首页视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 查询所有未删除的部门（IsDel=1表示未删除），传递给视图（ViewBag.Dept）
             ViewBag.Dept = _deptServices.QueryableToList(c => c.IsDel == 1);
-            // 查询设备类型字典：未删除且字典类型为设备类型（PubDictType.device枚举转整型再转字符串）
-            ViewBag.Device = _dictServices.Queryable()
-                .Where(c => c.IsDel == 1 && c.DictType == SqlFunc.ToString(Convert.ToInt32(PubDictType.device)))
-                .ToList();
-            // 查询设备属性字典：未删除且字典类型为设备属性（PubDictType.property枚举转整型再转字符串）
-            ViewBag.Property = _dictServices.Queryable()
-                .Where(c => c.IsDel == 1 && c.DictType == SqlFunc.ToString(Convert.ToInt32(PubDictType.property)))
-                .ToList();
-            // 返回Index视图（对应Views/Device/Index.cshtml）
+            ViewBag.Device = _dictServices.Queryable().Where(c => c.IsDel == 1 && c.DictType == SqlFunc.ToString(Convert.ToInt32(PubDictType.device))).ToList();
+            ViewBag.Property = _dictServices.Queryable().Where(c => c.IsDel == 1 && c.DictType == SqlFunc.ToString(Convert.ToInt32(PubDictType.property))).ToList(); ;
             return View();
         }
 
-        /// <summary>
-        /// 设备列表分页查询的HTTP POST请求处理方法
-        /// 接收分页、排序、查询条件参数，返回JSON格式的分页数据
-        /// </summary>
-        /// <param name="bootstrap">设备分页查询专用参数对象，包含页码、页大小、查询条件等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] PubParams.DeviceBootstrapParams bootstrap)
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.DeviceBootstrapParams bootstrap)
         {
-            // 调用设备服务的分页列表方法，传入查询参数，获取JSON格式的分页数据
             var sd = _deviceServices.PageList(bootstrap);
-            // 以ContentResult形式返回数据，供前端表格组件渲染
             return Content(sd);
         }
 
-        /// <summary>
-        /// 设备添加/编辑页面的HTTP GET请求处理方法
-        /// 根据ID是否为空区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">设备ID，为空表示添加操作，不为空表示编辑操作</param>
-        /// <returns>返回添加/编辑视图及对应的设备模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化设备实体模型
             var model = new Wms_device();
-            // ID为空，返回空模型（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(model);
             }
-            // ID不为空，查询对应设备的实体数据（编辑操作，视图加载已有数据）
             else
             {
                 model = _deviceServices.QueryableToEntity(c => c.DeviceId == SqlFunc.ToInt64(id));
@@ -117,90 +59,45 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 设备添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的设备数据，完成数据验证、业务逻辑处理并返回结果
-        /// </summary>
-        /// <param name="device">表单提交的设备实体数据</param>
-        /// <param name="id">设备ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_device device, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_device device, [FromForm]string id)
         {
-            // 初始化设备数据验证器（FluentValidation实现）
             var validator = new DeviceFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(device);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合预设规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（每个错误用换行符分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 以统一JSON格式返回失败结果及错误信息
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（表示添加操作）
             if (id.IsEmptyZero())
             {
-                // 检查设备序列号是否已存在（序列号唯一约束）
                 if (_deviceServices.IsAny(c => c.SerialNo == device.SerialNo))
                 {
-                    // 序列号已存在，返回失败提示（PubConst.Device1为预定义常量）
                     return BootJsonH((false, PubConst.Device1));
                 }
-
-                // 给新增设备赋值必要字段
-                device.DeviceId = PubId.SnowflakeId; // 生成雪花算法唯一ID
-                device.CreateBy = UserDtoCache.UserId; // 设置创建人ID（从当前登录用户缓存获取）
-                // 调用设备服务执行插入操作
+                device.DeviceId = PubId.SnowflakeId;
+                device.CreateBy = UserDtoCache.UserId;
                 bool flag = _deviceServices.Insert(device);
-
-                // 根据操作结果返回对应提示（成功返回添加成功，失败返回添加失败）
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（表示更新操作）
             else
             {
-                // 给更新的设备赋值必要字段
-                device.DeviceId = id.ToInt64(); // 设置设备ID（确保更新指定记录）
-                device.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                device.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间，工具类获取）
-                // 调用设备服务执行更新操作
+                device.DeviceId = id.ToInt64();
+                device.ModifiedBy = UserDtoCache.UserId;
+                device.ModifiedDate = DateTimeExt.DateTime;
                 var flag = _deviceServices.Update(device);
-
-                // 根据操作结果返回对应提示（成功返回更新成功，失败返回更新失败）
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 设备删除操作的HTTP GET请求处理方法（逻辑删除）
-        /// 不物理删除数据库记录，仅更新删除标识、修改人、修改时间
-        /// </summary>
-        /// <param name="id">要删除的设备ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 调用设备服务执行逻辑删除：仅更新指定字段
-            var flag = _deviceServices.Update(
-                new Wms_device
-                {
-                    DeviceId = SqlFunc.ToInt64(id), // 目标设备ID（字符串转长整型）
-                    IsDel = 0, // 逻辑删除标识（0表示已删除，1表示正常，按业务定义）
-                    ModifiedBy = UserDtoCache.UserId, // 删除操作人ID（当前登录用户）
-                    ModifiedDate = DateTimeExt.DateTime // 删除操作时间（当前时间）
-                },
-                c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 仅更新这三个字段，提升性能
-            );
-
-            // 根据操作结果返回对应提示（成功返回删除成功，失败返回删除失败）
+            var flag = _deviceServices.Update(new Wms_device { DeviceId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
             return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
         }
     }

src/KopSoftWms/Controllers/DictController.cs

@@ -22,21 +22,21 @@ namespace KopSoftWms.Controllers
         }
 
         [HttpGet]
-        [CheckMenu]
+        [CheckMenu]
         public IActionResult Index()
         {
             return View();
         }
 
         [HttpPost]
-        [OperationLog(LogType.select)]
-        public ContentResult List([FromForm] PubParams.DictBootstrapParams bootstrap)
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.DictBootstrapParams bootstrap)
         {
             var sd = _dictServices.PageList(bootstrap);
             return Content(sd);
         }
 
-        [HttpGet]
+        [HttpGet]
         public IActionResult Add(string id)
         {
             var model = new Sys_dict();
@@ -53,8 +53,8 @@ namespace KopSoftWms.Controllers
 
         [HttpPost]
         [FilterXss]
-        [OperationLog(LogType.addOrUpdate)]
-        public IActionResult AddOrUpdate([FromForm] Sys_dict dict, [FromForm] string id)
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Sys_dict dict, [FromForm]string id)
         {
             var validator = new SysDictFluent();
             var results = validator.Validate(dict);
@@ -87,7 +87,7 @@ namespace KopSoftWms.Controllers
         }
 
         [HttpGet]
-        [OperationLog(LogType.delete)]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
             var flag = _dictServices.Update(new Sys_dict { DictId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });

src/KopSoftWms/Controllers/HomeController.cs

@@ -1,16 +1,18 @@
 using IServices;
-using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Diagnostics;
 using System.Text;
 using YL.Core.Dto;
+using YL.Core.Entity;
 using YL.Models;
 using YL.NetCore.Attributes;
 using YL.NetCore.NetCoreApp;
+using YL.Utils.Pub;
+using YL.Utils.Extensions;
+using MediatR;
 
-//6
 namespace KopSoftWms.Controllers
 {
     public class HomeController : BaseController
@@ -20,12 +22,10 @@ namespace KopSoftWms.Controllers
         private readonly ISys_roleServices _roleServices;
         private readonly IMemoryCache _cache;
         private readonly IMediator _mediator;
-        //private readonly Func<string, SqlSugarClient> _serviceAccessor;
 
         public HomeController(ISys_logServices logServices,
             ISys_userServices sysUserServices,
-            ISys_roleServices roleServices, IMemoryCache cache, IMediator mediator
-            )
+            ISys_roleServices roleServices, IMemoryCache cache, IMediator mediator)
         {
             _logServices = logServices;
             _userServices = sysUserServices;
@@ -38,6 +38,16 @@ namespace KopSoftWms.Controllers
         {
             //TempData["returnUrl"] = returnUrl;
             //_userServices.Login(UserDtoCache.UserId, GetIp());
+            //_mediator.Publish(new Sys_log
+            //{
+            //    LogId = PubId.SnowflakeId,
+            //    Browser = GetBrowser(),
+            //    CreateBy = UserDtoCache.UserId,
+            //    Description = $"{UserDtoCache.UserNickname}登录成功",
+            //    LogIp = GetIp(),
+            //    Url = GetUrl(),
+            //    LogType = LogType.login.EnumToString(),
+            //});
             //_logServices.Insert(new Sys_log
             //{
             //    LogId = PubId.SnowflakeId,
@@ -48,20 +58,19 @@ namespace KopSoftWms.Controllers
             //    Url = GetUrl(),
             //    LogType = LogType.login.EnumToString(),
             //});
-            ViewBag.keywords = GetDescriptor("keywords");
-            ViewBag.description = GetDescriptor("description");
+            ViewBag.title = GetDescriptor("title");
             ViewBag.company = GetDescriptor("company");
-            ViewBag.nickname = UserDtoCache.UserNickname;
-            ViewBag.headimg = UserDtoCache.HeadImg;
+            ViewBag.customer = GetDescriptor("customer");
+            ViewBag.nickname = UserDtoCache?.UserNickname;
+            ViewBag.headimg = UserDtoCache?.HeadImg;
 
-            //菜单
+            ////菜单
             var menus = _roleServices.GetMenu(UserDtoCache.RoleId.Value);
-            GetMemoryCache.Set("menu_" + UserDtoCache.UserId, menus);
+            GetMemoryCache.Set("menu_" + UserDtoCache?.UserId, menus);
             ViewData["menu"] = menus;
             return View();
         }
 
-        //[AllowAnonymous]
         [AddHeader("Content-Type", YL.Utils.Files.ContentType.ContentTypeSSE)]
         [AddHeader("Cache-Control", YL.Utils.Files.ContentType.CacheControl)]
         [AddHeader("Connection", YL.Utils.Files.ContentType.Connection)]
@@ -72,7 +81,7 @@ namespace KopSoftWms.Controllers
                 Data = DateTime.Now.ToString(),
                 Event = "message",
                 Id = Guid.NewGuid().ToString(),
-                Retry = "1000",
+                Retry = "3000",
             };
             StringBuilder sb = new StringBuilder();
             sb.Append($"id:{a.Id}\n");
@@ -84,7 +93,7 @@ namespace KopSoftWms.Controllers
 
         public IActionResult Welcome()
         {
-            //ViewBag.keywords = GetDescriptor("keywords");
+            ViewBag.title = GetDescriptor("title");
             return View();
         }
 

src/KopSoftWms/Controllers/InventoryController.cs

@@ -1,28 +1,17 @@
 using IServices;
 using Microsoft.AspNetCore.Mvc;
 using YL.Core.Dto;
-using YL.NetCore.Attributes;
 using YL.NetCore.NetCoreApp;
+using YL.NetCore.Attributes;
 using YL.Utils.Pub;
 
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 库存控制器，处理库存相关的HTTP请求
-    /// 继承自BaseController，具备基础控制器功能
-    /// </summary>
     public class InventoryController : BaseController
     {
-        // 库存服务接口实例，用于库存相关业务逻辑处理
         private readonly IWms_inventoryServices _inventoryServices;
-        // 货架服务接口实例，用于获取货架相关数据
         private readonly IWms_storagerackServices _storagerackServices;
 
-        /// <summary>
-        /// 构造函数，通过依赖注入获取服务实例
-        /// </summary>
-        /// <param name="storagerackServices">货架服务接口</param>
-        /// <param name="inventoryServices">库存服务接口</param>
         public InventoryController(
             IWms_storagerackServices storagerackServices,
             IWms_inventoryServices inventoryServices
@@ -32,29 +21,18 @@ namespace KopSoftWms.Controllers
             _inventoryServices = inventoryServices;
         }
 
-        /// <summary>
-        /// 库存列表页面
-        /// </summary>
-        /// <returns>返回库存列表视图，并传递可用货架数据到视图</returns>
         [HttpGet]
-        [CheckMenu] // 检查菜单权限的特性
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 获取所有未删除的货架数据，用于页面筛选条件
             ViewBag.StorageRack = _storagerackServices.QueryableToList(c => c.IsDel == 1);
             return View();
         }
 
-        /// <summary>
-        /// 分页查询库存列表数据
-        /// </summary>
-        /// <param name="bootstrap">库存分页查询参数对象，包含分页、排序、查询条件等</param>
-        /// <returns>返回JSON格式的分页数据</returns>
         [HttpPost]
-        [OperationLog(LogType.select)] // 记录查询操作日志
-        public ContentResult List([FromForm] PubParams.InventoryBootstrapParams bootstrap)
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.InventoryBootstrapParams bootstrap)
         {
-            // 调用库存服务获取分页数据
             var sd = _inventoryServices.PageList(bootstrap);
             return Content(sd);
         }

src/KopSoftWms/Controllers/InventoryMoveController.cs

@@ -1,66 +1,30 @@
-// 引入服务接口命名空间，包含库存调拨、明细、序列号等相关服务接口
+using Microsoft.AspNetCore.Mvc;
+using YL.NetCore.Attributes;
+using YL.NetCore.NetCoreApp;
 using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
-using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询、事务及类型转换
-using SqlSugar;
-// 引入集合相关命名空间，支持List等集合类型操作
-using System.Collections.Generic;
-// 引入LINQ相关命名空间，支持集合的查询与转换操作
-using System.Linq;
-// 引入数据传输对象命名空间，包含调拨单分页参数、明细DTO等
+using YL.Utils.Table;
+using YL.Utils.Pub;
+using YL.Utils.Extensions;
 using YL.Core.Dto;
-// 引入核心实体类命名空间，包含库存调拨单、明细等实体定义
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含库存调拨单、明细的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
-using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
-using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、枚举转换等扩展方法
-using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含操作提示、状态枚举等公共定义
-using YL.Utils.Pub;
-// 引入安全工具命名空间，包含XSS过滤工具类
+using System.Linq;
+using SqlSugar;
+using System.Collections.Generic;
 using YL.Utils.Security;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 库存调拨控制器
-    /// 负责处理库存调拨单主表、明细的全流程操作（列表、添加、编辑、审核、删除、打印等）
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class InventoryMoveController : BaseController
     {
-        // 库存调拨单服务接口实例，处理调拨单主表业务逻辑
         private readonly IWms_inventorymoveServices _inventorymoveServices;
-        // 库存调拨明细服务接口实例，处理调拨单明细业务逻辑
         private readonly IWms_invmovedetailServices _invmovedetailServices;
-        // 序列号服务接口实例，用于生成唯一调拨单号
         private readonly ISys_serialnumServices _serialnumServices;
-        // XSS过滤工具实例，用于过滤用户输入的恶意脚本
         private readonly Xss _xss;
-        // SqlSugar数据库客户端实例，用于手动控制事务（如级联删除）
         private readonly SqlSugarClient _client;
-        // 物料服务接口实例，用于查询物料相关数据（编号、名称等）
         private readonly IWms_materialServices _materialServices;
-        // 库存服务接口实例，用于查询物料库存数据
         private readonly IWms_inventoryServices _inventoryServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化所有服务与工具实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建对象
-        /// </summary>
-        /// <param name="inventorymoveServices">库存调拨单服务接口</param>
-        /// <param name="invmovedetailServices">库存调拨明细服务接口</param>
-        /// <param name="serialnumServices">序列号服务接口</param>
-        /// <param name="xss">XSS过滤工具</param>
-        /// <param name="client">SqlSugar数据库客户端</param>
-        /// <param name="materialServices">物料服务接口</param>
-        /// <param name="inventoryServices">库存服务接口</param>
         public InventoryMoveController(
             IWms_inventorymoveServices inventorymoveServices,
             IWms_invmovedetailServices invmovedetailServices,
@@ -80,68 +44,49 @@ namespace KopSoftWms.Controllers
             _inventoryServices = inventoryServices;
         }
 
-        /// <summary>
-        /// 库存调拨单列表页面的HTTP GET请求处理方法
-        /// 向视图传递调拨单状态下拉选择数据
-        /// </summary>
-        /// <returns>返回库存调拨单列表视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 将StockInStatus枚举转换为键值对列表（复用入库单状态枚举，统一状态定义）
             var status = EnumExt.ToKVListLinq<StockInStatus>();
-            ViewBag.Status = status; // 传递状态数据到视图，用于下拉筛选
-            return View(); // 返回Index视图（对应Views/InventoryMove/Index.cshtml）
+            ViewBag.Status = status;
+            return View();
         }
 
         /// <summary>
-        /// 分页查询库存调拨单主表数据的HTTP POST请求处理方法
-        /// 接收分页、状态筛选等参数，返回JSON格式分页数据
+        /// 主表
         /// </summary>
-        /// <param name="bootstrap">调拨单分页查询参数对象，包含页码、页大小、状态等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] PubParams.StatusBootstrapParams bootstrap)
+        /// <param name="bootstrap">参数</param>
+        /// <returns></returns>
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.StatusBootstrapParams bootstrap)
         {
-            // 调用调拨单服务的分页列表方法，传入查询参数，获取JSON格式数据
             var sd = _inventorymoveServices.PageList(bootstrap);
-            return Content(sd); // 返回数据供前端表格渲染
+            return Content(sd);
         }
 
         /// <summary>
-        /// 分页查询库存调拨单明细数据的HTTP POST请求处理方法
-        /// 根据调拨单主表ID查询关联的明细数据
+        /// 明细
         /// </summary>
-        /// <param name="pid">调拨单主表ID</param>
-        /// <returns>返回JSON格式的明细分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
+        /// <param name="id">主表id</param>
+        /// <returns></returns>
+        [HttpPost]
+        [OperationLog(LogType.select)]
         public ContentResult ListDetail(string pid)
         {
-            // 调用明细服务的分页列表方法，传入主表ID，获取明细数据
             var sd = _invmovedetailServices.PageList(pid);
-            return Content(sd); // 返回明细数据供前端表格渲染
+            return Content(sd);
         }
 
-        /// <summary>
-        /// 库存调拨单添加/编辑页面的HTTP GET请求处理方法
-        /// 根据ID是否为空区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">调拨单ID，为空表示添加，不为空表示编辑</param>
-        /// <returns>返回添加/编辑视图及对应的调拨单模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化调拨单实体模型
             var model = new Wms_inventorymove();
-            // ID为空，返回空模型（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(model);
             }
-            // ID不为空，查询未删除的调拨单实体（编辑操作，视图加载已有数据）
             else
             {
                 model = _inventorymoveServices.QueryableToEntity(c => c.InventorymoveId == SqlFunc.ToInt64(id) && c.IsDel == 1);
@@ -149,36 +94,22 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 库存调拨明细添加/编辑页面的HTTP GET请求处理方法
-        /// 根据明细ID是否为空区分添加和编辑，关联调拨单主表ID
-        /// </summary>
-        /// <param name="id">明细ID，为空表示添加</param>
-        /// <param name="pid">调拨单主表ID，用于关联明细与主表</param>
-        /// <returns>返回添加/编辑视图及对应的明细DTO模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Detail(string id, string pid)
         {
-            // 初始化明细DTO模型（用于前端展示，包含主表关联信息和明细列表）
             var model = new Wms_invmovedetailDto();
-            // 查询调拨单主表信息（未删除），获取源货架和目标货架ID
             var head = _inventorymoveServices.QueryableToEntity(c => c.InventorymoveId == SqlFunc.ToInt64(pid) && c.IsDel == 1);
-            model.AimStoragerackId = head.AimStoragerackId; // 赋值目标货架ID到DTO
-            model.SourceStoragerackId = head.SourceStoragerackId; // 赋值源货架ID到DTO
-
-            // 明细ID为空或0（添加操作）
+            model.AimStoragerackId = head.AimStoragerackId;
+            model.SourceStoragerackId = head.SourceStoragerackId;
             if (id.IsEmptyZero())
             {
-                model.Pid = pid; // 关联调拨单主表ID
-                return View(model); // 返回空明细列表的DTO视图
+                model.Pid = pid;
+                return View(model);
             }
-            // 明细ID不为空（编辑操作）
             else
             {
-                // 查询该调拨单下未删除的所有明细
                 var detail = _invmovedetailServices.QueryableToList(c => c.InventorymoveId == SqlFunc.ToInt64(pid) && c.IsDel == 1);
-                model.Pid = pid; // 关联调拨单主表ID
-                // 将明细实体转换为前端展示用的子DTO，补充物料编号、名称、源货架库存等信息
+                model.Pid = pid;
                 model.Detail = detail.Select(c => new Wmsinvmovedetail
                 {
                     MaterialId = c.MaterialId.ToString(),
@@ -197,76 +128,48 @@ namespace KopSoftWms.Controllers
                     ModifiedDate = c.ModifiedDate,
                     PlanQty = c.PlanQty,
                     Remark = c.Remark,
-                    Status = c.Status
+                    Status = c.Status,
                 }).ToList();
-                return View(model); // 返回带明细列表的DTO视图
+                return View(model);
             }
         }
 
-        /// <summary>
-        /// 库存调拨单添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的调拨单数据，完成验证并执行对应操作
-        /// </summary>
-        /// <param name="model">表单提交的调拨单实体模型</param>
-        /// <param name="id">调拨单ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_inventorymove model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_inventorymove model, [FromForm]string id)
         {
-            // 初始化调拨单验证器（FluentValidation实现）
             var validator = new InventoryMoveFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（换行分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                return BootJsonH((PubEnum.Failed.ToInt32(), msg)); // 返回失败结果
+                return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（添加操作）
             if (id.IsEmptyZero())
             {
-                // 调用序列号服务生成唯一调拨单号
                 model.InventorymoveNo = _serialnumServices.GetSerialnum(UserDtoCache.UserId, "Wms_inventorymove");
-                model.InventorymoveId = PubId.SnowflakeId; // 生成雪花算法唯一ID
-                model.Status = StockInStatus.initial.ToByte(); // 初始状态设为"初始"
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID（当前登录用户）
-                bool flag = _inventorymoveServices.Insert(model); // 执行插入操作
-
-                // 根据操作结果返回对应提示
+                model.InventorymoveId = PubId.SnowflakeId;
+                model.Status = StockInStatus.initial.ToByte();
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _inventorymoveServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（更新操作）
             else
             {
-                model.InventorymoveId = id.ToInt64(); // 设置调拨单ID（确保更新指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间）
-                var flag = _inventorymoveServices.Update(model); // 执行更新操作
-
-                // 根据操作结果返回对应提示
+                model.InventorymoveId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _inventorymoveServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 库存调拨明细批量添加或更新操作的HTTP POST请求处理方法
-        /// 支持批量提交明细，自动判断新增或更新（更新逻辑为"删旧加新"）
-        /// </summary>
-        /// <param name="list">批量提交的明细实体列表</param>
-        /// <param name="id">调拨单主表ID，用于关联明细</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdateD([FromForm] List<Wms_invmovedetail> list, [FromForm] string id)
+        [HttpPost]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdateD([FromForm]List<Wms_invmovedetail> list, [FromForm]string id)
         {
-            // 批量验证明细数据（逐个验证每个明细）
             var validator = new InvmovedetailFluent();
             foreach (var c in list)
             {
@@ -275,45 +178,104 @@ namespace KopSoftWms.Controllers
                 if (!success)
                 {
                     string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                    return BootJsonH((PubEnum.Failed.ToInt32(), msg)); // 单个明细验证失败则返回
+                    return BootJsonH((PubEnum.Failed.ToInt32(), msg));
                 }
             }
-
-            // 查询该调拨单下已存在的未删除明细
             var exist = _invmovedetailServices.QueryableToList(c => c.InventorymoveId == SqlFunc.ToInt64(id));
-            var modelList = new List<Wms_invmovedetail>(); // 存储待操作的明细列表
-
-            // 无已存在明细（执行批量新增）
+            var modelList = new List<Wms_invmovedetail>();
             if (exist.IsNullT())
             {
-                // 遍历明细列表，补充基础字段并过滤XSS
                 list.ForEach((c) =>
                 {
-                    c.Remark = _xss.Filter(c.Remark); // XSS过滤备注信息
-                    c.MoveDetailId = PubId.SnowflakeId; // 生成明细唯一ID
-                    c.Status = StockInStatus.initial.ToByte(); // 初始状态设为"初始"
-                    c.IsDel = 1; // 标记为未删除
-                    c.CreateBy = UserDtoCache.UserId; // 设置创建人ID
-                    c.CreateDate = DateTimeExt.DateTime; // 设置创建时间
+                    c.Remark = _xss.Filter(c.Remark);
+                    c.MoveDetailId = PubId.SnowflakeId;
+                    c.Status = StockInStatus.initial.ToByte();
+                    c.IsDel = 1;
+                    c.CreateBy = UserDtoCache.UserId;
+                    c.CreateDate = DateTimeExt.DateTime;
                     modelList.Add(c);
                 });
-                bool flag = _invmovedetailServices.Insert(modelList); // 批量插入
+                bool flag = _invmovedetailServices.Insert(modelList);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // 有已存在明细（执行更新：先逻辑删除旧明细，再批量新增新明细）
             else
             {
-                // 逻辑删除该调拨单下所有未删除的旧明细
-                _invmovedetailServices.Update(
-                    new Wms_invmovedetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime },
-                    c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate },
-                    c => c.InventorymoveId == SqlFunc.ToInt64(id) && c.IsDel == 1
-                );
-
-                // 处理新明细列表，补充基础字段并过滤XSS
+                _invmovedetailServices.Update(new Wms_invmovedetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate }, c => c.InventorymoveId == SqlFunc.ToInt64(id) && c.IsDel == 1);
                 list.ForEach((c) =>
                 {
-                    c.Remark = _xss.Filter(c.Remark); // XSS过滤
-                    c.Status = StockInStatus.initial.ToByte(); // 初始状态
-                    c.MoveDetailId = PubId.SnowflakeId; // 新明细唯一ID
-                    c.IsDel = 1; // 未
+                    c.Remark = _xss.Filter(c.Remark);
+                    c.Status = StockInStatus.initial.ToByte();
+                    c.MoveDetailId = PubId.SnowflakeId;
+                    c.IsDel = 1;
+                    c.CreateBy = UserDtoCache.UserId;
+                    c.CreateDate = DateTimeExt.DateTime;
+                    modelList.Add(c);
+                });
+
+                var flag = _invmovedetailServices.Insert(modelList);
+                return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
+            }
+        }
+
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.update)]
+        public IActionResult Auditin(string id)
+        {
+            var list = _invmovedetailServices.QueryableToList(c => c.IsDel == 1 && c.InventorymoveId == SqlFunc.ToInt64(id));
+            if (!list.Any())
+            {
+                return BootJsonH((false, PubConst.StockIn4));
+            }
+            var flag = _inventorymoveServices.Auditin(UserDtoCache.UserId, SqlFunc.ToInt64(id));
+            return BootJsonH(flag ? (flag, PubConst.StockIn2) : (flag, PubConst.StockIn3));
+        }
+
+        /// <summary>
+        /// Delete
+        /// </summary>
+        /// <param name="id">主表id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.delete)]
+        public IActionResult Delete(string id)
+        {
+            var flag = _client.Ado.UseTran(() =>
+            {
+                _client.Updateable(new Wms_invmovedetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime })
+                .UpdateColumns(c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate }).Where(c => c.InventorymoveId == SqlFunc.ToInt64(id) && c.IsDel == 1).ExecuteCommand();
+
+                _client.Updateable(new Wms_inventorymove { InventorymoveId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }).UpdateColumns(c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate }).ExecuteCommand();
+            }).IsSuccess;
+            return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
+        }
+
+        /// <summary>
+        /// 删除明细
+        /// </summary>
+        /// <param name="id">明细id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.delete)]
+        public IActionResult DeleteDetail(string id)
+        {
+            var flag = _invmovedetailServices.Update(
+                 new Wms_invmovedetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime },
+                 c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate },
+                 c => c.MoveDetailId == SqlFunc.ToInt64(id)
+                 );
+            return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
+        }
+
+        [HttpGet]
+        public IActionResult PreviewJson(string id)
+        {
+            var str = _inventorymoveServices.PrintList(id);
+            return Content(str);
+        }
+    }
+}

src/KopSoftWms/Controllers/InventoryRecordController.cs

@@ -19,15 +19,15 @@ namespace KopSoftWms.Controllers
         }
 
         [HttpGet]
-        [CheckMenu]
+        [CheckMenu]
         public IActionResult Index()
         {
             return View();
         }
 
         [HttpPost]
-        [OperationLog(LogType.select)]
-        public ContentResult List([FromForm] PubParams.InventoryBootstrapParams bootstrap)
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.InventoryBootstrapParams bootstrap)
         {
             var sd = _inventoryrecordServices.PageList(bootstrap);
             return Content(sd);

src/KopSoftWms/Controllers/LogController.cs

@@ -21,14 +21,14 @@ namespace KopSoftWms.Controllers
         }
 
         [HttpGet]
-        [CheckMenu]
+        [CheckMenu]
         public IActionResult Index()
         {
             return View();
         }
 
-        [HttpPost]
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [HttpPost]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
             var sd = _logServices.PageList(bootstrap);
             return Content(sd);
@@ -36,23 +36,23 @@ namespace KopSoftWms.Controllers
 
         //[HttpDelete] axios
         //'Content-Type': 'application/json; charset=UTF-8' FromBody 修饰的每个操作，最多可以有一个参数
-        [HttpPost]
-        public IActionResult Delete([FromBody] long[] Id)
+        [HttpPost]
+        public IActionResult Delete([FromBody]long[] Id)
         {
             var flag = _logServices.Delete(Id.ToArray());
             return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
         }
 
         [HttpGet]
-        [CheckMenu]
+        [CheckMenu]
         public IActionResult Bar()
         {
             return View();
         }
 
         [HttpPost]
-        [OperationLog(LogType.select)]
-        public ContentResult Bar([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [OperationLog(LogType.select)]
+        public ContentResult Bar([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
             var str = _logServices.EChart(bootstrap);
             return Content(str);

src/KopSoftWms/Controllers/LoginController.cs

@@ -1,77 +1,40 @@
-// 引入服务接口命名空间，包含用户、日志等相关服务接口
-using IServices;
-// 引入MediatR命名空间，用于实现领域事件发布/订阅
-using MediatR;
-// 引入ASP.NET Core认证相关命名空间，处理Cookie认证
+using IServices;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-// 引入ASP.NET Core授权相关命名空间，控制匿名访问
 using Microsoft.AspNetCore.Authorization;
-// 引入HTTP上下文相关命名空间，获取请求上下文信息
 using Microsoft.AspNetCore.Http;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等
 using Microsoft.AspNetCore.Mvc;
-// 引入内存缓存命名空间，用于缓存用户信息
-using Microsoft.Extensions.Caching.Memory;
-// 引入配置相关命名空间，读取应用配置
 using Microsoft.Extensions.Configuration;
-// 引入系统基础命名空间，提供日期、字符串等基础功能
+using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Collections.Generic;
 using System.IO;
-// 引入身份声明相关命名空间，用于Cookie认证的用户身份信息
 using System.Security.Claims;
-// 引入异步编程相关命名空间，支持async/await
 using System.Threading.Tasks;
-// 引入数据传输对象命名空间，包含用户登录DTO
 using YL.Core.Dto;
-// 引入核心实体类命名空间，包含用户、日志等实体
 using YL.Core.Entity;
-// 引入.NET Core应用基础命名空间，提供基础控制器功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、枚举转换等扩展方法
 using YL.Utils.Extensions;
-// 引入JSON工具命名空间，提供JSON序列化功能
-using YL.Utils.Json;
-// 引入公共常量与枚举命名空间，包含日志类型、缓存键等定义
 using YL.Utils.Pub;
-// 引入安全工具命名空间，包含XSS过滤工具
 using YL.Utils.Security;
+using YL.Utils.Json;
+using MediatR;
+using Microsoft.Extensions.Localization;
+using YL.Localization;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 登录控制器
-    /// 负责处理用户登录、退出登录等认证相关操作
-    /// 继承自BaseController，复用缓存、请求信息获取等基础功能
-    /// </summary>
     public class LoginController : BaseController
     {
-        // 用户服务接口实例，处理用户登录验证、登录状态更新等业务
         private readonly ISys_userServices _userServices;
-        // HTTP上下文访问器实例，用于获取当前请求上下文
         private readonly IHttpContextAccessor _httpContext;
-        // 日志服务接口实例，处理系统操作日志记录
         private readonly ISys_logServices _logServices;
-        // 配置实例，用于读取应用配置项（如系统描述、关键词等）
         private readonly IConfiguration _configuration;
-        // XSS过滤工具实例，用于过滤用户输入的恶意脚本
         private readonly Xss _xss;
-        // MediatR实例，用于发布领域事件（如登录日志事件）
         private readonly IMediator _mediator;
+        private readonly IStringLocalizer<SharedResource> _sharedLocalizer;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化所有服务与工具实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建对象
-        /// </summary>
-        /// <param name="xss">XSS过滤工具</param>
-        /// <param name="logServices">日志服务接口</param>
-        /// <param name="httpContext">HTTP上下文访问器</param>
-        /// <param name="configuration">应用配置</param>
-        /// <param name="sys_User">用户服务接口</param>
-        /// <param name="mediator">MediatR实例</param>
-        public LoginController(Xss xss, ISys_logServices logServices, IHttpContextAccessor httpContext, IConfiguration configuration, ISys_userServices sys_User, IMediator mediator)
+        public LoginController(Xss xss, ISys_logServices logServices, IHttpContextAccessor httpContext, IConfiguration configuration, ISys_userServices sys_User, IMediator mediator, IStringLocalizer<SharedResource> sharedLocalizer)
         {
             _httpContext = httpContext;
             _configuration = configuration;
@@ -79,141 +42,105 @@ namespace KopSoftWms.Controllers
             _logServices = logServices;
             _xss = xss;
             _mediator = mediator;
+            _sharedLocalizer = sharedLocalizer;
         }
 
-        /// <summary>
-        /// 登录页面的HTTP GET请求处理方法
-        /// 允许匿名访问，向视图传递系统配置的关键词、描述、公司名称等信息
-        /// </summary>
-        /// <returns>返回登录视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [AllowAnonymous] // 允许匿名访问（无需登录即可访问该页面）
-        [Route("Login/Index")] // 配置路由路径，固定访问地址为/Login/Index
+        //string returnUrl = null
+        [HttpGet]
+        [AllowAnonymous]
         public IActionResult Index()
         {
-            // 从配置中获取"keywords"配置项，传递到视图（用于页面SEO关键词）
-            ViewBag.keywords = GetDescriptor("keywords");
-            // 从配置中获取"description"配置项，传递到视图（用于页面SEO描述）
-            ViewBag.description = GetDescriptor("description");
-            // 从配置中获取"company"配置项，传递到视图（用于页面显示公司名称）
+            //HttpContext.Request.EnableRewind();
+            //TempData["returnUrl"] = returnUrl;
+            ViewBag.title = GetDescriptor("title");
             ViewBag.company = GetDescriptor("company");
-            return View(); // 返回登录视图（对应Views/Login/Index.cshtml）
+            ViewBag.customer = GetDescriptor("customer");
+            var a = LogType.addOrUpdate;
+            var b = LogType.update;
+            if (a == b)
+                throw new Exception("du");
+            return View();
         }
 
-        /// <summary>
-        /// 登录验证的HTTP POST异步处理方法
-        /// 接收前端传递的登录信息，验证身份并创建Cookie认证，记录登录日志
-        /// </summary>
-        /// <param name="sys">登录请求DTO，包含用户名、密码等登录信息</param>
-        /// <returns>返回登录结果的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [AllowAnonymous] // 允许匿名访问（登录接口本身无需登录）
-        [Route("Login/CheckLoginAsync")] // 配置路由路径，固定访问地址为/Login/CheckLoginAsync
-        public async Task<IActionResult> CheckLoginAsync([FromBody] SysUserDto sys)
+        [Route("Login/CheckLoginAsync")]
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> CheckLoginAsync([FromBody]SysUserDto sys)
         {
-            // 清除菜单缓存和用户缓存（避免旧数据干扰新登录用户）
             ClearCache(MenuKey);
             ClearCache(UserKey);
-
-            // 调用用户服务的登录验证方法，返回验证结果（Item1：是否成功，Item2：提示信息，Item3：用户实体）
             var item = _userServices.CheckLogin(sys);
-
-            // 登录验证成功
             if (item.Item1)
             {
-                // 先退出当前已有的Cookie认证（避免多账号登录冲突）
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-
-                // 构建用户身份声明（Claims），存储用户核心信息（用于Cookie认证）
                 var claims = new List<Claim>
-                {
-                    new Claim(ClaimTypes.Name, item.Item3.UserName), // 用户名
-                    new Claim(ClaimTypes.Sid, item.Item3.UserId.ToString()), // 用户ID
-                    new Claim(ClaimTypes.Surname, item.Item3.UserNickname), // 用户昵称
-                    new Claim(ClaimTypes.Role, item.Item3.RoleId?.ToString()), // 角色ID
-                    // 用户头像（为空时使用默认头像路径，否则使用用户自定义头像）
-                    new Claim(ClaimTypes.Uri,string.IsNullOrWhiteSpace(item.Item3.HeadImg)?Path.Combine("upload","head","4523c812eb2047c39ad91f8c5de3fb31.jpg"):item.Item3.HeadImg)
-                };
-
-                // 创建基于声明的身份标识（指定认证方案为Cookie认证）
+                  {
+                      new Claim(ClaimTypes.Name, item.Item3.UserName),
+                      new Claim(ClaimTypes.Sid,item.Item3.UserId.ToString()),
+                      new Claim(ClaimTypes.Surname,item.Item3.UserNickname),
+                      new Claim(ClaimTypes.Role,item.Item3.RoleId?.ToString()),
+                      new Claim(ClaimTypes.Uri,string.IsNullOrWhiteSpace(item.Item3.HeadImg)?Path.Combine("upload","head","4523c812eb2047c39ad91f8c5de3fb31.jpg"):item.Item3.HeadImg)
+                  };
                 var claimsIdentitys = new ClaimsIdentity(
                claims,
                CookieAuthenticationDefaults.AuthenticationScheme);
-
-                // 创建ClaimsPrincipal（用户身份主体），用于后续登录认证
                 var claimsPrincipal = new ClaimsPrincipal(claimsIdentitys);
-
-                // 执行Cookie登录认证，创建认证Cookie
-                await HttpContext.SignInAsync(
-                    CookieAuthenticationDefaults.AuthenticationScheme, // 认证方案
-                    claimsPrincipal, // 用户身份主体
-                    new AuthenticationProperties // 认证属性配置
-                    {
-                        IssuedUtc = DateTime.Now, // Cookie颁发时间
-                        IsPersistent = true, // 是否持久化Cookie（关闭浏览器后仍有效）
-                        ExpiresUtc = DateTime.Now.AddDays(1) // Cookie过期时间（1天后过期）
-                    });
-
-                // 给登录DTO补充用户核心信息（用于缓存和日志）
+                await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrincipal, new AuthenticationProperties
+                {
+                    IssuedUtc = DateTime.Now,
+                    IsPersistent = true,
+                    ExpiresUtc = DateTime.Now.AddDays(1),
+                });
                 sys.UserId = item.Item3.UserId;
                 sys.UserName = item.Item3.UserName;
                 sys.UserNickname = item.Item3.UserNickname;
                 sys.RoleId = item.Item3.RoleId;
                 sys.HeadImg = item.Item3.HeadImg;
-
-                // 将用户信息存入内存缓存（键为"user_+用户ID"，方便后续快速获取）
                 GetMemoryCache.Set("user_" + item.Item3.UserId, sys);
-
-                // 调用用户服务更新用户登录状态（如最后登录时间、登录IP等）
                 _userServices.Login(item.Item3.UserId, GetIp());
-
-                // 发布登录成功日志事件（通过MediatR异步处理日志记录，解耦业务与日志）
                 await _mediator.Publish(new Sys_log
                 {
-                    LogId = PubId.SnowflakeId, // 生成日志唯一ID（雪花算法）
-                    Browser = GetBrowser(), // 获取客户端浏览器信息
-                    CreateBy = sys.UserId, // 操作人ID（当前登录用户ID）
-                    Description = $"{sys.UserNickname}登录成功", // 日志描述
-                    LogIp = GetIp(), // 获取客户端IP地址
-                    Url = GetUrl(), // 获取当前请求URL
-                    LogType = LogType.login.EnumToString(), // 日志类型（登录）
+                    LogId = PubId.SnowflakeId,
+                    Browser = GetBrowser(),
+                    CreateBy = sys.UserId,
+                    Description = $"{sys.UserNickname}登录成功",
+                    LogIp = GetIp(),
+                    Url = GetUrl(),
+                    LogType = LogType.login.EnumToString(),
                 });
             }
-            // 登录验证失败
             else
             {
-                // 发布登录失败日志事件（过滤用户输入的昵称，防止XSS攻击）
                 await _mediator.Publish(new Sys_log
                 {
-                    LogId = PubId.SnowflakeId, // 日志唯一ID
-                    Browser = GetBrowser(), // 客户端浏览器信息
-                    Description = $"{_xss.Filter(sys.UserNickname)}登录失败", // 日志描述（XSS过滤）
-                    LogIp = GetIp(), // 客户端IP地址
-                    Url = GetUrl(), // 请求URL
-                    LogType = LogType.login.EnumToString() // 日志类型（登录）
+                    LogId = PubId.SnowflakeId,
+                    Browser = GetBrowser(),
+                    Description = $"{_xss.Filter(sys.UserNickname)}登录失败",
+                    LogIp = GetIp(),
+                    Url = GetUrl(),
+                    LogType = LogType.login.EnumToString()
                 });
+                //_logServices.Insert(new Sys_log
+                //{
+                //    LogId = PubId.SnowflakeId,
+                //    Browser = GetBrowser(),
+                //    Description = $"{_xss.Filter(sys.UserNickname)}登录失败",
+                //    LogIp = GetIp(),
+                //    Url = GetUrl(),
+                //    LogType = LogType.login.EnumToString()
+                //});
             }
-
-            // 清空用户实体（避免敏感信息返回前端）
             item.Item3 = null;
-            // 将登录结果序列化为JSON字符串，返回给前端
+            //return Json(item);
             return Content(item.ToJsonL());
         }
 
-        /// <summary>
-        /// 退出登录的HTTP GET异步处理方法
-        /// 清除缓存、注销Cookie认证，并重定向到登录页面
-        /// </summary>
-        /// <returns>重定向到登录页面</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public async Task<IActionResult> Logout()
         {
-            // 清除菜单缓存和用户缓存（销毁当前用户的缓存数据）
             ClearCache(MenuKey);
             ClearCache(UserKey);
-            // 注销Cookie认证（清除登录状态）
             await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            // 重定向到登录页面
             return RedirectToAction("Index", "Login");
         }
     }

src/KopSoftWms/Controllers/MaterialController.cs

@@ -1,51 +1,24 @@
-// 引入服务接口命名空间，包含物料和库存相关服务接口
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询与类型转换
 using SqlSugar;
-// 引入LINQ相关命名空间，支持集合的查询操作
 using System.Linq;
-// 引入核心实体类命名空间，包含物料实体定义
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含物料实体的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、类型转换等扩展方法
 using YL.Utils.Extensions;
-// 引入文件操作工具命名空间，提供文件处理相关功能
 using YL.Utils.Files;
-// 引入公共常量与枚举命名空间，包含操作提示、日志类型等公共定义
 using YL.Utils.Pub;
-// 引入安全工具命名空间，包含编码转换等安全相关功能
 using YL.Utils.Security;
-// 引入表格工具命名空间，包含Bootstrap表格相关参数模型
 using YL.Utils.Table;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 物料控制器
-    /// 负责处理物料的列表展示、添加、编辑、删除、搜索、导出等操作
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class MaterialController : BaseController
     {
-        // 物料服务接口实例，处理物料相关业务逻辑
         private readonly IWms_materialServices _materialServices;
-        // 库存服务接口实例，用于查询物料库存相关数据（如删除前检查库存）
         private readonly IWms_inventoryServices _inventoryServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化服务实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建对象
-        /// </summary>
-        /// <param name="materialServices">物料服务接口，提供物料相关业务逻辑</param>
-        /// <param name="inventoryServices">库存服务接口，提供库存相关查询功能</param>
         public MaterialController(IWms_materialServices materialServices,
             IWms_inventoryServices inventoryServices
             )
@@ -54,50 +27,29 @@ namespace KopSoftWms.Controllers
             _inventoryServices = inventoryServices;
         }
 
-        /// <summary>
-        /// 物料列表页面的HTTP GET请求处理方法
-        /// 用于返回物料列表的视图页面
-        /// </summary>
-        /// <returns>返回物料列表视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            return View(); // 返回Index视图（对应Views/Material/Index.cshtml）
+            return View();
         }
 
-        /// <summary>
-        /// 分页查询物料列表数据的HTTP POST请求处理方法
-        /// 接收Bootstrap表格的分页、排序、查询参数，返回对应的数据结果
-        /// </summary>
-        /// <param name="bootstrap">Bootstrap表格参数对象，包含页码、页大小、排序字段、查询关键词等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用物料服务的分页列表方法，传入表格参数，获取分页数据（JSON格式字符串）
             var sd = _materialServices.PageList(bootstrap);
-            return Content(sd); // 以ContentResult形式返回数据，供前端Bootstrap表格渲染
+            return Content(sd);
         }
 
-        /// <summary>
-        /// 物料添加/编辑页面的HTTP GET请求处理方法
-        /// 根据是否传入ID区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">物料ID，为空时表示添加操作，不为空时表示编辑操作</param>
-        /// <returns>返回添加/编辑视图及对应的物料模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化物料实体模型
             var model = new Wms_material();
-            // 如果id为空，返回空模型（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(model);
             }
-            // 如果id不为空，查询对应物料的实体数据（编辑操作，视图加载已有数据）
             else
             {
                 model = _materialServices.QueryableToEntity(c => c.MaterialId == SqlFunc.ToInt64(id));
@@ -105,150 +57,87 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 物料添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的物料数据，完成数据验证、业务逻辑处理并返回结果
-        /// </summary>
-        /// <param name="model">表单提交的物料实体模型</param>
-        /// <param name="id">物料ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_material model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_material model, [FromForm]string id)
         {
-            // 初始化物料数据验证器（FluentValidation实现）
             var validator = new MaterialFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合预设规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（每个错误用换行符分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 以统一JSON格式返回失败结果及错误信息
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（表示添加操作）
             if (id.IsEmptyZero())
             {
-                // 检查物料编号或名称是否已存在（唯一性校验）
                 if (_materialServices.IsAny(c => c.MaterialNo == model.MaterialNo || c.MaterialName == model.MaterialName))
                 {
-                    // 物料编号或名称已存在，返回失败提示（PubConst.Material1为预定义常量）
                     return BootJsonH((false, PubConst.Material1));
                 }
-
-                // 给新增物料赋值必要字段
-                model.MaterialId = PubId.SnowflakeId; // 生成雪花算法唯一ID
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID（从当前登录用户缓存获取）
-                bool flag = _materialServices.Insert(model); // 调用物料服务执行插入操作
-
-                // 根据操作结果返回对应提示（成功返回添加成功，失败返回添加失败）
+                model.MaterialId = PubId.SnowflakeId;
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _materialServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（表示更新操作）
             else
             {
-                // 给更新的物料赋值必要字段
-                model.MaterialId = id.ToInt64(); // 设置物料ID（确保更新指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间，工具类获取）
-                var flag = _materialServices.Update(model); // 调用物料服务执行更新操作
-
-                // 根据操作结果返回对应提示（成功返回更新成功，失败返回更新失败）
+                model.MaterialId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _materialServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 物料删除操作的HTTP GET请求处理方法（逻辑删除）
-        /// 删除前检查物料是否有库存，有库存则不允许删除
-        /// </summary>
-        /// <param name="id">要删除的物料ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 检查该物料是否存在库存记录（有库存则不允许删除）
+            //判断库存数量，库存数量小于等于0，才能删除
             var isExist = _inventoryServices.IsAny(c => c.MaterialId == SqlFunc.ToInt64(id));
             if (isExist)
             {
-                // 物料存在库存，返回删除失败提示（PubConst.Material2为预定义常量）
                 return BootJsonH((false, PubConst.Material2));
             }
             else
             {
-                // 执行逻辑删除：更新删除标识、修改人、修改时间
-                var flag = _materialServices.Update(
-                    new Wms_material
-                    {
-                        MaterialId = SqlFunc.ToInt64(id),
-                        IsDel = 0, // 逻辑删除标识（0表示已删除，1表示正常，按业务定义）
-                        ModifiedBy = UserDtoCache.UserId,
-                        ModifiedDate = DateTimeExt.DateTime
-                    },
-                    c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 指定仅更新这三个字段
-                );
-
-                // 根据操作结果返回对应提示（成功返回删除成功，失败返回删除失败）
+                var flag = _materialServices.Update(new Wms_material { MaterialId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
                 return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
             }
         }
 
         /// <summary>
-        /// 物料搜索接口（用于入库等场景的物料选择）
-        /// 默认返回前100条数据，支持按关键词搜索
+        /// 入库选择物料，默认显示100条数据，如果没有在从服务端取数据
         /// </summary>
-        /// <param name="text">搜索关键词</param>
-        /// <returns>返回JSON格式的搜索结果数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        /// <param name="text"></param>
+        /// <returns></returns>
+        [HttpGet]
         public IActionResult Search(string text)
         {
-            // 初始化分页参数（查询前100条，按创建时间降序）
             var bootstrap = new Bootstrap.BootstrapParams
             {
                 limit = 100,
                 offset = 0,
                 sort = "CreateDate",
-                search = text, // 搜索关键词
+                search = text,
                 order = "desc"
             };
-
-            // 调用物料服务的分页列表方法，获取搜索结果
             var json = _materialServices.PageList(bootstrap);
-            return Content(json); // 返回搜索结果供前端选择
+            return Content(json);
         }
 
-        /// <summary>
-        /// 物料数据导出接口
-        /// 根据分页参数筛选数据并导出为Excel文件
-        /// </summary>
-        /// <param name="bootstrap">分页参数对象，包含筛选条件</param>
-        /// <returns>返回Excel文件流或导出失败的JSON提示</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.export)] // 操作日志记录特性，标记该操作类型为"导出"
-        public IActionResult Export([FromQuery] Bootstrap.BootstrapParams bootstrap)
+        [HttpGet]
+        [OperationLog(LogType.export)]
+        public IActionResult Export([FromQuery]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用物料服务的导出方法，获取Excel文件的字节数组
             var buffer = _materialServices.ExportList(bootstrap);
-            // 如果字节数组为空（导出失败）
             if (buffer.IsNull())
             {
-                // 返回导出失败的JSON提示（ContentResult包装字节数组）
                 return File(JsonL((false, PubConst.File8)).ToBytes(), ContentType.ContentTypeJson);
             }
-            // 导出成功，返回Excel文件流
-            // 文件名格式：当前时间戳-物料.xlsx（包含URL编码处理）
-            return File(
-                buffer,
-                ContentType.ContentTypeFile,
-                $"{DateTimeExt.GetDateTimeS(DateTimeExt.DateTimeFormatString)}-{EncoderUtil.UrlHttpUtilityEncoder("物料")}.xlsx"
-            );
+            return File(buffer, ContentType.ContentTypeFile, DateTimeExt.GetDateTimeS(DateTimeExt.DateTimeFormatString) + "-" + EncoderUtil.UrlHttpUtilityEncoder("物料") + ".xlsx");
         }
     }
 }

src/KopSoftWms/Controllers/ReservoirareaController.cs

@@ -1,47 +1,23 @@
-// 引入服务接口命名空间，包含储位区、货架相关服务接口定义
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询与类型转换
 using SqlSugar;
-// 引入LINQ相关命名空间，支持集合的查询操作
 using System.Linq;
-// 引入核心实体类命名空间，包含储位区实体定义
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含储位区的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、类型转换等扩展方法
 using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含操作提示、公共常量等定义
 using YL.Utils.Pub;
-// 引入表格工具命名空间，包含Bootstrap表格相关参数模型
 using YL.Utils.Table;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
+
 {
-    /// <summary>
-    /// 储位区控制器
-    /// 负责处理储位区相关的HTTP请求，包括列表展示、添加、编辑、删除等核心操作
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class ReservoirareaController : BaseController
     {
-        // 储位区服务接口实例，用于调用储位区相关业务逻辑（注入方式初始化）
         private readonly IWms_reservoirareaServices _reservoirareaServices;
-        // 货架服务接口实例，用于查询储位区是否关联货架（删除时校验用）
         private readonly IWms_storagerackServices _storagerackServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化两个服务实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建服务对象
-        /// </summary>
-        /// <param name="storagerackServices">货架服务接口，提供货架相关查询功能</param>
-        /// <param name="reservoirareaServices">储位区服务接口，提供储位区相关业务逻辑</param>
         public ReservoirareaController(IWms_storagerackServices storagerackServices,
             IWms_reservoirareaServices reservoirareaServices)
         {
@@ -49,50 +25,29 @@ namespace KopSoftWms.Controllers
             _reservoirareaServices = reservoirareaServices;
         }
 
-        /// <summary>
-        /// 储位区列表页面的HTTP GET请求处理方法
-        /// 用于返回储位区列表的视图页面
-        /// </summary>
-        /// <returns>返回储位区列表视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            return View(); // 返回Index视图（对应Views/Reservoirarea/Index.cshtml）
+            return View();
         }
 
-        /// <summary>
-        /// 分页查询储位区列表数据的HTTP POST请求处理方法
-        /// 接收Bootstrap表格的分页、排序、查询参数，返回JSON格式分页数据
-        /// </summary>
-        /// <param name="bootstrap">Bootstrap表格参数对象，包含页码、页大小、排序字段、查询关键词等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用储位区服务的分页列表方法，传入查询参数，获取JSON格式数据
             var sd = _reservoirareaServices.PageList(bootstrap);
-            return Content(sd); // 返回数据供前端表格渲染
+            return Content(sd);
         }
 
-        /// <summary>
-        /// 储位区添加/编辑页面的HTTP GET请求处理方法
-        /// 根据ID是否为空区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">储位区ID，为空表示添加操作，不为空表示编辑操作</param>
-        /// <returns>返回添加/编辑视图及对应的储位区模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化储位区实体模型
             var model = new Wms_reservoirarea();
-            // ID为空，返回空模型（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(model);
             }
-            // ID不为空，查询对应储位区的实体数据（编辑操作，视图加载已有数据）
             else
             {
                 model = _reservoirareaServices.QueryableToEntity(c => c.ReservoirAreaId == SqlFunc.ToInt64(id));
@@ -100,98 +55,52 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 储位区添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的储位区数据，完成数据验证、业务逻辑处理并返回结果
-        /// </summary>
-        /// <param name="model">表单提交的储位区实体模型</param>
-        /// <param name="id">储位区ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_reservoirarea model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_reservoirarea model, [FromForm]string id)
         {
-            // 初始化储位区验证器（FluentValidation实现）
             var validator = new ReservoirareaFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合预设规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（每个错误用换行符分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 以统一JSON格式返回失败结果及错误信息
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（表示添加操作）
             if (id.IsEmptyZero())
             {
-                // 检查储位区编号或名称是否已存在（唯一性校验）
                 if (_reservoirareaServices.IsAny(c => c.ReservoirAreaNo == model.ReservoirAreaNo || c.ReservoirAreaName == model.ReservoirAreaName))
                 {
-                    // 编号或名称已存在，返回失败提示（PubConst.Warehouse4为预定义常量）
                     return BootJsonH((false, PubConst.Warehouse4));
                 }
-
-                // 给新增储位区赋值必要字段
-                model.ReservoirAreaId = PubId.SnowflakeId; // 生成雪花算法唯一ID
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID（从当前登录用户缓存获取）
-                bool flag = _reservoirareaServices.Insert(model); // 调用储位区服务执行插入操作
-
-                // 根据操作结果返回对应提示（成功返回添加成功，失败返回添加失败）
+                model.ReservoirAreaId = PubId.SnowflakeId;
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _reservoirareaServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（表示更新操作）
             else
             {
-                // 给更新的储位区赋值必要字段
-                model.ReservoirAreaId = id.ToInt64(); // 设置储位区ID（确保更新指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间，工具类获取）
-                var flag = _reservoirareaServices.Update(model); // 调用储位区服务执行更新操作
-
-                // 根据操作结果返回对应提示（成功返回更新成功，失败返回更新失败）
+                model.ReservoirAreaId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _reservoirareaServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 储位区删除操作的HTTP GET请求处理方法（逻辑删除）
-        /// 删除前检查储位区是否关联货架，关联则不允许删除
-        /// </summary>
-        /// <param name="id">要删除的储位区ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 检查该储位区是否关联货架（存在关联则不允许删除）
             var isExist = _storagerackServices.IsAny(c => c.ReservoirAreaId == SqlFunc.ToInt64(id));
             if (isExist)
             {
-                // 存在关联货架，返回删除失败提示（PubConst.Warehouse3为预定义常量）
                 return BootJsonH((false, PubConst.Warehouse3));
             }
-            // 无关联货架，执行逻辑删除
             else
             {
-                // 调用储位区服务执行逻辑删除：仅更新指定字段
-                var flag = _reservoirareaServices.Update(
-                    new Wms_reservoirarea
-                    {
-                        ReservoirAreaId = SqlFunc.ToInt64(id), // 目标储位区ID（字符串转长整型）
-                        IsDel = 0, // 逻辑删除标识（0表示已删除，1表示正常，按业务定义）
-                        ModifiedBy = UserDtoCache.UserId, // 删除操作人ID（当前登录用户）
-                        ModifiedDate = DateTimeExt.DateTime // 删除操作时间（当前时间）
-                    },
-                    c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 仅更新这三个字段，提升性能
-                );
-
-                // 根据操作结果返回对应提示（成功返回删除成功，失败返回删除失败）
+                var flag = _reservoirareaServices.Update(new Wms_reservoirarea { ReservoirAreaId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
                 return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
             }
         }

src/KopSoftWms/Controllers/RoleController.cs

@@ -1,57 +1,27 @@
-// 引入FluentValidation验证结果命名空间，用于接收实体验证反馈
-using FluentValidation.Results;
-// 引入服务接口命名空间，包含角色、菜单、用户等相关服务接口
+using FluentValidation.Results;
 using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询与类型转换
 using SqlSugar;
-// 引入LINQ相关命名空间，支持集合的查询操作
+using System;
 using System.Linq;
-// 引入数据传输对象命名空间，包含角色菜单关联DTO
 using YL.Core.Dto;
-// 引入核心实体类命名空间，包含角色、角色菜单关联等实体
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含角色实体的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、类型转换等扩展方法
 using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含操作提示、角色相关常量等定义
 using YL.Utils.Pub;
-// 引入表格工具命名空间，包含Bootstrap表格相关参数模型
 using YL.Utils.Table;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 角色控制器
-    /// 负责处理角色的列表展示、添加、编辑、删除，以及角色与菜单的关联配置
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class RoleController : BaseController
     {
-        // 菜单服务接口实例，用于查询菜单数据（角色关联菜单时使用）
         private readonly ISys_menuServices _menuServices;
-        // 角色服务接口实例，处理角色相关业务逻辑
         private readonly ISys_roleServices _roleServices;
-        // 角色菜单关联服务接口实例，处理角色与菜单的关联关系
         private readonly ISys_rolemenuServices _rolemenuServices;
-        // 用户服务接口实例，用于查询角色是否关联用户（删除角色时校验）
         private readonly ISys_userServices _userServices;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化所有服务实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建对象
-        /// </summary>
-        /// <param name="userServices">用户服务接口</param>
-        /// <param name="rolemenuServices">角色菜单关联服务接口</param>
-        /// <param name="roleServices">角色服务接口</param>
-        /// <param name="menuServices">菜单服务接口</param>
         public RoleController(ISys_userServices userServices, ISys_rolemenuServices rolemenuServices, ISys_roleServices roleServices, ISys_menuServices menuServices)
         {
             _userServices = userServices;
@@ -60,41 +30,23 @@ namespace KopSoftWms.Controllers
             _rolemenuServices = rolemenuServices;
         }
 
-        /// <summary>
-        /// 角色列表页面的HTTP GET请求处理方法（默认GET请求，未显式标注）
-        /// 需验证菜单访问权限
-        /// </summary>
-        /// <returns>返回角色列表视图</returns>
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [CheckMenu]
         public IActionResult Index()
         {
-            return View(); // 返回Index视图（对应Views/Role/Index.cshtml）
+            return View();
         }
 
-        /// <summary>
-        /// 分页查询角色列表数据的HTTP POST请求处理方法
-        /// 接收Bootstrap表格的分页、排序、查询参数，返回JSON格式分页数据
-        /// </summary>
-        /// <param name="bootstrap">Bootstrap表格参数对象，包含页码、页大小、排序字段、查询关键词等</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] Bootstrap.BootstrapParams bootstrap)
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]Bootstrap.BootstrapParams bootstrap)
         {
-            // 调用角色服务的分页列表方法，传入查询参数，获取JSON格式数据
             var sd = _roleServices.PageList(bootstrap);
-            return Content(sd); // 返回数据供前端表格渲染
+            return Content(sd);
         }
 
-        /// <summary>
-        /// 获取菜单列表（用于角色关联菜单的树形展示）的HTTP GET请求处理方法
-        /// 返回可用于权限配置的菜单数据结构
-        /// </summary>
-        /// <returns>返回菜单列表的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult GetMenuList()
         {
-            // 注释代码：手动构建菜单树形结构（父菜单+子菜单）
             //var permissionMenus = _menuServices.QueryableToList(c => c.IsDel == 1 && c.MenuType == "menu" && c.Status == 1);
             //var parentPermissions = permissionMenus.Where(a => a.MenuParent == -1).ToList();
             //var ret = new List<PermissionMenu>();
@@ -113,35 +65,21 @@ namespace KopSoftWms.Controllers
             //    }).ToList();
             //    ret.Add(permissionMenu);
             //});
-
-            // 调用角色服务的GetMenu方法，获取预处理后的菜单数据（树形结构）
             return BootJsonH(_roleServices.GetMenu());
         }
 
-        /// <summary>
-        /// 角色添加/编辑页面的HTTP GET请求处理方法
-        /// 关联角色菜单数据，用于配置角色的菜单权限
-        /// </summary>
-        /// <param name="id">角色ID，为空表示添加，不为空表示编辑</param>
-        /// <returns>返回添加/编辑视图及对应的角色菜单DTO模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化角色菜单DTO（包含角色信息和关联的菜单列表）
             var roles = new RoleMenuDto();
-            // ID为空，返回空DTO（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(roles);
             }
-            // ID不为空，查询角色信息及关联的菜单列表（编辑操作）
             else
             {
-                // 查询指定ID的角色实体
                 var role = _roleServices.QueryableToEntity(c => c.RoleId == SqlFunc.ToInt64(id));
-                // 查询该角色关联的所有菜单
                 var list = _rolemenuServices.QueryableToList(c => c.RoleId == SqlFunc.ToInt64(id));
-                // 构建角色菜单DTO，封装角色信息和关联菜单
                 roles = new RoleMenuDto()
                 {
                     RoleId = role?.RoleId.ToString(),
@@ -150,17 +88,11 @@ namespace KopSoftWms.Controllers
                     Remark = role?.Remark,
                     Children = list
                 };
-                return View(roles); // 返回带数据的DTO视图
+                return View(roles);
             }
         }
 
-        /// <summary>
-        /// 角色查询页面的HTTP GET请求处理方法
-        /// 功能与Add方法类似，用于查看角色详情及关联的菜单权限
-        /// </summary>
-        /// <param name="id">角色ID，为空返回空模型，不为空返回角色详情</param>
-        /// <returns>返回查询视图及对应的角色菜单DTO模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Query(string id)
         {
             var roles = new RoleMenuDto();
@@ -184,119 +116,69 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 角色添加或更新操作的HTTP POST请求处理方法
-        /// 同时处理角色与菜单的关联关系（新增/更新角色时同步配置菜单权限）
-        /// </summary>
-        /// <param name="role">角色实体模型</param>
-        /// <param name="id">角色ID，为空表示添加，不为空表示更新</param>
-        /// <param name="menuId">角色关联的菜单ID数组</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Sys_role role, [FromForm] string id, [FromForm] string[] menuId)
+        [HttpPost]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Sys_role role, [FromForm]string id, [FromForm]string[] menuId)
         {
-            // 注释代码：菜单ID数组排序处理（当前未启用）
             //int[] menuIds = Array.ConvertAll(menuId, new Converter<string, int>(c => c.ToInt32()));
             //Array.Sort(menuIds);
             //var arrs = (from d in menuId orderby d.ToInt32() ascending select d.ToInt32()).ToArray();
             //var arrs2 = (from d in arrs select d).ToArray();
 
-            // 初始化角色验证器（FluentValidation实现）
             var validator = new SysRoleFluent();
-            // 执行角色实体数据验证，获取验证结果
             ValidationResult results = validator.Validate(role);
             bool success = results.IsValid;
-
-            // 验证失败（数据不符合预设规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（每个错误用换行符分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                // 以统一JSON格式返回失败结果及错误信息
                 return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（表示添加操作）
             if (id.IsEmptyZero())
             {
-                // 检查角色名称是否已存在（唯一性校验）
                 if (_roleServices.IsAny(c => c.RoleName == role.RoleName))
                 {
-                    // 角色名称已存在，返回失败提示（PubConst.Role2为预定义常量）
                     return BootJsonH((false, PubConst.Role2));
                 }
-
-                // 调用角色服务执行添加操作，同时关联菜单权限（传入当前用户ID和菜单ID数组）
                 var flag = _roleServices.Insert(role, UserDtoCache.UserId, menuId);
-                // 根据操作结果返回对应提示
                 return BootJsonH(flag.IsSuccess ? (flag.IsSuccess, PubConst.Add1) : (flag.IsSuccess, PubConst.Add2));
             }
-            // ID不为空（表示更新操作）
             else
             {
-                // 注释代码：限制管理员角色不可编辑（当前未启用）
+                //admin
                 //var model = _roleServices.QueryableToEntity(c => c.RoleId == SqlFunc.ToInt64(id));
                 //if (model.RoleType == "admin")
                 //{
                 //    return BootJsonH((false, PubConst.Role1));
                 //}
-
-                // 设置角色ID（确保更新指定记录）
                 role.RoleId = id.ToInt64();
-                // 调用角色服务执行更新操作，同时更新菜单权限关联
                 var flag = _roleServices.Update(role, UserDtoCache.UserId, menuId);
-                // 根据操作结果返回对应提示
                 return BootJsonH(flag.IsSuccess ? (flag.IsSuccess, PubConst.Update1) : (flag.IsSuccess, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 角色删除操作的HTTP GET请求处理方法（逻辑删除）
-        /// 包含管理员角色保护、角色关联用户校验，删除角色时同步删除关联的菜单权限
-        /// </summary>
-        /// <param name="id">要删除的角色ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 查询要删除的角色实体
             var model = _roleServices.QueryableToEntity(c => c.RoleId == SqlFunc.ToInt64(id));
-            // 管理员角色不允许删除（保护系统核心角色）
             if (model.RoleType == "admin")
             {
-                return BootJsonH((false, PubConst.Role1)); // 返回管理员角色不可删除的提示
+                return BootJsonH((false, PubConst.Role1));
             }
-
-            // 检查该角色是否关联用户（关联用户则不允许删除）
             var user = _userServices.IsAny(c => c.RoleId == SqlFunc.ToInt64(id));
             if (user)
             {
-                return BootJsonH((false, PubConst.Role3)); // 返回角色关联用户的提示
+                return BootJsonH((false, PubConst.Role3));
             }
-
-            // 执行角色逻辑删除：更新删除标识、修改人、修改时间
-            var flag = _roleServices.Update(
-                new Sys_role
-                {
-                    RoleId = SqlFunc.ToInt64(id),
-                    IsDel = 0, // 逻辑删除标识（0表示已删除，1表示正常）
-                    ModifiedBy = UserDtoCache.UserId,
-                    ModifiedDate = DateTimeExt.DateTime
-                },
-                c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate } // 指定仅更新这三个字段
-            );
-
-            // 角色删除成功后，同步删除角色与菜单的关联关系
+            var flag = _roleServices.Update(new Sys_role { RoleId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime }, c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate });
             if (flag)
             {
                 _rolemenuServices.Delete(c => c.RoleId == SqlFunc.ToInt64(id));
-                return BootJsonH((flag, PubConst.Delete1)); // 返回删除成功提示
+                return BootJsonH((flag, PubConst.Delete1));
             }
             else
             {
-                return BootJsonH((flag, PubConst.Delete2)); // 返回删除失败提示
+                return BootJsonH((flag, PubConst.Delete2));
             }
         }
     }

src/KopSoftWms/Controllers/RoutingController.cs

@@ -2,21 +2,10 @@
 
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 路由管理控制器
-    /// 负责处理与路由相关的页面请求和业务逻辑
-    /// 命名规范：以"Controller"为后缀，对应路由管理功能模块
-    /// </summary>
     public class RoutingController : Controller
     {
-        /// <summary>
-        /// 路由管理首页
-        /// 处理GET请求，返回路由管理的主视图
-        /// </summary>
-        /// <returns>视图对象（IActionResult），默认对应Views/Routing/Index.cshtml视图文件</returns>
         public IActionResult Index()
         {
-            // 返回Index视图，该视图通常包含路由管理的页面布局、表格、表单等UI元素
             return View();
         }
     }

src/KopSoftWms/Controllers/StockInController.cs

@@ -1,59 +1,27 @@
-// 引入服务接口命名空间，包含入库单、明细、供应商等相关服务接口
-using IServices;
-// 引入ASP.NET Core MVC核心命名空间，提供控制器、ActionResult等核心类型
+using IServices;
 using Microsoft.AspNetCore.Mvc;
-// 引入SqlSugar ORM框架命名空间，用于数据库查询、事务及类型转换
 using SqlSugar;
-// 引入LINQ相关命名空间，支持集合的查询操作
 using System.Linq;
-// 引入数据传输对象命名空间，包含入库单分页查询专用参数
 using YL.Core.Dto;
-// 引入核心实体类命名空间，包含入库单、明细等实体定义
 using YL.Core.Entity;
-// 引入实体验证命名空间，包含入库单、明细的FluentValidation验证规则
 using YL.Core.Entity.Fluent.Validation;
-// 引入自定义特性命名空间，包含权限检查、操作日志记录等特性
 using YL.NetCore.Attributes;
-// 引入.NET Core应用基础命名空间，提供基础控制器、响应格式化等功能
 using YL.NetCore.NetCoreApp;
-// 引入工具类扩展命名空间，提供字符串判空、枚举转换等扩展方法
 using YL.Utils.Extensions;
-// 引入公共常量与枚举命名空间，包含操作提示、字典类型、状态枚举等定义
 using YL.Utils.Pub;
+using YL.Utils.Table;
 
-// 定义控制器所在命名空间，遵循项目控制器统一存放规范
 namespace KopSoftWms.Controllers
 {
-    /// <summary>
-    /// 入库单控制器
-    /// 负责处理入库单主表、明细的全流程操作（列表、添加、编辑、审核、删除、打印等）
-    /// 继承自BaseController，复用用户缓存、统一响应格式等基础功能
-    /// </summary>
     public class StockInController : BaseController
     {
-        // 入库单服务接口实例，处理入库单主表业务逻辑
         private readonly IWms_stockinServices _stockinServices;
-        // 供应商服务接口实例，用于查询供应商相关数据（如入库单关联供应商）
         private readonly IWms_supplierServices _supplierServices;
-        // 字典服务接口实例，用于查询入库类型等字典数据
         private readonly ISys_dictServices _dictServices;
-        // 序列号服务接口实例，用于生成唯一入库单号
         private readonly ISys_serialnumServices _serialnumServices;
-        // 入库单明细服务接口实例，处理入库单明细业务逻辑
         private readonly IWms_stockindetailServices _stockindetailServices;
-        // SqlSugar数据库客户端实例，用于手动控制事务（如级联删除主表和明细）
         private readonly SqlSugarClient _client;
 
-        /// <summary>
-        /// 控制器构造函数，通过依赖注入初始化所有服务与工具实例
-        /// 依赖注入由ASP.NET Core框架自动管理，无需手动创建对象
-        /// </summary>
-        /// <param name="stockindetailServices">入库单明细服务接口</param>
-        /// <param name="serialnumServices">序列号服务接口</param>
-        /// <param name="dictServices">字典服务接口</param>
-        /// <param name="supplierServices">供应商服务接口</param>
-        /// <param name="stockinServices">入库单服务接口</param>
-        /// <param name="client">SqlSugar数据库客户端</param>
         public StockInController(
             IWms_stockindetailServices stockindetailServices,
             ISys_serialnumServices serialnumServices,
@@ -71,75 +39,51 @@ namespace KopSoftWms.Controllers
             _client = client;
         }
 
-        /// <summary>
-        /// 入库单列表页面的HTTP GET请求处理方法
-        /// 向视图传递入库类型字典、入库状态枚举数据（用于下拉筛选）
-        /// </summary>
-        /// <returns>返回入库单列表视图</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [CheckMenu] // 自定义权限校验特性，验证用户是否有权限访问该菜单
+        [HttpGet]
+        [CheckMenu]
         public IActionResult Index()
         {
-            // 查询入库类型字典：未删除且字典类型为入库类型（PubDictType.stockin转整型字符串）
-            var list = _dictServices.Queryable()
-                .Where(c => c.IsDel == 1 && c.DictType == PubDictType.stockin.ToInt32().ToString())
-                .ToList();
-            // 将StockInStatus枚举转换为键值对列表（用于状态下拉筛选）
+            var list = _dictServices.Queryable().Where(c => c.IsDel == 1 && c.DictType == PubDictType.stockin.ToInt32().ToString()).ToList();
             var stockInStatus = EnumExt.ToKVListLinq<StockInStatus>();
-
-            // 传递数据到视图
-            ViewBag.StockInType = list; // 入库类型下拉数据
-            ViewBag.StockInStatus = stockInStatus; // 入库状态下拉数据
-            return View(); // 返回Index视图（对应Views/StockIn/Index.cshtml）
+            ViewBag.StockInType = list;
+            ViewBag.StockInStatus = stockInStatus;
+            return View();
         }
 
         /// <summary>
-        /// 分页查询入库单主表数据的HTTP POST请求处理方法
-        /// 接收入库单专用分页参数，返回JSON格式分页数据
+        /// 主表
         /// </summary>
-        /// <param name="bootstrap">入库单分页查询参数对象，包含页码、状态、入库类型等筛选条件</param>
-        /// <returns>返回JSON格式的分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
-        public ContentResult List([FromForm] PubParams.StockInBootstrapParams bootstrap)
+        /// <param name="bootstrap">参数</param>
+        /// <returns></returns>
+        [HttpPost]
+        [OperationLog(LogType.select)]
+        public ContentResult List([FromForm]PubParams.StockInBootstrapParams bootstrap)
         {
-            // 调用入库单服务的分页列表方法，传入查询参数，获取JSON格式数据
             var sd = _stockinServices.PageList(bootstrap);
-            return Content(sd); // 返回数据供前端表格渲染
+            return Content(sd);
         }
 
         /// <summary>
-        /// 分页查询入库单明细数据的HTTP POST请求处理方法
-        /// 根据入库单主表ID查询关联的明细数据
+        /// 明细
         /// </summary>
-        /// <param name="pid">入库单主表ID</param>
-        /// <returns>返回JSON格式的明细分页数据（ContentResult包装）</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [OperationLog(LogType.select)] // 操作日志记录特性，标记该操作类型为"查询"
+        /// <param name="id">主表id</param>
+        /// <returns></returns>
+        [HttpPost]
+        [OperationLog(LogType.select)]
         public ContentResult ListDetail(string pid)
         {
-            // 调用明细服务的分页列表方法，传入主表ID，获取明细数据
             var sd = _stockindetailServices.PageList(pid);
-            return Content(sd); // 返回明细数据供前端表格渲染
+            return Content(sd);
         }
 
-        /// <summary>
-        /// 入库单添加/编辑页面的HTTP GET请求处理方法
-        /// 根据ID是否为空区分添加（无ID）和编辑（有ID）操作
-        /// </summary>
-        /// <param name="id">入库单ID，为空表示添加，不为空表示编辑</param>
-        /// <returns>返回添加/编辑视图及对应的入库单模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Add(string id)
         {
-            // 初始化入库单实体模型
             var model = new Wms_stockin();
-            // ID为空，返回空模型（添加操作，视图显示空白表单）
             if (id.IsEmpty())
             {
                 return View(model);
             }
-            // ID不为空，查询未删除的入库单实体（编辑操作，视图加载已有数据）
             else
             {
                 model = _stockinServices.QueryableToEntity(c => c.StockInId == SqlFunc.ToInt64(id) && c.IsDel == 1);
@@ -147,180 +91,153 @@ namespace KopSoftWms.Controllers
             }
         }
 
-        /// <summary>
-        /// 入库单明细添加/编辑页面的HTTP GET请求处理方法
-        /// 根据明细ID是否为空区分添加和编辑，关联入库单主表ID
-        /// </summary>
-        /// <param name="id">明细ID，为空表示添加</param>
-        /// <param name="pid">入库单主表ID，用于关联明细与主表</param>
-        /// <returns>返回添加/编辑视图及对应的明细模型</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
+        [HttpGet]
         public IActionResult Detail(string id, string pid)
         {
-            // 初始化明细实体模型
             var model = new Wms_stockindetail();
-            // 明细ID为空或0（添加操作）
             if (id.IsEmptyZero())
             {
-                model.StockInId = pid.ToInt64(); // 关联入库单主表ID
-                return View(model); // 返回空明细模型视图
+                model.StockInId = pid.ToInt64();
+                return View(model);
             }
-            // 明细ID不为空（编辑操作）
             else
             {
-                // 查询未删除的明细实体
                 model = _stockindetailServices.QueryableToEntity(c => c.StockInDetailId == SqlFunc.ToInt64(id) && c.IsDel == 1);
-                return View(model); // 返回带明细数据的视图
+                return View(model);
             }
         }
 
-        /// <summary>
-        /// 入库单添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的入库单数据，完成验证并执行对应操作
-        /// </summary>
-        /// <param name="model">表单提交的入库单实体模型</param>
-        /// <param name="id">入库单ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdate([FromForm] Wms_stockin model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdate([FromForm]Wms_stockin model, [FromForm]string id)
         {
-            // 初始化入库单验证器（FluentValidation实现）
             var validator = new StockInFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（换行分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                return BootJsonH((PubEnum.Failed.ToInt32(), msg)); // 返回失败结果
+                return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（添加操作）
             if (id.IsEmptyZero())
             {
-                // 若订单号不为空，检查是否已存在（唯一性校验）
                 if (!model.OrderNo.IsEmpty())
                 {
                     if (_stockinServices.IsAny(c => c.OrderNo == model.OrderNo))
                     {
-                        return BootJsonH((false, PubConst.StockIn1)); // 返回订单号已存在提示
+                        return BootJsonH((false, PubConst.StockIn1));
                     }
                 }
-
-                // 给新增入库单赋值必要字段
-                model.StockInNo = _serialnumServices.GetSerialnum(UserDtoCache.UserId, "Wms_stockin"); // 生成唯一入库单号
-                model.StockInId = PubId.SnowflakeId; // 生成雪花算法唯一ID
-                model.StockInStatus = StockInStatus.initial.ToByte(); // 初始状态设为"初始"
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID（当前登录用户）
-                bool flag = _stockinServices.Insert(model); // 执行插入操作
-
-                // 根据操作结果返回对应提示
+                model.StockInNo = _serialnumServices.GetSerialnum(UserDtoCache.UserId, "Wms_stockin");
+                model.StockInId = PubId.SnowflakeId;
+                model.StockInStatus = StockInStatus.initial.ToByte();
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _stockinServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（更新操作）
             else
             {
-                model.StockInId = id.ToInt64(); // 设置入库单ID（确保更新指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID（当前登录用户）
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间（当前时间）
-                var flag = _stockinServices.Update(model); // 执行更新操作
-
-                // 根据操作结果返回对应提示
+                model.StockInId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _stockinServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
-        /// <summary>
-        /// 入库单明细添加或更新操作的HTTP POST请求处理方法
-        /// 接收表单提交的明细数据，完成验证并执行对应操作
-        /// </summary>
-        /// <param name="model">表单提交的明细实体模型</param>
-        /// <param name="id">明细ID，为空表示添加，不为空表示更新</param>
-        /// <returns>返回操作结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpPost] // 标记为处理HTTP POST请求
-        [FilterXss] // 防XSS攻击特性，过滤表单数据中的恶意脚本
-        [OperationLog(LogType.addOrUpdate)] // 操作日志记录特性，标记该操作类型为"添加或更新"
-        public IActionResult AddOrUpdateD([FromForm] Wms_stockindetail model, [FromForm] string id)
+        [HttpPost]
+        [FilterXss]
+        [OperationLog(LogType.addOrUpdate)]
+        public IActionResult AddOrUpdateD([FromForm]Wms_stockindetail model, [FromForm]string id)
         {
-            // 初始化明细验证器（FluentValidation实现）
             var validator = new StockInDetailFluent();
-            // 执行模型数据验证，获取验证结果
             var results = validator.Validate(model);
             var success = results.IsValid;
-
-            // 验证失败（数据不符合规则）
             if (!success)
             {
-                // 拼接所有验证错误信息（换行分隔）
                 string msg = results.Errors.Aggregate("", (current, item) => (current + item.ErrorMessage + "</br>"));
-                return BootJsonH((PubEnum.Failed.ToInt32(), msg)); // 返回失败结果
+                return BootJsonH((PubEnum.Failed.ToInt32(), msg));
             }
-
-            // ID为空或0（添加操作）
             if (id.IsEmptyZero())
             {
-                model.StockInDetailId = PubId.SnowflakeId; // 生成明细唯一ID
-                model.Status = StockInStatus.initial.ToByte(); // 初始状态设为"初始"
-                model.CreateBy = UserDtoCache.UserId; // 设置创建人ID
-                bool flag = _stockindetailServices.Insert(model); // 执行插入操作
-
-                // 根据操作结果返回对应提示
+                model.StockInDetailId = PubId.SnowflakeId;
+                model.Status = StockInStatus.initial.ToByte();
+                model.CreateBy = UserDtoCache.UserId;
+                bool flag = _stockindetailServices.Insert(model);
                 return BootJsonH(flag ? (flag, PubConst.Add1) : (flag, PubConst.Add2));
             }
-            // ID不为空（更新操作）
             else
             {
-                model.StockInDetailId = id.ToInt64(); // 设置明细ID（确保更新指定记录）
-                model.ModifiedBy = UserDtoCache.UserId; // 设置修改人ID
-                model.ModifiedDate = DateTimeExt.DateTime; // 设置修改时间
-                var flag = _stockindetailServices.Update(model); // 执行更新操作
-
-                // 根据操作结果返回对应提示
+                model.StockInDetailId = id.ToInt64();
+                model.ModifiedBy = UserDtoCache.UserId;
+                model.ModifiedDate = DateTimeExt.DateTime;
+                var flag = _stockindetailServices.Update(model);
                 return BootJsonH(flag ? (flag, PubConst.Update1) : (flag, PubConst.Update2));
             }
         }
 
         /// <summary>
-        /// 入库单审核操作的HTTP GET请求处理方法
-        /// 审核前检查是否有明细数据，审核后更新入库单状态及库存
+        /// 审核
         /// </summary>
-        /// <param name="id">入库单ID</param>
-        /// <returns>返回审核结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.update)] // 操作日志记录特性，标记该操作类型为"更新"
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.update)]
         public IActionResult Auditin(string id)
         {
-            // 检查该入库单下是否存在未删除的明细（无明细则无法审核）
             var list = _stockindetailServices.QueryableToList(c => c.IsDel == 1 && c.StockInId == SqlFunc.ToInt64(id));
             if (!list.Any())
             {
-                return BootJsonH((false, PubConst.StockIn4)); // 返回无明细提示
+                return BootJsonH((false, PubConst.StockIn4));
             }
-
-            // 调用入库单服务的审核方法，传入审核人ID和入库单ID
             var flag = _stockinServices.Auditin(UserDtoCache.UserId, SqlFunc.ToInt64(id));
-            // 根据审核结果返回对应提示（成功/失败）
             return BootJsonH(flag ? (flag, PubConst.StockIn2) : (flag, PubConst.StockIn3));
         }
 
         /// <summary>
-        /// 入库单删除操作的HTTP GET请求处理方法（逻辑删除，级联删除明细）
-        /// 使用事务保证主表和明细删除操作的原子性
+        /// 删除
         /// </summary>
-        /// <param name="id">入库单主表ID</param>
-        /// <returns>返回删除结果（成功/失败）及提示信息的JSON数据</returns>
-        [HttpGet] // 标记为处理HTTP GET请求
-        [OperationLog(LogType.delete)] // 操作日志记录特性，标记该操作类型为"删除"
+        /// <param name="id">主表id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.delete)]
         public IActionResult Delete(string id)
         {
-            // 使用SqlSugar事务执行级联删除（主表+明细）
             var flag = _client.Ado.UseTran(() =>
             {
-                // 逻辑删除该入库单下所有未删除的明细
                 _client.Updateable(new Wms_stockindetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime })
-                .UpdateColumns(c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate }) // 仅更新指定字段
+                .UpdateColumns(c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate })
+                .Where(c => c.StockInId == SqlFunc.ToInt64(id) && c.IsDel == 1).ExecuteCommand();
+                _client.Updateable(new Wms_stockin { StockInId = SqlFunc.ToInt64(id), IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime })
+               .UpdateColumns(c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate })
+               .ExecuteCommand();
+            }).IsSuccess;
+            return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
+        }
+
+        /// <summary>
+        /// 删除明细
+        /// </summary>
+        /// <param name="id">明细id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [OperationLog(LogType.delete)]
+        public IActionResult DeleteDetail(string id)
+        {
+            var flag = _stockindetailServices.Update(
+                 new Wms_stockindetail { IsDel = 0, ModifiedBy = UserDtoCache.UserId, ModifiedDate = DateTimeExt.DateTime },
+                 c => new { c.IsDel, c.ModifiedBy, c.ModifiedDate },
+                 c => c.StockInDetailId == SqlFunc.ToInt64(id)
+                 );
+            return BootJsonH(flag ? (flag, PubConst.Delete1) : (flag, PubConst.Delete2));
+        }
+
+        [HttpGet]
+        public IActionResult PreviewJson(string id)
+        {
+            var str = _stockinServices.PrintList(id);
+            return Content(str);
+        }
+    }
+}