seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/117/head
13621160019@163.com 2022-01-12 21:38:46 +08:00
parent e3d88695e8 6c3ca2314f
commit c0116cbcef
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
myems-api/README.md
View File

@ -1411,6 +1411,7 @@ Result
| contact | Object | Contact Object | | contact | Object | Contact Object |
| cost_center | Object | Cost Center Object | | cost_center | Object | Cost Center Object |
| description | string | Shopfloor description | | description | string | Shopfloor description |
| qrcode | string | QRCode in String |
* GET All Shopfloors * GET All Shopfloors
```bash ```bash

32
myems-api/core/shopfloor.py
View File

@ -21,18 +21,6 @@ class ShopfloorCollection:
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor(dictionary=True) cursor = cnx.cursor(dictionary=True)
query = (" SELECT id, name, uuid "
" FROM tbl_shopfloors ")
cursor.execute(query)
rows_shopfloors = cursor.fetchall()
shopfloor_dict = dict()
if rows_shopfloors is not None and len(rows_shopfloors) > 0:
for row in rows_shopfloors:
shopfloor_dict[row['id']] = {"id": row['id'],
"name": row['name'],
"uuid": row['uuid']}
query = (" SELECT id, name, uuid " query = (" SELECT id, name, uuid "
" FROM tbl_contacts ") " FROM tbl_contacts ")
cursor.execute(query) cursor.execute(query)
@ -77,7 +65,8 @@ class ShopfloorCollection:
"is_input_counted": bool(row['is_input_counted']), "is_input_counted": bool(row['is_input_counted']),
"contact": contact, "contact": contact,
"cost_center": cost_center, "cost_center": cost_center,
"description": row['description']} "description": row['description'],
"qrcode": "shopfloor:" + row['uuid']}
result.append(meta_result) result.append(meta_result)
cursor.close() cursor.close()
@ -210,23 +199,11 @@ class ShopfloorItem:
def on_get(req, resp, id_): def on_get(req, resp, id_):
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_METER_ID') description='API.INVALID_SHOPFLOOR_ID')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor(dictionary=True) cursor = cnx.cursor(dictionary=True)
query = (" SELECT id, name, uuid "
" FROM tbl_shopfloors ")
cursor.execute(query)
rows_shopfloors = cursor.fetchall()
shopfloor_dict = dict()
if rows_shopfloors is not None and len(rows_shopfloors) > 0:
for row in rows_shopfloors:
shopfloor_dict[row['id']] = {"id": row['id'],
"name": row['name'],
"uuid": row['uuid']}
query = (" SELECT id, name, uuid " query = (" SELECT id, name, uuid "
" FROM tbl_contacts ") " FROM tbl_contacts ")
cursor.execute(query) cursor.execute(query)
@ -273,7 +250,8 @@ class ShopfloorItem:
"is_input_counted": bool(row['is_input_counted']), "is_input_counted": bool(row['is_input_counted']),
"contact": contact, "contact": contact,
"cost_center": cost_center, "cost_center": cost_center,
"description": row['description']} "description": row['description'],
"qrcode": "shopfloor:" + row['uuid']}
resp.text = json.dumps(meta_result) resp.text = json.dumps(meta_result)