diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index cfdd2e3..f656ec1 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -8,6 +8,8 @@ using HHWMS.Web; using HHWMS.Web.Models; using Microsoft.EntityFrameworkCore; using System.Linq; +using Newtonsoft.Json; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { @@ -28,7 +30,7 @@ namespace HHWMS.Web.Controllers return PartialView(vm); } - [ActionDescription("Sys.Search")] +/* [ActionDescription("Sys.Search")] [HttpPost] public string Search(ReceiptDetailListVM vm) { @@ -36,23 +38,51 @@ namespace HHWMS.Web.Controllers vm.Searcher.Limit = vm.FC.GetValue("Limit"); vm.Searcher.ReceiptHeaderId = vm.FC.GetValue("Code"); return vm.GetJson(false); + }*/ + + [HttpPost] + public ActionResult SelectReceiptCode() + { + var data = _unitwork.Find(x => x.FirstStatus < ReceiptStatusEnum.回传) + .Select(x => new { label = x.Code, value = x.Code }); + return JsonMore(data); } [HttpPost] public ActionResult SelectReceipt(string Code) { var data = _unitwork.Find(x => x.Code == Code).Include(x => x.ReceiptDetails).FirstOrDefault(); - var result = data.ReceiptDetails; - return JsonMore(result); + if(data != null) + { + var result = data.ReceiptDetails.Select(x => new { name = x.MaterialCode }); + return JsonMore(result); + } + else + { + return JsonMore(null); + } } - + /// + /// 入库盘料绑定操作 + /// + /// + /// [HttpPost] - public IActionResult Test(string Code, string code2, string code3, string code4) + public dynamic BindingData(List data) { - return FFResult().Message("success"); + // 查找明细,修改对应状态,并且 绑定物料周转箱 + return new ApiJsonResult { Success = true }; } #endregion } + + public class Binding + { + public string UniqueCode { get; set; } + public string BoxCode { get; set; } + public int Index { get; set; } + public int Size { get; set; } + } } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index a85b9b2..0578d19 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -1,117 +1,277 @@ -@model HHWMS.Web.ReceiptInListVM -@inject IStringLocalizer Localizer; + + + + + + + -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 绑定 + 重置 + + + + + -
-
-
- - - - - - -
-
-
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
-
-
-
-
-
-
diff --git a/HHWMS.Web/GlobalConfig.cs b/HHWMS.Web/GlobalConfig.cs deleted file mode 100644 index 36e2477..0000000 --- a/HHWMS.Web/GlobalConfig.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// GlobalConfig.cs -// -// Author: -// vito -// -// Copyright (c) 2019 -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -namespace HHWMS.Web -{ - public class GlobalConfig - { - /// - /// 站点监听地址 - /// - public string ApplicationUrl { get; set; } - - } -} diff --git a/HHWMS.Web/HHWMS.Web.csproj b/HHWMS.Web/HHWMS.Web.csproj index 23f559c..c58a21e 100644 --- a/HHWMS.Web/HHWMS.Web.csproj +++ b/HHWMS.Web/HHWMS.Web.csproj @@ -37,6 +37,7 @@ + all diff --git a/HHWMS.Web/Program.cs b/HHWMS.Web/Program.cs index 1b5dba8..cf90c53 100644 --- a/HHWMS.Web/Program.cs +++ b/HHWMS.Web/Program.cs @@ -107,10 +107,6 @@ app.Run(); { List pris = new List(); //Add data privilege to specific type - //指定哪些模型需要数据权限 - //pris.Add(new DataPrivilegeInfo("城市权限", m => m.Name)); - //pris.Add(new DataPrivilegeInfo("学校权限", m => m.SchoolName)); - //pris.Add(new DataPrivilegeInfo("专业权限", m => m.MajorName)); return pris; } diff --git a/HHWMS.Web/Views/Home/FrontPage.cshtml b/HHWMS.Web/Views/Home/FrontPage.cshtml index 09a25e5..e69de29 100644 --- a/HHWMS.Web/Views/Home/FrontPage.cshtml +++ b/HHWMS.Web/Views/Home/FrontPage.cshtml @@ -1,268 +0,0 @@ -@model WalkingTec.Mvvm.Core.BaseVM -@using System.Text.Json - -
-
-
- -
-
-
WTM开源
-
- - -
-
-
- -
-
-
控制器
-
- -
-
-
-
-
-
模型
-
- -
-
-
-
-
-
模拟数据
-
- - -
-
-
-
-
- -
-
-
版本信息
-
- @if (Model.ConfigInfo.IsQuickDebug == true) - { -

你正在使用调试模式,在调试模式下,框架会:

-

1 反射所有controller下的Index方法作为左侧菜单

-

2 登陆时自动添加用户名和密码

-

3 跳过权限验证

-

- 修改appsettings文件中的IsQuickDebug可关闭调试模式,详见文档 -

- } - else - { -

你正在使用普通模式,普通模式是项目发布后应该使用的模式,框架会:

-

1 从数据库读取菜单和权限配置

-

2 验证所有访问地址的权限

-

3 不再输出各类调试信息

-

- 修改appsettings文件中的IsQuickDebug可开启调试模式,详见文档 -

- } -
-
- -
-
框架特点
-
-
    -
  • 一键生成WTM项目
  • -
  • 一键生成增删改查,导入导出,批量操作代码
  • -
  • 支持一对多,多对多关联模型的识别和代码生成
  • -
  • 支持分离和不分离两种模式
  • -
  • 支持sqlserver,mysql,pgsql三种数据库
  • -
  • 封装了Layui,AntD,Element的大部分控件,编写前台更加简便
  • -
  • 提供了很多基类,封装了绝大部分后台常用操作
  • -
  • 提供了用户,角色,用户组,菜单,日志等常用模块
  • -
  • 支持数据权限的开发和配置
  • -
  • 支持读写分离和数据库分库
  • -
-
-
- -
-
- 作者的话 - -
-
-

- WTM框架,全称WalkingTec - MVVM(不是“我特么”的拼音首字母),WTM是一个快速开发框架,有多快?至少目前dotnetcore的开源项目中,我还没有见到更接地气,开发速度更快的框架。WTM的设计理念就是最大程度的加快开发速度,降低开发成本。 -

-

- 国内Java一家独大原因很多,有BAT的示范效应,也有微软自己战略的失误。好在微软这两年终于想明白了, dotnet - core的横空出世和收购github都是非常正确的方向。当然要想达到java一样的生态还有很长的路要走,那我就贡献一点绵薄之力吧。 -

-

- WTM开源以来,受到了越来越多开发者的喜爱,WTM必将以更加成熟稳定的姿态回报各位的喜爱。特别鸣谢贤心(layui.com),授权WTM开发的项目可以免费使用其收费版的LayuiAdmin。提高自己,造福他人,吾道不孤! -

-

- —— 框架开源地址:https://github.com/dotnetcore/WTM -

-

—— 框架在线文档:https://wtmdoc.walkingtec.cn

-

—— 框架QQ交流群:694148336

-
-
-
- -
- diff --git a/HHWMS.Web/Views/Shared/_Layout.cshtml b/HHWMS.Web/Views/Shared/_Layout.cshtml index cb754da..b3e2e95 100644 --- a/HHWMS.Web/Views/Shared/_Layout.cshtml +++ b/HHWMS.Web/Views/Shared/_Layout.cshtml @@ -12,6 +12,13 @@ + + + + + + +