Merge remote-tracking branch 'origin/fyy' into fyy

app/Http/Controllers/Api/ScreenController.php

@@ -217,6 +217,7 @@ class ScreenController extends BaseController
         $data = $model->where('del_time',0)
             ->where('status',2)
             ->select('finished_time')
+            ->orderBy('finished_time','desc')
             ->get()->toArray();
 
         $return = [];
@@ -232,7 +233,7 @@ class ScreenController extends BaseController
         }
         $maxValue = empty($return) ? 0 : max($return);
         $today = $return[$date] ?? 0;
-        $rate = $maxValue ? intval($today/$maxValue) : 0;
+        $rate = $maxValue ? intval($today/$maxValue * 100) : 0;
         //工序-----------------------------
 
         //包装-----------------------------
@@ -254,7 +255,7 @@ class ScreenController extends BaseController
         }
         $maxValue = empty($return) ? 0 : max($return);
         $today = $return[$date] ?? 0;
-        $rate2 = $maxValue ? intval($today/$maxValue) : 0;
+        $rate2 = $maxValue ? intval($today/$maxValue*100) : 0;
         //包装-----------------------------
 
         $arr = [

app/Service/DeleteOrderService.php

@@ -143,10 +143,10 @@ class DeleteOrderService extends Service
             if(! empty($arr_time)){
                 foreach ($arr_time as $value){
                     $modelBom = new OrdersProductBom(['channel'=> $value]);
-                    $modelBom->where('order_product_id',$id)->update(['del_time' => time()]);
+                    $modelBom->whereIn('order_product_id',$id)->update(['del_time' => time()]);
 
                     $modelProcess = new OrdersProductProcess(['channel' => $value]);
-                    $modelProcess->where('order_product_id',$id)->update(['del_time' => time()]);
+                    $modelProcess->whereIn('order_product_id',$id)->update(['del_time' => time()]);
                 }
             }
 
@@ -230,7 +230,7 @@ class DeleteOrderService extends Service
             }
 
             //已派工数量
-            (new DispatchService())->writeDispatchQuantity(array_column($message,'order_product_id'));
+            (new DispatchService())->writeDispatchQuantityDEL(array_column($message,'order_product_id'));
 
             DB::commit();
         }catch (\Throwable $e){

app/Service/FyyOrderService.php

@@ -106,7 +106,13 @@ class FyyOrderService extends Service
             ->orderBy('id','asc');
 
         if(! empty($data['order_no'])) $model->where('order_no', 'LIKE', '%'.$data['order_no'].'%');
-        if(! empty($data['out_order_no'])) $model->whereIn('out_order_no', $data['out_order_no']);
+        if(! empty($data['out_order_no'])) {
+            if(! is_array($data['out_order_no'])) {
+                $model->where('out_order_no', 'LIKE', '%'.$data['out_order_no'].'%');
+            }else{
+                $model->whereIn('out_order_no', $data['out_order_no']);
+            }
+        }
         if(! empty($data['customer_name'])) $model->where('customer_name', 'LIKE', '%'.$data['customer_name'].'%');
         if(! empty($data['product_no'])) $model->where('product_no', 'LIKE', '%'.$data['product_no'].'%');
         if(! empty($data['product_title'])) $model->where('product_title', 'LIKE', '%'.$data['product_title'].'%');

app/Service/FyySqlServerService.php

@@ -410,6 +410,12 @@ class FyySqlServerService extends Service
     public function U8Rdrecord32Save($data,$bredvouch = 0){
         if(! empty($this->error)) return [false,$this->error];
 
+        if($bredvouch){
+            $cmemo = '来源:福羊羊';
+        }else{
+            $cmemo = '来源:系统出库';
+        }
+
         $new = [];
         foreach ($data as $value){
             $keys = $value['id'] . $value['cwhcode'];
@@ -462,7 +468,7 @@ class FyySqlServerService extends Service
                     "cdepcode"=>$main_tmp['cdepcode'],
                     "ccuscode"=>$main_tmp['cuscode'],
                     "crdcode"=>'202',
-                    "cmemo"=> '',
+                    "cmemo"=> $cmemo,
                     "cdefine10" => $main_tmp['customer_name'], //客户名称
                     "bodys"=>$bodys_tmp,
                 ]

app/Service/ProductionOrderService.php

@@ -64,15 +64,14 @@ class ProductionOrderService extends Service
             OrdersProductMain::insert(['production_no' => $production_no,'crt_time' => time(),'crt_id' => $user['id']]);
 
             //生产数据的源数据
-            $result = $msg;
+            $result = $msg[0];
+            $quantity_map = $msg[1];
 
             $boom = $process = [];
             $time = time();
             foreach ($result as $key => $value){
-                $quantity_tmp = $data['quantity'][$key];
-
                 $result[$key]['production_no'] = $production_no;
-                $result[$key]['production_quantity'] = $quantity_tmp;
+                $result[$key]['production_quantity'] = $quantity_map[$value['sale_orders_product_id']];
                 $result[$key]['production_time'] = $time;
                 $result[$key]['crt_id'] = $user['id'];
             }
@@ -86,7 +85,7 @@ class ProductionOrderService extends Service
 
             $time_arr = [];
             foreach ($result as $key => $value){
-                $quantity_tmp = $data['quantity'][$key];
+                $quantity_tmp = $quantity_map[$value['sale_orders_product_id']];
 
                 $time_tmp = date("Ymd", $value['out_order_no_time']);
                 if(! in_array($time_tmp,$time_arr)) $time_arr[] = $time_tmp;
@@ -201,11 +200,12 @@ class ProductionOrderService extends Service
             ->get()->toArray();
 
         foreach ($result as $key => $value){
-            if($value['production_quantity'] + $map[$value['sale_orders_product_id']] > $value['order_quantity']) return [false,'生产数量不能大于订单数量'];
+            $quantity_tmp = $map[$value['sale_orders_product_id']] ?? 0;
+            if($value['production_quantity'] + $quantity_tmp > $value['order_quantity']) return [false,'生产数量不能大于订单数量'];
             unset($result[$key]['production_quantity']);//删除销售订单的已生产数量
         }
 
-        return [true, $result];
+        return [true, [$result,$map]];
     }
 
     public function fillData($data){

app/Service/ReportFormsService.php

@@ -89,7 +89,7 @@ class ReportFormsService extends Service
             $detail_key = $value['production_no'] . "|";
             foreach ($detail as $key_son => $value_son) {
                 if (strpos($key_son,$detail_key) !== false) {
-                    $value_son['rate'] = number_format($value_son['finish_count'] / $value['order_quantity'], 2);
+                    $value_son['rate'] = number_format($value_son['finish_count'] / $value['order_quantity'] * 100, 2);
                     $list[$key]['process'][] = $value_son;
                 }
             }