|
@@ -2,6 +2,8 @@
|
|
|
|
|
|
namespace app\admin\model;
|
|
|
|
|
|
+use app\abutment\model\SupplierRelationUser as SupplierRelationUserModel;
|
|
|
+use app\abutment\model\SupplierUser as SupplierUserModel;
|
|
|
use think\facade\Db;
|
|
|
use think\Model;
|
|
|
|
|
@@ -43,9 +45,65 @@ class ProcessWait extends Model
|
|
|
->join('action_process p', 'p.process_id=a.id AND p.order_process=' . $data['action_process'] . ' AND p.operation_type = ' . ActionProcess::$operation_type_approval)
|
|
|
->where(['a.process_type' => $data['order_type'], 'a.status' => Process::$status_normal, 'a.is_del' => Process::$is_del_normal])->value('p.id', 0);
|
|
|
|
|
|
-
|
|
|
if ($id) {
|
|
|
|
|
|
+ //如果是以下4个流程,还需要判断对应供应商是否开通账号,如果开通的话就不推送待办已办数据
|
|
|
+ if (in_array($data['order_type'], ['CKD', 'RKD', 'CGD', 'SPCB'])) {
|
|
|
+
|
|
|
+ switch ($data['order_type']) {
|
|
|
+ //发货申请单流程
|
|
|
+ case 'CKD':
|
|
|
+ $supplierNo = Db::name('order_out')
|
|
|
+ ->alias('a')
|
|
|
+ ->leftJoin('sale b', 'b.orderCode=a.orderCode')
|
|
|
+ ->where(['a.is_del' => 0, 'a.outCode' => $data['order_code']])
|
|
|
+ ->value('b.supplierNo');
|
|
|
+ break;
|
|
|
+
|
|
|
+ //采购单入库流程
|
|
|
+ case 'RKD':
|
|
|
+ $supplierNo = Db::name('purchease_in')
|
|
|
+ ->alias('a')
|
|
|
+ ->leftJoin('purchease_order b', 'b.cgdNo=a.cgdNo')
|
|
|
+ ->where(['a.is_del' => 0, 'a.wsm_in_code' => $data['order_code']])
|
|
|
+ ->value('b.supplierNo');
|
|
|
+ break;
|
|
|
+ //采购单流程
|
|
|
+ case 'CGD':
|
|
|
+ $supplierNo = Db::name('purchease_order')
|
|
|
+ ->where(['cgdNo' => $data['order_code'], 'is_del' => 0])
|
|
|
+ ->value('supplierNo');
|
|
|
+ break;
|
|
|
+
|
|
|
+ //商品成本流程
|
|
|
+ case 'SPCB':
|
|
|
+ $supplierNo = Db::name('good_basic')
|
|
|
+ ->where(['is_del' => 0, 'spuCode' => $data['order_code'],])
|
|
|
+ ->value('supplierNo');
|
|
|
+ break;
|
|
|
+
|
|
|
+ default:
|
|
|
+ $supplierNo = '';
|
|
|
+ break;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($supplierNo) {
|
|
|
+ //查询该供应商是否开通账号
|
|
|
+ $res = SupplierRelationUserModel::field('id')
|
|
|
+ ->where([
|
|
|
+ 'is_del' => SupplierUserModel::$is_del_normal,
|
|
|
+ 'supplierNo' => $supplierNo,
|
|
|
+ 'status' => SupplierUserModel::$status_normal
|
|
|
+ ])
|
|
|
+ ->findOrEmpty()
|
|
|
+ ->isEmpty();
|
|
|
+
|
|
|
+ if (!$res) return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
$insert_data = [
|
|
|
'order_type' => $data['order_type'],
|
|
|
'order_code' => $data['order_code'],
|