多表切块

app/Console/Commands/CreateWeightStatistic.php

@@ -24,7 +24,7 @@ class CreateWeightStatistic extends Command
     public function handle()
     {
         $yesterday = date("Y-m-d",strtotime("-1 day"));
-        $sql = <<<sql
+       /* $sql = <<<sql
 SELECT DATE_FORMAT(order_packages.created_at,'%Y-%m-%d') date,IFNULL(order_packages.measuring_machine_id, 0) measuring_machine_id,order_packages.owner_id,
 SUM(CASE WHEN order_packages.weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
 COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id
@@ -56,6 +56,7 @@ sql;
                 array_push($objs, $obj);
             }
             Cache::put("weight.".$yesterday, $objs);
-        }
+        }*/
+        Cache::put("weight.".$yesterday, []);
     }
 }

resources/views/process/index.blade.php

@@ -176,7 +176,7 @@
                     @can("二次加工管理-登记工时")<button :style="[{opacity:processOne.status=='交接完成'?'0.7':''},{transform:processOne.status=='交接完成'?'scale(0.85)':''}]" v-if="(processOne.status!='待审核' && processOne.status!='已驳回' && processOne.status!='待接单') && !processOne.openProcessHour"
                             class="btn btn-sm btn-outline-info" @click="openProcessHour(processOne);processOne.openProcessHour=true;processOne.detailFolding=false">登记工时</button>
                     <button v-if="processOne.openProcessHour" @click="closeProcessHour(processOne.id);processOne.openProcessHour=false" class="btn btn-sm btn-dark">收起登记工时</button>
-                    <button v-if="!processOne.openProcessHour && processOne.status=='加工中'" @click="processAccomplish(processOne)" class="btn btn-sm btn-outline-success" style="opacity: 0.7">完成</button>@endcan
+                    <button v-if="!processOne.openProcessHour && processOne.status=='待加工'" @click="processAccomplish(processOne)" class="btn btn-sm btn-outline-success" style="opacity: 0.7">完成</button>@endcan
                     @can("二次加工管理-交接完成")<button v-if="!processOne.openProcessHour && processOne.status=='待交接'" @click="accomplish(processOne)" class="btn btn-sm btn-outline-success" >交接完成</button>@endcan
                     @can("二次加工管理-编辑")
                         <button v-if="!processOne.openProcessHour && (processOne.status=='待审核' ||processOne.status=='待接单' || processOne.status=='已驳回' || processOne.status=='加工中' || processOne.status=='待加工')" @click="processEdit(processOne.id)" class="btn btn-sm btn-outline-info"
@@ -566,16 +566,16 @@
                     isForbidDrag:true,
                 }).init();
                 for (let i = 0; i < this.processes.length; i++) {
-                    this.processes[i].array = this.arrayFilter(processes[i]);
+                    this.processes[i].array = this.arrayFilter(this.processes[i]);
                 }
             },
             methods: {
-                arrayFilter: function (process) {
-                    if (!process.is_multi_row && process.id) return process.processesContents;
+                arrayFilter: function (processOne) {
+                    if (!processOne.is_multi_row && processOne.id) return processOne.processesContents;
                     let array = [];
                     let type = '成品单';
-                    if (process.id) type = '原料单';
-                    process.processesContents.forEach(function (processesContent) {
+                    if (processOne.id) type = '原料单';
+                    processOne.processesContents.forEach(function (processesContent) {
                         if (processesContent.type === type) array.push(processesContent);
                     });
                     return array;