入库管理

ZR.Model/MES/pro/DTO/ProFinishedProductReceiptDto.cs

@@ -0,0 +1,109 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// MES成品入库单主表（含产品信息及标签打印状态）查询对象
+    /// </summary>
+    public class ProFinishedProductReceiptQueryDto : PagerInfo 
+    {
+        /// <summary>
+        /// 入库类型
+        /// </summary>
+        public string ReceiptType { get; set; }
+
+        /// <summary>
+        /// 单据状态
+        /// </summary>
+        public string Status { get; set; }
+
+        public DateTime? StartTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+    }
+
+    /// <summary>
+    /// MES成品入库单主表（含产品信息及标签打印状态）输入输出对象
+    /// </summary>
+    public class ProFinishedProductReceiptDto
+    {
+        [Required(ErrorMessage = "入库单号（主键，规则：RCP+日期+流水号，如RCP20251112001）不能为空")]
+        public string ReceiptNo { get; set; }
+
+        [Required(ErrorMessage = "入库日期不能为空")]
+        public DateTime? ReceiptDate { get; set; }
+
+        public string SiteNo { get; set; }
+
+        public string WorkOrder { get; set; }
+
+        [Required(ErrorMessage = "仓库编码（关联仓库表）不能为空")]
+        public string WarehouseCode { get; set; }
+
+        [Required(ErrorMessage = "入库类型：NORMAL-正常入库；REWORK-返工入库；RETURN-客户退货；OTHER-其他不能为空")]
+        public string ReceiptType { get; set; }
+
+        [Required(ErrorMessage = "单据状态：DRAFT-草稿；SUBMITTED-已提交；APPROVED-已审核；CANCELED-已取消不能为空")]
+        public string Status { get; set; }
+
+        [Required(ErrorMessage = "产品编号（对应JSON中的PartNumber，如5615101DSV0000B96）不能为空")]
+        public string PartNumber { get; set; }
+
+        [Required(ErrorMessage = "产品名称（对应JSON中的Description，如A58左后门把手-手动版-幻彩银）不能为空")]
+        public string Description { get; set; }
+
+        public string Color { get; set; }
+
+        public string Specification { get; set; }
+
+        public string ProductionLine { get; set; }
+
+        public string Team { get; set; }
+
+        public string ShiftNo { get; set; }
+
+        public string LabelFrom { get; set; }
+
+        public DateTime? ProductionTime { get; set; }
+
+        [Required(ErrorMessage = "批次编码（对应JSON中的BatchCode，如20251016）不能为空")]
+        public string BatchCode { get; set; }
+
+        [Required(ErrorMessage = "计量单位（如个、箱、台）不能为空")]
+        public string Unit { get; set; }
+
+        public string PackageCode { get; set; }
+
+        public int? PackageCount { get; set; }
+
+        public int? PackageNum { get; set; }
+
+        public string LabelCode { get; set; }
+
+        [Required(ErrorMessage = "标签打印状态：UNPRINTED-未打印；PRINTED-已打印不能为空")]
+        public string LabelPrintStatus { get; set; }
+
+        public string StorageLocation { get; set; }
+
+        public string QcStatus { get; set; }
+
+        [Required(ErrorMessage = "创建人（用户ID）不能为空")]
+        public string CreatedBy { get; set; }
+
+        [Required(ErrorMessage = "创建时间（对应JSON中的CreatedTime）不能为空")]
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+        public string ApprovedBy { get; set; }
+
+        public DateTime? ApprovedTime { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/pro/DTO/ProFinishedProductReceiptLogDto.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// MES成品入库单操作日志表查询对象
+    /// </summary>
+    public class ProFinishedProductReceiptLogQueryDto : PagerInfo 
+    {
+        public DateTime? StartTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+    }
+
+    /// <summary>
+    /// MES成品入库单操作日志表输入输出对象
+    /// </summary>
+    public class ProFinishedProductReceiptLogDto
+    {
+        [Required(ErrorMessage = "自增主键不能为空")]
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long Id { get; set; }
+
+        [Required(ErrorMessage = "关联入库单号不能为空")]
+        public string ReceiptNo { get; set; }
+
+        [Required(ErrorMessage = "操作人（用户ID）不能为空")]
+        public string OperatedBy { get; set; }
+
+        [Required(ErrorMessage = "操作时间不能为空")]
+        public DateTime? OperatedTime { get; set; }
+
+        [Required(ErrorMessage = "操作类型：CREATE-创建；UPDATE-修改；APPROVE-审核；CANCEL-取消；PRINT_LABEL-打印标签；OTHER-其他不能为空")]
+        public string OperationType { get; set; }
+
+        public string OperationContent { get; set; }
+
+        public string OperationResult { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/pro/ProFinishedProductReceipt.cs

@@ -0,0 +1,196 @@
+
+namespace ZR.Model.Business
+{
+    /// <summary>
+    /// MES成品入库单主表（含产品信息及标签打印状态）
+    /// </summary>
+    [SugarTable("pro_finished_product_receipt")]
+    public class ProFinishedProductReceipt
+    {
+        /// <summary>
+        /// 入库单号（主键，规则：RCP+日期+流水号，如RCP20251112001） 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "receipt_no")]
+        public string ReceiptNo { get; set; }
+
+        /// <summary>
+        /// 入库日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "receipt_date")]
+        public DateTime? ReceiptDate { get; set; }
+
+        /// <summary>
+        /// 站点编号（对应JSON中的SiteNo） 
+        /// </summary>
+        [SugarColumn(ColumnName = "site_no")]
+        public string SiteNo { get; set; }
+
+        /// <summary>
+        /// 生产工单号（对应JSON中的WorkOrder） 
+        /// </summary>
+        [SugarColumn(ColumnName = "work_order")]
+        public string WorkOrder { get; set; }
+
+        /// <summary>
+        /// 仓库编码（关联仓库表） 
+        /// </summary>
+        [SugarColumn(ColumnName = "warehouse_code")]
+        public string WarehouseCode { get; set; }
+
+        /// <summary>
+        /// 入库类型：NORMAL-正常入库；REWORK-返工入库；RETURN-客户退货；OTHER-其他 
+        /// </summary>
+        [SugarColumn(ColumnName = "receipt_type")]
+        public string ReceiptType { get; set; }
+
+        /// <summary>
+        /// 单据状态：DRAFT-草稿；SUBMITTED-已提交；APPROVED-已审核；CANCELED-已取消 
+        /// </summary>
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 产品编号（对应JSON中的PartNumber，如5615101DSV0000B96） 
+        /// </summary>
+        [SugarColumn(ColumnName = "part_number")]
+        public string PartNumber { get; set; }
+
+        /// <summary>
+        /// 产品名称（对应JSON中的Description，如A58左后门把手-手动版-幻彩银） 
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 颜色（对应JSON中的Color，如幻彩银） 
+        /// </summary>
+        public string Color { get; set; }
+
+        /// <summary>
+        /// 规格型号（对应JSON中的Specification，如手动版） 
+        /// </summary>
+        public string Specification { get; set; }
+
+        /// <summary>
+        /// 生产线 
+        /// </summary>
+        [SugarColumn(ColumnName = "production_line")]
+        public string ProductionLine { get; set; }
+
+        /// <summary>
+        /// 班组（对应JSON中的Team，如B班） 
+        /// </summary>
+        public string Team { get; set; }
+
+        /// <summary>
+        /// 班次（如早班/中班/晚班） 
+        /// </summary>
+        [SugarColumn(ColumnName = "shift_no")]
+        public string ShiftNo { get; set; }
+
+        /// <summary>
+        /// 标签来源（对应JSON中的LabelFrom，如后道） 
+        /// </summary>
+        [SugarColumn(ColumnName = "label_from")]
+        public string LabelFrom { get; set; }
+
+        /// <summary>
+        /// 生产时间（对应JSON中的ProductionTime） 
+        /// </summary>
+        [SugarColumn(ColumnName = "production_time")]
+        public DateTime? ProductionTime { get; set; }
+
+        /// <summary>
+        /// 批次编码（对应JSON中的BatchCode，如20251016） 
+        /// </summary>
+        [SugarColumn(ColumnName = "batch_code")]
+        public string BatchCode { get; set; }
+
+        /// <summary>
+        /// 计量单位（如个、箱、台） 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 包装编码（对应JSON中的PackageCode，如BNW20240401_001） 
+        /// </summary>
+        [SugarColumn(ColumnName = "package_code")]
+        public string PackageCode { get; set; }
+
+        /// <summary>
+        /// 包装数量（对应JSON中的PackageCout，如1） 
+        /// </summary>
+        [SugarColumn(ColumnName = "package_count")]
+        public int? PackageCount { get; set; }
+
+        /// <summary>
+        /// 每包数量（对应JSON中的PackageNum，如24） 
+        /// </summary>
+        [SugarColumn(ColumnName = "package_num")]
+        public int? PackageNum { get; set; }
+
+        /// <summary>
+        /// 标签编码（对应JSON中的LabelCode，如60102853-Y73-01/2025040811//） 
+        /// </summary>
+        [SugarColumn(ColumnName = "label_code")]
+        public string LabelCode { get; set; }
+
+        /// <summary>
+        /// 标签打印状态：UNPRINTED-未打印；PRINTED-已打印 
+        /// </summary>
+        [SugarColumn(ColumnName = "label_print_status")]
+        public string LabelPrintStatus { get; set; }
+
+        /// <summary>
+        /// 存储库位（如A区-1货架-01层） 
+        /// </summary>
+        [SugarColumn(ColumnName = "storage_location")]
+        public string StorageLocation { get; set; }
+
+        /// <summary>
+        /// 质检状态：PENDING-待检；QUALIFIED-合格；UNQUALIFIED-不合格 
+        /// </summary>
+        [SugarColumn(ColumnName = "qc_status")]
+        public string QcStatus { get; set; }
+
+        /// <summary>
+        /// 创建人（用户ID） 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_by")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间（对应JSON中的CreatedTime） 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_time")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人（用户ID） 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_by")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_time")]
+        public DateTime? UpdatedTime { get; set; }
+
+        /// <summary>
+        /// 审核人（用户ID） 
+        /// </summary>
+        [SugarColumn(ColumnName = "approved_by")]
+        public string ApprovedBy { get; set; }
+
+        /// <summary>
+        /// 审核时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "approved_time")]
+        public DateTime? ApprovedTime { get; set; }
+
+        /// <summary>
+        /// 备注信息 
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+}

ZR.Model/MES/pro/ProFinishedProductReceiptLog.cs

@@ -0,0 +1,58 @@
+
+namespace ZR.Model.Business
+{
+    /// <summary>
+    /// MES成品入库单操作日志表
+    /// </summary>
+    [SugarTable("pro_finished_product_receipt_log")]
+    public class ProFinishedProductReceiptLog
+    {
+        /// <summary>
+        /// 自增主键 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 关联入库单号 
+        /// </summary>
+        [SugarColumn(ColumnName = "receipt_no")]
+        public string ReceiptNo { get; set; }
+
+        /// <summary>
+        /// 操作人（用户ID） 
+        /// </summary>
+        [SugarColumn(ColumnName = "operated_by")]
+        public string OperatedBy { get; set; }
+
+        /// <summary>
+        /// 操作时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "operated_time")]
+        public DateTime? OperatedTime { get; set; }
+
+        /// <summary>
+        /// 操作类型：CREATE-创建；UPDATE-修改；APPROVE-审核；CANCEL-取消；PRINT_LABEL-打印标签；OTHER-其他 
+        /// </summary>
+        [SugarColumn(ColumnName = "operation_type")]
+        public string OperationType { get; set; }
+
+        /// <summary>
+        /// 操作内容（如“标签打印成功，编码：XXX”） 
+        /// </summary>
+        [SugarColumn(ColumnName = "operation_content")]
+        public string OperationContent { get; set; }
+
+        /// <summary>
+        /// 操作结果：SUCCESS-成功；FAIL-失败 
+        /// </summary>
+        [SugarColumn(ColumnName = "operation_result")]
+        public string OperationResult { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+}