xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inv' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-05 14:42:08 +08:00
parent 750c2fc642 4464c86788
commit e3b38ee117
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/InvRequisitionItemReturnService.php
+4 -3
View File
@@ -119,10 +119,10 @@ class InvRequisitionItemReturnService
$data['applicant_id'] = $user['user']['id']; $data['applicant_id'] = $user['user']['id'];
$data['applicant_name'] = $user['user']['name']; $data['applicant_name'] = $user['user']['name'];
$reqItemId = $data['requisition_id']; //$reqItemId = $data['requisition_id'];
$arr = []; $arr = [];
foreach ($reqItemsArr as $reqItem) { foreach ($reqItemsArr as $reqItem) {
$reqItemId = $reqItem['id'];
// 检查是否有对应的新申请项数据 // 检查是否有对应的新申请项数据
if (!isset($newReqItems[$reqItemId])) { if (!isset($newReqItems[$reqItemId])) {
continue; continue;
@@ -135,7 +135,7 @@ class InvRequisitionItemReturnService
'apply_user_id' => $user['user']['id'], 'apply_user_id' => $user['user']['id'],
'apply_user_name' => $user['user']['name'], 'apply_user_name' => $user['user']['name'],
'return_qty' => $newReqItems[$reqItemId]['return_qty'] ?: '1', 'return_qty' => $newReqItems[$reqItemId]['return_qty'] ?: '1',
'apply_remark' => $newReqItems[$reqItemId]['apply_remark'] ?? '', 'apply_remark' => $data['apply_remark'] ?? '',
//'attachment' => $newReqItems[$reqItemId]['attachment'], //'attachment' => $newReqItems[$reqItemId]['attachment'],
//'return_at' => time(), //'return_at' => time(),
'return_at' => $data['return_at'], 'return_at' => $data['return_at'],
@@ -175,6 +175,7 @@ class InvRequisitionItemReturnService
$created = []; $created = [];
foreach ($items as $item) { foreach ($items as $item) {
//$created = $this->logicCreate($item, $dl); //$created = $this->logicCreate($item, $dl);
$item['requisition_id'] = $data['requisition_id'];
$created = $this->logicCreate($item); $created = $this->logicCreate($item);
} }
$this->processRequisitionItemReturnAttachment($res, $attachment); $this->processRequisitionItemReturnAttachment($res, $attachment);
app/common/service/InvRequisitionService.php
+2 -1
View File
@@ -226,13 +226,14 @@ class InvRequisitionService
} }
foreach ($items as $item) { foreach ($items as $item) {
$invitem = InvItem::where('id',$item)->first();
$itemData = [ $itemData = [
'requisition_id' => $created->id, 'requisition_id' => $created->id,
'item_id' => $item['item_id'], 'item_id' => $item['item_id'],
'item_name_snap' => $item['item_name_snap'], // 修改：使用 snap 字段 'item_name_snap' => $item['item_name_snap'], // 修改：使用 snap 字段
'spec_model_snap' => $item['spec_model_snap']??'', // 修改：使用 snap 字段 'spec_model_snap' => $item['spec_model_snap']??'', // 修改：使用 snap 字段
'unit_snap' => $item['unit_snap']??'', // 修改：使用 snap 字段 'unit_snap' => $item['unit_snap']??'', // 修改：使用 snap 字段
'is_consumable_snap' => $item['is_consumable_snap']?? 0, // 修改：使用 snap 字段 'is_consumable_snap' => $item['is_consumable_snap']?? ($invitem['is_consumable_snap']??0), // 修改：使用 snap 字段
'request_qty' => (int) $item['request_qty'] ?? 1, // 动态获取数量，转为整型 'request_qty' => (int) $item['request_qty'] ?? 1, // 动态获取数量，转为整型
'approved_qty' => (int) $item['request_qty'] ?? 1, // 初始审批数量等于申请数量 'approved_qty' => (int) $item['request_qty'] ?? 1, // 初始审批数量等于申请数量
'remark' => $item['remark'] ?? '' 'remark' => $item['remark'] ?? ''