|
@@ -312,6 +312,7 @@ class Beihuogl extends Start_Controller {
|
|
|
$update_arr['features'] = '';
|
|
$update_arr['features'] = '';
|
|
|
$update_arr['jm'] = '';
|
|
$update_arr['jm'] = '';
|
|
|
$update_arr['public_time'] = 0;
|
|
$update_arr['public_time'] = 0;
|
|
|
|
|
+ $update_arr['erp_zh'] = '';
|
|
|
$update_arr['bh_no'] = '';
|
|
$update_arr['bh_no'] = '';
|
|
|
$update_arr['u9sc_no'] = '';
|
|
$update_arr['u9sc_no'] = '';
|
|
|
}
|
|
}
|
|
@@ -778,7 +779,7 @@ class Beihuogl extends Start_Controller {
|
|
|
$typeclass = $this->logic_u9tools->getTypeClass();
|
|
$typeclass = $this->logic_u9tools->getTypeClass();
|
|
|
|
|
|
|
|
foreach($list as $k=>$v){
|
|
foreach($list as $k=>$v){
|
|
|
- $whlabel_info = $this->goods->find("sku = '".$v['sku']."'",'sku,features,jm','id desc');
|
|
|
|
|
|
|
+ $whlabel_info = $this->goods->find("sku = '".$v['sku']."'",'sku,features,jm,zh','id desc');
|
|
|
if(empty($whlabel_info)){
|
|
if(empty($whlabel_info)){
|
|
|
$whlabel_info = $this->whlabel->find("sku = '".$v['sku']."'",'sku,features','id desc');
|
|
$whlabel_info = $this->whlabel->find("sku = '".$v['sku']."'",'sku,features','id desc');
|
|
|
if(empty($whlabel_info)){
|
|
if(empty($whlabel_info)){
|
|
@@ -792,12 +793,14 @@ class Beihuogl extends Start_Controller {
|
|
|
'jm'=>$r['jm'],
|
|
'jm'=>$r['jm'],
|
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
|
'features'=>$whlabel_info['features'],
|
|
'features'=>$whlabel_info['features'],
|
|
|
|
|
+ 'erp_zh'=>$r['zh'],
|
|
|
],$v['id']);
|
|
],$v['id']);
|
|
|
}else{
|
|
}else{
|
|
|
$this->bhsq->save([
|
|
$this->bhsq->save([
|
|
|
'jm'=>$whlabel_info['jm'],
|
|
'jm'=>$whlabel_info['jm'],
|
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
|
'features'=>$whlabel_info['features'],
|
|
'features'=>$whlabel_info['features'],
|
|
|
|
|
+ 'erp_zh'=>$whlabel_info['zh'],
|
|
|
],$v['id']);
|
|
],$v['id']);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -970,7 +973,7 @@ class Beihuogl extends Start_Controller {
|
|
|
$classid = $this->logic_u9tools->getClass();
|
|
$classid = $this->logic_u9tools->getClass();
|
|
|
$typeclass = $this->logic_u9tools->getTypeClass();
|
|
$typeclass = $this->logic_u9tools->getTypeClass();
|
|
|
foreach($list as $k=>$v){
|
|
foreach($list as $k=>$v){
|
|
|
- $whlabel_info = $this->goods->find("sku = '".$v['sku']."'",'sku,features,jm','id desc');
|
|
|
|
|
|
|
+ $whlabel_info = $this->goods->find("sku = '".$v['sku']."'",'sku,features,jm,zh','id desc');
|
|
|
if(empty($whlabel_info)){
|
|
if(empty($whlabel_info)){
|
|
|
$whlabel_info = $this->whlabel->find("sku = '".$v['sku']."'",'sku,features','id desc');
|
|
$whlabel_info = $this->whlabel->find("sku = '".$v['sku']."'",'sku,features','id desc');
|
|
|
if(empty($whlabel_info)){
|
|
if(empty($whlabel_info)){
|
|
@@ -983,6 +986,7 @@ class Beihuogl extends Start_Controller {
|
|
|
'jm'=>$r['jm'],
|
|
'jm'=>$r['jm'],
|
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
|
'features'=>$whlabel_info['features'],
|
|
'features'=>$whlabel_info['features'],
|
|
|
|
|
+ 'erp_zh'=>$r['zh'],
|
|
|
],$v['id']);
|
|
],$v['id']);
|
|
|
}
|
|
}
|
|
|
$list[$k]['jm'] = $r['jm'];
|
|
$list[$k]['jm'] = $r['jm'];
|
|
@@ -991,6 +995,7 @@ class Beihuogl extends Start_Controller {
|
|
|
'jm'=>$whlabel_info['jm'],
|
|
'jm'=>$whlabel_info['jm'],
|
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
'drck'=>$this->getU9Drck($whlabel_info['features']),
|
|
|
'features'=>$whlabel_info['features'],
|
|
'features'=>$whlabel_info['features'],
|
|
|
|
|
+ 'erp_zh'=>$whlabel_info['zh'],
|
|
|
],$v['id']);
|
|
],$v['id']);
|
|
|
$list[$k]['jm'] = $whlabel_info['jm'];
|
|
$list[$k]['jm'] = $whlabel_info['jm'];
|
|
|
}
|
|
}
|