|
|
@@ -120,7 +120,7 @@ class TestService extends Service
|
|
|
'customSQLPath' => 'U8API/SO_SOMain/Get',
|
|
|
'paramObj' => [
|
|
|
"@pagesize" => $page,
|
|
|
- "@where" => "AND m.dDate >= '$start_time' AND m.dDate <= '$end_time'",
|
|
|
+ "@where" => "AND m.dDate >= '$start_time' AND m.dDate <= '$end_time' AND m.iStatus = 1",
|
|
|
"@code" => $order_number,
|
|
|
"@version" => $version,
|
|
|
]
|
|
|
@@ -152,6 +152,7 @@ class TestService extends Service
|
|
|
$total_qty = $money = 0;
|
|
|
foreach ($detail as $d_value){
|
|
|
$return_detail[] = [
|
|
|
+ 'erp_sale_dt_id' => $d_value['autoid'],
|
|
|
'item_no' => $d_value['irowno'],
|
|
|
'material_code' => $d_value['cinvcode'],
|
|
|
'brand_name' => $d_value['cdefine28'] ?? '',
|
|
|
@@ -198,6 +199,7 @@ class TestService extends Service
|
|
|
$total_qty = $money = 0;
|
|
|
foreach ($detail as $d_value){
|
|
|
$return_detail[] = [
|
|
|
+ 'erp_sale_dt_id' => $d_value['autoid'],
|
|
|
'material_code' => $d_value['cinvcode'] ?? '',
|
|
|
'specs' => $d_value['cinvstd'] ?? '',
|
|
|
'unit' => $d_value['cinvm_unit'] ?? '',
|
|
|
@@ -244,6 +246,7 @@ class TestService extends Service
|
|
|
$total_qty = $money = 0;
|
|
|
foreach ($detail as $d_value){
|
|
|
$return_detail[] = [
|
|
|
+ 'erp_sale_dt_id' => $d_value['autoid'],
|
|
|
'material_code' => $d_value['cinvcode'] ?? '',
|
|
|
'contract_no' => $d_value['cdefine23'] ?? '',
|
|
|
'specs' => $d_value['cinvstd'] ?? '',
|
|
|
@@ -396,6 +399,26 @@ class TestService extends Service
|
|
|
return [true, $result['data']['DataTable1']];
|
|
|
}
|
|
|
|
|
|
+ public function updateSalesOrder($data, $common_array){
|
|
|
+ if (empty($data['sale_order_details']) || !is_array($data['sale_order_details'])) {
|
|
|
+ return [false, '更新数据不能为空'];
|
|
|
+ }
|
|
|
+ foreach ($data['sale_order_details'] as $index => $value) {
|
|
|
+ $line = $index + 1;
|
|
|
+ if (empty($value['erp_sale_dt_id'])) {
|
|
|
+ return [false, "第{$line}行:明细行ID不能为空"];
|
|
|
+ }
|
|
|
+ if (!isset($value['quantity']) || !is_numeric($value['quantity']) || floatval($value['quantity']) < 0.0) {
|
|
|
+ return [false, "第{$line}行:数量格式错误或必须大于等于0"];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $service = new U8ThirtyPartyDatabaseServerService($common_array);
|
|
|
+ list($status, $msg) = $service->updateSaleOrderDetails($data);
|
|
|
+
|
|
|
+ return [$status, $msg];
|
|
|
+ }
|
|
|
+
|
|
|
public function materialAddU8($data,$common_array){
|
|
|
list($status, $msg) = $this->getToken($common_array);
|
|
|
if(! $status) return [false, $msg];
|
|
|
@@ -561,7 +584,7 @@ class TestService extends Service
|
|
|
$service = new U8ThirtyPartyDatabaseServerService($config[$data['site']]);
|
|
|
list($status, $msg) = $service->getStockCountWithPercentage();
|
|
|
|
|
|
- return [$service, $msg];
|
|
|
+ return [$status, $msg];
|
|
|
}
|
|
|
|
|
|
//-----------------------------------朗峰u8-----
|