From a86117a8b7c0bad4ce7a457ba06cf571b31fd65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E6=B5=B7=E5=86=9B?= <yuhaijun@haomo.studio.com>
Date: Mon, 23 Sep 2019 19:53:30 +0800
Subject: [PATCH] add
---
common/models/bill-category.js | 5 +++
...using-category.json => bill-category.json} | 31 ++++++++++++++-----
common/models/bill-shop.js | 5 +++
.../{warehousing-shop.json => bill-shop.json} | 16 +++++-----
common/models/warehousing-category.js | 5 ---
common/models/warehousing-shop.js | 5 ---
server/model-config.json | 4 +++
7 files changed, 45 insertions(+), 26 deletions(-)
create mode 100644 common/models/bill-category.js
rename common/models/{warehousing-category.json => bill-category.json} (73%)
create mode 100644 common/models/bill-shop.js
rename common/models/{warehousing-shop.json => bill-shop.json} (87%)
delete mode 100644 common/models/warehousing-category.js
delete mode 100644 common/models/warehousing-shop.js
diff --git a/common/models/bill-category.js b/common/models/bill-category.js
new file mode 100644
index 0000000..3b6fbba
--- /dev/null
+++ b/common/models/bill-category.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function(Billcategory) {
+
+};
diff --git a/common/models/warehousing-category.json b/common/models/bill-category.json
similarity index 73%
rename from common/models/warehousing-category.json
rename to common/models/bill-category.json
index b9e655c..463e9e1 100644
--- a/common/models/warehousing-category.json
+++ b/common/models/bill-category.json
@@ -1,5 +1,5 @@
{
- "name": "WarehousingCategory",
+ "name": "BillCategory",
"base": "PersistedModel",
"idInjection": false,
"options": {
@@ -7,9 +7,24 @@
},
"mysql": {
"schema": "wordpress",
- "table": "warehousing_category"
+ "table": "bill_category"
},
"properties": {
+ "id": {
+ "type": "String",
+ "required": false,
+ "length": 36,
+ "precision": null,
+ "scale": null,
+ "mysql": {
+ "columnName": "id",
+ "dataType": "varchar",
+ "dataLength": 36,
+ "dataPrecision": null,
+ "dataScale": null,
+ "nullable": "Y"
+ }
+ },
"name": {
"type": "String",
"required": false,
@@ -25,14 +40,14 @@
"nullable": "Y"
}
},
- "sku": {
+ "value1": {
"type": "Number",
"required": false,
"length": null,
"precision": 45,
"scale": 0,
"mysql": {
- "columnName": "sku",
+ "columnName": "value1",
"dataType": "decimal",
"dataLength": null,
"dataPrecision": 45,
@@ -40,14 +55,14 @@
"nullable": "Y"
}
},
- "diff": {
+ "value2": {
"type": "String",
"required": true,
"length": 2,
"precision": null,
"scale": null,
"mysql": {
- "columnName": "diff",
+ "columnName": "value2",
"dataType": "varchar",
"dataLength": 2,
"dataPrecision": null,
@@ -55,14 +70,14 @@
"nullable": "N"
}
},
- "percent": {
+ "value3": {
"type": "String",
"required": false,
"length": 55,
"precision": null,
"scale": null,
"mysql": {
- "columnName": "percent",
+ "columnName": "value3",
"dataType": "varchar",
"dataLength": 55,
"dataPrecision": null,
diff --git a/common/models/bill-shop.js b/common/models/bill-shop.js
new file mode 100644
index 0000000..b555714
--- /dev/null
+++ b/common/models/bill-shop.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function(Billshop) {
+
+};
diff --git a/common/models/warehousing-shop.json b/common/models/bill-shop.json
similarity index 87%
rename from common/models/warehousing-shop.json
rename to common/models/bill-shop.json
index b8d023f..7df7cd5 100644
--- a/common/models/warehousing-shop.json
+++ b/common/models/bill-shop.json
@@ -1,5 +1,5 @@
{
- "name": "WarehousingShop",
+ "name": "BillShop",
"base": "PersistedModel",
"idInjection": false,
"options": {
@@ -7,7 +7,7 @@
},
"mysql": {
"schema": "wordpress",
- "table": "warehousing_shop"
+ "table": "bill_shop"
},
"properties": {
"name": {
@@ -25,14 +25,14 @@
"nullable": "Y"
}
},
- "sku": {
+ "value1": {
"type": "Number",
"required": false,
"length": null,
"precision": 45,
"scale": 0,
"mysql": {
- "columnName": "sku",
+ "columnName": "value1",
"dataType": "decimal",
"dataLength": null,
"dataPrecision": 45,
@@ -40,14 +40,14 @@
"nullable": "Y"
}
},
- "diff": {
+ "value2": {
"type": "String",
"required": true,
"length": 2,
"precision": null,
"scale": null,
"mysql": {
- "columnName": "diff",
+ "columnName": "value2",
"dataType": "varchar",
"dataLength": 2,
"dataPrecision": null,
@@ -55,14 +55,14 @@
"nullable": "N"
}
},
- "percent": {
+ "value3": {
"type": "String",
"required": false,
"length": 55,
"precision": null,
"scale": null,
"mysql": {
- "columnName": "percent",
+ "columnName": "value3",
"dataType": "varchar",
"dataLength": 55,
"dataPrecision": null,
diff --git a/common/models/warehousing-category.js b/common/models/warehousing-category.js
deleted file mode 100644
index 33df56e..0000000
--- a/common/models/warehousing-category.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function(Warehousingcategory) {
-
-};
diff --git a/common/models/warehousing-shop.js b/common/models/warehousing-shop.js
deleted file mode 100644
index e124e0f..0000000
--- a/common/models/warehousing-shop.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function(Warehousingshop) {
-
-};
diff --git a/server/model-config.json b/server/model-config.json
index a67ba55..1aa442e 100644
--- a/server/model-config.json
+++ b/server/model-config.json
@@ -676,5 +676,9 @@
"HosRevenue": {
"dataSource": "ruipeng",
"public": true
+ },
+ "BillCategory": {
+ "dataSource": "ruipeng",
+ "public": true
}
}
--
2.21.0