ad

app/admin/controller/Reorder.php

@@ -118,7 +118,8 @@ class Reorder extends Base
                 "remark" => $remark,
                 "order_type" => $order['order_type'],
                 "is_addr" => $is_addr,
-                "status" => $order['is_stock'] == 1 ? (Db::name('order_out_child')->where(['is_del' => 0, 'orderCode' => $ordeCode])->value('id', 0) ? 11 : 4) : 1,//库存品未分仓选4，分仓选11，非库存品选1
+//                "status" => $order['is_stock'] == 1 ? (Db::name('order_out_child')->where(['is_del' => 0, 'orderCode' => $ordeCode])->value('id', 0) ? 11 : 4) : 1,//库存品未分仓选4，分仓选11，非库存品选1
+                "status" => $order['is_stock'] == 1 ? ($is_addr==1? 11 : 4) : 1,//库存品 无地址选4，分仓选11，非库存品选1
                 "is_del" => 0,
                 "addtime" => $date,
                 "updatetime" => $date,

app/admin/controller/ReportByRelaComNo.php

@@ -430,8 +430,7 @@ class ReportByRelaComNo extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        //@todo  此处无法添加业务公司筛选
-        $where = [['cb.is_del', '=', 0]];
+        $where = [['cb.is_del', '=', 0], ['d.companyNo', '=', $this->relaComNo]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['cb.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
 //        if ($param['supplier'] != '') $where[] = ['s.name', 'like', '%' . $param['supplier'] . '%'];
 
@@ -464,22 +463,22 @@ class ReportByRelaComNo extends Base
             ->cursor();
 
         //所有账号
-        $user=Db::connect('mysql_sys')
+        $user = Db::connect('mysql_sys')
             ->name('user')
             ->alias('a')
-            ->leftJoin('account_item b','b.account_id=a.account_id')
-            ->leftJoin('company_item c','c.id=b.itemid')
-            ->column('a.nickname,c.name','a.account_id');
+            ->leftJoin('account_item b', 'b.account_id=a.account_id')
+            ->leftJoin('company_item c', 'c.id=b.itemid')
+            ->column('a.nickname,c.name', 'a.account_id');
 
         $data = [];
         foreach ($list as $value) {
 
-            if(isset($user[$value['createrid']])){
-                $value['nickname']=$user[$value['createrid']]['nickname'];
-                $value['name']=$user[$value['createrid']]['name'];
-            }else{
-                $value['nickname']=$value['supplierName'];
-                $value['name']='供应商';
+            if (isset($user[$value['createrid']])) {
+                $value['nickname'] = $user[$value['createrid']]['nickname'];
+                $value['name'] = $user[$value['createrid']]['name'];
+            } else {
+                $value['nickname'] = $value['supplierName'];
+                $value['name'] = '供应商';
             }
 
             if ($value['name'] == '供应商') {
@@ -1502,7 +1501,6 @@ class ReportByRelaComNo extends Base
         ]);
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
-
         $where = [['gp.is_del', '=', 0], ['gp.exam_status', '=', 3], ['gb.companyNo', '=', $this->relaComNo]];
         //exam_status==6 上线成功
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['gp.online_time', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];//当上面状态确定为exam_status==6时，上线时间也可以取 updatetime