|
@@ -34,6 +34,7 @@ class DischargeTaskImport implements ToCollection, WithHeadingRow
|
|
|
$owner = Owner::query()->where('name', trim($item['货主']))->first();
|
|
$owner = Owner::query()->where('name', trim($item['货主']))->first();
|
|
|
$waveHouse = Warehouse::query()->where('name', trim($item['仓库']))->first();
|
|
$waveHouse = Warehouse::query()->where('name', trim($item['仓库']))->first();
|
|
|
$type = array_search(trim($item['作业名称']), DischargeTask::types);
|
|
$type = array_search(trim($item['作业名称']), DischargeTask::types);
|
|
|
|
|
+ $unit = array_search(trim($item['单位']), DischargeTask::units);
|
|
|
|
|
|
|
|
if (array_search(trim($item['入库单']), $numbers)) $message .= '入库单号重复;';
|
|
if (array_search(trim($item['入库单']), $numbers)) $message .= '入库单号重复;';
|
|
|
|
|
|
|
@@ -47,6 +48,8 @@ class DischargeTaskImport implements ToCollection, WithHeadingRow
|
|
|
|
|
|
|
|
if (!$item['单价'] || strlen(trim('单价')) == 0) $message .= '未输入单价;';
|
|
if (!$item['单价'] || strlen(trim('单价')) == 0) $message .= '未输入单价;';
|
|
|
|
|
|
|
|
|
|
+ if (!$item['单位'] || strlen(trim('单位')) == 0) $message .= '未输入单位;';
|
|
|
|
|
+
|
|
|
if (isset($type) && $type != 0) $message .= '指定作业类型错误;';
|
|
if (isset($type) && $type != 0) $message .= '指定作业类型错误;';
|
|
|
|
|
|
|
|
if (!$item['作业名称']) $message .= '未指定作业类型';
|
|
if (!$item['作业名称']) $message .= '未指定作业类型';
|
|
@@ -64,6 +67,7 @@ class DischargeTaskImport implements ToCollection, WithHeadingRow
|
|
|
'numbers' => trim($item['入库单']),
|
|
'numbers' => trim($item['入库单']),
|
|
|
'income_amount' => $item['数量'],
|
|
'income_amount' => $item['数量'],
|
|
|
'income_unit_price' => $item['单价'],
|
|
'income_unit_price' => $item['单价'],
|
|
|
|
|
+ 'unit' => $unit,
|
|
|
'income_total_cost' => $item['数量'] * $item['单价'],
|
|
'income_total_cost' => $item['数量'] * $item['单价'],
|
|
|
'status' => 0,
|
|
'status' => 0,
|
|
|
'income_remark' => $item['备注'],
|
|
'income_remark' => $item['备注'],
|