Ver Fonte

fyy 时间戳问题

cqpCow há 2 anos atrás
pai
commit
66fb3b1b69

+ 0 - 6
app/Http/Controllers/Api/ScreenController.php

@@ -72,7 +72,6 @@ class ScreenController extends BaseController
 
     //本月质量
     public function output_value_month1(Request $request){
-        date_default_timezone_set("PRC");
         $date = date('Ymd',time());
 
         $startDate = strtotime(date('Y-m-01 00:00:00', time()));
@@ -106,7 +105,6 @@ class ScreenController extends BaseController
 
     //产量趋势图
     public function output_value_efficiency(Request $request){
-        date_default_timezone_set("PRC");
         // 获取当前时间戳
         $currentTimestamp = time();
         // 输出过去两周的起止时间(包括当前日期)
@@ -148,7 +146,6 @@ class ScreenController extends BaseController
 
     //工序负荷全览
     public function capacity(Request $request){
-        date_default_timezone_set("PRC");
         $date = date('Ymd',time());
 
         //工序-----------------------------
@@ -273,7 +270,6 @@ class ScreenController extends BaseController
 
     //在制工单
     public function work_order(Request $request){
-        date_default_timezone_set("PRC");
         // 获取当前时间戳
         $currentTimestamp = time();
         $timestamp = strtotime("-3 months", $currentTimestamp);
@@ -301,8 +297,6 @@ class ScreenController extends BaseController
 
     //待加工
     public function nu_work_order(Request $request){
-        date_default_timezone_set("PRC");
-
         $date = date('Ymd',time());
 
         //工序-----------------------------

+ 0 - 1
app/Http/Controllers/Api/TestController.php

@@ -66,7 +66,6 @@ class TestController extends BaseController
 
 
 public function testData(Request $request){
-        date_default_timezone_set('PRC');
         $arr = ['title' => json_encode($request->all()),
             'crt_time' => date('Y-m-d H:i:s')
         ];

+ 0 - 2
app/Service/CloudDataService.php

@@ -61,8 +61,6 @@ class CloudDataService extends Service
         $getUrl = 'https://history.usr.cn:7002';
         $list = json_decode($res,true);
 
-        date_default_timezone_set("PRC");
-
         $now = strtotime(date('Y-m-d')) * 1000;
         $start = $now;
 

+ 1 - 4
app/Service/DeleteOrderService.php

@@ -135,7 +135,6 @@ class DeleteOrderService extends Service
             $time = array_unique(array_column($message,'out_order_no_time'));
             $arr_time = [];
             if(! empty($time)){
-                date_default_timezone_set("PRC");
                 foreach ($time as $value){
                     $time_tmp = date("Ymd", $value);
                     if(! in_array($time_tmp,$arr_time)) $arr_time[] = $time_tmp;
@@ -208,7 +207,7 @@ class DeleteOrderService extends Service
             //工序表
             $message = DispatchSub::whereIn('id',$id)->select('out_order_no_time','sale_orders_product_id','dispatch_no','dispatch_quantity','order_product_id','process_id')->get()->toArray();
             if(! empty($message)){
-                date_default_timezone_set("PRC");
+
 
                 foreach ($message as $value){
                     $tmp_time = date('Ymd',$value['out_order_no_time']);
@@ -252,8 +251,6 @@ class DeleteOrderService extends Service
         try {
             DB::beginTransaction();
 
-            date_default_timezone_set('PRC');
-
             foreach ($result as $key => $value){
                 SaleOrdersProduct::where('id',$value['sale_orders_product_id'])->decrement('finished_num', $value['finished_num']);
 

+ 4 - 7
app/Service/DispatchService.php

@@ -154,7 +154,6 @@ class DispatchService extends Service
         //主表
         Dispatch::insert(['dispatch_no' => $dispatch_no,'crt_time' => $time]);
 
-        date_default_timezone_set("PRC");
         $time_tmp = date("Ymd", $data['out_order_no_time'][0]);
         $process_model = new OrdersProductProcess(['channel' => $time_tmp]);
 
@@ -203,8 +202,6 @@ class DispatchService extends Service
     }
 
     public function is_same_month($timestamp1,$timestamp2){
-        date_default_timezone_set("PRC");
-
         // 格式化时间戳为年份和月份
         $year1 = date('Y', $timestamp1);
         $month1 = date('m', $timestamp1);
@@ -259,7 +256,7 @@ class DispatchService extends Service
         $bool = $this->is_same_month($data['out_order_no_time'][0],$data['out_order_no_time'][1]);
         if(! $bool) return [false,'制单日期必须同月!'];
 
-        date_default_timezone_set("PRC");
+
         $time = date("Ymd",$data['out_order_no_time'][0]);
         $process_model = new OrdersProductProcess(['channel' => $time]);
         if(! $process_model->is_table_isset()) return [true, []];//不存在process子表 返回空数据
@@ -324,7 +321,7 @@ class DispatchService extends Service
         $emp_map = Employee::whereIn('id',array_column($data['data'],'crt_id'))
             ->pluck('emp_name','id')
             ->toArray();
-        date_default_timezone_set("PRC");
+
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
             $data['data'][$key]['out_checker_time'] = $value['out_checker_time'] ? date('Y-m-d',$value['out_checker_time']) : '';
@@ -443,7 +440,7 @@ class DispatchService extends Service
             ->pluck('out_order_no','order_no')
             ->toArray();
 
-        date_default_timezone_set("PRC");
+
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['out_order_no'] = $order_map[$value['order_no']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d',$value['crt_time']) : '';
@@ -522,7 +519,7 @@ class DispatchService extends Service
     public function fillDispatchMobileOrderList($data){
         if(empty($data)) return $data;
 
-        date_default_timezone_set("PRC");
+
         foreach ($data as $key => $value){
             $data[$key]['un_finished_quantity'] = $value['dispatch_quantity'] - $value['finished_num'];
         }

+ 0 - 2
app/Service/ErrorOperationService.php

@@ -26,8 +26,6 @@ class ErrorOperationService extends Service
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
-        date_default_timezone_set("PRC");
-
         $emp_map = Employee::whereIn('id',array_column($data['data'],'user_id'))
             ->pluck('emp_name','id')
             ->toArray();

+ 4 - 6
app/Service/FinishedOrderService.php

@@ -78,8 +78,6 @@ class FinishedOrderService extends Service
 
     public function addInJob($result,$data,$user){
         try{
-            date_default_timezone_set("PRC");
-
             //用友数据插入------------
             $insert_sql_server = [];
             foreach ($result as $key => $value){
@@ -200,7 +198,7 @@ class FinishedOrderService extends Service
     public function orderDetail($data){
         if($this->isEmpty($data,'id')) return [false,'ID不能为空!'];
 
-        date_default_timezone_set("PRC");
+
 
         $first = DispatchSub::where('id',$data['id'])->first();
         $process_model = new OrdersProductProcess(['channel' => date("Ymd",$first->out_order_no_time)]);
@@ -224,7 +222,7 @@ class FinishedOrderService extends Service
     }
 
     public function is_same_month($timestamp1,$timestamp2){
-        date_default_timezone_set("PRC");
+
 
         // 格式化时间戳为年份和月份
         $year1 = date('Y', $timestamp1);
@@ -349,7 +347,7 @@ class FinishedOrderService extends Service
             ->pluck('title','id')
             ->toArray();
 
-        date_default_timezone_set("PRC");
+
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d',$value['crt_time']) : '';
 
@@ -444,7 +442,7 @@ class FinishedOrderService extends Service
     public function addMobileInJob($result, $data, $count_arr,$user){
         try{
             //用友数据写入------------
-            date_default_timezone_set("PRC");
+
             $insert_sql_server = [];
             foreach ($result as $key => $value){
                 $quantity_tmp = $count_arr[$value['id']];

+ 0 - 2
app/Service/FyyOrderService.php

@@ -18,7 +18,6 @@ class FyyOrderService extends Service
     }
 
     public function setOrderNo(){
-        date_default_timezone_set('PRC');
         $order_no = date('Ymd') . time() . rand(1000, 9999);
         return $order_no;
     }
@@ -153,7 +152,6 @@ class FyyOrderService extends Service
             }
         }
 
-        date_default_timezone_set("PRC");
         foreach ($data['data'] as $key => $value){
             $keys = $value['product_no'] . $value['technology_name'] . $value['wood_name'];
             $data['data'][$key]['sub'] = $detail_map[$keys] ?? [];

+ 5 - 5
app/Service/FyySqlServerService.php

@@ -160,7 +160,7 @@ class FyySqlServerService extends Service
     }
 
     public function is_same_month($timestamp1,$timestamp2){
-        date_default_timezone_set("PRC");
+
 
         // 格式化时间戳为年份和月份
         $year1 = date('Y', $timestamp1);
@@ -185,7 +185,7 @@ class FyySqlServerService extends Service
         if(! $bool) return [false,'制单日期必须同月!',''];
 
         //查询产品主表副表数据
-        date_default_timezone_set("PRC");
+
         $start = date('Y-m-d H:i:s.000',$data['out_order_no_time'][0]);
         $end = date('Y-m-d H:i:s.000',$data['out_order_no_time'][1]);
         $model = $this->db->table('SO_SOMain as a')
@@ -331,7 +331,7 @@ class FyySqlServerService extends Service
     //产成品入库单保存接口以及审核
     public function U8Rdrecord10Save($data,$bredvouch = 0){
         if(! empty($this->error)) return [false,$this->error];
-        date_default_timezone_set("PRC");
+
 
         if($bredvouch){
             $cmemo = '来源:福羊羊完工操作撤回';
@@ -501,7 +501,7 @@ class FyySqlServerService extends Service
 
     //产成品入库单单据号
     public function createOrderNumberAboutSCRK(){
-        date_default_timezone_set("PRC");
+
 
         $current_month = date('m'); // 获取当前月份
         $date1 = date('y') . $current_month  ; // 格式 "2307"
@@ -527,7 +527,7 @@ class FyySqlServerService extends Service
 
     //销售出库单单据号
     public function createOrderNumberAboutXC(){
-        date_default_timezone_set("PRC");
+
 
         $current_month = date('m'); // 获取当前月份
         $date1 = date('y') . $current_month  ; // 格式 "2307"

+ 2 - 3
app/Service/ProductionOrderService.php

@@ -85,7 +85,6 @@ class ProductionOrderService extends Service
             //组织process bom的数据 写入与主表的关联id
 
             $time_arr = [];
-            date_default_timezone_set("PRC");
             foreach ($result as $key => $value){
                 $quantity_tmp = $data['quantity'][$key];
 
@@ -204,7 +203,7 @@ class ProductionOrderService extends Service
         $sale_orders_product_id = array_unique(array_column($data['data'],'sale_orders_product_id'));
         $production_map = $this->getProductionOrderQuantity($sale_orders_product_id);
 
-        date_default_timezone_set("PRC");
+
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
             $data['data'][$key]['out_checker_time'] = $value['out_checker_time'] ? date('Y-m-d',$value['out_checker_time']) : '';
@@ -309,7 +308,7 @@ class ProductionOrderService extends Service
         $sale_orders_product_id = array_unique(array_column($data,'sale_orders_product_id'));
         $production_map = $this->getProductionOrderQuantity($sale_orders_product_id);
 
-        date_default_timezone_set("PRC");
+
 
         $exportFields = ['production_time', 'production_no', 'out_order_no_time','out_order_no','customer_no','customer_name','table_header_mark','product_no','product_title','product_size','product_unit','order_quantity','production_quantity','not_production','technology_material','technology_name','wood_name','process_mark','table_body_mark','out_crt_man']; // 指定要导出的字段
         foreach ($data as $key => $value){

+ 11 - 11
app/Service/ReportFormsService.php

@@ -72,7 +72,7 @@ class ReportFormsService extends Service
         }
 
         //返回统计数据
-        date_default_timezone_set("PRC");
+
         foreach ($list as $key => $value) {
             $list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
             $list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
@@ -92,7 +92,7 @@ class ReportFormsService extends Service
     }
 
     private function checkSameQuarter($timestamps) {
-        date_default_timezone_set("PRC");
+
         $quarters = $out_time = [];
         foreach ($timestamps as $timestamp) {
             $date = date('Ym', $timestamp);
@@ -141,7 +141,7 @@ class ReportFormsService extends Service
             ->pluck('title','id')
             ->toArray();
         $return_team = $return_team_time_tmp = $return_team_time= [];
-        date_default_timezone_set("PRC");
+
         foreach ($result as $value){
             if(isset($return_team[$value['team_id']])){
                 $return_team[$value['team_id']]['num'] += 1;
@@ -230,7 +230,7 @@ class ReportFormsService extends Service
             ->select('production_time','production_no','customer_no','customer_name','table_header_mark','product_no','product_title','product_size','product_unit','dispatch_complete_quantity','finished_num','technology_material','technology_name','wood_name','process_mark','table_body_mark')
             ->get()->toArray();
 
-        date_default_timezone_set("PRC");
+
         foreach ($list as $key => $value) {
             $list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
         }
@@ -293,7 +293,7 @@ class ReportFormsService extends Service
         }
 
         //返回统计数据
-        date_default_timezone_set("PRC");
+
         foreach ($list as $key => $value) {
             $list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
             $list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
@@ -345,7 +345,7 @@ class ReportFormsService extends Service
             }
         }
 
-        date_default_timezone_set("PRC");
+
 
         $scrapp_map = Scrapp::where('del_time',0)->pluck('title','id')->toArray();
         foreach ($list as $key => $value) {
@@ -421,7 +421,7 @@ class ReportFormsService extends Service
         }
 
         //返回统计数据
-        date_default_timezone_set("PRC");
+
         foreach ($list as $key => $value) {
             $list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
             $list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
@@ -476,7 +476,7 @@ class ReportFormsService extends Service
             }
         }
 
-        date_default_timezone_set("PRC");
+
         //次品原因 班组 人员
         $map = Scrapp::whereIn('id',$scrapp_id)
             ->pluck('title','id')
@@ -602,7 +602,7 @@ class ReportFormsService extends Service
             ->select('device_name','time','data_point_name')
             ->get()->toArray();
 
-        date_default_timezone_set("PRC");
+
         $return = [
             'run' => [],
             'work' => [],
@@ -651,7 +651,7 @@ class ReportFormsService extends Service
             ->select('device_name','time','value')
             ->get()->toArray();
 
-        date_default_timezone_set("PRC");
+
 
         //所有的时间
         $time_all = [];
@@ -711,7 +711,7 @@ class ReportFormsService extends Service
         if(empty($result)) return [true,[]];
         $device_name = array_values(array_unique(array_column($result,'device_name')));
 
-        date_default_timezone_set("PRC");
+
         $run_time = $process_time = $fault = $time_all = [];
         foreach ($result as $value){
             $time = date("Y-m-d",$value['time'] / 1000);

+ 1 - 1
config/app.php

@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'PRC',
 
     /*
     |--------------------------------------------------------------------------