fix: back to sor.C with simple param cleaning
This commit is contained in:
parent
37c39a053f
commit
6b6489af02
@ -1,23 +1,16 @@
|
|||||||
|
|
||||||
user_id = await get_user()
|
user_id = await get_user()
|
||||||
user_orgid = (await get_userorgid()) or '0'
|
user_orgid = (await get_userorgid()) or '0'
|
||||||
dbname = get_module_dbname('supplychain')
|
dbname = get_module_dbname('supplychain')
|
||||||
|
|
||||||
# Only keep known table columns
|
ns = params_kw.copy()
|
||||||
known_cols = {'contract_name', 'sign_date', 'start_date', 'end_date', 'status', 'default_discount', 'remark', 'supplier_id', 'contract_code'}
|
ns['id'] = getID()
|
||||||
data = {}
|
ns['resellerid'] = user_orgid
|
||||||
for k, v in params_kw.items():
|
ns['created_by'] = user_id
|
||||||
if k in known_cols and v is not None and v != '':
|
ns['created_at'] = timestampstr()
|
||||||
data[k] = v
|
ns['updated_at'] = timestampstr()
|
||||||
|
|
||||||
data['id'] = getID()
|
|
||||||
data['resellerid'] = user_orgid
|
|
||||||
data['created_by'] = user_id
|
|
||||||
data['created_at'] = timestampstr()
|
|
||||||
data['updated_at'] = timestampstr()
|
|
||||||
|
|
||||||
# Auto-generate contract_code
|
# Auto-generate contract_code
|
||||||
if not data.get('contract_code'):
|
if not ns.get('contract_code'):
|
||||||
today = curDateString().replace('-', '')
|
today = curDateString().replace('-', '')
|
||||||
prefix = f'SC-{today}'
|
prefix = f'SC-{today}'
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
@ -27,12 +20,14 @@ if not data.get('contract_code'):
|
|||||||
{"rid": user_orgid, "p": prefix + "%"}
|
{"rid": user_orgid, "p": prefix + "%"}
|
||||||
)
|
)
|
||||||
seq = (recs[0].cnt if recs else 0) + 1
|
seq = (recs[0].cnt if recs else 0) + 1
|
||||||
data['contract_code'] = f'{prefix}-{seq:04d}'
|
ns['contract_code'] = f'{prefix}-{seq:04d}'
|
||||||
|
|
||||||
try:
|
# Clean non-column keys
|
||||||
db = DBPools()
|
for k in list(ns.keys()):
|
||||||
async with db.sqlorContext(dbname) as sor:
|
if k.endswith('_text') or k.startswith('_') or k in ('page', 'rows', 'pagerows', 'data_filter', 'referer_widget'):
|
||||||
await sor.I(data)
|
ns.pop(k, None)
|
||||||
return json.dumps({'widgettype':'Message','options':{'title':'Success','message':'供应合同创建成功'}}, ensure_ascii=False)
|
|
||||||
except Exception as e:
|
db = DBPools()
|
||||||
return json.dumps({'widgettype':'Error','options':{'title':'Error','message':f'创建失败: {e}'}}, ensure_ascii=False)
|
async with db.sqlorContext(dbname) as sor:
|
||||||
|
await sor.C('supply_contracts', ns)
|
||||||
|
return json.dumps({'widgettype':'Message','options':{'title':'Success','message':'供应合同创建成功'}}, ensure_ascii=False)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user