|
@@ -234,10 +234,10 @@ class OrderOutChild extends Base
|
|
|
if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
|
|
|
else {
|
|
|
// if($param['IsByMe']==0){
|
|
|
- $role = $this->checkDataShare();
|
|
|
- if (!empty($role[DataGroupModel::$type_全部])) {
|
|
|
- $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
|
|
|
- }
|
|
|
+// $role = $this->checkDataShare();
|
|
|
+// if (!empty($role[DataGroupModel::$type_全部])) {
|
|
|
+// $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
|
|
|
+// }
|
|
|
// }
|
|
|
|
|
|
}
|
|
@@ -254,15 +254,15 @@ class OrderOutChild extends Base
|
|
|
// $condition .= " or (a.order_type<>1 and a.supplierNo in ('" . implode('\',\'', $person_supplier) . "'))";
|
|
|
// }
|
|
|
}
|
|
|
- if ($this->level == 3) {
|
|
|
-
|
|
|
- //是否是仓库管理员
|
|
|
- $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
|
|
|
- //库管看到所有的库存品发货申请单
|
|
|
- if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
|
|
|
- $condition .= " and (a.order_type <>1 )";
|
|
|
-
|
|
|
- }
|
|
|
+// if ($this->level == 3) {
|
|
|
+//
|
|
|
+// //是否是仓库管理员
|
|
|
+// $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
|
|
|
+// //库管看到所有的库存品发货申请单
|
|
|
+// if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
|
|
|
+// $condition .= " and (a.order_type <>1 )";
|
|
|
+//
|
|
|
+// }
|
|
|
|
|
|
$list = Db::name('order_out_child')
|
|
|
->alias('a')
|