|
|
@@ -2,165 +2,63 @@
|
|
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
|
|
-
|
|
|
use App\Authority;
|
|
|
use App\Batch;
|
|
|
-use App\Carrier;
|
|
|
-use App\CarType;
|
|
|
use App\City;
|
|
|
use App\Commodity;
|
|
|
-use App\CommodityBarcode;
|
|
|
use App\Console\Commands\CreateOwnerAreaReport;
|
|
|
use App\Console\Commands\CreateOwnerBillReport;
|
|
|
use App\Console\Commands\CreateOwnerReport;
|
|
|
-use App\Console\Commands\SyncBatchTask;
|
|
|
-use App\Console\Commands\SyncWmsCommoditiesInformation;
|
|
|
-use App\Console\Commands\SyncWMSOrderTask;
|
|
|
use App\Console\Commands\WasSyncWmsAsnInformation;
|
|
|
-use App\DeliveryAppointment;
|
|
|
-use App\Events\BroadcastToStation;
|
|
|
-use App\DeliveryAppointmentCar;
|
|
|
-use App\Events\DeliveryAppointmentEvent;
|
|
|
-use App\Exceptions\ErrorException;
|
|
|
-use App\Events\CancelOrder;
|
|
|
use App\Events\SendEmailEvent;
|
|
|
use App\Exceptions\Exception;
|
|
|
-use App\Http\Controllers\api\thirdPart\haiq\PickStationController;
|
|
|
-use App\Http\Controllers\api\thirdPart\hengli\PackageController;
|
|
|
use App\Http\Controllers\api\thirdPart\weight\WeightBaseController;
|
|
|
-use App\Http\Requests\ForeignHaiRobotic_taskUpdateRequest;
|
|
|
-use App\Http\Requests\TestAaRequest;
|
|
|
-use App\Imports\OrderTrackingImport;
|
|
|
-use App\InventoryAccount;
|
|
|
-use App\Jobs\BatchTaskJob;
|
|
|
use App\Jobs\DeleteRepetitionSkuItem;
|
|
|
-use App\Jobs\OrderCreateInstantBill;
|
|
|
-use App\Jobs\OrderFreeze;
|
|
|
-use App\Jobs\StoreCreateInstantBill;
|
|
|
-use App\Jobs\ResetInstantBill;
|
|
|
use App\LaborReport;
|
|
|
use App\LaborReportStatus;
|
|
|
use App\Log;
|
|
|
use App\Logistic;
|
|
|
-use App\MeasuringMachine;
|
|
|
-use App\Menu;
|
|
|
-use App\Notifications\SendEmailNotification;
|
|
|
use App\OracleActAllocationDetails;
|
|
|
-use App\OracleBasCustomer;
|
|
|
-use App\OracleBasSKU;
|
|
|
use App\OracleDOCASNHeader;
|
|
|
-use App\OracleDOCOrderDetail;
|
|
|
-use App\OracleDOCOrderHeader;
|
|
|
-use App\OracleDocOrderPackingSummary;
|
|
|
-use App\OracleDocOrderSerialNo;
|
|
|
-use App\OracleDOCWaveDetails;
|
|
|
-use App\OracleDOCWaveHeader;
|
|
|
-use App\OracleInvLotLocId;
|
|
|
use App\Order;
|
|
|
use App\OrderBin;
|
|
|
use App\OrderCommodity;
|
|
|
use App\OrderIssue;
|
|
|
use App\OrderPackage;
|
|
|
-use App\OrderPackageCommodities;
|
|
|
use App\Owner;
|
|
|
use App\OwnerAreaReport;
|
|
|
-use App\OwnerBillReport;
|
|
|
-use App\OwnerFeeDetail;
|
|
|
-use App\OwnerFeeDetailLogistic;
|
|
|
use App\OwnerMaterial;
|
|
|
-use App\OwnerPriceExpress;
|
|
|
-use App\OwnerPriceOperation;
|
|
|
-use App\OwnerPriceOperationItem;
|
|
|
-use App\OwnerPriceSystem;
|
|
|
-use App\OwnerReport;
|
|
|
-use App\OwnerStoragePriceModel;
|
|
|
use App\Package;
|
|
|
-use App\Process;
|
|
|
-use App\ProcessDaily;
|
|
|
-use App\ProcessStatistic;
|
|
|
use App\Procurement;
|
|
|
use App\ProcurementCheckSheet;
|
|
|
use App\ProcurementDeliverie;
|
|
|
use App\ProcurementQuotation;
|
|
|
use App\ProcurementTotalBill;
|
|
|
-use App\Province;
|
|
|
-use App\Region;
|
|
|
-use App\RejectedBill;
|
|
|
use App\RejectedBillItem;
|
|
|
use App\Services\CacheService;
|
|
|
use App\Services\CommodityService;
|
|
|
use App\Services\common\BatchUpdateService;
|
|
|
use App\Services\common\DataHandlerService;
|
|
|
-use App\Services\common\QueryService;
|
|
|
-use App\Services\DocWaveHeaderService;
|
|
|
-use App\Services\FeatureService;
|
|
|
-use App\Services\InventoryCompareService;
|
|
|
-use App\Services\LogisticService;
|
|
|
use App\Services\LogisticZopService;
|
|
|
use App\Services\LogService;
|
|
|
-use App\Services\OracleActAllocationDetailService;
|
|
|
-use App\Services\OracleBasSkuService;
|
|
|
-use App\Services\OracleDocAsnHerderService;
|
|
|
use App\Services\OracleDOCOrderHeaderService;
|
|
|
-use App\Services\OracleDocWaveDetailService;
|
|
|
-use App\Services\OrderCommodityService;
|
|
|
use App\Services\OrderPackageReceivedSyncService;
|
|
|
use App\Services\OrderPackageService;
|
|
|
use App\Services\OrderService;
|
|
|
-use App\Services\OrderTrackingOwnerService;
|
|
|
use App\Services\OrderTrackingService;
|
|
|
-use App\Services\OwnerPriceOperationService;
|
|
|
-use App\Services\OwnerService;
|
|
|
-use App\Services\ProcurementService;
|
|
|
-use App\Services\RegionService;
|
|
|
use App\Services\RejectedBillService;
|
|
|
-use App\Services\ShopService;
|
|
|
use App\Services\StoreService;
|
|
|
use App\Services\SupplierService;
|
|
|
-use App\Services\WarehouseService;
|
|
|
-use App\Station;
|
|
|
-use App\StationRuleBatch;
|
|
|
-use App\StationTask;
|
|
|
-use App\StationTaskMaterialBox;
|
|
|
-use App\StationType;
|
|
|
use App\Store;
|
|
|
use App\StationTaskBatch;
|
|
|
-use App\StoreCheckingReceiveItem;
|
|
|
use App\StoreItem;
|
|
|
-use App\StoreItems;
|
|
|
-use App\Supplier;
|
|
|
-use App\Traits\ModelLogChanging;
|
|
|
-use App\Unit;
|
|
|
-use App\User;
|
|
|
use App\UserDetail;
|
|
|
use App\UserDutyCheck;
|
|
|
use App\ValueStore;
|
|
|
-use App\Warehouse;
|
|
|
-use App\Waybill;
|
|
|
-use App\WaybillPriceModel;
|
|
|
use Carbon\Carbon;
|
|
|
-use Carbon\CarbonPeriod;
|
|
|
-use ChangeColumnOrderIdToOrderIssues;
|
|
|
-use Doctrine\DBAL\Exception\DatabaseObjectExistsException;
|
|
|
-use Doctrine\DBAL\Query\QueryBuilder;
|
|
|
-use Illuminate\Database\Connection;
|
|
|
-use Illuminate\Database\Eloquent\Builder;
|
|
|
-use Illuminate\Database\Eloquent\Model;
|
|
|
-use Illuminate\Database\QueryException;
|
|
|
-use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\Cache;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
-use Illuminate\Support\Facades\Hash;
|
|
|
-use Illuminate\Support\Facades\Http;
|
|
|
-use Illuminate\Support\Facades\Redis;
|
|
|
-use Illuminate\Support\Facades\Storage;
|
|
|
-use Illuminate\Support\Str;
|
|
|
-use Maatwebsite\Excel\Facades\Excel;
|
|
|
-use Mockery\Mock;
|
|
|
-use Overtrue\LaravelPinyin\Facades\Pinyin;
|
|
|
-use PhpMyAdmin\Server\Status\Data;
|
|
|
-use Ramsey\Collection\Collection;
|
|
|
use Zttp\Zttp;
|
|
|
|
|
|
class TestController extends Controller
|
|
|
@@ -615,36 +513,6 @@ class TestController extends Controller
|
|
|
// ]))->save();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- public function changeOrder()
|
|
|
- {
|
|
|
- /**
|
|
|
- * @var OrderService $orderService
|
|
|
- */
|
|
|
- $carbon = Carbon::now()->subMinutes(30);
|
|
|
- var_dump('$orderHeader', new Carbon());
|
|
|
- $orderHeader_start = OracleDOCOrderHeader::query()->selectRaw(implode(',', OracleDOCOrderHeaderService::$columns))
|
|
|
- ->with(['oracleBASCustomer' => function ($query) {
|
|
|
- $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
|
|
|
- }, 'oracleDOCOrderDetails' => function ($query) {
|
|
|
- $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered');
|
|
|
- }, 'actAllocationDetails' => function ($query) {
|
|
|
- $query->selectRaw('ACT_Allocation_Details.AllocationDetailsID,ACT_Allocation_Details.OrderNo,ACT_Allocation_Details.Qty_Each,ACT_Allocation_Details.PickToTraceID,ACT_Allocation_Details.CustomerID,ACT_Allocation_Details.Sku');
|
|
|
- }, 'oracleBASCode' => function ($query) {
|
|
|
- $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
|
|
|
- }])
|
|
|
- ->where('DOC_Order_Header.addTime', '>=', $carbon)
|
|
|
-// ->where('DOC_Order_Header.editTime','>=',$carbon)
|
|
|
- ->get();
|
|
|
- var_dump((string)Carbon::now());
|
|
|
-
|
|
|
- $orderService = app('OrderService');
|
|
|
- $orderService->syncOrder($orderHeader_start);
|
|
|
-// $orderService->syncOrder($orderHeader_edit);
|
|
|
- var_dump((string)Carbon::now());
|
|
|
-// orderService getCreateOrderModelsByWMSOrderHeaders
|
|
|
- }
|
|
|
-
|
|
|
public function cleanOrderRepeat()
|
|
|
{
|
|
|
|
|
|
@@ -1380,6 +1248,7 @@ where purch.islower=1 and deliver.id>'.$id);
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
public function syncOrderTracking()
|
|
|
{
|
|
|
$orderNos = ['OSSO21040013','OSSO21040012'];
|
ajun