|
@@ -453,17 +453,24 @@ class TestService extends Service
|
|
|
if(! $status) return [false, $msg];
|
|
if(! $status) return [false, $msg];
|
|
|
list($host, $token) = $msg;
|
|
list($host, $token) = $msg;
|
|
|
|
|
|
|
|
- $header = ["Authorization: {$token}",'Content-Type:application/json'];;
|
|
|
|
|
|
|
+ $today = (new \DateTime())->setTime(0, 0, 0)->format('Y-m-d H:i:s') . '.000';
|
|
|
|
|
+ $fourDaysAgo = (new \DateTime())->sub(new \DateInterval('P4D'))->setTime(0, 0, 0)->format('Y-m-d H:i:s') . '.000';
|
|
|
|
|
+
|
|
|
|
|
+ $header = ["Authorization: {$token}",'Content-Type:application/json'];
|
|
|
$url = $host . "/api/System/SqlQuery";
|
|
$url = $host . "/api/System/SqlQuery";
|
|
|
- $json = '{
|
|
|
|
|
- "customSQLFileName": "U8SQL",
|
|
|
|
|
- "customSQLPath": "U8API/SO_SOMain/Get",
|
|
|
|
|
- "paramObj": {
|
|
|
|
|
- "@pagesize": 3,
|
|
|
|
|
- }
|
|
|
|
|
- }';
|
|
|
|
|
|
|
+ $json = [
|
|
|
|
|
+ 'customSQLFileName' => "U8SQL",
|
|
|
|
|
+ 'customSQLPath' => 'U8API/SO_SOMain/Get',
|
|
|
|
|
+ 'paramObj' => [
|
|
|
|
|
+ "@pagesize" => 3,
|
|
|
|
|
+ "@where" => "AND m.dDate >= '$fourDaysAgo'"
|
|
|
|
|
+ ]
|
|
|
|
|
+ ];
|
|
|
|
|
+ $json = json_encode($json);
|
|
|
|
|
+
|
|
|
list($status, $result) = $this->post_helper($url,$json, $header, 30);
|
|
list($status, $result) = $this->post_helper($url,$json, $header, 30);
|
|
|
if(! $status) return [false, $result];
|
|
if(! $status) return [false, $result];
|
|
|
|
|
+
|
|
|
if(! isset($result['code'])) return [false, '异常错误,请联系开发者'];
|
|
if(! isset($result['code'])) return [false, '异常错误,请联系开发者'];
|
|
|
if($result['code'] != 0) return [false, $result['msg']];
|
|
if($result['code'] != 0) return [false, $result['msg']];
|
|
|
if(empty($result['data'])) return [true, []];
|
|
if(empty($result['data'])) return [true, []];
|
|
@@ -484,19 +491,20 @@ class TestService extends Service
|
|
|
'decor_b' => $d_value['cdefine32'] ?? '',
|
|
'decor_b' => $d_value['cdefine32'] ?? '',
|
|
|
'craft_type_code_b' => $d_value['cdefine33'] ?? '',
|
|
'craft_type_code_b' => $d_value['cdefine33'] ?? '',
|
|
|
'unit' => $d_value['cinvm_unit'],
|
|
'unit' => $d_value['cinvm_unit'],
|
|
|
- 'price' => $d_value['itaxunitprice'],
|
|
|
|
|
- 'not_tax_price' => $d_value['itaxunitprice'],
|
|
|
|
|
- 'tax_price' => $d_value['itaxunitprice'],
|
|
|
|
|
|
|
+ 'price' => $d_value['itaxunitprice'] ?? 0,
|
|
|
|
|
+ 'not_tax_price' => $d_value['itaxunitprice'] ?? 0,
|
|
|
|
|
+ 'tax_price' => $d_value['itaxunitprice'] ?? 0,
|
|
|
'qty' => $d_value['iquantity'],
|
|
'qty' => $d_value['iquantity'],
|
|
|
- 'money' => $d_value['isum'],
|
|
|
|
|
- 'tax_amount' => $d_value['isum'],
|
|
|
|
|
- 'total_tax_amount' => $d_value['isum'],
|
|
|
|
|
- 'tax_rate' => $d_value['itaxrate'],
|
|
|
|
|
|
|
+ 'money' => $d_value['isum'] ?? 0,
|
|
|
|
|
+ 'tax_amount' => $d_value['isum'] ?? 0,
|
|
|
|
|
+ 'total_tax_amount' => $d_value['isum'] ?? 0,
|
|
|
|
|
+ 'tax_rate' => $d_value['itaxrate'] ?? 0,
|
|
|
'expected_delivery_date' => date('Y-m-d',strtotime($d_value['dpredate'])),
|
|
'expected_delivery_date' => date('Y-m-d',strtotime($d_value['dpredate'])),
|
|
|
'remark' => $d_value['cmemo'] ?? '',
|
|
'remark' => $d_value['cmemo'] ?? '',
|
|
|
];
|
|
];
|
|
|
|
|
+ $t = $d_value['isum'] ?? 0;
|
|
|
$total_qty = bcadd($total_qty,$d_value['iquantity'],3);
|
|
$total_qty = bcadd($total_qty,$d_value['iquantity'],3);
|
|
|
- $money = bcadd($money,$d_value['isum'],3);
|
|
|
|
|
|
|
+ $money = bcadd($money,$t,3);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$return[] = [
|
|
$return[] = [
|