BUG订单管理，复核时间无效

复核时间要改成精确到分钟
二次加工，统计表中，起始时间，改为登记的第一天的起点工作时间
GO增加增加选项以换行符处理数据

app/Http/Controllers/OrderIssueController.php

@@ -127,6 +127,8 @@ class OrderIssueController extends Controller
 
     public function exportOrderIssue(Request $request)
     {
+        ini_set('max_execution_time', 2500);
+        ini_set('memory_limit', '1526M');
         if (!Gate::allows('订单管理-问题件-查询')) {
             return redirect(url('/'));
         }

app/Http/Controllers/ProcessController.php

@@ -369,7 +369,8 @@ class ProcessController extends Controller
             $process->update();
             $result['process']=$processDaily->process_id;
             $processStatistic=ProcessStatistic::find($processDaily->process_id);
-            $processStatistic->started_at=date('Y-m-d H:i:s');
+            //$processStatistic->started_at=date('Y-m-d H:i:s');
+            $processStatistic->started_at=$processDaily->date.' '.$started_at;
             $processStatistic->update();
             $this->log(__METHOD__,"二次加工单加工中".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         }

app/Http/Controllers/ProcessStatisticController.php

@@ -14,9 +14,9 @@ class ProcessStatisticController extends Controller
     public function index(Request $request){
         if(!Gate::allows('二次加工管理-查询')){ return redirect('denied');  }
         /** @var ProcessStatisticService $processStatistics */
-        $processStatistics=app("processStatisticService")->paginate($request->input());
+        $processStatistics=app("ProcessStatisticService")->paginate($request->input());
         $owners=app("OwnerService")->getSelection();
-        $processMethods=app("processMethodService")->getSelection();
+        $processMethods=app("ProcessMethodService")->getSelection();
         return view('process.statistic',['processStatistics'=>$processStatistics,'params'=>$request->input(),'owners'=>$owners,'processMethods'=>$processMethods]);
     }
 

app/Providers/AppServiceProvider.php

@@ -30,7 +30,6 @@ use App\Services\OrderService;
 use App\Services\OrderIssueWorkLoadService;
 use App\Services\OrderPackageCommoditiesService;
 use App\Services\OrderTrackingService;
-use App\Services\OwnerReportService;
 use App\Services\OwnerService;
 use App\Services\PackageService;
 use App\Services\PackageStatisticsService;
@@ -137,6 +136,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('WarehouseService',WarehouseService::class);
         app()->singleton('StoreItemService',StoreItemService::class);
         app()->singleton('PackageService',PackageService::class);
+        app()->singleton('ProcessMethodService',ProcessMethodService::class);
 
         $this->loadingOrderModuleService();
         $this->loadingBasedModuleService();

app/Services/OracleActAllocationDetailService.php

@@ -13,10 +13,10 @@ Class OracleActAllocationDetailService
 {
     private function query($sql, array $params){
         if ($params['checktime_start'] ?? false){
-            $sql .= " AND checktime >= '".$params['checktime_start']." 00:00:00'";
+            $sql .= " AND checktime >= '".$params['checktime_start'].":00'";
         }
         if ($params['checktime_end'] ?? false){
-            $sql .= " AND checktime <= '".$params['checktime_end']." 23:59:59'";
+            $sql .= " AND checktime <= '".$params['checktime_end'].":59'";
         }
         return $sql;
     }

app/Services/ProcessService.php

@@ -14,7 +14,7 @@ Class ProcessService
      * @return Builder
      */
     private function conditionQuery(array $params){
-        $processes=Process::filterAuthorities()->with(['tutorials','signs',
+        $processes=Process::filterAuthorities()->with(['owner','processMethod','tutorials'=>function($query){$query->with('owner');},'signs','operatorLogs'=>function($query){$query->with('user');},
             'signUnitPrice','processesContents'=>function($query){
             return $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 return $query->with('barcodes');

resources/views/order/index/delivering.blade.php

@@ -326,8 +326,8 @@
                         {name:'c_city',type:'input',tip:'市：15天以内模糊搜索，15天以外精确搜索',placeholder:'市'},
                         {name:'c_district',type:'input',tip:'区：15天以内模糊搜索，15天以外精确搜索',placeholder:'区'},
                         {name:'releasestatus',type:'select',tip:'是否冻结冻结',placeholder:'是否冻结',data:[{name:'H',value:'是'},{name:'',value:'否'}]},
-                        {name:'checktime_start',type:'dateTime',tip:'选择显示复核时间的起始日期'},
-                        {name:'checktime_end',type:'dateTime',tip:'选择显示复核时间的结束日期'},
+                        {name:'checktime_start',type:'time',tip:['选择显示复核时间的起始日期',"选择显示复核时间的起始时间"]},
+                        {name:'checktime_end',type:'time',tip:['选择显示复核时间的结束日期','选择显示复核时间的结束时间']},
                         {name: 'is_display_all', type: 'checkbox', tip: '是否隐藏装箱完成以后的状态', data: [{name: 'ture', value: '隐藏完成状态'}]},
                     ],
                 ];

serves/excelExportGo/api/controller/controller.go

@@ -5,8 +5,10 @@ import (
     "bswas/orm"
     "bswas/utilities"
     "encoding/json"
+    "fmt"
     "net/http"
     "strconv"
+    "time"
 )
 
 func Export(w http.ResponseWriter,req *http.Request)  {
@@ -40,6 +42,8 @@ func selectCreateFormat(params map[string]string) (row []interface{}, list [][]i
 	switch params["createFormat"] {
 	case "merge":
 		row, list, mergeRow, mergeColumn = selectModule(params)
+    case "warpText":
+        row, list, _, mergeColumn = selectModule(params)
 	default:
 		row, list, _, _ = selectModule(params)
 	}
@@ -126,6 +130,8 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		}
 		row, list = LaborReportFormat(data)
 	case "orderIssue":
+        t := time.Now()
+        fmt.Println(t.Format("2006-01-02 15:04:05"))
 		sqlList := make(map[string]string)
 		err := json.Unmarshal([]byte(params["sqlList"]), &sqlList)
 		if err != nil {
@@ -177,6 +183,8 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 			"A","B","C","D","E","F","G","H","I","J","K","L",
 			"U","Y","Z","AA","AF","AG","AH","AI","AJ","AK",
 		}
+        t = time.Now()
+        fmt.Println(t.Format("2006-01-02 15:04:05"))
 	case "inventoryAccountMission":
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {

serves/excelExportGo/excel/export.go

@@ -13,6 +13,23 @@ func CreateFile(row []interface{},list [][]interface{}, mergeRow map[string]stri
 	if err != nil {
 		utilities.WriteLog("/excel/export.go:14   文件生成失败!","ERROR")
 	}
+    if mergeRow == nil && mergeColumn != nil {
+        styleID, err := file.NewStyle(&excelize.Style{
+            Alignment: &excelize.Alignment{
+                WrapText: true,
+            },
+        })
+        if err != nil {
+            utilities.WriteLog("/excel/export.go:18  创建换行样式失败!","ERROR")
+        }
+        for i := 0;i<len(mergeColumn); i++ {
+            err = file.SetColStyle(SHEET, mergeColumn[i], styleID)
+            if err != nil {
+                utilities.WriteLog("/excel/export.go:31  “"+mergeColumn[i]+"”设置换行格式失败!","ERROR")
+                return
+            }
+        }
+    }
 	cell, _ := excelize.CoordinatesToCellName(1, 1)
 	if err := streamWriter.SetRow(cell, row); err != nil {
 		utilities.WriteLog("/excel/export.go:18  写入表头失败!","ERROR")
@@ -39,4 +56,4 @@ func CreateFile(row []interface{},list [][]interface{}, mergeRow map[string]stri
 		utilities.WriteLog("/excel/export.go:39  文件流关闭失败!","ERROR")
 	}
 	return file
-}
+}

serves/excelExportGo/test.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+    "bswas/utilities"
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize/v2"
+)
+
+func main() {
+    file := excelize.NewFile()
+    streamWriter, err := file.NewStreamWriter("Sheet1")
+    if err != nil {
+        fmt.Println(err)
+    }
+    styleID, err := file.NewStyle(&excelize.Style{
+        Alignment: &excelize.Alignment{
+            WrapText: true,
+        },
+    })
+    err = file.SetColStyle("Sheet1", "A", styleID)
+    if err != nil {
+        fmt.Println(err)
+    }
+    /*result := orm.GetMysqlData("SELECT GROUP_CONCAT(type SEPARATOR '\r\n') as test,count(*) count FROM `processes_contents` where process_id = 27 GROUP BY process_id")
+    list := make([][]interface{},len(result))
+    for index,value := range result{
+        line := []interface{}{
+            value["test"],
+        }
+        list[index] = line
+        count, _ := strconv.ParseFloat(value["count"], 64)
+        if  count > 1 {
+
+        }
+    }*/
+    //err = file.SetRowHeight("Sheet1", 1, 2*50)
+    line := []interface{}{
+        "Data\r\n15",
+    }
+    list := [][]interface{}{
+        line,
+    }
+    for index := 0; index < len(list); index++ {
+        cell, _ := excelize.CoordinatesToCellName(1, index+2)
+        if err := streamWriter.SetRow(cell, list[index]); err != nil {
+            utilities.WriteLog("/excel/export.go:23  数据写入文件失败!","ERROR")
+        }
+    }
+    if err := streamWriter.SetRow("A1", []interface{}{
+        excelize.Cell{StyleID: styleID, Value: "Data\r\n15"}}); err != nil {
+        fmt.Println(err)
+    }
+    //err = file.SetRowHeight("Sheet1", 2, 50)
+    if err := streamWriter.Flush(); err != nil {
+        fmt.Println(err)
+    }
+    if err := file.SaveAs("Book1.xlsx"); err != nil {
+        fmt.Println(err)
+    }
+}