Merge branch 'feature/inv' into develop

This commit is contained in:
2026-01-07 09:44:29 +08:00
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -112,7 +112,7 @@ class InvItemService
$data['spec_model'] = '';
$data['unit'] = '件';
$data['is_consumable'] = 0;
$data['stock_qty'] = 1;
$data['stock_qty'] = $data['stock_qty']??1;
$data['location'] = '';
return $data;
}
+3 -3
View File
@@ -144,9 +144,9 @@ class InvRequisitionService
'requisition_id' => $created->id,
'item_id' => $item['item_id'],
'item_name_snap' => $item['item_name_snap'], // 修改:使用 snap 字段
'spec_model_snap' => $item['spec_model_snap'], // 修改:使用 snap 字段
'unit_snap' => $item['unit_snap'], // 修改:使用 snap 字段
'is_consumable_snap' => $item['is_consumable_snap'], // 修改:使用 snap 字段
'spec_model_snap' => $item['spec_model_snap']??'', // 修改:使用 snap 字段
'unit_snap' => $item['unit_snap']??'', // 修改:使用 snap 字段
'is_consumable_snap' => $item['is_consumable_snap']?? 0, // 修改:使用 snap 字段
'request_qty' => (int) $item['request_qty'] ?? 1, // 动态获取数量,转为整型
'approved_qty' => (int) $item['request_qty'] ?? 1, // 初始审批数量等于申请数量
'remark' => $item['remark'] ?? ''