EricGEGE commited on
Commit
4a7ba73
·
verified ·
1 Parent(s): 099350f

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -3
app.py CHANGED
@@ -280,7 +280,7 @@ def submit_order1(
280
  elif session_state['username'] == 'cevcaigou288':
281
  prefix = 'GU00000'
282
 
283
- # 查询已有订单数量
284
  latest_order = session.query(PurchaseOrder).filter(
285
  PurchaseOrder.采购编号.like(f"{prefix}%")
286
  ).order_by(PurchaseOrder.id.desc()).first()
@@ -294,8 +294,17 @@ def submit_order1(
294
  i = 901
295
 
296
  order_name = f"{prefix}{i}"
297
-
298
- profit = float(销售合同价) * 7.25 - float(采购价) + float(采购价) * 0.115
 
 
 
 
 
 
 
 
 
299
 
300
  # 创建新订单
301
  new_order = PurchaseOrder(
@@ -336,6 +345,7 @@ def submit_order1(
336
  return "操作有误: {}".format(e)
337
 
338
 
 
339
  def submit_order2(
340
  username,
341
  付款抬头, 合同号, 运编号, 车辆信息, 销售合同价, 采购价,
 
280
  elif session_state['username'] == 'cevcaigou288':
281
  prefix = 'GU00000'
282
 
283
+ # 查询已有订单数量
284
  latest_order = session.query(PurchaseOrder).filter(
285
  PurchaseOrder.采购编号.like(f"{prefix}%")
286
  ).order_by(PurchaseOrder.id.desc()).first()
 
294
  i = 901
295
 
296
  order_name = f"{prefix}{i}"
297
+
298
+ # 查找现有运编号记录
299
+ existing_order = session.query(PurchaseOrder).filter(
300
+ PurchaseOrder.运编号 == 运编号
301
+ ).first()
302
+
303
+ if not existing_order:
304
+ session.close()
305
+ return "未找到相关运编号记录"
306
+
307
+ profit = float(销售合同价) * 7 - float(采购价) + float(采购价) * 0.115
308
 
309
  # 创建新订单
310
  new_order = PurchaseOrder(
 
345
  return "操作有误: {}".format(e)
346
 
347
 
348
+
349
  def submit_order2(
350
  username,
351
  付款抬头, 合同号, 运编号, 车辆信息, 销售合同价, 采购价,