chore: prepare release build
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace app\controller\admin;
|
||||
|
||||
use app\support\AppraisalEvidenceService;
|
||||
use app\support\FulfillmentFlowService;
|
||||
use support\Request;
|
||||
|
||||
@@ -10,7 +11,7 @@ class WarehouseWorkbenchController
|
||||
public function inboundLookup(Request $request)
|
||||
{
|
||||
try {
|
||||
return api_success($this->service()->lookupInboundByTrackingNo((string)$request->input('tracking_no', '')));
|
||||
return api_success($this->service()->lookupInboundByInboundNo($this->inboundNo($request)));
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
} catch (\RuntimeException $e) {
|
||||
@@ -24,9 +25,10 @@ class WarehouseWorkbenchController
|
||||
{
|
||||
try {
|
||||
return api_success($this->service()->receiveInbound(
|
||||
(string)$request->input('tracking_no', ''),
|
||||
$this->inboundNo($request),
|
||||
(string)$request->input('internal_tag_no', ''),
|
||||
$request
|
||||
$request,
|
||||
$request->input('inbound_attachments', [])
|
||||
), '入库完成');
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
@@ -37,6 +39,38 @@ class WarehouseWorkbenchController
|
||||
}
|
||||
}
|
||||
|
||||
public function uploadInboundEvidenceFile(Request $request)
|
||||
{
|
||||
$evidenceService = new AppraisalEvidenceService();
|
||||
try {
|
||||
$asset = $evidenceService->upload($request);
|
||||
if (!in_array((string)($asset['file_type'] ?? ''), ['image', 'video'], true)) {
|
||||
$evidenceService->delete((string)($asset['file_url'] ?? ''));
|
||||
return api_error('拆包附件仅支持上传图片或视频', 422);
|
||||
}
|
||||
|
||||
return api_success($asset);
|
||||
} catch (\Throwable $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
}
|
||||
}
|
||||
|
||||
public function uploadReturnPackingFile(Request $request)
|
||||
{
|
||||
$evidenceService = new AppraisalEvidenceService();
|
||||
try {
|
||||
$asset = $evidenceService->upload($request);
|
||||
if (!in_array((string)($asset['file_type'] ?? ''), ['image', 'video'], true)) {
|
||||
$evidenceService->delete((string)($asset['file_url'] ?? ''));
|
||||
return api_error('打包装箱附件仅支持上传图片或视频', 422);
|
||||
}
|
||||
|
||||
return api_success($asset);
|
||||
} catch (\Throwable $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
}
|
||||
}
|
||||
|
||||
public function zhongjianLookup(Request $request)
|
||||
{
|
||||
try {
|
||||
@@ -96,7 +130,7 @@ class WarehouseWorkbenchController
|
||||
(string)$request->input('internal_tag_no', ''),
|
||||
(string)$request->input('qr_input', ''),
|
||||
$request
|
||||
), '验真吊牌已确认');
|
||||
), '验真吊牌匹配通过,请核对报告');
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
} catch (\RuntimeException $e) {
|
||||
@@ -119,6 +153,23 @@ class WarehouseWorkbenchController
|
||||
}
|
||||
}
|
||||
|
||||
public function confirmReturnReport(Request $request)
|
||||
{
|
||||
try {
|
||||
return api_success($this->service()->confirmReturnReport(
|
||||
(string)$request->input('internal_tag_no', ''),
|
||||
(int)$request->input('report_id', 0),
|
||||
$request
|
||||
), '报告已确认,可填写回寄运单');
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
} catch (\RuntimeException $e) {
|
||||
return api_error($e->getMessage(), $e->getCode() ?: 404);
|
||||
} catch (\Throwable $e) {
|
||||
return api_error('报告确认失败', 500, ['detail' => $e->getMessage()]);
|
||||
}
|
||||
}
|
||||
|
||||
public function shipReturn(Request $request)
|
||||
{
|
||||
try {
|
||||
@@ -126,7 +177,8 @@ class WarehouseWorkbenchController
|
||||
(string)$request->input('internal_tag_no', ''),
|
||||
(string)$request->input('express_company', ''),
|
||||
(string)$request->input('tracking_no', ''),
|
||||
$request
|
||||
$request,
|
||||
$request->input('packing_attachments', [])
|
||||
), '回寄运单已登记');
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return api_error($e->getMessage(), 422);
|
||||
@@ -141,4 +193,26 @@ class WarehouseWorkbenchController
|
||||
{
|
||||
return new FulfillmentFlowService();
|
||||
}
|
||||
|
||||
private function inboundNo(Request $request): string
|
||||
{
|
||||
$inboundNo = $this->requestString($request, 'inbound_no');
|
||||
if ($inboundNo !== '') {
|
||||
return $inboundNo;
|
||||
}
|
||||
|
||||
return $this->requestString($request, 'tracking_no');
|
||||
}
|
||||
|
||||
private function requestString(Request $request, string $key): string
|
||||
{
|
||||
foreach ([$request->get($key, null), $request->post($key, null), $request->input($key, null)] as $value) {
|
||||
$text = trim((string)($value ?? ''));
|
||||
if ($text !== '') {
|
||||
return $text;
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user