222

schangxiang@126.com

2025-05-09 13f8c1efe9aaf7b7d1e4e77107de61a56d6f9646

222

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Web/Controllers/EntityModeDrawer_Generate.cs

@@ -23,8 +23,8 @@
            //替换新增form列表属性
            string attrString = "";
            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForUpdateMode(param.ColumnNameList);
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes(param.ColumnNameList, param);
            str = str.Replace("$PageAddFormAttributes$", attrString);
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_formItems(param.ColumnNameList, param);
            str = str.Replace("$PageAddFormAttributes_formItems$", attrString);

            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes(param.ColumnNameList,param);

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeDrawerÄ£°å.txt

@@ -76,7 +76,7 @@
   * æ·»åŠ çš„form字段
   */
  const formItems = reactive([
    $PageAddFormAttributes$
    $PageAddFormAttributes_formItems$
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/StructStrHelper.cs

@@ -1820,7 +1820,7 @@
        /// </summary>
        /// <param name="columnModelList"></param>
        /// <returns></returns>
        public static string GetVueFormOptionsStrForPageAddFormAttributes(List<ColumnModel> columnModelList, GenerateCodeParam param)
        public static string GetVueFormOptionsStrForPageAddFormAttributes_formItems(List<ColumnModel> columnModelList, GenerateCodeParam param)
        {
            StringBuilder sb = new StringBuilder();
            try

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

@@ -64,6 +64,36 @@
        public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦è‡ªäº§
        /// </summary>
        public bool?  IsSelfMade { get; set; }

        /// <summary>
        /// æ˜¯å¦è‡ªäº§-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int?  SelfNum { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
@@ -74,14 +104,14 @@
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ•°é‡
        /// 
        /// </summary>
        public bool?  IsSelfMade { get; set; }
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -94,16 +124,6 @@
        public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  MaterialType { get; set; }
@@ -112,16 +132,6 @@
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int?  SelfNum { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -142,16 +152,6 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤–径（单位：mm）
@@ -254,6 +254,36 @@
        public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool?  IsDisabled { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
@@ -290,16 +320,6 @@
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦åˆ é™¤
        /// </summary>
        public bool?  IsDeleted { get; set; }
@@ -310,16 +330,6 @@
        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤äººID
        /// </summary>
        public string DeleterId { get; set; }
@@ -328,16 +338,6 @@
        /// åˆ é™¤äººID-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool?  IsDisabled { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// åˆ é™¤æ—¶é—´
@@ -368,6 +368,26 @@
        public SearchFilterModeEnum LastModifierName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string DeleteRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        public string ExtraField1 { get; set; }
@@ -396,26 +416,6 @@
        /// æ‰©å±•å­—段3-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string DeleteRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs

@@ -20,14 +20,29 @@
        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 bool? IsSelfMade { get; set; }
        public decimal? NullLength { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -35,19 +50,9 @@
        public PurchaseTypeEnum PurchaseType { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum MaterialType { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -58,11 +63,6 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -115,16 +115,6 @@
        public string? RedundantField3 { get; set; }

        /// <summary>
        /// åˆ›å»ºäººID
        /// </summary>
        public string? CreatorId { get; set; }

        /// <summary>
        /// ä¿®æ”¹äººID
        /// </summary>
        public string? LastModifierId { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }
@@ -140,6 +130,16 @@
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ›å»ºäººID
        /// </summary>
        public string? CreatorId { get; set; }

        /// <summary>
        /// ä¿®æ”¹äººID
        /// </summary>
        public string? LastModifierId { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public string? CreatorName { get; set; }
@@ -148,6 +148,16 @@
        /// ä¿®æ”¹äºº
        /// </summary>
        public string? LastModifierName { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string? OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string? DeleteRemark { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
@@ -163,16 +173,6 @@
        /// æ‰©å±•å­—段3
        /// </summary>
        public string? ExtraField3 { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string? OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string? DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs

@@ -23,14 +23,29 @@
        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 bool? IsSelfMade { get; set; }
        public decimal? NullLength { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -48,11 +63,6 @@
            } 
        } 
        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum MaterialType { get; set; }
@@ -68,11 +78,6 @@
            } 
        } 
        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        public string? PrimaryUnit { get; set; }
@@ -81,11 +86,6 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -148,6 +148,21 @@
        public string? RedundantField3 { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// æ‰©å±•å±žæ€§
        /// </summary>
        public ExtraPropertyDictionary? ExtraProperties { get; set; }
@@ -178,29 +193,14 @@
        public string? LastModifierId { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

        /// <summary>
        /// æ˜¯å¦åˆ é™¤
        /// </summary>
        public bool IsDeleted { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

        /// <summary>
        /// åˆ é™¤äººID
        /// </summary>
        public string? DeleterId { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ é™¤æ—¶é—´
@@ -218,6 +218,16 @@
        public string? LastModifierName { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string? OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string? DeleteRemark { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        public string? ExtraField1 { get; set; }
@@ -231,16 +241,6 @@
        /// æ‰©å±•å­—段3
        /// </summary>
        public string? ExtraField3 { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string? OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string? DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs

@@ -23,16 +23,34 @@
        public bool IsValid { get; set; }

        /// <summary>
        /// æ˜¯å¦è‡ªäº§
        /// </summary>
        [ExcelColumn(Name = "是否自产", Width = 25)]
        public bool? IsSelfMade { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "数量", Width = 25)]
        public int Num { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "自有数量", Width = 25)]
        public int? SelfNum { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [ExcelColumn(Name = "物料名称", Width = 25)]
        public string MaterialName { get; set; }

        /// <summary>
        /// æ•°é‡
        /// 
        /// </summary>
        [ExcelColumn(Name = "数量", Width = 25)]
        public bool? IsSelfMade { get; set; }
        [ExcelColumn(Name = "", Width = 25)]
        public decimal? NullLength { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -41,22 +59,10 @@
        public PurchaseTypeEnum PurchaseType { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        [ExcelColumn(Name = "是否有效物料", Width = 25)]
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        [ExcelColumn(Name = "物料类型（枚举值）", Width = 25)]
        public MaterialTypeEnum MaterialType { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "自有数量", Width = 25)]
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -69,12 +75,6 @@
        /// </summary>
        [ExcelColumn(Name = "规格/标准（如：GB/T 8163-2018）", Width = 25)]
        public string Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [ExcelColumn(Name = "", Width = 25)]
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -167,6 +167,18 @@
        public string LastModifierName { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "操作备注", Width = 25)]
        public string OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "删除备注", Width = 25)]
        public string DeleteRemark { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        [ExcelColumn(Name = "扩展字段1", Width = 25)]
@@ -183,18 +195,6 @@
        /// </summary>
        [ExcelColumn(Name = "扩展字段3", Width = 25)]
        public string ExtraField3 { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "操作备注", Width = 25)]
        public string OperationRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "删除备注", Width = 25)]
        public string DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -145,15 +145,15 @@
 
                updateObj.MaterialCode = input.MaterialCode;
        updateObj.IsValid = input.IsValid;
        updateObj.MaterialName = input.MaterialName;
        updateObj.IsSelfMade = input.IsSelfMade;
        updateObj.PurchaseType = input.PurchaseType;
        updateObj.Num = input.Num;
        updateObj.MaterialType = input.MaterialType;
        updateObj.SelfNum = input.SelfNum;
        updateObj.MaterialName = input.MaterialName;
        updateObj.NullLength = input.NullLength;
        updateObj.PurchaseType = input.PurchaseType;
        updateObj.MaterialType = input.MaterialType;
        updateObj.PrimaryUnit = input.PrimaryUnit;
        updateObj.Standard = input.Standard;
        updateObj.NullLength = input.NullLength;
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.WallThickness = input.WallThickness;
        updateObj.MaterialQuality = input.MaterialQuality;
@@ -168,11 +168,11 @@
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.CreatorName = input.CreatorName;
        updateObj.LastModifierName = input.LastModifierName;
        updateObj.OperationRemark = input.OperationRemark;
        updateObj.DeleteRemark = input.DeleteRemark;
        updateObj.ExtraField1 = input.ExtraField1;
        updateObj.ExtraField2 = input.ExtraField2;
        updateObj.ExtraField3 = input.ExtraField3;
        updateObj.OperationRemark = input.OperationRemark;
        updateObj.DeleteRemark = input.DeleteRemark;
 
 
        await wmsMaterialRepository.UpdateAsync(updateObj); 
@@ -330,15 +330,15 @@
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -353,11 +353,11 @@
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
 
                    }; 
 
@@ -369,15 +369,15 @@
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -392,11 +392,11 @@
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
 
                    }; 
 
@@ -478,9 +478,9 @@
        Check.NotNull(input, nameof(input)); 
                Check.NotNullOrWhiteSpace(input.MaterialCode, "物料编码（唯一标识）", 64);
        Check.NotNull(input.IsValid, "是否有效物料");
        Check.NotNull(input.Num, "数量");
        Check.NotNullOrWhiteSpace(input.MaterialName, "物料名称", 128);
        Check.NotNull(input.PurchaseType, "采购类型（枚举值）");
        Check.NotNull(input.Num, "是否有效物料");
        Check.NotNull(input.MaterialType, "物料类型（枚举值）");
        Check.NotNull(input.OuterDiameter, "外径（单位：mm）");
        Check.NotNull(input.WallThickness, "壁厚（单位：mm）");

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs

@@ -138,11 +138,11 @@
            .HasComment("是否有效物料");
            b.Property(x => x.IsSelfMade)
       .IsRequired(false)
       .HasComment("数量");
       .HasComment("是否自产");

            b.Property(x => x.Num)
       .IsRequired()
       .HasComment("是否有效物料");
       .HasComment("数量");
            b.Property(x => x.SelfNum)
       .IsRequired(false)
       .HasComment("自有数量");

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,1041 @@
// <auto-generated />
using System;
using CMS.Plugin.HIAWms.MySQL;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;

#nullable disable

namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250509003959_InitialCreate6")]
    partial class InitialCreate6
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
        {
#pragma warning disable 612, 618
            modelBuilder
                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
                .HasAnnotation("ProductVersion", "6.0.16")
                .HasAnnotation("Relational:MaxIdentifierLength", 64);

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("AreaDesc")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("描述");

                    b.Property<string>("AreaName")
                        .IsRequired()
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("库区名称");

                    b.Property<string>("AreaNo")
                        .IsRequired()
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("库区编号");

                    b.Property<int>("AreaStatus")
                        .HasColumnType("int")
                        .HasComment("库区状态");

                    b.Property<int>("AreaType")
                        .HasColumnType("int")
                        .HasComment("库区类型");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("RedundantField1")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段1 - é¢„留扩展用途");

                    b.Property<string>("RedundantField2")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段2 - é¢„留扩展用途");

                    b.Property<string>("RedundantField3")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段3 - é¢„留扩展用途");

                    b.Property<string>("Remark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("StoreCode")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("仓库代码");

                    b.Property<string>("StoreName")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("仓库名称");

                    b.HasKey("Id");

                    b.HasIndex("AreaName");

                    b.ToTable("scms_wmsareas", (string)null);

                    b.HasComment("库区表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<int>("ContainerStatus")
                        .HasColumnType("int")
                        .HasComment("托盘状态");

                    b.Property<int>("ContainerType")
                        .HasColumnType("int")
                        .HasComment("托盘类型");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("ExceptionNumber")
                        .HasColumnType("int")
                        .HasComment("异常数量");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<decimal?>("LimitHeight")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("限高");

                    b.Property<decimal?>("LimitLength")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("限长");

                    b.Property<decimal?>("LimitWidth")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("限宽");

                    b.Property<int?>("MaterialNumber")
                        .HasColumnType("int")
                        .HasComment("物料数量");

                    b.Property<decimal?>("MaxWeight")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("载重上限");

                    b.Property<string>("RedundantField1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("冗余字段1 - é¢„留扩展用途");

                    b.Property<string>("RedundantField2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("冗余字段2 - é¢„留扩展用途");

                    b.Property<string>("RedundantField3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("冗余字段3 - é¢„留扩展用途");

                    b.Property<string>("Remark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<decimal?>("SpecHeight")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("高度");

                    b.Property<decimal?>("SpecLength")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("长度");

                    b.Property<decimal?>("SpecWidth")
                        .HasPrecision(18, 2)
                        .HasColumnType("decimal(18,2)")
                        .HasComment("宽度");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo")
                        .IsUnique();

                    b.HasIndex("ContainerStatus");

                    b.HasIndex("ContainerType");

                    b.ToTable("scms_wmscontainers", (string)null);

                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("容器编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MaterialId")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料ID");

                    b.Property<string>("MaterialModel")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("机型");

                    b.Property<string>("MaterialName")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("物料名称");

                    b.Property<string>("MaterialNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料件号");

                    b.Property<DateTime?>("OperateTime")
                        .HasColumnType("datetime(6)")
                        .HasComment("操作时间");

                    b.Property<string>("OrderNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("单据编号");

                    b.Property<string>("Remark")
                        .HasMaxLength(500)
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("StockType")
                        .HasColumnType("int")
                        .HasComment("操作类型");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("MaterialId");

                    b.HasIndex("MaterialNo");

                    b.HasIndex("OperateTime");

                    b.HasIndex("OrderNo");

                    b.HasIndex("StockType");

                    b.HasIndex("TaskNo");

                    b.ToTable("scms_wmsinoutstockrecords", (string)null);

                    b.HasComment("出入库记录表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterial.WmsMaterial", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("Certification")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("证书编号");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp")
                        .HasComment("并发戳");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime")
                        .HasComment("创建时间");

                    b.Property<Guid?>("CreatorId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId")
                        .HasComment("创建人ID");

                    b.Property<string>("CreatorName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("创建人");

                    b.Property<string>("DeleteRemark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("删除备注");

                    b.Property<Guid?>("DeleterId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId")
                        .HasComment("删除人ID");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime")
                        .HasComment("删除时间");

                    b.Property<string>("ExtraField1")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段1");

                    b.Property<string>("ExtraField2")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段2");

                    b.Property<string>("ExtraField3")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段3");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties")
                        .HasComment("扩展属性");

                    b.Property<string>("Factory")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("生产工厂");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted")
                        .HasComment("是否删除");

                    b.Property<bool?>("IsDisabled")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasComment("是否禁用");

                    b.Property<int>("IsMainBranch")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("int")
                        .HasDefaultValue(2)
                        .HasComment("是否为主支管");

                    b.Property<bool?>("IsSelfMade")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否自产");

                    b.Property<bool>("IsValid")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否有效物料");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime")
                        .HasComment("修改时间");

                    b.Property<Guid?>("LastModifierId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId")
                        .HasComment("修改人ID");

                    b.Property<string>("LastModifierName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("修改人");

                    b.Property<decimal>("Length")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("长度（单位：m）");

                    b.Property<string>("MaterialCode")
                        .IsRequired()
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("物料编码（唯一标识）");

                    b.Property<string>("MaterialName")
                        .IsRequired()
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("物料名称");

                    b.Property<string>("MaterialQuality")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("材质（如：304不锈钢）");

                    b.Property<int>("MaterialType")
                        .HasColumnType("int")
                        .HasComment("物料类型（枚举值）");

                    b.Property<decimal?>("NullLength")
                        .HasColumnType("decimal(65,30)");

                    b.Property<int>("Num")
                        .HasColumnType("int")
                        .HasComment("数量");

                    b.Property<string>("OperationRemark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("操作备注");

                    b.Property<decimal>("OuterDiameter")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("外径（单位：mm）");

                    b.Property<string>("PrimaryUnit")
                        .HasMaxLength(20)
                        .HasColumnType("varchar(20)")
                        .HasComment("主单位（如：kg、m、个）");

                    b.Property<int>("PurchaseType")
                        .HasColumnType("int")
                        .HasComment("采购类型（枚举值）");

                    b.Property<string>("RedundantField1")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("冗余字段1 - é¢„留扩展用途");

                    b.Property<string>("RedundantField2")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("冗余字段2 - é¢„留扩展用途");

                    b.Property<string>("RedundantField3")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("冗余字段3 - é¢„留扩展用途");

                    b.Property<string>("Remark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<int?>("SelfNum")
                        .HasColumnType("int")
                        .HasComment("自有数量");

                    b.Property<int>("Sort")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("int")
                        .HasDefaultValue(0)
                        .HasComment("排序");

                    b.Property<string>("Standard")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("规格/标准（如：GB/T 8163-2018）");

                    b.Property<decimal>("WallThickness")
                        .HasColumnType("decimal(18,2)")
                        .HasComment("壁厚（单位：mm）");

                    b.HasKey("Id");

                    b.HasIndex("MaterialCode")
                        .IsUnique();

                    b.HasIndex("MaterialName");

                    b.HasIndex("MaterialType");

                    b.HasIndex("PurchaseType");

                    b.ToTable("scms_wmsmaterials", (string)null);

                    b.HasComment("物料基础信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("AreaCode")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("所在库区");

                    b.Property<int>("ColumnNo")
                        .HasColumnType("int")
                        .HasComment("列");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int>("EmptyContainer")
                        .HasColumnType("int")
                        .HasComment("是否空托");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int>("Islock")
                        .HasColumnType("int")
                        .HasComment("是否锁定");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<int>("LayerNo")
                        .HasColumnType("int")
                        .HasComment("层");

                    b.Property<string>("PlaceNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("编号");

                    b.Property<int>("PlaceStatus")
                        .HasColumnType("int")
                        .HasComment("货位状态");

                    b.Property<string>("RedundantField1")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段1 - é¢„留扩展用途");

                    b.Property<string>("RedundantField2")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段2 - é¢„留扩展用途");

                    b.Property<string>("RedundantField3")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段3 - é¢„留扩展用途");

                    b.Property<string>("Remark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<int>("RowNo")
                        .HasColumnType("int")
                        .HasComment("排");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<int>("StorageTypeNo")
                        .HasColumnType("int")
                        .HasComment("货位类型");

                    b.HasKey("Id");

                    b.HasIndex("AreaCode");

                    b.HasIndex("PlaceNo")
                        .IsUnique();

                    b.HasIndex("PlaceStatus");

                    b.HasIndex("StorageTypeNo");

                    b.ToTable("scms_wmsplaces", (string)null);

                    b.HasComment("库位表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("RedundantField1")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段1 - é¢„留扩展用途");

                    b.Property<string>("RedundantField2")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段2 - é¢„留扩展用途");

                    b.Property<string>("RedundantField3")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("冗余字段3 - é¢„留扩展用途");

                    b.Property<string>("Remark")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("StoreCode")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("仓库代码");

                    b.Property<string>("StoreName")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("仓库名称");

                    b.HasKey("Id");

                    b.HasIndex("StoreName");

                    b.ToTable("scms_wmsstores", (string)null);

                    b.HasComment("仓库信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int?>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("DodeviceId")
                        .HasColumnType("int")
                        .HasComment("堆垛机ID");

                    b.Property<int>("Dodevicetype")
                        .HasColumnType("int")
                        .HasComment("设备类型");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int?>("IsNextTask")
                        .HasColumnType("int")
                        .HasComment("下个任务是否生成成功");

                    b.Property<bool>("IsRead")
                        .HasColumnType("tinyint(1)")
                        .HasComment("WCS是否可以读取");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MutableParam1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量1");

                    b.Property<string>("MutableParam2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量2");

                    b.Property<string>("MutableParam3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量3");

                    b.Property<int?>("SonTaskType")
                        .HasColumnType("int")
                        .HasComment("子任务类型");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourceOrderNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("来源单据号");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("TaskDodeviceStatus")
                        .HasColumnType("int")
                        .HasComment("设备任务状态");

                    b.Property<int>("TaskLevel")
                        .HasColumnType("int")
                        .HasComment("任务等级");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<int>("TaskStatus")
                        .HasColumnType("int")
                        .HasComment("任务状态");

                    b.Property<int>("TaskType")
                        .HasColumnType("int")
                        .HasComment("任务类型");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("DodeviceId");

                    b.HasIndex("IsRead");

                    b.HasIndex("Sort");

                    b.HasIndex("SourceOrderNo");

                    b.HasIndex("SourcePlace");

                    b.HasIndex("TaskNo")
                        .IsUnique();

                    b.HasIndex("TaskStatus");

                    b.HasIndex("TaskType");

                    b.HasIndex("ToPlace");

                    b.ToTable("scms_wmstasks", (string)null);

                    b.HasComment("任务表");
                });
#pragma warning restore 612, 618
        }
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509003959_InitialCreate6.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    public partial class InitialCreate6 : Migration
    {
        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.AlterColumn<int>(
                name: "Num",
                table: "scms_wmsmaterials",
                type: "int",
                nullable: false,
                comment: "数量",
                oldClrType: typeof(int),
                oldType: "int",
                oldComment: "是否有效物料");

            migrationBuilder.AlterColumn<bool>(
                name: "IsSelfMade",
                table: "scms_wmsmaterials",
                type: "tinyint(1)",
                nullable: true,
                comment: "是否自产",
                oldClrType: typeof(bool),
                oldType: "tinyint(1)",
                oldNullable: true,
                oldComment: "数量");
        }

        protected override void Down(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.AlterColumn<int>(
                name: "Num",
                table: "scms_wmsmaterials",
                type: "int",
                nullable: false,
                comment: "是否有效物料",
                oldClrType: typeof(int),
                oldType: "int",
                oldComment: "数量");

            migrationBuilder.AlterColumn<bool>(
                name: "IsSelfMade",
                table: "scms_wmsmaterials",
                type: "tinyint(1)",
                nullable: true,
                comment: "数量",
                oldClrType: typeof(bool),
                oldType: "tinyint(1)",
                oldNullable: true,
                oldComment: "是否自产");
        }
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs

@@ -517,7 +517,7 @@

                    b.Property<bool?>("IsSelfMade")
                        .HasColumnType("tinyint(1)")
                        .HasComment("数量");
                        .HasComment("是否自产");

                    b.Property<bool>("IsValid")
                        .HasColumnType("tinyint(1)")
@@ -569,7 +569,7 @@

                    b.Property<int>("Num")
                        .HasColumnType("int")
                        .HasComment("是否有效物料");
                        .HasComment("数量");

                    b.Property<string>("OperationRemark")
                        .HasMaxLength(256)

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat

@@ -1,5 +1,5 @@
cd ../
dotnet ef migrations add InitialCreate5 -c CMSPluginDbContext -o Migrations
dotnet ef migrations add InitialCreate6 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx

Binary files differ

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx

@@ -94,32 +94,15 @@
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
              rules: [{required: true, message: '物料名称不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '数量', 
                   label: '是否自产', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                   placeholder: '请输入是否自产', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
              rules: [{required: true, message: '采购类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '是否有效物料', 
                   label: '数量', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
@@ -132,17 +115,8 @@
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
              rules: [{required: true, message: '物料类型（枚举值）不能为空', trigger: 'blur' }], 
                   placeholder: '请输入数量', 
              rules: [{required: true, message: '数量不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '自有数量', 
@@ -161,18 +135,12 @@
                   placeholder: '请输入自有数量', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                   placeholder: '请输入物料名称', 
              rules: [{required: true, message: '物料名称不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '', 
@@ -189,6 +157,38 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
              rules: [{required: true, message: '采购类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
              rules: [{required: true, message: '物料类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -314,6 +314,20 @@
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                }, 
                { 
                   label: '扩展字段1', 
                   prop: 'extraField1', 
                   el: 'input', 
@@ -333,20 +347,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段3', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                },  
  ]) 
  /** 
@@ -385,15 +385,15 @@
    const data = { 
      materialCode: formData.value.materialCode, 
isValid: formData.value.isValid, 
materialName: formData.value.materialName, 
isSelfMade: formData.value.isSelfMade, 
purchaseType: formData.value.purchaseType, 
num: formData.value.num, 
materialType: formData.value.materialType, 
selfNum: formData.value.selfNum, 
materialName: formData.value.materialName, 
nullLength: formData.value.nullLength, 
purchaseType: formData.value.purchaseType, 
materialType: formData.value.materialType, 
primaryUnit: formData.value.primaryUnit, 
standard: formData.value.standard, 
nullLength: formData.value.nullLength, 
outerDiameter: formData.value.outerDiameter, 
wallThickness: formData.value.wallThickness, 
materialQuality: formData.value.materialQuality, 
@@ -407,11 +407,11 @@
remark: formData.value.remark, 
creatorName: formData.value.creatorName, 
lastModifierName: formData.value.lastModifierName, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark, 
extraField1: formData.value.extraField1, 
extraField2: formData.value.extraField2, 
extraField3: formData.value.extraField3, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark,  
extraField3: formData.value.extraField3,  
    } 
    if (!current.value) { 
      await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -468,15 +468,15 @@
      formData.value = { 
        materialCode: res.materialCode, 
isValid: res.isValid, 
materialName: res.materialName, 
isSelfMade: res.isSelfMade, 
purchaseType: res.purchaseType, 
num: res.num, 
materialType: res.materialType, 
selfNum: res.selfNum, 
materialName: res.materialName, 
nullLength: res.nullLength, 
purchaseType: res.purchaseType, 
materialType: res.materialType, 
primaryUnit: res.primaryUnit, 
standard: res.standard, 
nullLength: res.nullLength, 
outerDiameter: res.outerDiameter, 
wallThickness: res.wallThickness, 
materialQuality: res.materialQuality, 
@@ -490,11 +490,11 @@
remark: res.remark, 
creatorName: res.creatorName, 
lastModifierName: res.lastModifierName, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark, 
extraField1: res.extraField1, 
extraField2: res.extraField2, 
extraField3: res.extraField3, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark,  
extraField3: res.extraField3,  
        id: res.id, 
      } 
      disabled.value = true 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx

@@ -94,30 +94,15 @@
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '数量', 
                   label: '是否自产', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                   placeholder: '请输入是否自产', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
                }, 
                { 
                   label: '是否有效物料', 
                   label: '数量', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
@@ -130,15 +115,7 @@
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
                   placeholder: '请输入数量', 
                }, 
                { 
                   label: '自有数量', 
@@ -157,18 +134,11 @@
                   placeholder: '请输入自有数量', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '', 
@@ -185,6 +155,36 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -285,20 +285,6 @@
                   placeholder: '请输入冗余字段3 - é¢„留扩展用途', 
                }, 
                { 
                   label: '创建时间', 
                   prop: 'creationTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入创建时间', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
@@ -314,6 +300,20 @@
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '创建时间', 
                   prop: 'creationTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入创建时间', 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
@@ -326,6 +326,20 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                }, 
                { 
                   label: '扩展字段1', 
@@ -347,20 +361,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段3', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                },  
  ]) 
  /** 
@@ -377,15 +377,15 @@
    const data = { 
      materialCode: formData.value.materialCode || '', 
isValid: formData.value.isValid || '', 
materialName: formData.value.materialName || '', 
isSelfMade: formData.value.isSelfMade || '', 
purchaseType: formData.value.purchaseType || '', 
num: formData.value.num || '', 
materialType: formData.value.materialType || '', 
selfNum: formData.value.selfNum || '', 
materialName: formData.value.materialName || '', 
nullLength: formData.value.nullLength || '', 
purchaseType: formData.value.purchaseType || '', 
materialType: formData.value.materialType || '', 
primaryUnit: formData.value.primaryUnit || '', 
standard: formData.value.standard || '', 
nullLength: formData.value.nullLength || '', 
outerDiameter: formData.value.outerDiameter || '', 
wallThickness: formData.value.wallThickness || '', 
materialQuality: formData.value.materialQuality || '', 
@@ -396,16 +396,16 @@
redundantField1: formData.value.redundantField1 || '', 
redundantField2: formData.value.redundantField2 || '', 
redundantField3: formData.value.redundantField3 || '', 
creationTime: formData.value.creationTime || '', 
remark: formData.value.remark || '', 
isDisabled: formData.value.isDisabled || '', 
creationTime: formData.value.creationTime || '', 
creatorName: formData.value.creatorName || '', 
lastModifierName: formData.value.lastModifierName || '', 
operationRemark: formData.value.operationRemark || '', 
deleteRemark: formData.value.deleteRemark || '', 
extraField1: formData.value.extraField1 || '', 
extraField2: formData.value.extraField2 || '', 
extraField3: formData.value.extraField3 || '', 
operationRemark: formData.value.operationRemark || '', 
deleteRemark: formData.value.deleteRemark || '',  
extraField3: formData.value.extraField3 || '',  
    } 
    return data; 
  } 
@@ -430,15 +430,15 @@
    formData.value = {} 
    formData.value.MaterialCode = '' 
formData.value.IsValid = '' 
formData.value.MaterialName = '' 
formData.value.IsSelfMade = '' 
formData.value.PurchaseType = '' 
formData.value.Num = '' 
formData.value.MaterialType = '' 
formData.value.SelfNum = '' 
formData.value.MaterialName = '' 
formData.value.NullLength = '' 
formData.value.PurchaseType = '' 
formData.value.MaterialType = '' 
formData.value.PrimaryUnit = '' 
formData.value.Standard = '' 
formData.value.NullLength = '' 
formData.value.OuterDiameter = '' 
formData.value.WallThickness = '' 
formData.value.MaterialQuality = '' 
@@ -452,11 +452,11 @@
formData.value.Remark = '' 
formData.value.CreatorName = '' 
formData.value.LastModifierName = '' 
formData.value.OperationRemark = '' 
formData.value.DeleteRemark = '' 
formData.value.ExtraField1 = '' 
formData.value.ExtraField2 = '' 
formData.value.ExtraField3 = '' 
formData.value.OperationRemark = '' 
formData.value.DeleteRemark = ''  
formData.value.ExtraField3 = ''  
    //向父组件发送自定义事件 
    ctx.emit('restQuery'); 
  } 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts

@@ -15,14 +15,29 @@
  width:80, 
}, 
{ 
  field: 'isSelfMade', 
  title: '是否自产', 
  width:80, 
}, 
{ 
  field: 'num', 
  title: '数量', 
  width:160, 
}, 
{ 
  field: 'selfNum', 
  title: '自有数量', 
  width:160, 
}, 
{ 
  field: 'materialName', 
  title: '物料名称', 
  width:160, 
}, 
{ 
  field: 'isSelfMade', 
  title: '数量', 
  width:80, 
  field: 'nullLength', 
  title: '', 
  width:160, 
}, 
{ 
  field: 'purchaseTypeDesc', 
@@ -30,18 +45,8 @@
  width:160, 
}, 
{ 
  field: 'num', 
  title: '是否有效物料', 
  width:160, 
}, 
{ 
  field: 'materialTypeDesc', 
  title: '物料类型（枚举值）', 
  width:160, 
}, 
{ 
  field: 'selfNum', 
  title: '自有数量', 
  width:160, 
}, 
{ 
@@ -52,11 +57,6 @@
{ 
  field: 'standard', 
  title: '规格/标准（如：GB/T 8163-2018）', 
  width:160, 
}, 
{ 
  field: 'nullLength', 
  title: '', 
  width:160, 
}, 
{ 
@@ -110,11 +110,6 @@
  width:160, 
}, 
{ 
  field: 'creationTime', 
  title: '创建时间', 
  width:180, 
}, 
{ 
  field: 'sort', 
  title: '排序', 
  width:160, 
@@ -123,6 +118,11 @@
  field: 'remark', 
  title: '备注', 
  width:160, 
}, 
{ 
  field: 'creationTime', 
  title: '创建时间', 
  width:180, 
}, 
{ 
  field: 'deletionTime', 
@@ -140,6 +140,16 @@
  width:160, 
}, 
{ 
  field: 'operationRemark', 
  title: '操作备注', 
  width:160, 
}, 
{ 
  field: 'deleteRemark', 
  title: '删除备注', 
  width:160, 
}, 
{ 
  field: 'extraField1', 
  title: '扩展字段1', 
  width:160, 
@@ -152,16 +162,6 @@
{ 
  field: 'extraField3', 
  title: '扩展字段3', 
  width:160, 
}, 
{ 
  field: 'operationRemark', 
  title: '操作备注', 
  width:160, 
}, 
{ 
  field: 'deleteRemark', 
  title: '删除备注', 
  width:160, 
},  
] 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx

@@ -221,6 +221,13 @@
   </div>  
  ) 
},
isDisabled: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isDisabled != null ? (row.isDisabled ? '是' : '否') : '-'} 
   </div>  
  ) 
},
creationTime: ({ row }: any) => { 
 return ( 
   <div>  
@@ -243,13 +250,6 @@
 return ( 
   <div>  
     {row.isDeleted != null ? (row.isDeleted ? '是' : '否') : '-'} 
   </div>  
  ) 
},
isDisabled: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isDisabled != null ? (row.isDisabled ? '是' : '否') : '-'} 
   </div>  
  ) 
},