支持供应商简称维护和订单PDF下载命名

po_app/app.py

@@ -147,6 +147,11 @@ def suppliers():
             setattr(s, f, request.form.get(f, "").strip())
         if not s.name:
             raise ValueError('供应商名称必填')
+        if 'short_name' in request.form:
+            short_name = request.form['short_name'].strip()
+            if len(short_name) > 60:
+                raise ValueError('供应商简称不能超过60个字符')
+            s.short_name = short_name
         if not sid:
             db.add(s)
         db.commit()
@@ -208,12 +213,16 @@ def supplier_import_excel():
         if not any(r):
             continue
         (code, name, contact, phone, payment_terms, tax_no,
-         bank_name, bank_account) = (list(r) + [""] * 8)[:8]
+         bank_name, bank_account, short_name) = (list(r) + [None] * 9)[:9]
         code, name = s(code), s(name)
         if not name:
             failed += 1
             errs.append(u"第%d行：供应商名称为空" % i)
             continue
+        if short_name is not None and len(s(short_name)) > 60:
+            failed += 1
+            errs.append(u"第%d行：供应商简称不能超过60个字符" % i)
+            continue
         obj = db.query(Supplier).filter_by(code=code).first() if code else None
         if not obj:
             obj = db.query(Supplier).filter_by(name=name).first()
@@ -229,13 +238,15 @@ def supplier_import_excel():
             obj.tax_no = s(tax_no)
             obj.bank_name = s(bank_name)
             obj.bank_account = s(bank_account)
+            if short_name is not None:
+                obj.short_name = s(short_name)
             obj.active = True
             updated += 1
         else:
             db.add(Supplier(code=code, name=name, contact=s(contact),
                             phone=s(phone), payment_terms=s(payment_terms),
                             tax_no=s(tax_no), bank_name=s(bank_name),
-                            bank_account=s(bank_account), active=True))
+                            bank_account=s(bank_account), short_name=s(short_name), active=True))
             added += 1
     db.commit()
     msg = u"导入完成：新增 %d，更新 %d，跳过 %d，失败 %d" % (added, updated, skipped, failed)
@@ -254,11 +265,11 @@ def supplier_import_template():
     wb = openpyxl.Workbook()
     ws = wb.active
     ws.append([u"编号", u"名称", u"联系人", u"电话", u"付款方式", u"税号",
-               u"开户银行", u"银行帐号"])
+               u"开户银行", u"银行帐号", u"公司简称"])
     ws.append(["S003", u"苏州精锐五金制品有限公司", u"周经理", "13800000001",
                u"月结30天", "91320500MA1XXXXXXX", u"中国银行苏州工业园区支行",
-               "4562 1088 0012 3456"])
-    for col, w in zip("ABCDEFGH", (10, 30, 12, 16, 14, 22, 26, 24)):
+               "4562 1088 0012 3456", u"精锐五金"])
+    for col, w in zip("ABCDEFGHI", (10, 30, 12, 16, 14, 22, 26, 24, 18)):
         ws.column_dimensions[col].width = w
     buf = io.BytesIO()
     wb.save(buf)
@@ -406,7 +417,7 @@ def api_materials():
 @login_required
 def api_suppliers():
     rows = db.query(Supplier).filter_by(active=True).all()
-    return jsonify([{"id": s.id, "name": s.name, "contact": s.contact,
+    return jsonify([{"id": s.id, "name": s.name, "short_name": s.short_name, "contact": s.contact,
                      "phone": s.phone, "tax_no": s.tax_no, "bank_name": s.bank_name,
                      "bank_account": s.bank_account,
                      "payment_terms": s.payment_terms} for s in rows])