得润宝

app/Service/U8ThirdPartyService.php

@@ -291,6 +291,7 @@ class U8ThirdPartyService extends Service
                 "CBATCH"       => $item['cBatch'],
                 'DPRODATE' => $item['dPDate'],
                 'DVDATE' => $item['dVDate'],
+                'cFree1' => $item['cFree1'],
                 'cFree2' => $item['cFree2'],
             ];
         }
@@ -411,6 +412,8 @@ class U8ThirdPartyService extends Service
                 "iMaIDs"       => $item['AutoID'],
                 "dMadeDate"    => $item['dMadeDate'],   // 生产日期
                 "dVDate"       => $item['dVDate'],      // 失效日期
+                'cFree1' => $item['cFree1'],
+                'cFree2' => $item['cFree2'],
             ];
         }
 
@@ -530,6 +533,8 @@ class U8ThirdPartyService extends Service
                 "dVDate"       => $item['dVDate'],
                 "iTaxRate"     => $item['iTaxRate'] ?? 0,
                 "iTaxUnitPrice"=> $item['iOriTaxCost'] ?? 0,
+                'cFree1' => $item['cFree1'],
+                'cFree2' => $item['cFree2'],
             ];
         }
         if(empty($iBody)) return [false, '表体明细为空'];
@@ -767,7 +772,9 @@ class U8ThirdPartyService extends Service
                    "dvDate"        => (string)$value['failureDate'], // 示例中只需失效日期
 //                   "dMDate"          => (string)$value['productDate'], // todo
                    "iSOsID"        => (int)$item['iSOsID'], // 强制转整型，去掉引号
-                   "cBatch"        => (string)$value['lot']
+                   "cBatch"        => (string)$value['lot'],
+                   'cFree1' => $item['cFree1'],
+                   'cFree2' => $item['cFree2'],
                ];
            }
        }
@@ -837,6 +844,8 @@ class U8ThirdPartyService extends Service
                "iDLsID"       => $item['iDLsID'],             // 核心：发货单子表ID
                "dMadeDate"       => $item['dMDate'], // 生产
                "dVDate"       => $item['dvDate'], // 失效
+               'cFree1' => $item['cFree1'],
+               'cFree2' => $item['cFree2'],
 //               "iUnitCost"    => (float)($item['iUnitPrice'] ?? 0), // 无税单价
 //               "iPrice"       => round((float)($item['iUnitPrice'] ?? 0) * $pendingQty, 2), // 无税金额
            ];
@@ -1072,6 +1081,8 @@ class U8ThirdPartyService extends Service
                 "iNum"         => 0,
                 "dMadeDate"    => $productDate, // 生产日期
                 "dVDate"       => $failureDate, // 失效日期
+                'cFree1' => $value['param_one'] ?? null,
+                'cFree2' => $value['param_two'] ?? null,
             ];
         }
 
@@ -1146,6 +1157,8 @@ class U8ThirdPartyService extends Service
                 "iinvexchrate" => 0,
                 "dMadeDate"    => $productDate, // 生产日期
                 "dVDate"       => $failureDate, // 失效日期
+                'cFree1' => $value['param_one'] ?? null,
+                'cFree2' => $value['param_two'] ?? null,
             ];
         }
 
@@ -1298,6 +1311,8 @@ class U8ThirdPartyService extends Service
                     "iDLsID"       => $value['iDLsID'] ?? 0, // 关键：关联发货单行ID
                     "dMadeDate"    => $value['dMDate'] ?? null,
                     "dVDate"       => $value['dvDate'] ?? null,
+                    'cFree1' => $details['cFree1'] ?? null,
+                    'cFree2' => $details['cFree2'] ?? null,
                 ];
             }
 
@@ -1396,6 +1411,8 @@ class U8ThirdPartyService extends Service
             "cBatch"       => (string)($order['CBATCH'] ?? ''),
             "dMadeDate"    => (string)($order['DPRODATE'] ?? ''),
             "dVDate"       => (string)($order['DVDATE'] ?? ''),
+            'cFree1' => $order['CFREE1'] ?? null,
+            'cFree2' => $order['CFREE2'] ?? null,
         ];
 
         $final_data = [$tmp];
@@ -1605,6 +1622,8 @@ class U8ThirdPartyService extends Service
            "iQuantity"    => $num,   // 数量
            "dMadeDate"    => $order['DPRODATE'] ?? '', // 生产日期
            "dVDate"       => $order['DVDATE'] ?? '',
+           'cFree1' => $order['CFREE1'] ?? null,
+           'cFree2' => $order['CFREE2'] ?? null,
        ];
        $final_data = [$tmp];
 
@@ -1855,6 +1874,8 @@ class U8ThirdPartyService extends Service
                         "cBatch"        => (string)($order['CBATCH'] ?? ''),
                         "dMadeDate"     => (string)($order['DPRODATE'] ?? ''),
                         "dVDate"        => (string)($order['DVDATE'] ?? ''),
+                        'cFree1' => $order['CFREE1'] ?? null,
+                        'cFree2' => $order['CFREE2'] ?? null,
                     ]
                 ]
             ]