删除工作组调整

app/Http/Controllers/TestController.php

@@ -1281,12 +1281,15 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
          * @var CommodityService $commodityService
          */
         $ownerIds=['13'];
-        $barcodes = ['5211801041604', '5211801041004', '5211801041603'];
+        $barcodes = 'BH08B4029E027110';
         $skus = ['BH08B4029E027110'];
         $commodityService = app(CommodityService::class);
-        $commodities=$commodityService->get_($ownerIds,$skus,[],true);
-        dd($commodities);
-
+        //$commodities=$commodityService->get_($ownerIds,$skus,[],true);
+//        dd($commodities->first());
+        $ownerId=13;
+        $sku='BH08B4029E027110';
+        $commodity=$commodityService->syncBarcodes($barcodes,$ownerId,$sku);
+        dd($commodity);
     }
 
     public function syncOrderTracking()

app/Http/Controllers/UserWorkgroupController.php

@@ -117,8 +117,6 @@ class UserWorkgroupController extends Controller
         if(!Gate::allows('工作组-删除')){ return redirect(url('/'));  }
         $UserWorkgroup=UserWorkgroup::with('signs')->find($id);
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($UserWorkgroup),Auth::user()['id']);
-        $sign=$UserWorkgroup->signs;
-        $sign->delete();
         $result=$UserWorkgroup->delete();
         return ['success'=>$result];
     }

app/Services/CommodityService.php

@@ -263,7 +263,13 @@ Class CommodityService
             }
             return $barcodes;
         })();
-        $commodity = $this->firstOrCreate(['owner_id' => $ownerId, 'sku' => $sku]);
+        //
+        $commodities=$this->get_([$ownerId],[$sku],[],true);
+        if ($commodities->first()){
+            $commodity=$commodities->first();
+        }else{
+            $commodity = $this->firstOrCreate(['owner_id' => $ownerId, 'sku' => $sku]);
+        }
         $commodityBarcodes = $commodity['barcodes'] ?? new Collection();
 
 
@@ -729,7 +735,7 @@ Class CommodityService
      * @param array $skus
      * @param array $barcodes
      * @param bool $isSyncWms 是否开启同步wms数据  开启则必须给定 $ownerIds 和 $skus
-     * @param int $paginate
+     * @param int $paginate   分页只对  货主$ownerIds 条件
      * @param int $page
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed|null
      */
@@ -767,10 +773,10 @@ Class CommodityService
                     ->whereIn('sku', $skus)->get();
                 if ($ownerIds) {
                     sort($ownerIds);
-                    $md5 = md5(json_encode([$skus, $ownerIds]));
-                    return Cache::remember('commodity_' . $md5, $time, function () use ($skus, $ownerIds, $commodities) {
+//                    $md5 = md5(json_encode([$skus, $ownerIds]));
+//                    return Cache::remember('commodity_' . $md5, $time, function () use ($skus, $ownerIds, $commodities) {
                         return $commodities->whereIn('owner_id', $ownerIds);
-                    });
+//                    });
                 }
                 if ($barcodes && !$ownerIds) {
                     sort($barcodes);

resources/views/personnel/checking-in/importAndExportQRCode.blade.php

@@ -30,7 +30,7 @@
     </div>
 
 
-    <script src="{{ asset('js/app201009.js') }}"></script>
+    <script src="{{ asset('js/app.js') }}"></script>
     <script>
         function computeDiffMicroTime_fromNow(dateComparing) {
             let now=new Date();

resources/views/personnel/checking-in/importAndExportSuccess.blade.php

@@ -27,7 +27,7 @@
         <h5 style="margin-top: 0;color: red">下班登出成功</h5>
     @endif
 </div>
-<script src="{{ asset('js/app201009.js') }}"></script>
+<script src="{{ asset('js/app.js') }}"></script>
 <script>
     new Vue({
         el:'#page',

resources/views/personnel/checking-in/success.blade.php

@@ -16,7 +16,7 @@
         <h5 v-else style="margin-top: 0;color: red">等待组长确认登入，请勿关闭:<span id="_lefttime" ></span></h5>
     </div>
 </div>
-<script src="{{ asset('js/app201009.js') }}"></script>
+<script src="{{ asset('js/app.js') }}"></script>
 <script>
     new Vue({
         el:'#page',