Sfoglia il codice sorgente

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 anni fa
parent
commit
bf5c277757
1 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. 5 1
      app/admin/controller/Orderback.php

+ 5 - 1
app/admin/controller/Orderback.php

@@ -767,7 +767,7 @@ class Orderback extends Base
                 $stn = ["order_code" => $param['thNo'], "status" => $info['status'], "action_remark" => '', "action_type" => "edit"];
                 ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, "CKTHD",  $param['status'], $stn);
 
-                if (in_array($param['status'], [2, 3])) {
+                if (in_array($param['status'], [1,2, 3])) {
                     if ($param['status'] == 2) $roleid = [10, 31, 41];//特殊处理,写入到10采购负责人、31库管人员、41库管-张凯旋这三个角色下的所有人
                     else $roleid = [31, 41];//特殊处理,写入到、31库管人员、41库管-张凯旋这三个角色下的所有人
 
@@ -775,6 +775,10 @@ class Orderback extends Base
                         ->where('is_del', 0)
                         ->whereIn('roleid', $roleid)
                         ->column('uid');
+
+                    //如果是退货商品验收(节点1),把供应商负责人也加进去
+                    if ($param['status'] == 1) $handle_user_list[] = $sale['cgderid'];
+
                     $process = ["order_code" => $param['thNo'], "order_id" => $info['id'], "order_status" => $param['status'], "order_type" => "CKTHD", "before_status" => $info['status'], 'handle_user_list' => implode(',', $handle_user_list)];
 
                 } else $process = ["order_code" => $param['thNo'], "order_id" => $info['id'], "order_status" => $param['status'], "order_type" => "CKTHD", "before_status" => $info['status']];