From 9cf7b57cd6f3d56a80a5925add2d8dabee28437f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 16:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
index eee2ed5..b59aa06 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
@@ -1,5 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
+using CMS.Plugin.MyExtension.Domain;
+using CmsQueryExtensions.Extension;
using MathNet.Numerics;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
@@ -9,7 +11,7 @@
/// <summary>
/// WmsMaterial
/// </summary>
- public class WmsMaterial : FullAuditedAggregateRoot<Guid>
+ public class WmsMaterial : MyFullAuditedAggregateRoot<Guid>
{
/// <summary>
/// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
@@ -17,9 +19,34 @@
public string MaterialCode { get; set; }
/// <summary>
+ /// 鏄惁鏈夋晥鐗╂枡
+ /// </summary>
+ public bool IsValid { get; set; }
+
+ /// <summary>
+ /// 鏄惁鑷骇
+ /// </summary>
+ public bool? IsSelfMade { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int Num { get; set; }
+
+ /// <summary>
+ /// 鑷湁鏁伴噺
+ /// </summary>
+ public int? SelfNum { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鍙┖闀垮害
+ /// </summary>
+ public decimal? NullLength { get; set; }
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -70,7 +97,7 @@
/// 鐢熶骇宸ュ巶
/// </summary>
public string Factory { get; set; }
-
+
/// <summary>
/// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
/// </summary>
--
Gitblit v1.9.3