feat(材料管理): 添加原材料工单号字段并优化工单查询

在入库、出库记录及相关DTO中添加WorkorderRaw字段用于记录原材料工单号
修改ProWorkorderService查询逻辑，增加PlanNum>0的条件过滤

DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs

@@ -18,6 +18,8 @@ namespace DOAN.Model.BZFM.Dto
         public string TransactionType { get; set; }
 
         public string StoveCode { get; set; }
+
+        public string WorkorderRaw { get; set; }
     }
 
     /// <summary>
@@ -74,6 +76,11 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号
+        /// </summary>
+        public string WorkorderRaw { get; set; }
+
         [ExcelColumn(Name = "入库类型")]
         public string TransactionTypeLabel { get; set; }
     }
@@ -120,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号
+        /// </summary>
+        public string WorkorderRaw { get; set; }
+
         // 1-蓝单正向 2-红单逆向
         public int ReceiptType { get; set; } = 1;
     }
@@ -189,5 +201,9 @@ namespace DOAN.Model.BZFM.Dto
         [ExcelColumn(Name = "创建时间")]
         [SugarColumn(ColumnName = "created_time")]
         public DateTime? CreatedTime { get; set; }
+
+        [ExcelColumn(Name = "原材料工单号")]
+        [SugarColumn(ColumnName = "workorder_raw")]
+        public string WorkorderRaw { get; set; }
     }
 }

DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs

@@ -4,7 +4,7 @@ namespace DOAN.Model.BZFM.Dto
     /// <summary>
     /// 出库记录表查询对象
     /// </summary>
-    public class MmRecordOutboundQueryDto : PagerInfo 
+    public class MmRecordOutboundQueryDto : PagerInfo
     {
         public string MaterialCode { get; set; }
 
@@ -19,6 +19,11 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号
+        /// </summary>
+        public string WorkorderRaw { get; set; }
+
         public string Operator { get; set; }
     }
 
@@ -67,6 +72,11 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号
+        /// </summary>
+        public string WorkorderRaw { get; set; }
+
         [ExcelColumn(Name = "出库类型")]
         public string TransactionTypeLabel { get; set; }
     }
@@ -117,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号
+        /// </summary>
+        public string WorkorderRaw { get; set; }
+
         /// <summary>
         /// 1-蓝单正向 2-红单逆向
         /// </summary>
@@ -186,5 +201,9 @@ namespace DOAN.Model.BZFM.Dto
         [ExcelColumn(Name = "创建时间")]
         [SugarColumn(ColumnName = "created_time")]
         public DateTime? CreatedTime { get; set; }
+
+        [ExcelColumn(Name = "原材料工单号")]
+        [SugarColumn(ColumnName = "workorder_raw")]
+        public string WorkorderRaw { get; set; }
     }
 }

DOAN.Model/MES/Material/MmRecordInbound.cs

@@ -127,5 +127,11 @@ namespace DOAN.Model.BZFM
         /// 工单号（一旦确定，不可更改） 
         /// </summary>
         public string Workorder { get; set; }
+
+        /// <summary>
+        /// 原材料工单号 
+        /// </summary>
+        [SugarColumn(ColumnName = "workorder_raw")]
+        public string WorkorderRaw { get; set; }
     }
 }

DOAN.Model/MES/Material/MmRecordOutbound.cs

@@ -104,5 +104,11 @@ namespace DOAN.Model.BZFM
         /// </summary>
         public string Workorder { get; set; }
 
+        /// <summary>
+        /// 原材料工单号 
+        /// </summary>
+        [SugarColumn(ColumnName = "workorder_raw")]
+        public string WorkorderRaw { get; set; }
+
     }
 }

DOAN.Service/MES/Product/ProWorkorderService.cs

@@ -58,6 +58,7 @@ namespace DOAN.Service.MES.product
 
             var predicate = Expressionable
                 .Create<ProWorkorder>()
+                .And(it => it.PlanNum > 0)
                 .AndIF(
                     !string.IsNullOrEmpty(parm.productionName),
                     it => it.productionName.Contains(parm.productionName)
@@ -165,6 +166,7 @@ namespace DOAN.Service.MES.product
             }
             var predicate = Expressionable
                 .Create<ProWorkorder>()
+                .And(it => it.PlanNum > 0)
                 .AndIF(
                     !string.IsNullOrEmpty(parm.productionName),
                     it => it.productionName.Contains(parm.productionName)
@@ -198,6 +200,7 @@ namespace DOAN.Service.MES.product
 
             var query = Queryable()
                 .Where(predicate.ToExpression())
+                
                 .ToPage<ProWorkorder, ProWorkorderDto>(parm);
 
             return query;