修改

payne

2024-04-23 a2b75d1dcbf52f1f51886cc1815823af18b74f06

修改

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRule.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/4/23下午5:02:12
 * @desc : æ‰¹æ¬¡å±žæ€§è§„则
 */
namespace Admin.NET.Core
{
    /// <summary>
    /// æ‰¹æ¬¡å±žæ€§è§„则
    /// </summary>
    [Table("wms_batch_rule")]
    [Comment("批次属性规则")]
    public class WmsBatchRule : DEntityBase
    {


        /// <summary>
        /// è§„则编号
        /// </summary>
        [Comment("规则编号")]
        [Required]
        [MaxLength(255)]
        public string RuleCode { get; set; }


        /// <summary>
        /// è§„则名称
        /// </summary>
        [Comment("规则名称")]
        [Required]
        [MaxLength(255)]
        public string RuleName { get; set; }


        /// <summary>
        /// è§„则描述
        /// </summary>
        [Comment("规则描述")]
        [MaxLength(255)]
        public string RuleDesc { get; set; }


        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [Comment("是否禁用")]
        [Required]

        public bool IsDisabled { get; set; }









    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRuleDetail.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/4/23下午5:02:29
 * @desc : æ‰¹æ¬¡å±žæ€§è§„则明细
 */
namespace Admin.NET.Core
{
    /// <summary>
    /// æ‰¹æ¬¡å±žæ€§è§„则明细
    /// </summary>
    [Table("wms_batch_rule_detail")]
    [Comment("批次属性规则明细")]
    public class WmsBatchRuleDetail : DEntityBase
    {


        /// <summary>
        /// è§„则编号Id
        /// </summary>
        [Comment("规则编号Id")]

        public long? BatchRuleId { get; set; }


        /// <summary>
        /// æ‰¹æ¬¡æ ‡ç­¾
        /// </summary>
        [Comment("批次标签")]
        [MaxLength(255)]
        public string BatchTag { get; set; }


        /// <summary>
        /// RF标签
        /// </summary>
        [Comment("RF标签")]
        [MaxLength(255)]
        public string RFTag { get; set; }


        /// <summary>
        /// RF显示
        /// </summary>
        [Comment("RF显示")]
        [MaxLength(255)]
        public string RFShow { get; set; }


        /// <summary>
        /// è¾“入控制
        /// </summary>
        [Comment("输入控制")]
        [MaxLength(255)]
        public string InputControl { get; set; }


        /// <summary>
        /// å±žæ€§æ ¼å¼
        /// </summary>
        [Comment("属性格式")]
        [MaxLength(255)]
        public string AttrForamt { get; set; }


        /// <summary>
        /// å±žæ€§é€‰é¡¹
        /// </summary>
        [Comment("属性选项")]
        [MaxLength(255)]
        public string AttrOption { get; set; }


        /// <summary>
        /// å…³é”®å±žæ€§
        /// </summary>
        [Comment("关键属性")]
        [MaxLength(255)]
        public string KeyAttr { get; set; }


        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [Comment("是否禁用")]
        [Required]

        public bool IsDisabled { get; set; }









    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/4/23下午5:01:21
 * @desc : æŽ§åˆ¶å±žæ€§è§„则
 */
namespace Admin.NET.Core
{
    /// <summary>
    /// æŽ§åˆ¶å±žæ€§è§„则
    /// </summary>
    [Table("wms_control_rule")]
    [Comment("控制属性规则")]
    public class WmsControlRule : DEntityBase
    {


        /// <summary>
        /// è§„则编号
        /// </summary>
        [Comment("规则编号")]
        [Required]
        [MaxLength(50)]
        public string RuleCode { get; set; }


        /// <summary>
        /// è§„则名称
        /// </summary>
        [Comment("规则名称")]
        [Required]
        [MaxLength(50)]
        public string RuleName { get; set; }


        /// <summary>
        /// è§„则描述
        /// </summary>
        [Comment("规则描述")]
        [MaxLength(255)]
        public string RuleDesc { get; set; }


        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [Comment("是否禁用")]
        [Required]

        public bool IsDisabled { get; set; }









    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/4/23下午5:01:43
 * @desc : æŽ§åˆ¶å±žæ€§è§„则明细
 */
namespace Admin.NET.Core
{
    /// <summary>
    /// æŽ§åˆ¶å±žæ€§è§„则明细
    /// </summary>
    [Table("wms_control_rule_detail")]
    [Comment("控制属性规则明细")]
    public class WmsControlRuleDetail : DEntityBase
    {


        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// </summary>
        [Comment("控制属性规则ID")]
        [Required]

        public long ControlRuleId { get; set; }


        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        [Comment("最高库存")]

        [Column("MaxImumqty", TypeName = "decimal(10,3)")]
        public decimal? MaxImumqty { get; set; }


        /// <summary>
        /// æœ€ä½Žåº“å­˜
        /// </summary>
        [Comment("最低库存")]

        [Column("MinImumqty", TypeName = "decimal(10,3)")]
        public decimal? MinImumqty { get; set; }


        /// <summary>
        /// å®‰å…¨åº“å­˜
        /// </summary>
        [Comment("安全库存")]

        [Column("SafeImumqty", TypeName = "decimal(10,3)")]
        public decimal? SafeImumqty { get; set; }


        /// <summary>
        /// æœ€å°åº“龄
        /// </summary>
        [Comment("最小库龄")]

        [Column("MinStorageAge", TypeName = "decimal(10,3)")]
        public decimal? MinStorageAge { get; set; }


        /// <summary>
        /// æœ€å¤§åº“龄
        /// </summary>
        [Comment("最大库龄")]

        [Column("MaxStorageAge", TypeName = "decimal(10,3)")]
        public decimal? MaxStorageAge { get; set; }


        /// <summary>
        /// æ˜¯å¦å…æ£€
        /// </summary>
        [Comment("是否免检")]

        public bool? IsNotChek { get; set; }


        /// <summary>
        /// ä¿è´¨æœŸå¤©æ•°
        /// </summary>
        [Comment("保质期天数")]

        [Column("ShelfLifeDays", TypeName = "decimal(10,3)")]
        public decimal? ShelfLifeDays { get; set; }


        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [Comment("是否禁用")]
        [Required]

        public bool IsDisabled { get; set; }









    }
}

 ʹÓÃÎĵµ/PDManerÎļþ/Ô­²ÄÁÏ¿â±ê×¼»¯.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.1.3",
  "createdTime": "2024-4-12 12:56:29",
  "updatedTime": "2024-4-23 16:40:22",
  "updatedTime": "2024-4-23 16:59:43",
  "dbConns": [],
  "profile": {
    "default": {
@@ -43320,7 +43320,7 @@
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
@@ -43338,7 +43338,7 @@
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
@@ -43365,6 +43365,23 @@
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "0F93B3F0-CAA4-40CE-A101-B212B0B766D0",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "IsDisabled",
          "defName": "是否禁用",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "582CD0A4-3B98-4588-9383-B24C6CF6A18C"
        },
        {
          "defKey": "CreatedUserName",
@@ -43763,6 +43780,23 @@
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "B5EE2A1D-434B-40D4-AE30-178D1DABC57F",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "IsDisabled",
          "defName": "是否禁用",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "38F923A4-EE25-4E20-B66F-2BAF56E94144"
        },
        {
          "defKey": "CreatedUserName",
@@ -45043,7 +45077,7 @@
        }
      },
      "defKey": "wms_control_rule",
      "defName": "控制属性规格",
      "defName": "控制属性规则",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
@@ -45155,44 +45189,44 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "Code",
          "defKey": "RuleCode",
          "defName": "规则编号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "EA50CBBB-1767-4101-9DAC-7C8E302241E9",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "Name",
          "defKey": "RuleName",
          "defName": "规则名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "A145DF29-EA07-4308-B410-4DE14F29DC8B",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "Desc",
          "defName": "描述",
          "defKey": "RuleDesc",
          "defName": "规则描述",
          "comment": "",
          "type": "",
          "len": "",
@@ -45207,6 +45241,23 @@
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "ED8FCC44-999B-4952-9B40-A20A86C78EE5",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "IsDisabled",
          "defName": "是否禁用",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "7C32FC58-EB02-4D9F-9FA1-B1ADF198A791"
        },
        {
          "defKey": "CreatedUserName",
@@ -45471,7 +45522,7 @@
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
@@ -45495,7 +45546,7 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "C8C6FF27-DB1B-4050-84C0-9BE21D9BFE57",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
@@ -45513,7 +45564,7 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "18EE1570-81EB-4E2B-BBF8-B7DE984C29A5",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
@@ -45531,7 +45582,7 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "AC209FAD-8EB4-43D6-9DC2-8A43A0DA270A",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
@@ -45549,7 +45600,7 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "1FBB5213-E284-4130-A1D4-CCB8873BCA83",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
@@ -45567,12 +45618,12 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "C0097556-CB43-49E6-AC7E-95DD1FFC6D90",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "IsChek",
          "defKey": "IsNotChek",
          "defName": "是否免检",
          "comment": "",
          "type": "",
@@ -45585,11 +45636,45 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "16B0368C-7F27-41C9-BE0B-321870610A3A",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "ShelfLifeDays",
          "defName": "保质期天数",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "533D8075-6A4B-4A83-AB1F-E290DDE49EAF"
        },
        {
          "defKey": "IsDisabled",
          "defName": "是否禁用",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "9AF4D310-9EAC-40F9-8A80-60F15B20F00E"
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "comment": "",