Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库模块_出库货物记录:init

Browse Source
This commit is contained in:
qianhao.xu
2024-03-22 08:54:11 +08:00
parent dac58ddb77
commit 3e7cd97255
4 changed files with 132 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
View File

@@ -33,7 +33,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:list")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:list")]
public IActionResult QueryWmGoodsOutProduction([FromQuery] WmGoodsOutProductionQueryDto parm)
{
var response = _WmGoodsOutProductionService.GetList(parm);
@@ -47,12 +47,12 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:query")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:query")]
public IActionResult GetWmGoodsOutProduction(string Id)
{
var response = _WmGoodsOutProductionService.GetInfo(Id);
var info = response.Adapt<WmGoodsOutProduction>();
var info = response.Adapt<WmGoodsOutRecord>();
return SUCCESS(info);
}
@@ -61,11 +61,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:add")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:add")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToCreate(HttpContext);
var modal = parm.Adapt<WmGoodsOutRecord>().ToCreate(HttpContext);
var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal);
@@ -77,11 +77,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:edit")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:edit")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToUpdate(HttpContext);
var modal = parm.Adapt<WmGoodsOutRecord>().ToUpdate(HttpContext);
var response = _WmGoodsOutProductionService.UpdateWmGoodsOutProduction(modal);
return ToResponse(response);
@@ -92,7 +92,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:delete")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:delete")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsOutProduction(string ids)
{

114
ZR.Model/MES/wms/WmGoodsOutRecord.cs Normal file
View File

@@ -0,0 +1,114 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 出库货物记录表
/// </summary>
[SugarTable("wm_goods_out_record")]
public class WmGoodsOutRecord
{
/// <summary>
/// 雪花id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 成品库当前货物表主键
/// </summary>
[SugarColumn(ColumnName = "fk_now_production_id")]
public string FkNowProductionId { get; set; }
/// <summary>
/// 出库单号
/// </summary>
[SugarColumn(ColumnName = "fk_out_order_id")]
public string FkOutOrderId { get; set; }
/// <summary>
/// 箱子编号（MES）
/// </summary>
[SugarColumn(ColumnName = "package_code")]
public string PackageCode { get; set; }
/// <summary>
/// 箱子编号（客户）
/// </summary>
[SugarColumn(ColumnName = "package_code_client")]
public string PackageCodeClient { get; set; }
/// <summary>
/// 箱子编号（原始码）
/// </summary>
[SugarColumn(ColumnName = "package_code_original")]
public string PackageCodeOriginal { get; set; }
/// <summary>
/// 库位编号
/// </summary>
[SugarColumn(ColumnName = "location_code")]
public string LocationCode { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string Partnumber { get; set; }
/// <summary>
/// 箱子中货物数量（理论）
/// </summary>
[SugarColumn(ColumnName = "goods_num_logic")]
public int? GoodsNumLogic { get; set; }
/// <summary>
/// 箱子中货物数量（实际）
/// </summary>
[SugarColumn(ColumnName = "goods_num_action")]
public int? GoodsNumAction { get; set; }
/// <summary>
/// 入库时间
/// </summary>
[SugarColumn(ColumnName = "entry_warehouse_time")]
public DateTime? EntryWarehouseTime { get; set; }
/// <summary>
/// 出库时间
/// </summary>
[SugarColumn(ColumnName = "out_time")]
public DateTime? OutTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "uPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "uPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "cREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "cREATED_TIME")]
public DateTime? CreatedTime { get; set; }
}
}

8
ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs
View File

@@ -10,15 +10,15 @@ namespace ZR.Service.mes.wms.IService
/// <summary>
/// 出库货物记录表service接口
/// </summary>
public interface IWmGoodsOutProductionService : IBaseService<WmGoodsOutProduction>
public interface IWmGoodsOutProductionService : IBaseService<WmGoodsOutRecord>
{
PagedInfo<WmGoodsOutProductionDto> GetList(WmGoodsOutProductionQueryDto parm);
WmGoodsOutProduction GetInfo(string Id);
WmGoodsOutRecord GetInfo(string Id);
WmGoodsOutProduction AddWmGoodsOutProduction(WmGoodsOutProduction parm);
WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord parm);
int UpdateWmGoodsOutProduction(WmGoodsOutProduction parm);
int UpdateWmGoodsOutProduction(WmGoodsOutRecord parm);
}
}

12
ZR.Service/mes/wms/WmGoodsOutProductionService.cs
View File

@@ -17,7 +17,7 @@ namespace ZR.Service.Business
/// 出库货物记录表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmGoodsOutProductionService), ServiceLifetime = LifeTime.Transient)]
public class WmGoodsOutProductionService : BaseService<WmGoodsOutProduction>, IWmGoodsOutProductionService
public class WmGoodsOutProductionService : BaseService<WmGoodsOutRecord>, IWmGoodsOutProductionService
{
/// <summary>
/// 查询出库货物记录表列表
@@ -26,11 +26,11 @@ namespace ZR.Service.Business
/// <returns></returns>
public PagedInfo<WmGoodsOutProductionDto> GetList(WmGoodsOutProductionQueryDto parm)
{
var predicate = Expressionable.Create<WmGoodsOutProduction>();
var predicate = Expressionable.Create<WmGoodsOutRecord>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmGoodsOutProduction, WmGoodsOutProductionDto>(parm);
.ToPage<WmGoodsOutRecord, WmGoodsOutProductionDto>(parm);
return response;
}
@@ -41,7 +41,7 @@ namespace ZR.Service.Business
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmGoodsOutProduction GetInfo(string Id)
public WmGoodsOutRecord GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
@@ -55,7 +55,7 @@ namespace ZR.Service.Business
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmGoodsOutProduction AddWmGoodsOutProduction(WmGoodsOutProduction model)
public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
@@ -65,7 +65,7 @@ namespace ZR.Service.Business
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmGoodsOutProduction(WmGoodsOutProduction model)
public int UpdateWmGoodsOutProduction(WmGoodsOutRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmGoodsOutProduction()
//{