|
@@ -10,6 +10,7 @@ use App\OracleDOCOrderHeader;
|
|
|
use App\OracleDOCWaveDetails;
|
|
use App\OracleDOCWaveDetails;
|
|
|
use App\OracleDOCWaveHeader;
|
|
use App\OracleDOCWaveHeader;
|
|
|
use App\Owner;
|
|
use App\Owner;
|
|
|
|
|
+use App\Warehouse;
|
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
@@ -235,6 +236,7 @@ class WaveService
|
|
|
public function sendPiece($messageId, $userId, $ownerId, $warehouseId, $date, $number)
|
|
public function sendPiece($messageId, $userId, $ownerId, $warehouseId, $date, $number)
|
|
|
{
|
|
{
|
|
|
$url = config('api.java.base') . config('api.java.piece.log.record');
|
|
$url = config('api.java.base') . config('api.java.piece.log.record');
|
|
|
|
|
+ $warehouse = Warehouse::query()->where('id',$warehouseId)->first();
|
|
|
$request = [
|
|
$request = [
|
|
|
"user_type" => 0,
|
|
"user_type" => 0,
|
|
|
"job_type" => "二次分拣",
|
|
"job_type" => "二次分拣",
|
|
@@ -245,6 +247,7 @@ class WaveService
|
|
|
"message_id" => $messageId,
|
|
"message_id" => $messageId,
|
|
|
"user_id" => $userId,
|
|
"user_id" => $userId,
|
|
|
"warehouse_id" => $warehouseId,
|
|
"warehouse_id" => $warehouseId,
|
|
|
|
|
+ "warehouse_code" => $warehouse['code'],
|
|
|
"owner_id" => $ownerId,
|
|
"owner_id" => $ownerId,
|
|
|
"item_number" => $number,
|
|
"item_number" => $number,
|
|
|
];
|
|
];
|
|
@@ -265,6 +268,7 @@ class WaveService
|
|
|
{
|
|
{
|
|
|
$url = config('api.java.base') . config('api.java.piece.ownerLog.delivery');
|
|
$url = config('api.java.base') . config('api.java.piece.ownerLog.delivery');
|
|
|
$waveQuery = OracleDOCWaveDetails::query()->select("orderNo")->where("waveNo", $batch_id);
|
|
$waveQuery = OracleDOCWaveDetails::query()->select("orderNo")->where("waveNo", $batch_id);
|
|
|
|
|
+ $warehouse = Warehouse::query()->where('id',$warehouseId)->first();
|
|
|
$items = OracleDOCOrderDetail::query()->whereIn("orderNo", $waveQuery)->get();
|
|
$items = OracleDOCOrderDetail::query()->whereIn("orderNo", $waveQuery)->get();
|
|
|
if (count($items) == 0) {
|
|
if (count($items) == 0) {
|
|
|
app('LogService')->log("二次分拣货主计件", "batch_id details is null", $batch_id);
|
|
app('LogService')->log("二次分拣货主计件", "batch_id details is null", $batch_id);
|
|
@@ -280,6 +284,7 @@ class WaveService
|
|
|
"messageId" => $batch_id . $orderDetail->orderno . $orderDetail->sku . $orderDetail->orderlineno,
|
|
"messageId" => $batch_id . $orderDetail->orderno . $orderDetail->sku . $orderDetail->orderlineno,
|
|
|
"deliveryOrderCode" => $orderDetail->orderno,
|
|
"deliveryOrderCode" => $orderDetail->orderno,
|
|
|
"warehouseId" => $warehouseId,
|
|
"warehouseId" => $warehouseId,
|
|
|
|
|
+ "warehouse_code" => $warehouse['code'],
|
|
|
"ownerId" => $ownerId,
|
|
"ownerId" => $ownerId,
|
|
|
"userId" => $userId,
|
|
"userId" => $userId,
|
|
|
"userType" => 0,
|
|
"userType" => 0,
|