duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对于采购件的内容进行修改，使其填写更加便利加上库位自动加载上一次的逻辑

Browse Source
This commit is contained in:
dxc
2026-02-11 08:38:12 +08:00
parent d594ed7ef1
commit ec16ef8d20
4 changed files with 124 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
inventory-backend/app/api/v1/inbound/buy.py
View File

@ -5,19 +5,29 @@ import traceback
inbound_buy_bp = Blueprint('stock_buy', __name__)
# ------------------------------------------------------------------
# 0. 基础物料搜索
# ------------------------------------------------------------------
@inbound_buy_bp.route('/search-base', methods=['GET'])
def search_base():
"""
供前端下拉框远程搜索使用
Query Param: keyword (名称或规格)
"""
try:
keyword = request.args.get('keyword', '')
data = BuyInboundService.search_base_material(keyword)
return jsonify({"code": 200, "msg": "success", "data": data})
return jsonify({
"code": 200,
"msg": "success",
"data": data
})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 1. 获取列表
# ------------------------------------------------------------------
@ -27,6 +37,8 @@ def get_list():
page = request.args.get('page', 1, type=int)
limit = request.args.get('pageSize', 15, type=int)
keyword = request.args.get('keyword', '')
# 获取状态列表参数，前端传参格式: statuses=在库,借库
statuses_str = request.args.get('statuses', '')
statuses = statuses_str.split(',') if statuses_str else []
@ -36,6 +48,7 @@ def get_list():
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 2. 新增入库
# ------------------------------------------------------------------
@ -45,12 +58,19 @@ def submit():
data = request.get_json()
if not data:
return jsonify({"code": 400, "msg": "No data"}), 400
new_stock = BuyInboundService.handle_inbound(data)
return jsonify({"code": 200, "msg": "入库成功", "data": new_stock.to_dict()})
return jsonify({
"code": 200,
"msg": "入库成功",
"data": new_stock.to_dict()
})
except Exception as e:
traceback.print_exc()
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 3. 更新入库
# ------------------------------------------------------------------
@ -63,6 +83,7 @@ def update_buy(id):
except Exception as e:
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 4. 删除
# ------------------------------------------------------------------
@ -74,8 +95,18 @@ def delete_buy(id):
except Exception as e:
return jsonify({"code": 500, "msg": str(e)}), 500
# ------------------------------------------------------------------
# 5. 供应商建议 (基于 base_id)
# 5. 获取关联的出库历史 (如果有)
# ------------------------------------------------------------------
@inbound_buy_bp.route('/<int:id>/history', methods=['GET'])
def get_history(id):
# 如果没有出库模块，这个接口可能为空，但为保持兼容性保留
return jsonify({"code": 200, "msg": "success", "data": []})
# ------------------------------------------------------------------
# 6. 供应商建议
# ------------------------------------------------------------------
@inbound_buy_bp.route('/suggestions/suppliers', methods=['GET'])
def get_supplier_suggestions():
@ -85,8 +116,9 @@ def get_supplier_suggestions():
data = BuyInboundService.get_history_suppliers(base_id)
return jsonify({"code": 200, "msg": "success", "data": data})
# ------------------------------------------------------------------
# 6. 采购人建议 (全局，基于 stock_buy 表)
# 7. 采购人建议 (全局)
# ------------------------------------------------------------------
@inbound_buy_bp.route('/suggestions/users', methods=['GET'])
def get_user_suggestions():
@ -95,7 +127,7 @@ def get_user_suggestions():
return jsonify({"code": 200, "msg": "success", "data": data})
# ------------------------------------------------------------------
# 7. 链接建议 (基于 base_id)
# 8. 链接建议
# ------------------------------------------------------------------
@inbound_buy_bp.route('/suggestions/links', methods=['GET'])
def get_link_suggestions():
@ -104,4 +136,15 @@ def get_link_suggestions():
if not base_id:
return jsonify({"code": 400, "msg": "base_id required"}), 400
data = BuyInboundService.get_history_links(base_id, link_type)
return jsonify({"code": 200, "msg": "success", "data": data})
# ------------------------------------------------------------------
# 9. [新增] 库位建议
# ------------------------------------------------------------------
@inbound_buy_bp.route('/suggestions/locations', methods=['GET'])
def get_location_suggestions():
base_id = request.args.get('base_id', type=int)
if not base_id:
return jsonify({"code": 400, "msg": "base_id required"}), 400
data = BuyInboundService.get_history_locations(base_id)
return jsonify({"code": 200, "msg": "success", "data": data})

30
inventory-backend/app/services/inbound/buy_service.py
View File

@ -51,7 +51,8 @@ class BuyInboundService:
query = query.filter(
or_(
MaterialBase.name.ilike(f'%{keyword}%'),
MaterialBase.spec_model.ilike(f'%{keyword}%')
MaterialBase.spec_model.ilike(f'%{keyword}%'),
MaterialBase.pinyin.ilike(f'%{keyword}%')
)
)
query = query.order_by(MaterialBase.id.desc()).limit(20)
@ -336,22 +337,20 @@ class BuyInboundService:
# ============================================================
@staticmethod
def get_history_suppliers(base_id):
"""返回该物料在 stock_buy 表中关联过的供应商列表"""
"""返回该物料关联的供应商列表（去重）"""
try:
# 去重查询
query = db.session.query(StockBuy.supplier_name).filter(
StockBuy.base_id == base_id,
StockBuy.supplier_name.isnot(None),
StockBuy.supplier_name != ''
).distinct().order_by(StockBuy.supplier_name)
suppliers = [row[0] for row in query.all()]
return suppliers
except Exception:
return []
# ============================================================
# 7. 采购人/邮箱历史查询 (全局，从 stock_buy 获取)
# 7. 采购人建议 (全局，基于 stock_buy 表)
# ============================================================
@staticmethod
def get_history_purchasers(keyword):
@ -371,7 +370,7 @@ class BuyInboundService:
StockBuy.buyer_email.ilike(kw)
))
# 按名字去重，取最新的记录（这里简单做 distinct，具体业务如果一个人有多个邮箱可能需要更复杂逻辑，这里简化为 distinct 组合）
# 按名字去重，取最新的记录（这里简单做 distinct）
results = query.distinct().limit(20).all()
users = []
@ -401,5 +400,24 @@ class BuyInboundService:
links = [row[0] for row in query.all()]
return links
except Exception:
return []
# ============================================================
# 9. [新增] 库位建议 (基于 base_id)
# ============================================================
@staticmethod
def get_history_locations(base_id):
"""查询该物料的历史存放库位，方便复用"""
try:
query = db.session.query(StockBuy.warehouse_location).filter(
StockBuy.base_id == base_id,
StockBuy.warehouse_location.isnot(None),
StockBuy.warehouse_location != ''
).distinct().limit(10)
# 简单去重列表
locs = [row[0] for row in query.all()]
return locs
except Exception:
return []