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

仓库模块_出库:修正

Browse Source
This commit is contained in:
qianhao.xu
2024-03-19 11:08:28 +08:00
parent 741ec8ade4
commit bf4e606977
15 changed files with 641 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ZR.Model/MES/wms/Dto/WmMaterialDto.cs
View File

@@ -48,6 +48,38 @@ namespace ZR.Model.MES.wms.Dto
public DateTime? UpdatedTime { get; set; }
}
/// <summary>
/// 带库存记录的物料库存表
/// </summary>
public class WmMaterialQuery_stockQuantityDto : WmMaterialQueryDto
{
/// <summary>
/// 库存数量
/// </summary>
public int stockQuantity { get; set; }
/// <summary>
/// 需要出货数量
/// </summary>
public int requireOutNum { get; set; }
}
/// <summary>
/// 带需要出货数量的物料库存表
/// </summary>
public class WmMaterialQuery_stockQuantityDto2 : WmMaterialQueryDto
{
/// <summary>
/// 需要出货数量
/// </summary>
public int requireOutNum { get; set; }
}
/// <summary>
/// 物料记录表输入输出对象
/// </summary>
@@ -95,4 +127,7 @@ namespace ZR.Model.MES.wms.Dto
}
}

71
ZR.Model/MES/wms/Dto/WmOutOrderDto.cs Normal file
View File

@@ -0,0 +1,71 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 出货单（物料+客户）查询对象
/// </summary>
public class WmOutOrderQueryDto : PagerInfo
{
}
/// <summary>
/// 出货单（物料+客户）输入输出对象
/// </summary>
public class WmOutOrderDto
{
public string ShipmentNum { get; set; }
public string CustomId { get; set; }
public string CustomNo { get; set; }
public string CustomName { get; set; }
public string CustomAddress { get; set; }
public string Remarks { get; set; }
public int Type { get; set; }
public int? Status { get; set; }
public int? Year { get; set; }
public int? Week { get; set; }
public int? Date { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
/// <summary>
/// 出货单（物料+客户）输入输出对象
/// </summary>
public class WmOutOrder_materialDto : WmOutOrderDto
{
//带出货数量的物料表
public List<WmMaterialQuery_stockQuantityDto> MaterialList { get; set; }
}
/// <summary>
/// 出货单_物料——数量
/// </summary>
public class WmOutOrder_material_num : WmOutOrderDto
{
//带出货数量的物料表
public List<WmMaterialQuery_stockQuantityDto2> MaterialList { get; set; }
}
}

9
ZR.Model/MES/wms/WmGoodsNowProduction.cs
View File

@@ -27,12 +27,19 @@ namespace ZR.Model.MES.wms
public string PackageCodeClient { get; set; }
/// <summary>
/// 箱子编号 (批次号)
/// 箱子编号 (原始)
///</summary>
[SugarColumn(ColumnName = "package_code_original")]
public string PackageCodeOriginal { get; set; }
/// <summary>
/// 零件号
///</summary>
[SugarColumn(ColumnName = "partnumber")]
public string Partnumber { get; set; }
/// <summary>
/// 库位编号
///</summary>

59
ZR.Model/MES/wms/WmMaterialOutorder.cs Normal file
View File

@@ -0,0 +1,59 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 物料表和出库单关联表
/// </summary>
[SugarTable("wm_material_outorder")]
public class WmMaterialOutorder
{
/// <summary>
/// Id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 物料表主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_material_id")]
public string FkMaterialId { get; set; }
/// <summary>
/// 出货单id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_outorder_id")]
public string FkOutorderId { get; set; }
/// <summary>
/// 出货数量
/// </summary>
[SugarColumn(ColumnName = "outhouse_num")]
public int OuthouseNum { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime? CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
}
}

161
ZR.Model/MES/wms/WmOutOrder.cs
View File

@@ -1,129 +1,100 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 出货单（物料+客户）
///</summary>
/// </summary>
[SugarTable("wm_out_order")]
public class WmOutOrder
{
//[Navigate(NavigateType.OneToMany, nameof(WmMaterialOutorder.FkOutorderId))]//BookA表中的studenId
//public List<WmMaterialOutorder> Books { get; set; }//注意禁止给books手动赋值
/// <summary>
/// 主键G
///</summary>
[SugarColumn(ColumnName="id" ,IsPrimaryKey = true )]
public string Id { get; set; }
/// <summary>
/// 出货单号(雪花算法)
///</summary>
[SugarColumn(ColumnName="shipment_num" )]
public string ShipmentNum { get; set; }
/// 出库单号(EG+时间)
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "shipment_num")]
public string ShipmentNum { get; set; }
/// <summary>
/// 客户id
///</summary>
[SugarColumn(ColumnName="custom_id" )]
public string CustomId { get; set; }
/// </summary>
[SugarColumn(ColumnName = "custom_id")]
public string CustomId { get; set; }
/// <summary>
/// 客户代码
///</summary>
[SugarColumn(ColumnName="custom_no" )]
public string CustomNo { get; set; }
/// </summary>
[SugarColumn(ColumnName = "custom_no")]
public string CustomNo { get; set; }
/// <summary>
/// 客户名称
///</summary>
[SugarColumn(ColumnName="custom_name" )]
public string CustomName { get; set; }
/// </summary>
[SugarColumn(ColumnName = "custom_name")]
public string CustomName { get; set; }
/// <summary>
/// 客户地址
///</summary>
[SugarColumn(ColumnName="custom_address" )]
public string CustomAddress { get; set; }
/// <summary>
/// 物料号（零件号）
///</summary>
[SugarColumn(ColumnName="partnumber" )]
public string Partnumber { get; set; }
/// <summary>
/// 单位
///</summary>
[SugarColumn(ColumnName="unit" )]
public string Unit { get; set; }
/// <summary>
/// 产品描述（产品名称）
///</summary>
[SugarColumn(ColumnName="product_name" )]
public string ProductName { get; set; }
/// <summary>
/// 产品颜色
///</summary>
[SugarColumn(ColumnName="color" )]
public string Color { get; set; }
/// <summary>
/// 规格（左右脚）
///</summary>
[SugarColumn(ColumnName="specification" )]
public string Specification { get; set; }
/// <summary>
/// 显示描述(产品描述+颜色+规格)
///</summary>
[SugarColumn(ColumnName="description" )]
public string Description { get; set; }
/// <summary>
/// 版本号
///</summary>
[SugarColumn(ColumnName="version" )]
public string Version { get; set; }
/// </summary>
[SugarColumn(ColumnName = "custom_address")]
public string CustomAddress { get; set; }
/// <summary>
/// 备注
///</summary>
[SugarColumn(ColumnName="remarks" )]
public string Remarks { get; set; }
/// </summary>
public string Remarks { get; set; }
/// <summary>
/// 状态（0-不可见 1-可见）
///</summary>
[SugarColumn(ColumnName="status" )]
public int? Status { get; set; }
/// 出库单状态（1-出库中 2-出库完成 3-弃用）
/// </summary>
public int Type { get; set; }
/// <summary>
/// 状态（0-停用 1-启用）
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 年
///</summary>
[SugarColumn(ColumnName="year" )]
public int? Year { get; set; }
/// </summary>
public int? Year { get; set; }
/// <summary>
/// 周
///</summary>
[SugarColumn(ColumnName="week" )]
public int? Week { get; set; }
/// </summary>
public int? Week { get; set; }
/// <summary>
/// 日
///</summary>
[SugarColumn(ColumnName="date" )]
public int? Date { get; set; }
/// <summary>
/// 要货数量
///</summary>
[SugarColumn(ColumnName="number" )]
public int? Number { get; set; }
/// </summary>
public int? Date { get; set; }
/// <summary>
/// 创建人
///</summary>
[SugarColumn(ColumnName="CREATED_BY" )]
public string CreatedBy { get; set; }
/// </summary>
[SugarColumn(ColumnName = "cREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
///</summary>
[SugarColumn(ColumnName="CREATED_TIME" )]
public DateTime? CreatedTime { get; set; }
/// </summary>
[SugarColumn(ColumnName = "cREATED_TIME")]
public DateTime? CreatedTime { get; set; }
/// <summary>
/// 更新人
///</summary>
[SugarColumn(ColumnName="UPDATED_BY" )]
public string UpdatedBy { get; set; }
/// </summary>
[SugarColumn(ColumnName = "uPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
///</summary>
[SugarColumn(ColumnName="UPDATED_TIME" )]
public DateTime? UpdatedTime { get; set; }
/// </summary>
[SugarColumn(ColumnName = "uPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
}
}
}