From a2b75d1dcbf52f1f51886cc1815823af18b74f06 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 17:06:42 +0800
Subject: [PATCH] 修改
---
使用文档/PDManer文件/原材料库标准化.pdma.json | 125 +++++++++++++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRule.cs | 64 ++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs | 109 +++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRuleDetail.cs | 102 ++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs | 64 ++++++++
5 files changed, 444 insertions(+), 20 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRule.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRule.cs
new file mode 100644
index 0000000..5795399
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRule.cs
@@ -0,0 +1,64 @@
+锘縰sing 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; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRuleDetail.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRuleDetail.cs
new file mode 100644
index 0000000..f51edea
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsBatchRuleDetail.cs
@@ -0,0 +1,102 @@
+锘縰sing 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; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs
new file mode 100644
index 0000000..c2a4833
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs
@@ -0,0 +1,64 @@
+锘縰sing 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; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs
new file mode 100644
index 0000000..3571838
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs
@@ -0,0 +1,109 @@
+锘縰sing 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>
+ /// 鎺у埗灞炴�ц鍒橧D
+ /// </summary>
+ [Comment("鎺у埗灞炴�ц鍒橧D")]
+ [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; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json" "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
index 40089b5..c35a49b 100755
--- "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
+++ "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.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": "",
--
Gitblit v1.9.3