|
@@ -492,7 +492,7 @@ class Reorder extends Base
|
|
|
$value['addive_time']=isset($addrlist['addive_time'])?$addrlist['addive_time']:"";
|
|
$value['addive_time']=isset($addrlist['addive_time'])?$addrlist['addive_time']:"";
|
|
|
$value['customer_code']=isset($addrlist['customer_code']) ?$addrlist['customer_code']:"" ;
|
|
$value['customer_code']=isset($addrlist['customer_code']) ?$addrlist['customer_code']:"" ;
|
|
|
$value['receipt_quantity']=isset($addrlist['receipt_quantity']) ?$addrlist['receipt_quantity']:"" ;
|
|
$value['receipt_quantity']=isset($addrlist['receipt_quantity']) ?$addrlist['receipt_quantity']:"" ;
|
|
|
- $send = Db::name("order_out")->where(['addrid' => $addrlist['id'], 'orderCode' => $addrlist['orderCode']])->sum("send_num");
|
|
|
|
|
|
|
+ $send = Db::name("order_out")->where(['addrid' => $addrlist['id'], 'orderCode' => $addrlist['orderCode']])->where("status",">=",2)->sum("send_num");
|
|
|
$value['addr_send'] = $send ?? 0;
|
|
$value['addr_send'] = $send ?? 0;
|
|
|
$value['addr_wsend'] = $value['receipt_quantity'] - $value['addr_send'];
|
|
$value['addr_wsend'] = $value['receipt_quantity'] - $value['addr_send'];
|
|
|
$customer = Db::name("customer_info")->where(['companyNo'=>$addrlist['customer_code']])->find();
|
|
$customer = Db::name("customer_info")->where(['companyNo'=>$addrlist['customer_code']])->find();
|
