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

app/admin/model/ProcessWait.php

@@ -58,10 +58,10 @@ class ProcessWait extends Model
             }
 
             //如果是系统节点，不写入待办已办数据
-            if($info['operation_type'] == ActionProcess::$operation_type_system) return true;
+            if ($info['operation_type'] == ActionProcess::$operation_type_system) return true;
 
             //如果是以下4个流程，还需要判断对应供应商是否开通账号，如果开通的话就不推送待办已办数据
-            if (in_array($data['order_type'], ['CKD', 'RKD', 'CGD', 'SPCB'])) {
+            if (in_array($data['order_type'], ['CKD', 'RKD', 'CGD'])) {
 
                 switch ($data['order_type']) {
                     //发货申请单流程
@@ -89,12 +89,12 @@ class ProcessWait extends Model
                             ->value('supplierNo');
                         break;
 
-                    //商品成本流程
-                    case 'SPCB':
-                        $supplierNo = Db::name('good_basic')
-                            ->where(['is_del' => 0, 'spuCode' => $data['order_code'],])
-                            ->value('supplierNo');
-                        break;
+//                    //商品成本流程--要根据节点的值来判断是否推送待办数据
+//                    case 'SPCB':
+//                        $supplierNo = Db::name('good_basic')
+//                            ->where(['is_del' => 0, 'spuCode' => $data['order_code'],])
+//                            ->value('supplierNo');
+//                        break;
 
                     default:
                         $supplierNo = '';
@@ -114,10 +114,14 @@ class ProcessWait extends Model
                         ->isEmpty();
 
                     if (!$res) return true;
+
                 }
 
             }
 
+            //如果是SPCB的话，以下节点值推送待办数据(0新建待审核,2基础修改待审核,3成本修改待审核)
+            if ($data['order_type'] == 'SPCB' && !in_array($data['action_process'], [0, 2, 3])) return true;
+
             $insert_data = [
                 'order_type' => $data['order_type'],
                 'order_code' => $data['order_code'],