入库同步修改

app/Console/Commands/WasSyncWmsAsnInformation.php

@@ -84,8 +84,9 @@ class WasSyncWmsAsnInformation extends Command
     public function WasSyncWmsAsn(){
         /** @var StoreService $storeService */
         $storeService  = app(StoreService::class);
-        ini_set('memory_limit', '1024M');
+        ini_set('memory_limit', '2048M');
         $storeService->storeCreateByWms();
+        $storeService->storeEditCreateWms();
         $storeService->storeUpdateByWms();
     }
 }

app/Http/Controllers/TestController.php

@@ -16,15 +16,18 @@ use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use App\Services\LogService;
+use App\Services\OracleDocAsnHerderService;
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderCommodityService;
 use App\Services\OrderService;
 use App\Services\WaveService;
 use App\Services\WaybillService;
 use App\SortingStation;
+use App\Store;
 use App\User;
 use App\UserToken;
 use App\Waybill;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -85,8 +88,10 @@ class TestController extends Controller
 
     public function test1()
     {
-        $store_map=[];
-        dd($store_map['11111']??'');
+        /** @var OracleDocAsnHerderService $oracleDocAsnHerderService */
+        $oracleDocAsnHerderService = app(OracleDocAsnHerderService::class);
+        $asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateEdit('2022-10-26 20:01:00');
+        dd($asnHerders);
     }
 }
 

app/Services/OracleDocAsnHerderService.php

@@ -33,7 +33,7 @@ class OracleDocAsnHerderService
             ->with(['asnType', 'asnStatus'])
             ->select('asnno', 'asnstatus', 'asntype', 'addtime', 'edittime', 'customerid', 'notes', 'warehouseid', 'asnreference3', 'asnreference2')
             ->where('EditTime', '>=', $startDate)
-            ->whereColumn('EditTime', '<>', 'addTime')
+            ->whereColumn('EditTime', '!=', 'addTime')
             ->orderByDesc('EditTime')
             ->get();
     }

app/Services/StoreService.php

@@ -85,6 +85,15 @@ class StoreService
         $this->setLastRecordsByRedis($create_key, $create_set, $create_keys, $last_records);
         $this->setAsnLastSyncAt($created_at, $last_time);
     }
+    public function storeEditCreateWms(){
+        $updated_at = config('sync.asn_sync.updated_at');
+        /** @var OracleDocAsnHerderService $oracleDocAsnHerderService */
+        $oracleDocAsnHerderService = app(OracleDocAsnHerderService::class);
+        $last_time = $this->getAsnLastSyncAt($updated_at, 'update');
+        $asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateEdit($last_time);
+        if (count($asnHerders)<1) return;
+        $this->createStore($asnHerders,"update");
+    }
 
     public function storeUpdateByWms()
     {
@@ -99,6 +108,7 @@ class StoreService
         app('LogService')
             ->log(__METHOD__, __FUNCTION__, '11 获取上次更新时间：' . $last_time );
         $asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateEdit($last_time);
+
         if (count($asnHerders)<1) return;
         try {
             $arr=[];
@@ -111,7 +121,7 @@ class StoreService
         }
         $last_time = $asnHerders->first()['edittime'];
         $last_records = $asnHerders->where('edittime', $last_time);
-        $this->createStore($asnHerders,"update");
+//        $this->createStore($asnHerders,"update");
         $this->updateStore($asnHerders);
         $this->createStoreRejected($asnHerders);
         $this->deleteCacheKey($update_set, $update_keys);