openapi 震坤行

server/app/Services/ZhenKhService.php

@@ -273,25 +273,29 @@ class ZhenKhService
                     $deliveryPost['logisticsCode'] = $zkhDelivery['expressCode'];
                 }
                 $pids = [];
+                $itemList = [];
                 foreach($orderDelivery as $delivery){
                     $zkhGoods = $this->rhawnService->getZkhGoodsSku($delivery->p_id);
                     if(empty($zkhGoods)){
                         throw new \Exception('对应震坤行商品数据未找到');
                     }
-                    $itemList = [];
                     foreach($zkhGoods as $goods){
                         $temp = [];
-                        $temp['purchaseOrderId'] = $currentOrderDelivery->so_cus_po;
-                        $temp['itemLineNumber'] = $deliveryDetail[$goods->zg_sku]['itemLineNumber'];
-                        $temp['planItemNumber'] = $deliveryDetail[$goods->zg_sku]['itemLineNumber'];
-                        $temp['zkhSku'] = $goods->zg_sku;
-                        $temp['materialDescribe'] = $deliveryDetail[$goods->zg_sku]['materialDescribe'];
-                        $temp['number'] = $currentOrderDelivery->so_cus_po;
-                        $temp['unit'] = $deliveryDetail[$goods->zg_sku]['unit'];
-                        $itemList[] = $temp;
+                        if(isset($itemList[$goods->zg_sku]) && !empty($itemList[$goods->zg_sku])){
+                            $itemList[$goods->zg_sku] = intval($itemList[$goods->zg_sku]) + intval($delivery->dpd_num);
+                        }else{
+                            $temp['purchaseOrderId'] = $currentOrderDelivery->so_cus_po;
+                            $temp['itemLineNumber'] = $deliveryDetail[$goods->zg_sku]['itemLineNumber'];
+                            $temp['planItemNumber'] = $deliveryDetail[$goods->zg_sku]['itemLineNumber'];
+                            $temp['zkhSku'] = $goods->zg_sku;
+                            $temp['materialDescribe'] = $deliveryDetail[$goods->zg_sku]['materialDescribe'];
+                            $temp['number'] = $delivery->dpd_num;
+                            $temp['unit'] = $deliveryDetail[$goods->zg_sku]['unit'];
+                            $itemList[$goods->zg_sku] = $temp;
+                        }
                     }
                 }
-                $deliveryPost['itemList'] = $itemList;
+                $deliveryPost['itemList'] = array_values($itemList);
                 //确认发货
                 $this->apiService->ackDeliveryOrder($deliveryPost,$this->getToken());
             }