|
|
@@ -152,7 +152,7 @@ class Sale extends Base
|
|
|
"good_num"=>$good_num,
|
|
|
"good_type"=>$goodtype,
|
|
|
"order_type"=>$order_type,
|
|
|
- 'send_way'=>1
|
|
|
+ 'send_way'=>2
|
|
|
|
|
|
];
|
|
|
$addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !=="" ?$this->post['addrlist']:"";
|
|
|
@@ -402,11 +402,11 @@ class Sale extends Base
|
|
|
"supplierNo"=>$data['supplierNo'],
|
|
|
"supplier_name"=>$supplier['name'],
|
|
|
"companyNo"=>$data['companyNo'],
|
|
|
- "send_status"=>$data['send_way']==2?3:1,
|
|
|
- "send_num"=>$data['send_way']==2?$data['good_num']:0,
|
|
|
- "wsend_num"=>$data['send_way']==2?0:$data['good_num'],
|
|
|
+ "send_status"=>$data['send_way']==1?3:1,
|
|
|
+ "send_num"=>$data['send_way']==1?$data['good_num']:0,
|
|
|
+ "wsend_num"=>$data['send_way']==1?0:$data['good_num'],
|
|
|
"remark"=>"",
|
|
|
- "status"=>$data['send_way']==2?3:1,
|
|
|
+ "status"=>$data['send_way']==1?3:1,
|
|
|
"lasttime"=>date("Y-m-d H:i:s"),
|
|
|
"is_del"=>0,
|
|
|
"order_type"=>$data['order_type'],
|
|
|
@@ -1258,7 +1258,7 @@ class Sale extends Base
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_type"=>1,
|
|
|
"order_type"=>2,
|
|
|
- 'send_way'=>1
|
|
|
+ 'send_way'=>2
|
|
|
];
|
|
|
if($good['is_stock']==0) {
|
|
|
$bol = $this->createCgd($cgd);
|
