|
|
@@ -525,7 +525,7 @@ class Beihuogl extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
|
|
|
|
- $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,ccwl_num,add_time,update_time",$order_str,$start,$perpage);
|
|
|
+ $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,ccwl_num,add_time,update_time,erp_check",$order_str,$start,$perpage);
|
|
|
|
|
|
if(empty($list)){
|
|
|
$rows = array('total'=>0,'over'=>1,'pagenum'=>0,'rows'=>([]));
|
|
|
@@ -539,9 +539,15 @@ class Beihuogl extends Start_Controller {
|
|
|
$list[$k]['shop_id'] = isset($shop_list[$v['shop_id']])?$shop_list[$v['shop_id']]:"无";
|
|
|
$list[$k]['plat_id'] = isset($plat_list[$v['plat_id']])?$plat_list[$v['plat_id']]:"无";
|
|
|
$list[$k]['add_time'] = date("Y-m-d",$v['add_time']);
|
|
|
- $list[$k]['sku'] = $v['sku']." <i class='fa fa-edit' data-id='".$v['id']."' data-sku='".$v['sku']."' onclick='edit_sku(this)'></i>";
|
|
|
+ if($v['erp_check'] == 1){
|
|
|
+ $list[$k]['sku'] = "<i style='color:red'>".$v['sku']."</i> <i class='fa fa-edit' data-id='".$v['id']."' data-sku='".$v['sku']."' onclick='edit_sku(this)'></i>";
|
|
|
+ }else{
|
|
|
+ $list[$k]['sku'] = $v['sku']." <i class='fa fa-edit' data-id='".$v['id']."' data-sku='".$v['sku']."' onclick='edit_sku(this)'></i>";
|
|
|
+ }
|
|
|
+
|
|
|
$list[$k]['ccwl_num'] = $v['ccwl_num']." <i class='fa fa-edit' data-id='".$v['id']."' data-num='".$v['ccwl_num']."' onclick='edit_ccwl(this)'></i>";
|
|
|
$list[$k]['update_time'] = "<a href='javascript:void(0)' style='margin-right:4px;color: #fff;background-color:#4169E1;padding:4px 10px;border-radius:5px;font-size:15px' data-id='".$v['id']."' data-type='3' onclick='update_status(this)'>驳回</a>";
|
|
|
+ unset($list[$k]['erp_check']);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -572,15 +578,19 @@ class Beihuogl extends Start_Controller {
|
|
|
}
|
|
|
$list = $this->bhsq->find_all('id in ('.implode(',',$data['arr_id']).')');
|
|
|
$error_list = [];
|
|
|
+ $success_ids = [];
|
|
|
+ $errors_ids = [];
|
|
|
foreach($list as $k=>$v){
|
|
|
if(empty($v['sku'])){
|
|
|
$error_list[] = [
|
|
|
'msg'=>$v['value'].'请录入SKU',
|
|
|
];
|
|
|
+ $errors_ids[] = $v['id'];
|
|
|
continue;
|
|
|
}
|
|
|
$num = $this->goods->find_count("sku = '".$v['sku']."'");
|
|
|
if(!empty($num)){
|
|
|
+ $success_ids[] = $v['id'];
|
|
|
continue;
|
|
|
}
|
|
|
$whlabel_info = $this->whlabel->find("sku = '".$v['sku']."'",'sku,features','id desc');
|
|
|
@@ -588,9 +598,14 @@ class Beihuogl extends Start_Controller {
|
|
|
$error_list[] = [
|
|
|
'msg'=>$v['sku'].'未在进销存浏览那找到对应信息',
|
|
|
];
|
|
|
+ $errors_ids[] = $v['id'];
|
|
|
}
|
|
|
}
|
|
|
+ $this->db->where_in('id', $errors_ids);
|
|
|
+ $this->db->update('bhsq', ['erp_check'=>1]);
|
|
|
|
|
|
+ $this->db->where_in('id', $success_ids);
|
|
|
+ $this->db->update('bhsq', ['erp_check'=>0]);
|
|
|
if(empty($error_list)){
|
|
|
echo json_encode(['success'=>true,'msg'=>'校验成功,没有异常信息']);
|
|
|
exit;
|