|
|
@@ -152,6 +152,8 @@ class Sale extends Base
|
|
|
"good_num"=>$good_num,
|
|
|
"good_type"=>$goodtype,
|
|
|
"order_type"=>$order_type,
|
|
|
+ 'send_way'=>1
|
|
|
+
|
|
|
];
|
|
|
$addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !=="" ?$this->post['addrlist']:"";
|
|
|
if($sendtype==1){
|
|
|
@@ -400,11 +402,11 @@ class Sale extends Base
|
|
|
"supplierNo"=>$data['supplierNo'],
|
|
|
"supplier_name"=>$supplier['name'],
|
|
|
"companyNo"=>$data['companyNo'],
|
|
|
- "send_status"=>1,
|
|
|
- "send_num"=>"0",
|
|
|
- "wsend_num"=>$data['good_num'],
|
|
|
+ "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'],
|
|
|
"remark"=>"",
|
|
|
- "status"=>1,
|
|
|
+ "status"=>$data['send_way']==2?3:1,
|
|
|
"lasttime"=>date("Y-m-d H:i:s"),
|
|
|
"is_del"=>0,
|
|
|
"order_type"=>$data['order_type'],
|
|
|
@@ -643,6 +645,7 @@ class Sale extends Base
|
|
|
"good_type"=>1,
|
|
|
"is_diff"=>$zxinfo['is_diff'],
|
|
|
"order_type"=>3,
|
|
|
+ 'send_way'=>$zxinfo['send_way']
|
|
|
];
|
|
|
$token=isset($this->post['token'])&&$this->post['token']!=""? trim($this->post['token']):"";
|
|
|
if($token==""){
|
|
|
@@ -1000,6 +1003,8 @@ class Sale extends Base
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_type"=>1,
|
|
|
"order_type"=>4,
|
|
|
+ "send_way"=>$goodinfo['send_way'],
|
|
|
+
|
|
|
];
|
|
|
$datas=[
|
|
|
"orderCode"=>$orderCode,
|
|
|
@@ -1253,6 +1258,7 @@ class Sale extends Base
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_type"=>1,
|
|
|
"order_type"=>2,
|
|
|
+ 'send_way'=>1
|
|
|
];
|
|
|
if($good['is_stock']==0) {
|
|
|
$bol = $this->createCgd($cgd);
|
|
|
@@ -2971,6 +2977,8 @@ class Sale extends Base
|
|
|
return error_show(1003, "未找到相关阶梯价格");
|
|
|
}
|
|
|
|
|
|
+ if(!isset($origin['min_num'])) $origin['min_num']=0;
|
|
|
+
|
|
|
$lastnum = max($origin['min_num']??0, $good['min_num']);
|
|
|
if ($sale_num < $lastnum) {
|
|
|
return error_show(1003, "商品不满足起订量{$lastnum}");
|
