# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
This commit is contained in:
赵正易
2024-03-19 20:49:02 +08:00
42 changed files with 2489 additions and 40 deletions

View File

@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.wms.Dto
{
public class ResultionPackageCodeDto
{
/// <summary>
/// 原始码
/// </summary>
public string originalCode { get; set; }
/// <summary>
/// 批次号
/// </summary>
public string PatchCode { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string PartNumner { get; set; }
/// <summary>
/// 工单号
/// </summary>
public string WorkoderID { get; set; }
/// <summary>
/// 数量
/// </summary>
public string Quantity { get; set; }
/// <summary>
/// 生产时间
/// </summary>
public string ProductionTime { get; set; }
/// <summary>
/// 产品描述
/// </summary>
public string ProductionDescribe { get; set; }
}
}

View File

@@ -0,0 +1,42 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 客户信息查询对象
/// </summary>
public class WmCustomQueryDto : PagerInfo
{
public string CustomNo { get; set; }
public string CustomName { get; set; }
}
/// <summary>
/// 客户信息输入输出对象
/// </summary>
public class WmCustomDto
{
[Required(ErrorMessage = "主键不能为空")]
public int Id { get; set; }
public string CustomNo { get; set; }
public string CustomName { get; set; }
public string CustomAddress { get; set; }
public string Remark { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
}

View File

@@ -0,0 +1,133 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 物料记录表查询对象
/// </summary>
public class WmMaterialQueryDto : PagerInfo
{
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; }
}
/// <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>
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; }
}
}

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; }
}
}

View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 待入库货物
/// </summary>
public class WmgoodsDto
{
/// <summary>
/// 货架
/// </summary>
public string location { set; get; }
/// <summary>
/// 箱子列表(原始外箱标签码)
/// </summary>
public string[] packagelist { set; get; }
}
}

View File

@@ -0,0 +1,67 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 客户信息
/// </summary>
[SugarTable("wm_custom")]
public class WmCustom
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 客户代码
/// </summary>
[SugarColumn(ColumnName = "custom_no")]
public string CustomNo { get; set; }
/// <summary>
/// 客户名称
/// </summary>
[SugarColumn(ColumnName = "custom_name")]
public string CustomName { get; set; }
/// <summary>
/// 客户地址
/// </summary>
[SugarColumn(ColumnName = "custom_address")]
public string CustomAddress { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { 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; }
}
}

View File

@@ -0,0 +1,89 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 成品库当前货物表
///</summary>
[SugarTable("wm_goods_now_production")]
public class WmGoodsNowProduction
{
/// <summary>
/// 雪花id
///</summary>
[SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
public string Id { 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 = "partnumber")]
public string Partnumber { get; set; }
/// <summary>
/// 库位编号
///</summary>
[SugarColumn(ColumnName = "location_code")]
public string LocationCode { 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 = "remark")]
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; }
}
}

View File

@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 入库日志U8上传
///</summary>
[SugarTable("wm_in_log")]
public class WmInLog
{
/// <summary>
/// 主键(雪花生产)
///</summary>
[SugarColumn(ColumnName="id" )]
public string Id { get; set; }
/// <summary>
/// u8库存编码
///</summary>
[SugarColumn(ColumnName="u8_inventory_code" )]
public string U8InventoryCode { get; set; }
/// <summary>
/// 仓库编号
///</summary>
[SugarColumn(ColumnName="wm_info_id" )]
public string WmInfoId { get; set; }
/// <summary>
/// mes内码
///</summary>
[SugarColumn(ColumnName="package_code" )]
public string PackageCode { get; set; }
/// <summary>
/// 批次号
///</summary>
[SugarColumn(ColumnName="code" )]
public string Code { get; set; }
/// <summary>
/// 数量
///</summary>
[SugarColumn(ColumnName="number" )]
public string Number { 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; }
}
}

View File

@@ -0,0 +1,109 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 物料记录表
///</summary>
[SugarTable("wm_material")]
public class WmMaterial
{
/// <summary>
/// 主键G
///</summary>
[SugarColumn(ColumnName="id" ,IsPrimaryKey = true )]
public string Id { get; set; }
/// <summary>
/// 物料号(零件号)
///</summary>
[SugarColumn(ColumnName="partnumber")]
public string Partnumber { get; set; }
/// <summary>
/// U8库存编码
///</summary>
[SugarColumn(ColumnName="u8_inventory_code")]
public string U8InventoryCode { get; set; }
/// <summary>
/// 毛坯号
///</summary>
[SugarColumn(ColumnName="blank_num" )]
public string BlankNum { 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>
/// 备注
///</summary>
[SugarColumn(ColumnName="remarks" )]
public string Remarks { get; set; }
/// <summary>
/// 排序(特殊排序)
///</summary>
[SugarColumn(ColumnName="sort" )]
public int? Sort { get; set; }
/// <summary>
/// 便捷搜索字段1
///</summary>
[SugarColumn(ColumnName="search1" )]
public string Search1 { get; set; }
/// <summary>
/// 便捷搜索字段2
///</summary>
[SugarColumn(ColumnName="search2" )]
public string Search2 { get; set; }
/// <summary>
/// 状态0-不可见 1-可见)
///</summary>
[SugarColumn(ColumnName="status" )]
public int? Status { 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; }
}
}

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; }
}
}

View File

@@ -0,0 +1,100 @@
namespace ZR.Model.MES.wms
{
/// <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>
/// 出库单号(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>
/// 客户代码
/// </summary>
[SugarColumn(ColumnName = "custom_no")]
public string CustomNo { get; set; }
/// <summary>
/// 客户名称
/// </summary>
[SugarColumn(ColumnName = "custom_name")]
public string CustomName { get; set; }
/// <summary>
/// 客户地址
/// </summary>
[SugarColumn(ColumnName = "custom_address")]
public string CustomAddress { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
/// <summary>
/// 出库单状态1-出库中 2-出库完成 3-弃用)
/// </summary>
public int Type { get; set; }
/// <summary>
/// 状态0-停用 1-启用)
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 年
/// </summary>
public int? Year { get; set; }
/// <summary>
/// 周
/// </summary>
public int? Week { get; set; }
/// <summary>
/// 日
/// </summary>
public int? Date { 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; }
}
}

View File

@@ -0,0 +1,76 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms
{
/// <summary>
/// 包装记录
///</summary>
[SugarTable("wm_packingrecord")]
public class WmPackingrecord
{
/// <summary>
///
///</summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 零件号
///</summary>
[SugarColumn(ColumnName = "PartNum")]
public string PartNum { get; set; }
/// <summary>
/// 设备名称ID
///</summary>
[SugarColumn(ColumnName = "Machine")]
public string Machine { get; set; }
/// <summary>
/// 产品条码
///</summary>
[SugarColumn(ColumnName = "ProductCode")]
public string ProductCode { get; set; }
/// <summary>
/// 箱条码
///</summary>
[SugarColumn(ColumnName = "PackingCode")]
public string PackingCode { get; set; }
/// <summary>
/// 扫码记录
///</summary>
[SugarColumn(ColumnName = "ScannerContent")]
public string ScannerContent { get; set; }
/// <summary>
/// 工单号
///</summary>
[SugarColumn(ColumnName = "WorkOrderNum")]
public string WorkOrderNum { get; set; }
/// <summary>
/// 备用3
///</summary>
[SugarColumn(ColumnName = "Standby3")]
public string Standby3 { get; set; }
/// <summary>
/// 备用4
///</summary>
[SugarColumn(ColumnName = "Standby4")]
public string Standby4 { get; set; }
/// <summary>
/// 备用5
///</summary>
[SugarColumn(ColumnName = "Standby5")]
public string Standby5 { get; set; }
/// <summary>
/// 指示是否满箱
/// 默认值: b'0'
///</summary>
[SugarColumn(ColumnName = "BFilled")]
public bool BFilled { get; set; }
/// <summary>
/// 创建时间
///</summary>
[SugarColumn(ColumnName = "CreateTime")]
public DateTime? CreateTime { get; set; }
}
}