diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
index 0a366b0b..c2191ce2 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
@@ -33,7 +33,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[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
///
///
[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();
+ var info = response.Adapt();
return SUCCESS(info);
}
@@ -61,11 +61,11 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[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().ToCreate(HttpContext);
+ var modal = parm.Adapt().ToCreate(HttpContext);
var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal);
@@ -77,11 +77,11 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[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().ToUpdate(HttpContext);
+ var modal = parm.Adapt().ToUpdate(HttpContext);
var response = _WmGoodsOutProductionService.UpdateWmGoodsOutProduction(modal);
return ToResponse(response);
@@ -92,7 +92,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpDelete("{ids}")]
- [ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:delete")]
+ [ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:delete")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsOutProduction(string ids)
{
diff --git a/ZR.Model/MES/wms/WmGoodsOutRecord.cs b/ZR.Model/MES/wms/WmGoodsOutRecord.cs
new file mode 100644
index 00000000..49c51062
--- /dev/null
+++ b/ZR.Model/MES/wms/WmGoodsOutRecord.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace ZR.Model.MES.wms
+{
+ ///
+ /// 出库货物记录表
+ ///
+ [SugarTable("wm_goods_out_record")]
+ public class WmGoodsOutRecord
+ {
+ ///
+ /// 雪花id
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+ public string Id { get; set; }
+
+ ///
+ /// 成品库当前货物表主键
+ ///
+ [SugarColumn(ColumnName = "fk_now_production_id")]
+ public string FkNowProductionId { get; set; }
+
+ ///
+ /// 出库单号
+ ///
+ [SugarColumn(ColumnName = "fk_out_order_id")]
+ public string FkOutOrderId { get; set; }
+
+ ///
+ /// 箱子编号(MES)
+ ///
+ [SugarColumn(ColumnName = "package_code")]
+ public string PackageCode { get; set; }
+
+ ///
+ /// 箱子编号(客户)
+ ///
+ [SugarColumn(ColumnName = "package_code_client")]
+ public string PackageCodeClient { get; set; }
+
+ ///
+ /// 箱子编号(原始码)
+ ///
+ [SugarColumn(ColumnName = "package_code_original")]
+ public string PackageCodeOriginal { get; set; }
+
+ ///
+ /// 库位编号
+ ///
+ [SugarColumn(ColumnName = "location_code")]
+ public string LocationCode { get; set; }
+
+ ///
+ /// 零件号
+ ///
+ public string Partnumber { get; set; }
+
+ ///
+ /// 箱子中货物数量(理论)
+ ///
+ [SugarColumn(ColumnName = "goods_num_logic")]
+ public int? GoodsNumLogic { get; set; }
+
+ ///
+ /// 箱子中货物数量(实际)
+ ///
+ [SugarColumn(ColumnName = "goods_num_action")]
+ public int? GoodsNumAction { get; set; }
+
+ ///
+ /// 入库时间
+ ///
+ [SugarColumn(ColumnName = "entry_warehouse_time")]
+ public DateTime? EntryWarehouseTime { get; set; }
+
+ ///
+ /// 出库时间
+ ///
+ [SugarColumn(ColumnName = "out_time")]
+ public DateTime? OutTime { get; set; }
+
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
+
+ ///
+ /// 更新人
+ ///
+ [SugarColumn(ColumnName = "uPDATED_BY")]
+ public string UpdatedBy { get; set; }
+
+ ///
+ /// 更新时间
+ ///
+ [SugarColumn(ColumnName = "uPDATED_TIME")]
+ public DateTime? UpdatedTime { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ [SugarColumn(ColumnName = "cREATED_BY")]
+ public string CreatedBy { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ [SugarColumn(ColumnName = "cREATED_TIME")]
+ public DateTime? CreatedTime { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs b/ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs
index 7b119d3a..e64c0d81 100644
--- a/ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs
+++ b/ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs
@@ -10,15 +10,15 @@ namespace ZR.Service.mes.wms.IService
///
/// 出库货物记录表service接口
///
- public interface IWmGoodsOutProductionService : IBaseService
+ public interface IWmGoodsOutProductionService : IBaseService
{
PagedInfo 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);
}
}
diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
index d062e0ee..fc7a40e6 100644
--- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
@@ -17,7 +17,7 @@ namespace ZR.Service.Business
/// 出库货物记录表Service业务层处理
///
[AppService(ServiceType = typeof(IWmGoodsOutProductionService), ServiceLifetime = LifeTime.Transient)]
- public class WmGoodsOutProductionService : BaseService, IWmGoodsOutProductionService
+ public class WmGoodsOutProductionService : BaseService, IWmGoodsOutProductionService
{
///
/// 查询出库货物记录表列表
@@ -26,11 +26,11 @@ namespace ZR.Service.Business
///
public PagedInfo GetList(WmGoodsOutProductionQueryDto parm)
{
- var predicate = Expressionable.Create();
+ var predicate = Expressionable.Create();
var response = Queryable()
.Where(predicate.ToExpression())
- .ToPage(parm);
+ .ToPage(parm);
return response;
}
@@ -41,7 +41,7 @@ namespace ZR.Service.Business
///
///
///
- 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
///
///
///
- public WmGoodsOutProduction AddWmGoodsOutProduction(WmGoodsOutProduction model)
+ public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
@@ -65,7 +65,7 @@ namespace ZR.Service.Business
///
///
///
- public int UpdateWmGoodsOutProduction(WmGoodsOutProduction model)
+ public int UpdateWmGoodsOutProduction(WmGoodsOutRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmGoodsOutProduction()
//{