From d193f3fc52da7c9784642eb55b7df33594f9ce63 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sun, 17 Mar 2024 14:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=5F?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=EF=BC=9A=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/wms/WMExitwarehouseController.cs | 82 +++++++++++ .../WMentryWarehousing_productController.cs | 16 +-- .../mes/wms/WmMaterialController.cs | 113 +++++++++++++++ ZR.Admin.WebApi/Extensions/LogoExtension.cs | 24 ++++ ZR.Admin.WebApi/appsettings.development.json | 4 +- .../ZrAdmin.NET-物料记录表-0316162215.zip | Bin 0 -> 9313 bytes ZR.Common/Tools.cs | 2 + ZR.Model/MES/wms/Dto/WmMaterialDto.cs | 59 ++++++++ ZR.Model/MES/wms/WmCustom.cs | 59 ++++++++ ZR.Model/MES/wms/WmInLog.cs | 64 +++++++++ ZR.Model/MES/wms/WmMaterial.cs | 109 +++++++++++++++ ZR.Model/MES/wms/WmOutOrder.cs | 129 ++++++++++++++++++ ZR.Service/ZR.Service.csproj | 4 + .../wms/IService/IWMExitwarehouseService.cs | 26 ++++ ... => IWMentryWarehousing_productService.cs} | 0 .../mes/wms/IService/IWmMaterialService.cs | 24 ++++ ZR.Service/mes/wms/WMExitwarehouseService.cs | 115 ++++++++++++++++ .../wms/WMentryWarehousing_productService.cs | 22 ++- ZR.Service/mes/wms/WmMaterialService.cs | 98 +++++++++++++ 19 files changed, 934 insertions(+), 16 deletions(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-物料记录表-0316162215.zip create mode 100644 ZR.Model/MES/wms/Dto/WmMaterialDto.cs create mode 100644 ZR.Model/MES/wms/WmCustom.cs create mode 100644 ZR.Model/MES/wms/WmInLog.cs create mode 100644 ZR.Model/MES/wms/WmMaterial.cs create mode 100644 ZR.Model/MES/wms/WmOutOrder.cs create mode 100644 ZR.Service/mes/wms/IService/IWMExitwarehouseService.cs rename ZR.Service/mes/wms/IService/{IWMWarehousingService.cs => IWMentryWarehousing_productService.cs} (100%) create mode 100644 ZR.Service/mes/wms/IService/IWmMaterialService.cs create mode 100644 ZR.Service/mes/wms/WMExitwarehouseService.cs create mode 100644 ZR.Service/mes/wms/WmMaterialService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs new file mode 100644 index 00000000..7a0520d6 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs @@ -0,0 +1,82 @@ +using Infrastructure.Extensions; +using JinianNet.JNTemplate; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; +using ZR.Admin.WebApi.Extensions; +using ZR.Model.Dto; +using ZR.Model.MES.qu; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Service.mes.wms; +using ZR.Service.mes.wms.IService; +using static System.Runtime.InteropServices.JavaScript.JSType; + +namespace ZR.Admin.WebApi.Controllers.mes.wms +{ + + + /// + /// 退库模块 + /// + [Route("/mes/wm/exitwarehouse")] + public class WMExitwarehouseController : BaseController + { + private readonly IWMExitwarehouseService Exitwarehouse; + public WMExitwarehouseController(IWMExitwarehouseService Exitwarehouse) { + this.Exitwarehouse = Exitwarehouse; + } + + /// + /// 一般退库 + /// + /// + /// + [HttpGet("common")] + public IActionResult ExitwarehouseCommmon(string originalCode) + { + string msg = null; + bool data = Exitwarehouse.ExitwarehouseCommmon(originalCode); + if (data) + { + msg = "退库成功"; + } + else + { + msg = "箱子不在仓库中"; + } + return ToResponse(new ApiResult(200, msg, data)); + } + + /// + /// 7 判断箱子是否存在成品库仓库里 + /// + /// + /// + [HttpGet("is_existed_warehouse")] + public IActionResult IsExistedWarehouse(string originalCode = "") + { + if (string.IsNullOrEmpty(originalCode)) + { + + return ToResponse(new ApiResult(200, "传入为空", false)); + } + string msg = null; + bool data = this.Exitwarehouse.IsExistedWarehouse(originalCode); + if (data) + { + msg = "存在"; + + } + else + { + msg = "不存在"; + } + + return ToResponse(new ApiResult(200, msg, data)); + + } + + + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs index 6047f6ea..7aeaff95 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs @@ -113,23 +113,23 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms return ToResponse(new ApiResult(200, "传入为空", false)); } string msg = ""; - bool data = false; + string createName = HttpContext.GetName(); - int status = this.wm_entryWarehousing_productService.IntoProductwarehouse(wmgoodsDto, createName); - if (status == 0) + int num = this.wm_entryWarehousing_productService.IntoProductwarehouse(wmgoodsDto, createName); + if (num == 0) { msg = "数据插入异常"; - data = false; + } - else if (status == 1) + else if (num >= 1) { - msg = "success"; - data = true; + msg = "成功入库"+num+"个"; + } - return ToResponse(new ApiResult(200, msg, data)); + return ToResponse(new ApiResult(200, msg, num)); } /// /// 获取库位已经存在箱子 diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs new file mode 100644 index 00000000..7164cd19 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs @@ -0,0 +1,113 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Model.Dto; + +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Service.mes.wms.IService; +using ZR.Model.MES.wms.Dto; +using ZR.Model.MES.wms; +using Org.BouncyCastle.Crypto; + +//创建时间：2024-03-16 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 物料记录表增删改查 + /// + [Verify] + [Route("/mes/wm/WmMaterial")] + public class WmMaterialController : BaseController + { + /// + /// 物料记录表接口 + /// + private readonly IWmMaterialService _WmMaterialService; + + public WmMaterialController(IWmMaterialService WmMaterialService) + { + _WmMaterialService = WmMaterialService; + } + + /// + /// 查询物料记录表列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "wms:wmmaterial:list")] + public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm) + { + var response = _WmMaterialService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询物料记录表详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "wms:wmmaterial:query")] + public IActionResult GetWmMaterial(string Id) + { + var response = _WmMaterialService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加物料记录表 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "wms:wmmaterial:add")] + [Log(Title = "物料记录表", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmMaterial([FromBody] WmMaterialDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmMaterialService.AddWmMaterial(modal); + + return SUCCESS(response); + } + + /// + /// 更新物料记录表 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "wms:wmmaterial:edit")] + [Log(Title = "物料记录表", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmMaterial([FromBody] WmMaterialDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmMaterialService.UpdateWmMaterial(modal); + + return ToResponse(response); + } + + /// + /// 删除物料记录表 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "wms:wmmaterial:delete")] + [Log(Title = "物料记录表", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmMaterial(string ids) + { + long[] idsArr = Tools.SpitLongArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + + var response = _WmMaterialService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/Extensions/LogoExtension.cs b/ZR.Admin.WebApi/Extensions/LogoExtension.cs index 704778fd..e9dc7421 100644 --- a/ZR.Admin.WebApi/Extensions/LogoExtension.cs +++ b/ZR.Admin.WebApi/Extensions/LogoExtension.cs @@ -1,4 +1,5 @@ using JinianNet.JNTemplate; +using System.Net.NetworkInformation; using ZR.Common; namespace ZR.Admin.WebApi.Extensions @@ -14,6 +15,29 @@ namespace ZR.Admin.WebApi.Extensions Console.WriteLine(content); Console.ForegroundColor = ConsoleColor.Blue; + // 获取本地计算机的所有网络接口信息 + NetworkInterface[] networkInterfaces = NetworkInterface.GetAllNetworkInterfaces(); + + foreach (NetworkInterface networkInterface in networkInterfaces) + { + // 过滤出活动的网络接口 + if (networkInterface.OperationalStatus == OperationalStatus.Up) + { + // 获取网络接口的IP属性 + IPInterfaceProperties ipProperties = networkInterface.GetIPProperties(); + UnicastIPAddressInformationCollection ipAddresses = ipProperties.UnicastAddresses; + + foreach (UnicastIPAddressInformation ipAddress in ipAddresses) + { + // 输出IPv4地址 + if (ipAddress.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + Console.WriteLine("本机ip: "+ipAddress.Address.ToString()); + } + } + } + } + } } } diff --git a/ZR.Admin.WebApi/appsettings.development.json b/ZR.Admin.WebApi/appsettings.development.json index 1be1a9b5..16cd819c 100644 --- a/ZR.Admin.WebApi/appsettings.development.json +++ b/ZR.Admin.WebApi/appsettings.development.json @@ -11,7 +11,7 @@ { //外网连接服务器 - "Conn": "Data Source=127.0.0.01;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=127.0.0.1;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;", @@ -26,7 +26,7 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 - "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog={dbName};", + "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};", "DbType": 0, "IsAutoCloseConnection": true, "DbName": "ZrAdmin" //代码生成默认连接数据库 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-物料记录表-0316162215.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-物料记录表-0316162215.zip new file mode 100644 index 0000000000000000000000000000000000000000..154e8f26c09dcf41a49190d95a054d3b165dcade GIT binary patch literal 9313 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 literal 0 HcmV?d00001 diff --git a/ZR.Common/Tools.cs b/ZR.Common/Tools.cs index 70c9d855..c6d4532d 100644 --- a/ZR.Common/Tools.cs +++ b/ZR.Common/Tools.cs @@ -32,6 +32,8 @@ namespace ZR.Common return infoIdss; } + + /// /// 根据日期获取星期几 /// diff --git a/ZR.Model/MES/wms/Dto/WmMaterialDto.cs b/ZR.Model/MES/wms/Dto/WmMaterialDto.cs new file mode 100644 index 00000000..b007e34d --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmMaterialDto.cs @@ -0,0 +1,59 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.wms.Dto +{ + /// + /// 物料记录表查询对象 + /// + public class WmMaterialQueryDto : PagerInfo + { + } + + /// + /// 物料记录表输入输出对象 + /// + public class WmMaterialDto + { + + public string Id { get; set; } + + public string Partnumber { get; set; } + + public string U8InventoryCode { get; set; } + + public string BlankNum { get; set; } + + public string Unit { get; set; } + + public string ProductName { get; set; } + + public string Color { get; set; } + + public string Specification { get; set; } + + public string Description { get; set; } + + public string Version { get; set; } + + public string Remarks { get; set; } + + public int? Sort { get; set; } + + public string Search1 { get; set; } + + public string Search2 { get; set; } + + public int? Status { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + + + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/WmCustom.cs b/ZR.Model/MES/wms/WmCustom.cs new file mode 100644 index 00000000..8ae834c5 --- /dev/null +++ b/ZR.Model/MES/wms/WmCustom.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 客户信息 + /// + [SugarTable("wm_custom")] + public class WmCustom + { + /// + /// 主键 + /// + [SugarColumn(ColumnName="id" ,IsPrimaryKey = true ,IsIdentity = true )] + public int Id { get; set; } + /// + /// 客户代码 + /// + [SugarColumn(ColumnName="custom_no" )] + public string CustomNo { get; set; } + /// + /// 客户名称 + /// + [SugarColumn(ColumnName="custom_name" )] + public string CustomName { get; set; } + /// + /// 客户地址 + /// + [SugarColumn(ColumnName="custom_address" )] + public string CustomAddress { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName="remark" )] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmInLog.cs b/ZR.Model/MES/wms/WmInLog.cs new file mode 100644 index 00000000..07471ebb --- /dev/null +++ b/ZR.Model/MES/wms/WmInLog.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 入库日志（U8上传） + /// + [SugarTable("wm_in_log")] + public class WmInLog + { + /// + /// 主键（雪花生产） + /// + [SugarColumn(ColumnName="id" )] + public string Id { get; set; } + /// + /// u8库存编码 + /// + [SugarColumn(ColumnName="u8_inventory_code" )] + public string U8InventoryCode { get; set; } + /// + /// 仓库编号 + /// + [SugarColumn(ColumnName="wm_info_id" )] + public string WmInfoId { get; set; } + /// + /// mes内码 + /// + [SugarColumn(ColumnName="package_code" )] + public string PackageCode { get; set; } + /// + /// 批次号 + /// + [SugarColumn(ColumnName="code" )] + public string Code { get; set; } + /// + /// 数量 + /// + [SugarColumn(ColumnName="number" )] + public string Number { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmMaterial.cs b/ZR.Model/MES/wms/WmMaterial.cs new file mode 100644 index 00000000..dbbc3919 --- /dev/null +++ b/ZR.Model/MES/wms/WmMaterial.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 物料记录表 + /// + [SugarTable("wm_material")] + public class WmMaterial + { + /// + /// 主键G + /// + [SugarColumn(ColumnName="id" ,IsPrimaryKey = true )] + public string Id { get; set; } + /// + /// 物料号（零件号） + /// + [SugarColumn(ColumnName="partnumber")] + public string Partnumber { get; set; } + /// + /// U8库存编码 + /// + [SugarColumn(ColumnName="u8_inventory_code")] + public string U8InventoryCode { get; set; } + /// + /// 毛坯号 + /// + [SugarColumn(ColumnName="blank_num" )] + public string BlankNum { get; set; } + /// + /// 单位 + /// + [SugarColumn(ColumnName="unit" )] + public string Unit { get; set; } + /// + /// 产品描述（产品名称） + /// + [SugarColumn(ColumnName="product_name" )] + public string ProductName { get; set; } + /// + /// 产品颜色 + /// + [SugarColumn(ColumnName="color" )] + public string Color { get; set; } + /// + /// 规格（左右脚） + /// + [SugarColumn(ColumnName="specification" )] + public string Specification { get; set; } + /// + /// 显示描述(产品描述+颜色+规格) + /// + [SugarColumn(ColumnName="description" )] + public string Description { get; set; } + /// + /// 版本号 + /// + [SugarColumn(ColumnName="version" )] + public string Version { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName="remarks" )] + public string Remarks { get; set; } + /// + /// 排序(特殊排序) + /// + [SugarColumn(ColumnName="sort" )] + public int? Sort { get; set; } + /// + /// 便捷搜索字段1 + /// + [SugarColumn(ColumnName="search1" )] + public string Search1 { get; set; } + /// + /// 便捷搜索字段2 + /// + [SugarColumn(ColumnName="search2" )] + public string Search2 { get; set; } + /// + /// 状态（0-不可见 1-可见） + /// + [SugarColumn(ColumnName="status" )] + public int? Status { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmOutOrder.cs b/ZR.Model/MES/wms/WmOutOrder.cs new file mode 100644 index 00000000..8facbd8b --- /dev/null +++ b/ZR.Model/MES/wms/WmOutOrder.cs @@ -0,0 +1,129 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 出货单（物料+客户） + /// + [SugarTable("wm_out_order")] + public class WmOutOrder + { + /// + /// 主键G + /// + [SugarColumn(ColumnName="id" ,IsPrimaryKey = true )] + public string Id { get; set; } + /// + /// 出货单号(雪花算法) + /// + [SugarColumn(ColumnName="shipment_num" )] + public string ShipmentNum { get; set; } + /// + /// 客户id + /// + [SugarColumn(ColumnName="custom_id" )] + public string CustomId { get; set; } + /// + /// 客户代码 + /// + [SugarColumn(ColumnName="custom_no" )] + public string CustomNo { get; set; } + /// + /// 客户名称 + /// + [SugarColumn(ColumnName="custom_name" )] + public string CustomName { get; set; } + /// + /// 客户地址 + /// + [SugarColumn(ColumnName="custom_address" )] + public string CustomAddress { get; set; } + /// + /// 物料号（零件号） + /// + [SugarColumn(ColumnName="partnumber" )] + public string Partnumber { get; set; } + /// + /// 单位 + /// + [SugarColumn(ColumnName="unit" )] + public string Unit { get; set; } + /// + /// 产品描述（产品名称） + /// + [SugarColumn(ColumnName="product_name" )] + public string ProductName { get; set; } + /// + /// 产品颜色 + /// + [SugarColumn(ColumnName="color" )] + public string Color { get; set; } + /// + /// 规格（左右脚） + /// + [SugarColumn(ColumnName="specification" )] + public string Specification { get; set; } + /// + /// 显示描述(产品描述+颜色+规格) + /// + [SugarColumn(ColumnName="description" )] + public string Description { get; set; } + /// + /// 版本号 + /// + [SugarColumn(ColumnName="version" )] + public string Version { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName="remarks" )] + public string Remarks { get; set; } + /// + /// 状态（0-不可见 1-可见） + /// + [SugarColumn(ColumnName="status" )] + public int? Status { get; set; } + /// + /// 年 + /// + [SugarColumn(ColumnName="year" )] + public int? Year { get; set; } + /// + /// 周 + /// + [SugarColumn(ColumnName="week" )] + public int? Week { get; set; } + /// + /// 日 + /// + [SugarColumn(ColumnName="date" )] + public int? Date { get; set; } + /// + /// 要货数量 + /// + [SugarColumn(ColumnName="number" )] + public int? Number { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Service/ZR.Service.csproj b/ZR.Service/ZR.Service.csproj index 3488f23c..582a50fb 100644 --- a/ZR.Service/ZR.Service.csproj +++ b/ZR.Service/ZR.Service.csproj @@ -8,6 +8,10 @@ + + + + diff --git a/ZR.Service/mes/wms/IService/IWMExitwarehouseService.cs b/ZR.Service/mes/wms/IService/IWMExitwarehouseService.cs new file mode 100644 index 00000000..d329acc0 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWMExitwarehouseService.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + public interface IWMExitwarehouseService + { + /// + /// 一般退库 + /// + /// + /// + public bool ExitwarehouseCommmon(string original); + /// + /// 判断箱子是否存在陈平库中 + /// + /// + /// + + public bool IsExistedWarehouse(string originalCode); + + } +} diff --git a/ZR.Service/mes/wms/IService/IWMWarehousingService.cs b/ZR.Service/mes/wms/IService/IWMentryWarehousing_productService.cs similarity index 100% rename from ZR.Service/mes/wms/IService/IWMWarehousingService.cs rename to ZR.Service/mes/wms/IService/IWMentryWarehousing_productService.cs diff --git a/ZR.Service/mes/wms/IService/IWmMaterialService.cs b/ZR.Service/mes/wms/IService/IWmMaterialService.cs new file mode 100644 index 00000000..0f745359 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmMaterialService.cs @@ -0,0 +1,24 @@ +using System; +using ZR.Model; +using ZR.Model.Dto; +using System.Collections.Generic; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// 物料记录表service接口 + /// + public interface IWmMaterialService : IBaseService + { + PagedInfo GetList(WmMaterialQueryDto parm); + + WmMaterial GetInfo(string Id); + + WmMaterial AddWmMaterial(WmMaterial parm); + + int UpdateWmMaterial(WmMaterial parm); + + } +} diff --git a/ZR.Service/mes/wms/WMExitwarehouseService.cs b/ZR.Service/mes/wms/WMExitwarehouseService.cs new file mode 100644 index 00000000..2f4d1a36 --- /dev/null +++ b/ZR.Service/mes/wms/WMExitwarehouseService.cs @@ -0,0 +1,115 @@ +using Infrastructure.Attribute; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.MES.pro; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + + [AppService(ServiceType = typeof(IWMExitwarehouseService), ServiceLifetime = LifeTime.Transient)] + public class WMExitwarehouseService : BaseService, IWMExitwarehouseService + { + private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); + //普通入库 + public bool ExitwarehouseCommmon(string original) + { + ResultionPackageCodeDto packageCode = ResolutionPackagecode(original); + string patchCode = packageCode.PatchCode; + + + int result = Context.Deleteable().Where(it => it.PackageCodeClient == patchCode).ExecuteCommand(); + + if (result == 0) + { + return false; + } + return true; + + } + + /// + /// 判断箱子是否在成品库中 + /// + /// + /// + /// + public bool IsExistedWarehouse(string originalCode) + { + ResultionPackageCodeDto resultionPackage = ResolutionPackagecode(originalCode); + + return Context.Queryable().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any(); + } + + + /// + /// 解析外箱标签码 + /// + /// + /// + private ResultionPackageCodeDto ResolutionPackagecode(string packagecode) + { + ResultionPackageCodeDto resultionPackageCode = new ResultionPackageCodeDto(); + try + { + resultionPackageCode.originalCode = packagecode; + + // todo 解析外箱标签码 + string[] splitstr = packagecode.Split('^'); + resultionPackageCode.PatchCode = splitstr[0].Substring(5); + + //todo 解析零件号 + string partnumber = splitstr[1].Substring(11); + //int length = lingshi.Length - 2; + //string partnumber = lingshi.Substring(0, length); + resultionPackageCode.PartNumner = partnumber; + //todo 解析工单号 + string workoderidid = splitstr[2].Substring(7); + resultionPackageCode.WorkoderID = workoderidid; + //todo 生产描述 + resultionPackageCode.ProductionTime = "20" + workoderidid.Substring(0, 6); + //todo 解析箱子中产品数量 + string product_num = splitstr[3].Substring(4); + resultionPackageCode.Quantity = product_num; + //todo 产品描述 partnumber + // ProWorklplan_v2 plan= Context.Queryable().Where(it => it.Partnumber == partnumber).First(); + //if(plan != null) + // { + // resultionPackageCode.ProductionDescribe = plan.ProductName; + // } + // else + // { + // resultionPackageCode.ProductionDescribe = "生产计划无此零件号"; + // } + ProWorkorder_v2 workorder = Context.Queryable().Where(it => it.FinishedPartNumber == partnumber).First(); + + if (workorder != null) + { + resultionPackageCode.ProductionDescribe = workorder.ProductDescription; + } + else + { + resultionPackageCode.ProductionDescribe = "生产工单无此零件号"; + } + + + } + catch (Exception ex) + { + logger.Error($"外箱标签码，解析失败 {ex.Message}"); + + } + + return resultionPackageCode; + } + + } + + +} diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index 05cf9ef9..85e55f47 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -10,6 +10,8 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using ZR.Model.mes.pro; +using ZR.Model.MES.pro; using ZR.Model.MES.qu; using ZR.Model.MES.wms; using ZR.Model.MES.wms.Dto; @@ -218,17 +220,25 @@ namespace ZR.Service.mes.wms string product_num = splitstr[3].Substring(4); resultionPackageCode.Quantity = product_num; //todo 产品描述 partnumber - ProWorklplan_v2 plan= Context.Queryable().Where(it => it.Partnumber == partnumber).First(); - if(plan != null) + // ProWorklplan_v2 plan= Context.Queryable().Where(it => it.Partnumber == partnumber).First(); + //if(plan != null) + // { + // resultionPackageCode.ProductionDescribe = plan.ProductName; + // } + // else + // { + // resultionPackageCode.ProductionDescribe = "生产计划无此零件号"; + // } + ProWorkorder_v2 workorder= Context.Queryable().Where(it => it.FinishedPartNumber == partnumber).First(); + + if (workorder != null) { - resultionPackageCode.ProductionDescribe = plan.ProductName; + resultionPackageCode.ProductionDescribe = workorder.ProductDescription; } else { - resultionPackageCode.ProductionDescribe = "生产计划无此零件号"; + resultionPackageCode.ProductionDescribe = "生产工单无此零件号"; } - - } diff --git a/ZR.Service/mes/wms/WmMaterialService.cs b/ZR.Service/mes/wms/WmMaterialService.cs new file mode 100644 index 00000000..bcecf225 --- /dev/null +++ b/ZR.Service/mes/wms/WmMaterialService.cs @@ -0,0 +1,98 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using ZR.Model; +using ZR.Model.Dto; + +using ZR.Repository; + +using System.Linq; +using ZR.Service.mes.wms.IService; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms +{ + /// + /// 物料记录表Service业务层处理 + /// + [AppService(ServiceType = typeof(IWmMaterialService), ServiceLifetime = LifeTime.Transient)] + public class WmMaterialService : BaseService, IWmMaterialService + { + /// + /// 查询物料记录表列表 + /// + /// + /// + public PagedInfo GetList(WmMaterialQueryDto parm) + { + var predicate = Expressionable.Create(); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public WmMaterial GetInfo(string Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加物料记录表 + /// + /// + /// + public WmMaterial AddWmMaterial(WmMaterial model) + { + model.Id= SnowFlakeSingle.Instance.NextId().ToString(); + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改物料记录表 + /// + /// + /// + public int UpdateWmMaterial(WmMaterial model) + { + //var response = Update(w => w.Id == model.Id, it => new WmMaterial() + //{ + // Partnumber = model.Partnumber, + // U8InventoryCode = model.U8InventoryCode, + // BlankNum = model.BlankNum, + // Unit = model.Unit, + // ProductName = model.ProductName, + // Color = model.Color, + // Specification = model.Specification, + // Description = model.Description, + // Version = model.Version, + // Remarks = model.Remarks, + // Sort = model.Sort, + // Search1 = model.Search1, + // Search2 = model.Search2, + // Status = model.Status, + // CreatedBy = model.CreatedBy, + // CreatedTime = model.CreatedTime, + // UpdatedBy = model.UpdatedBy, + // UpdatedTime = model.UpdatedTime, + //}); + //return response; + return Update(model, true); + } + + } +} \ No newline at end of file