二次加工放行验收，excel导出通用json

app/Http/Controllers/ProcessController.php

@@ -847,7 +847,7 @@ class ProcessController extends Controller
         }]);
         if (count($process->processesContents) == 0)return ['success'=>false,'data'=>'没有成本单不得验收！'];
         $result=$this->statistic($process, true);
-        if (!$result['success'])return $result;
+        //if (!$result['success'])return $result;
         $process->update([
             'status'=>'待交接'
         ]);

app/Http/Controllers/TestController.php

@@ -27,10 +27,12 @@ use App\Services\OrderPackageService;
 use App\User;
 use App\Waybill;
 use Carbon\Carbon;
+use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
 use Zttp\Zttp;
 
 class TestController extends Controller
@@ -330,16 +332,14 @@ class TestController extends Controller
     }
 
     function test1(){
-        $wms_code = "ASN2008120974";
-        $basCodes = OracleBasCode::query()->select('code','codename_c')
-            ->whereIn('codename_c',['部分收货','订单创建'])->where('codeid','ASN_STS')->get();
-        $basCodeMap = [];
-        foreach ($basCodes as $basCode){
-            $basCodeMap[$basCode->code] = $basCode->codename_c;
+        $post = Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(['row'=>['第一列','第二列'],'list'=>[['第一行','第二行'],['2第一行','2第二行']]],JSON_UNESCAPED_UNICODE)]);
+        if ($post->status() == 500){
+            throw new Exception($post->header("Msg"));
         }
-        $docASNs=OracleDOCASNDetail::query()->where("ASNNo",$wms_code)->get();   //入库单
-        $docASNs[0]->load('oracleDocAsnHeader');
-        dd($docASNs[0]);
+        return response($post,200, [
+            "Content-type"=>"application/octet-stream",
+            "Content-Disposition"=>"attachment; filename=订单记录-".date('ymdHis').'.xlsx',
+        ]);
     }
 
     /*1*/

serves/excelExportGo/api/controller/controller.go

@@ -5,7 +5,6 @@ import (
 	"bswas/orm"
 	"bswas/utilities"
 	"encoding/json"
-	"fmt"
 	"net/http"
 )
 
@@ -16,7 +15,7 @@ func Export(w http.ResponseWriter,req *http.Request)  {
 	// 解析参数 存入map
 	e := decoder.Decode(&params)
 	if e != nil{
-		utilities.WriteLog("/api/controller/controller.go:17   参数解析失败!","ERROR")
+		utilities.WriteLog("/api/controller/controller.go:18   参数解析失败!","ERROR")
 		return
 	}
 	file := excel.CreateFile(selectModule(params))
@@ -26,14 +25,26 @@ func Export(w http.ResponseWriter,req *http.Request)  {
 		return
 	}
 	if _, err := file.WriteTo(w); err != nil {
-		utilities.WriteLog("/api/controller/controller.go:22   返回二进制流失败!","ERROR")
+		utilities.WriteLog("/api/controller/controller.go:28   返回二进制流失败!","ERROR")
 		return
 	}
 }
+type base struct {
+	ROW []interface{} `json:"row"`
+	LIST [][]interface{} `json:"list"`
+}
 
 func selectModule(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string) {
 	var data []map[string]string
 	switch params["type"] {
+	case "base":
+		var val base
+		err := json.Unmarshal([]byte(params["data"]),&val)
+		if err != nil {
+			utilities.WriteLog("/api/controller/controller.go:44  JSON解析失败!","ERROR")
+		}
+		row = val.ROW
+		list = val.LIST
 	case "waybill":
 		data = orm.GetMysqlData(params["sql"])
 		row, list = WaybillFormat(data)
@@ -77,7 +88,7 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		}else{
 			err := json.Unmarshal([]byte(params["data"]), &data)
 			if err != nil {
-				utilities.WriteLog("/api/controller/controller.go:73   库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:91   库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, true)
@@ -87,7 +98,7 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		}else{
 			err := json.Unmarshal([]byte(params["data"]), &data)
 			if err != nil {
-				utilities.WriteLog("/api/controller/controller.go:83   全部库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:101   全部库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, false)
@@ -106,14 +117,14 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 	case "laborReport":
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:102   临时工报表数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:120   临时工报表数据json解析失败!","ERROR")
 		}
 		row, list = LaborReportFormat(data)
 	case "orderIssue":
 		sqlList := make(map[string]string)
 		err := json.Unmarshal([]byte(params["sqlList"]), &sqlList)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:110   订单问题件数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:129   订单问题件数据json解析失败!","ERROR")
 		}
 		if sqlList["orderPackageSql"] == "" || sqlList["secondOrderPackageSql"] == "" || sqlList["orderIssueSql"] == "" || sqlList["rejectedBillItemSql"] == "" || sqlList["logSql"] == ""{
 			return
@@ -169,15 +180,13 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		request := paramList{}
 		err := json.Unmarshal([]byte(params["data"]), &request)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:137   称重统计数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:183   称重统计数据json解析失败!","ERROR")
 		}
 		row, list = PackageStatisticFormat(request.ROW, request.LIST)
 	case "inventoryAccountMission":
-		fmt.Println(params["data"])
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {
-			fmt.Println(err)
-			utilities.WriteLog("/api/controller/controller.go:178   库存盘点数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:189   库存盘点数据json解析失败!","ERROR")
 		}
 		row, list = InventoryAccountMissionFormat(data)
 	case "inventoryCompare":

serves/excelExportGo/logs/2020-09-09.log

@@ -1,9 +0,0 @@
-
-[ERROR]   11:12:55
-   /api/controller/controller.go:17   参数解析失败!
-[ERROR]   11:12:56
-   /api/controller/controller.go:17   参数解析失败!
-[ERROR]   11:13:49
-   /api/controller/controller.go:17   参数解析失败!
-[ERROR]   11:13:49
-   /api/controller/controller.go:17   参数解析失败!

serves/excelExportGo/logs/2020-09-10.log

@@ -1,37 +0,0 @@
-
-[ERROR]   09:29:38
-   /api/controller/controller.go:174   库存盘点数据json解析失败!
-[ERROR]   09:34:44
-   /api/controller/controller.go:174   库存盘点数据json解析失败!
-[ERROR]   09:36:14
-   /api/controller/controller.go:174   库存盘点数据json解析失败!
-[ERROR]   09:42:33
-   /api/controller/controller.go:174   库存盘点数据json解析失败!
-[ERROR]   09:47:43
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   09:48:19
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:23:27
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:24:52
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:29:22
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:31:32
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:33:15
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:44:56
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   10:46:42
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   11:01:44
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   11:06:02
-   /api/controller/controller.go:178   库存盘点数据json解析失败!
-[ERROR]   13:37:16
-   /orm/query.go:11   SQL执行错误!(select inventory_compares.mission_code,inventory_compares.custom_location,inventory_compares.quality,inventory_compares.amount_in_sys,inventory_compares.amount_in_compare,inventory_compares.differ,inventory_compares.created_at, owners.name owner_name, commodities.name commodity_name,commodities.sku commodity_sku, commodity_barcodes.code commodity_barcode_code from `inventory_compares` left join `owners` on `inventory_compares`.`owner_id` = `owners`.`id` left join `commodities` on `inventory_compares`.`commodity_id` = `commodities`.`id` left join `commodity_barcodes` on `commodity_barcodes`.`commodity_id` = `commodities`.`id` order by `id` desc)
-[ERROR]   13:44:31
-   /orm/query.go:11   SQL执行错误!(select inventory_compares.*, owners.name owner_name, commodities.name commodity_name,commodities.sku commodity_sku, commodity_barcodes.code commodity_barcode_code from `inventory_compares` left join `owners` on `inventory_compares`.`owner_id` = `owners`.`id` left join `commodities` on `inventory_compares`.`commodity_id` = `commodities`.`id` left join `commodity_barcodes` on `commodity_barcodes`.`commodity_id` = `commodities`.`id` where `id` = '530,529' order by `id` desc)
-[ERROR]   13:52:09
-   /orm/query.go:11   SQL执行错误!(select inventory_compares.*, owners.name owner_name, commodities.name commodity_name,commodities.sku commodity_sku, commodity_barcodes.code commodity_barcode_code from `inventory_compares` left join `owners` on `inventory_compares`.`owner_id` = `owners`.`id` left join `commodities` on `inventory_compares`.`commodity_id` = `commodities`.`id` left join `commodity_barcodes` on `commodity_barcodes`.`commodity_id` = `commodities`.`id` where `id` in ('680', '679') order by `id` desc)