diff --git a/inventory-backend/app/api/v1/inbound/buy.py b/inventory-backend/app/api/v1/inbound/buy.py index 52c6adc..a5ae7c8 100644 --- a/inventory-backend/app/api/v1/inbound/buy.py +++ b/inventory-backend/app/api/v1/inbound/buy.py @@ -213,6 +213,11 @@ def submit(): if perm_code and perm_code not in user_permissions: data.pop(field, None) + # 库位必填校验（安全兜底） + location = data.get('warehouse_location', '').strip() + if not location: + return jsonify({"code": 400, "msg": "入库失败：库位为必填项，不能为空！"}), 400 + new_stock = BuyInboundService.handle_inbound(data) return jsonify({ diff --git a/inventory-backend/app/api/v1/inbound/product.py b/inventory-backend/app/api/v1/inbound/product.py index 7202292..5398262 100644 --- a/inventory-backend/app/api/v1/inbound/product.py +++ b/inventory-backend/app/api/v1/inbound/product.py @@ -133,6 +133,12 @@ def submit(): try: data = request.get_json() if not data: return jsonify({"code": 400, "msg": "No data"}), 400 + + # 库位必填校验（安全兜底） + location = data.get('warehouse_location', '').strip() + if not location: + return jsonify({"code": 400, "msg": "入库失败：库位为必填项，不能为空！"}), 400 + user_permissions = get_current_user_permissions() if 'inbound_product:*' not in user_permissions: field_to_perm = {'id': 'inbound_product:id', 'base_id': 'inbound_product:base_id', 'company_name': 'inbound_product:company_name', 'material_name': 'inbound_product:material_name', 'category': 'inbound_product:category', 'material_type': 'inbound_product:material_type', 'spec_model': 'inbound_product:spec_model', 'unit': 'inbound_product:unit', 'sku': 'inbound_product:sku', 'inbound_date': 'inbound_product:inbound_date', 'barcode': 'inbound_product:barcode', 'serial_number': 'inbound_product:serial_number', 'status': 'inbound_product:status', 'quality_status': 'inbound_product:quality_status', 'in_quantity': 'inbound_product:in_quantity', 'stock_quantity': 'inbound_product:stock_quantity', 'available_quantity': 'inbound_product:available_quantity', 'warehouse_location': 'inbound_product:warehouse_location', 'bom_code': 'inbound_product:bom_code', 'bom_version': 'inbound_product:bom_version', 'work_order_code': 'inbound_product:work_order_code', 'order_id': 'inbound_product:order_id', 'production_manager': 'inbound_product:production_manager', 'production_start_time': 'inbound_product:production_start_time', 'production_end_time': 'inbound_product:production_end_time', 'raw_material_cost': 'inbound_product:raw_material_cost', 'manual_cost': 'inbound_product:manual_cost', 'sale_price': 'inbound_product:sale_price', 'product_photo': 'inbound_product:product_photo', 'quality_report_link': 'inbound_product:quality_report_link', 'inspection_report_link': 'inbound_product:inspection_report_link', 'detail_link': 'inbound_product:detail_link'} diff --git a/inventory-backend/app/api/v1/inbound/semi.py b/inventory-backend/app/api/v1/inbound/semi.py index cfe97a4..a0d15d9 100644 --- a/inventory-backend/app/api/v1/inbound/semi.py +++ b/inventory-backend/app/api/v1/inbound/semi.py @@ -128,6 +128,12 @@ def submit(): try: data = request.get_json() if not data: return jsonify({"code": 400, "msg": "No data"}), 400 + + # 库位必填校验（安全兜底） + location = data.get('warehouse_location', '').strip() + if not location: + return jsonify({"code": 400, "msg": "入库失败：库位为必填项，不能为空！"}), 400 + user_permissions = get_current_user_permissions() if 'inbound_semi:*' not in user_permissions: field_to_perm = {'id': 'inbound_semi:id', 'base_id': 'inbound_semi:base_id', 'company_name': 'inbound_semi:company_name', 'material_name': 'inbound_semi:material_name', 'category': 'inbound_semi:category', 'material_type': 'inbound_semi:material_type', 'spec_model': 'inbound_semi:spec_model', 'unit': 'inbound_semi:unit', 'sku': 'inbound_semi:sku', 'inbound_date': 'inbound_semi:inbound_date', 'barcode': 'inbound_semi:barcode', 'serial_number': 'inbound_semi:serial_number', 'batch_number': 'inbound_semi:batch_number', 'status': 'inbound_semi:status', 'quality_status': 'inbound_semi:quality_status', 'in_quantity': 'inbound_semi:in_quantity', 'stock_quantity': 'inbound_semi:stock_quantity', 'available_quantity': 'inbound_semi:available_quantity', 'warehouse_location': 'inbound_semi:warehouse_location', 'bom_code': 'inbound_semi:bom_code', 'bom_version': 'inbound_semi:bom_version', 'work_order_code': 'inbound_semi:work_order_code', 'raw_material_cost': 'inbound_semi:raw_material_cost', 'manual_cost': 'inbound_semi:manual_cost', 'unit_total_cost': 'inbound_semi:unit_total_cost', 'production_manager': 'inbound_semi:production_manager', 'production_start_time': 'inbound_semi:production_start_time', 'production_end_time': 'inbound_semi:production_end_time', 'arrival_photo': 'inbound_semi:arrival_photo', 'quality_report_link': 'inbound_semi:quality_report_link', 'detail_link': 'inbound_semi:detail_link'} diff --git a/inventory-web/src/views/material/list.vue b/inventory-web/src/views/material/list.vue index d130858..df3b513 100644 --- a/inventory-web/src/views/material/list.vue +++ b/inventory-web/src/views/material/list.vue @@ -229,17 +229,13 @@ diff --git a/inventory-web/src/views/stock/inbound/buy.vue b/inventory-web/src/views/stock/inbound/buy.vue index c7f08d6..3db5725 100644 --- a/inventory-web/src/views/stock/inbound/buy.vue +++ b/inventory-web/src/views/stock/inbound/buy.vue @@ -1180,6 +1180,7 @@ const rules = computed(() => { const baseRules = { base_id: [{required: true, message: '请选择物料', trigger: 'change'}], in_quantity: [{required: true, message: '请输入数量', trigger: 'blur'}], + warehouse_location: [{required: true, message: '库位不能为空，请填写或选择', trigger: ['blur', 'change']}], serial_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}], batch_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}] } diff --git a/inventory-web/src/views/stock/inbound/product.vue b/inventory-web/src/views/stock/inbound/product.vue index 2518169..9fd9972 100644 --- a/inventory-web/src/views/stock/inbound/product.vue +++ b/inventory-web/src/views/stock/inbound/product.vue @@ -923,7 +923,8 @@ const validateUnique = (rule: any, value: string, callback: any) => { const rules = { base_id: [{ required: true, message: '必选', trigger: 'change' }], serial_number: [{ required: true, message: '必填', trigger: 'blur' }, { validator: validateUnique, trigger: 'blur' }], - in_quantity: [{ required: true, message: '必填', trigger: 'blur' }] + in_quantity: [{ required: true, message: '必填', trigger: 'blur' }], + warehouse_location: [{required: true, message: '库位不能为空，请填写或选择', trigger: ['blur', 'change']}] } diff --git a/inventory-web/src/views/stock/inbound/semi.vue b/inventory-web/src/views/stock/inbound/semi.vue index b02d2c2..b914e7c 100644 --- a/inventory-web/src/views/stock/inbound/semi.vue +++ b/inventory-web/src/views/stock/inbound/semi.vue @@ -1050,6 +1050,7 @@ const validateIdentity = (rule: any, value: any, callback: any) => { const rules = { base_id: [{required: true, message: '请选择物料', trigger: 'change'}], in_quantity: [{required: true, message: '请输入数量', trigger: 'blur'}], + warehouse_location: [{required: true, message: '库位不能为空，请填写或选择', trigger: ['blur', 'change']}], serial_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}], batch_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}] }