问题件 退单状态，默认不应该是空，而是无

问题件生成 先生成退件在生成问题单时不会同步
问题件导出 导出【已解决且完结】并选中导出时会导出空表

app/Http/Controllers/OrderIssueController.php

@@ -133,9 +133,10 @@ class OrderIssueController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
+
             $sqlList = app('OrderIssueService')->getSqlList($params);
         }else{
-            $sqlList = app('OrderIssueService')->getSqlList(['id'=>$request->data]);
+            $sqlList = app('OrderIssueService')->getSqlList(['id'=>$request->data,"is_handle"=>true]);
         }
         $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList),'createFormat'=>'merge']);
         if ($post->status() == 500){

app/Http/Controllers/TestController.php

@@ -19,6 +19,7 @@ use App\OracleActAllocationDetails;
 use App\OracleBasCode;
 use App\OracleBasSKU;
 use App\OracleDOCASNDetail;
+use App\OracleDOCASNHeader;
 use App\OracleDOCOrderHeader;
 use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveDetails;
@@ -75,6 +76,7 @@ use Zttp\Zttp;
 
 class TestController extends Controller
 {
+    const ASNREFERENCE_2 = 'ASNREFERENCE2';
     private $data = [];
 
     public function __construct()
@@ -731,8 +733,9 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function test11()
     {
-        $orderHeader = OracleDOCOrderHeader::query()->with('actAllocationDetails')->where('orderNo', 'SO201024001172')->get();
-        dd(app(OrderService::class)->createByWmsOrder($orderHeader));
+        $rejectedBill = RejectedBill::query()->where('logistic_number_return','75404378424256')->first();
+        $asn_header = OracleDOCASNHeader::query()->where('ASNREFERENCE_2',$rejectedBill->logistic_number_return)->get();
+        dd($rejectedBill,$asn_header);
     }
 
     public function output()

app/OrderIssue.php

@@ -24,6 +24,7 @@ class OrderIssue extends Model
      * situation_explain
      * custom_code  自定义订单号 客户客服自定义
      * imported_status 导入处理
+     * 退回单号
      */
     protected $appends = [
 //        'secondLogisticNumber',
@@ -36,7 +37,7 @@ class OrderIssue extends Model
 
     public function order()
     {
-        return $this->belongsTo('App\Order', 'order_id', 'id');
+        return $this->belongsTo(Order::class, 'order_id', 'id');
     }
 
     public function rejectedBill()
@@ -217,4 +218,14 @@ class OrderIssue extends Model
         return parent::delete();
     }
 
+    public function syncRejectedBill()
+    {
+        if(!isset($this['second_logistic_number'])){
+            $order = $this->order;
+            $rejectedBill = RejectedBill::query()->where('logistic_number','like','原单退回'.'%')->where('order_number',$order->client_code)->first();
+            if($rejectedBill){
+                $this->update(['logistic_number_return'=>$rejectedBill->logistic_number_return]);
+            }
+        }
+    }
 }

app/Services/OrderIssueService.php

@@ -326,6 +326,11 @@ class OrderIssueService
     {
         if(!$orderIssues)return;
         foreach ($orderIssues as $orderIssue) {
+            try {
+                $orderIssue->syncRejectedBill();
+            } catch (\Exception $e) {
+                dd($e->getMessage());
+            }
             $orderIssue->同步退单状态();
         }
     }

serves/excelExportGo/api/controller/controller.go

@@ -32,6 +32,8 @@ func Export(w http.ResponseWriter,req *http.Request)  {
 type base struct {
 	ROW []interface{} `json:"row"`
 	LIST [][]interface{} `json:"list"`
+	MERGEROW map[string]string `json:"mergeRow"`
+	MERGECOLUMN []string `json:"mergeColumn"`
 }
 
 func selectCreateFormat(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string){
@@ -43,7 +45,7 @@ func selectCreateFormat(params map[string]string) (row []interface{}, list [][]i
 	}
 	return
 }
-//packageStatistic
+
 func selectModule(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string) {
 	var data []map[string]string
 	switch params["type"] {
@@ -51,10 +53,12 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		var val base
 		err := json.Unmarshal([]byte(params["data"]),&val)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:53  JSON解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:56  JSON解析失败!","ERROR")
 		}
 		row = val.ROW
 		list = val.LIST
+		mergeRow = val.MERGEROW
+		mergeColumn = val.MERGECOLUMN
 	case "waybill":
 		data = orm.GetMysqlData(params["sql"])
 		row, list = WaybillFormat(data)
@@ -95,7 +99,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:97   库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:102   库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, true)
@@ -105,7 +109,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:107   全部库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:112   全部库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, false)
@@ -118,14 +122,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:121   临时工报表数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:125   临时工报表数据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:128   订单问题件数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:132   订单问题件数据json解析失败!","ERROR")
 		}
 		if sqlList["orderPackageSql"] == "" || sqlList["secondOrderPackageSql"] == "" || sqlList["orderIssueSql"] == "" || sqlList["rejectedBillItemSql"] == "" || sqlList["logSql"] == ""{
 			return
@@ -173,21 +177,10 @@ 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",
 		}
-	case "packageStatistic":
-		type paramList struct {
-			ROW []interface{} `json:"row"`
-			LIST []map[int]string `json:"list"`
-		}
-		request := paramList{}
-		err := json.Unmarshal([]byte(params["data"]), &request)
-		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:184   称重统计数据json解析失败!","ERROR")
-		}
-		row, list = PackageStatisticFormat(request.ROW, request.LIST)
 	case "inventoryAccountMission":
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:190   库存盘点数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:183   库存盘点数据json解析失败!","ERROR")
 		}
 		row, list = InventoryAccountMissionFormat(data)
 	case "inventoryCompare":
@@ -198,16 +191,16 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		var rule map[string]string
 		err := json.Unmarshal([]byte(params["row"]), &row)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:201   参数传递错误!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:194   参数传递错误!","ERROR")
 		}
 		err = json.Unmarshal([]byte(params["column"]), &column)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:205   参数传递错误!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:198   参数传递错误!","ERROR")
 		}
 		if params["mergeColumn"] != ""{
 		    err = json.Unmarshal([]byte(params["mergeColumn"]), &mergeColumn)
             if err != nil {
-                utilities.WriteLog("/api/controller/controller.go:210   参数传递错误!","ERROR")
+                utilities.WriteLog("/api/controller/controller.go:203   参数传递错误!","ERROR")
             }
         }
 		err = json.Unmarshal([]byte(params["rule"]), &rule)