|
|
@@ -775,7 +775,7 @@ class OrderOutChild extends Base
|
|
|
$isT= Db::name("order_out_child")->where(["outCode"=>$param['outCode'],"is_del"=>0])->findOrEmpty();
|
|
|
if(!empty($isT))return error_show(1004,'发货单已存在工单');
|
|
|
if($out['wsm_code']==''){
|
|
|
- if($sale["order_type"]==1) $cod =["b.supplierNo"=>$sale['supNo']];
|
|
|
+ if($sale["order_type"]!=1) $cod =["b.supplierNo"=>$sale['supNo']];
|
|
|
else $cod =["b.companyNo"=>$sale['supplierNo']];
|
|
|
$wsmcode =Db::name("good_stock")->alias("a")
|
|
|
->leftJoin("warehouse_info b","a.wsm_code = b.wsm_code ")
|
|
|
@@ -785,7 +785,7 @@ class OrderOutChild extends Base
|
|
|
->value("a.wsm_code",'');
|
|
|
}else $wsmcode =$out['wsm_code'];
|
|
|
$outchild=[
|
|
|
- "outChildCode"=>"",str_replace("DF","TCD",$param['outCode']),
|
|
|
+ "outChildCode"=>str_replace("DF","TCD",$param['outCode']),
|
|
|
"orderCode"=>$out['orderCode'],
|
|
|
"outCode"=>$out['outCode'],
|
|
|
"companyNo"=>$sale['supplierNo'],
|
|
|
@@ -826,7 +826,7 @@ class OrderOutChild extends Base
|
|
|
$item['num']=0;
|
|
|
}
|
|
|
$bnin[]=[
|
|
|
- "outChildCode"=>$outchild['outChildCode'],
|
|
|
+ "childCode"=>$outchild['outChildCode'],
|
|
|
"orderCode"=>$out['orderCode'],
|
|
|
"outCode"=>$out['outCode'],
|
|
|
"bnCode"=>$item['bnCode'],
|
