From 59f7962ffc123b1a031526cc65a09de2dbddf467 Mon Sep 17 00:00:00 2001 From: "xiaowei.song" Date: Wed, 13 Mar 2024 11:34:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WMentryWarehousing_productController.cs | 59 +++++++++++++++++++ .../mes/wms/WMlocationInfoController.cs | 1 + ZR.Admin.WebApi/appsettings.development.json | 6 +- ZR.Admin.WebApi/appsettings.production.json | 4 +- .../mes/wms/IService/IWMWarehousingService.cs | 22 +++++++ .../wms/WMentryWarehousing_productService.cs | 28 +++++++++ 6 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs create mode 100644 ZR.Service/mes/wms/IService/IWMWarehousingService.cs create mode 100644 ZR.Service/mes/wms/WMentryWarehousing_productService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs new file mode 100644 index 00000000..9ab4a6c8 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs @@ -0,0 +1,59 @@ +using Infrastructure.Extensions; +using JinianNet.JNTemplate; +using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; +using ZR.Model.MES.qu; +using ZR.Model.MES.wms; +using ZR.Service.mes.wms.IService; + +namespace ZR.Admin.WebApi.Controllers.mes.wms +{ + /// + /// 入库模块 + /// + [Route("/mes/wm/entrywarehouse")] + public class WMentryWarehousing_productController : BaseController + { + + private readonly IWMentryWarehousing_productService wm_entryWarehousing_productService; + public WMentryWarehousing_productController(IWMentryWarehousing_productService wm_entryWarehousing_productService) + { + this.wm_entryWarehousing_productService = wm_entryWarehousing_productService; + } + + /// + /// 1. 判断是否为库位码 + /// + /// + [HttpGet("is_production_location")] + public IActionResult IsProductionLocation(string production_location_code = "") + { + + // 查询 wm_info 表，根据库位码，查询在表中是否存在，true false + bool state = this.wm_entryWarehousing_productService.IsProductionLoacation(production_location_code); + + return ToResponse(new ApiResult(200, "success", state)); + } + + /// + /// 2. 判断是否为成品库箱子码 + /// + /// + [HttpGet("is_production_package")] + public IActionResult IsProductionPackage(string package_code = "") + { + return ToResponse(new ApiResult(200, "success", true)); + } + + /// + /// 3.判断是否为满箱 + /// + /// + [HttpGet("is_full_package")] + public IActionResult IsFullPackage(string package_code = "") + { + return ToResponse(new ApiResult(200, "success", true)); + } + } + +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs index 2a9e8c78..73062a85 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs @@ -8,6 +8,7 @@ using ZR.Service.mes.wms.IService; namespace ZR.Admin.WebApi.Controllers.mes.wms { + [Route("/mes/wm/storagelocation")] public class WMlocationInfoController : BaseController { diff --git a/ZR.Admin.WebApi/appsettings.development.json b/ZR.Admin.WebApi/appsettings.development.json index e1938e94..427f6649 100644 --- a/ZR.Admin.WebApi/appsettings.development.json +++ b/ZR.Admin.WebApi/appsettings.development.json @@ -6,14 +6,14 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "urls": "http://localhost:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改 + "urls": "http://0.0.0.0:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { //外网连接服务器 - "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //内网连接服务器 - // "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4, "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/ZR.Admin.WebApi/appsettings.production.json b/ZR.Admin.WebApi/appsettings.production.json index f17cac53..d664dd28 100644 --- a/ZR.Admin.WebApi/appsettings.production.json +++ b/ZR.Admin.WebApi/appsettings.production.json @@ -6,12 +6,12 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "urls": "http://localhost:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改 + "urls": "http://0.0.0.0:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { //"Conn": "Data Source=147.116.122.230;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", - "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/ZR.Service/mes/wms/IService/IWMWarehousingService.cs b/ZR.Service/mes/wms/IService/IWMWarehousingService.cs new file mode 100644 index 00000000..8bef042d --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWMWarehousingService.cs @@ -0,0 +1,22 @@ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.MES.qc.DTO; +using ZR.Model.MES.wms; + +namespace ZR.Service.mes.wms.IService +{ + public interface IWMentryWarehousing_productService + { + + + // 获取库位列表 + public bool IsProductionLoacation(string production_location_code); + + + + } +} diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs new file mode 100644 index 00000000..3ab1952d --- /dev/null +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -0,0 +1,28 @@ +using Infrastructure.Attribute; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.MES.qu; +using ZR.Model.MES.wms; +using ZR.Service.mes.qc.IService; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + [AppService(ServiceType = typeof(IWMentryWarehousing_productService), ServiceLifetime = LifeTime.Transient)] + public class WMentryWarehousing_productService : BaseService, IWMentryWarehousing_productService + { + bool IWMentryWarehousing_productService.IsProductionLoacation(string production_location_code) + { + + return Context.Queryable().Where(it => it.WarehouseNum == 1) + .Where(it => it.Location.Equals(production_location_code)).Any(); + + } + } +}