Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new_order_out_child

app/admin/controller/After.php

@@ -42,7 +42,7 @@ class After extends Base
 //             return error_show(1004,"参数outCode 不能为空");
 //         }
         $orderout = Db::name("order_out")
-            ->field('id,orderCode,wsm_code,send_num,order_type')
+            ->field('id,orderCode,wsm_code,send_num,order_type,status')
             ->where(["outCode" => $param['outCode'], 'is_del' => 0])
             ->findOrEmpty();
         if (empty($orderout)) return error_show(1005, "未找到发货单数据");
@@ -181,7 +181,8 @@ class After extends Base
                 "status" => 1,
                 "is_del" => 0,
                 "addtime" => date("Y-m-d H:i:s"),
-                "updatetime" => date("Y-m-d H:i:s")
+                "updatetime" => date("Y-m-d H:i:s"),
+                'order_out_status'=>$orderout['status'],
             ];
             $create = Db::name("order_return")->insert($in, true);
             $orde = ["order_code" => $returnCode, "status" => $in['status'], "action_remark" => '', "action_type" => "create"];

app/admin/controller/AfterChild.php

@@ -478,4 +478,32 @@ class AfterChild extends Base
 
     }
 
+    //更新退货工单标记
+    public function setRecord()
+    {
+
+        $param = $this->request->only(['id', 'record'], 'post', 'trim');
+
+        $val = Validate::rule([
+            'id|退货工单id' => 'require|number|gt:0',
+            'record|标记内容' => 'require',
+        ]);
+
+        if ($val->check($param) == false) return json_show(1004, $val->getError());
+
+        $temp = Db::name('order_return_child')
+            ->field('id')
+            ->where(['is_del' => 0, 'id' => $param['id']])
+            ->findOrEmpty();
+
+        if (empty($temp)) return json_show(1004, '该退货工单不存在');
+
+        $rs = Db::name('order_return_child')
+            ->where(['is_del' => 0, 'id' => $param['id']])
+            ->update(['record' => $param['record'], 'updatetime' => date('Y-m-d H:i:s')]);
+
+        return $rs ? json_show(0, '更新退货工单标记内容成功') : json_show(1004, '更新退货工单标记内容失败');
+
+    }
+
 }

app/admin/controller/OrderOutChild.php

@@ -83,11 +83,16 @@ class OrderOutChild extends Base
 
         $count = Db::name('order_out_child')
             ->alias('a')
+            ->leftJoin('order_return b','b.returnCode=a.returnCode AND b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.send_wsm_code AND c.is_del=0')
             ->where($where)
             ->count('a.id');
 
         $list = Db::name('order_out_child')
             ->alias('a')
+            ->field('a.*,b.order_out_status,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name')
+            ->leftJoin('order_return b','b.returnCode=a.returnCode AND b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.send_wsm_code AND c.is_del=0')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->where($where)
@@ -284,7 +289,10 @@ class OrderOutChild extends Base
         if ($outChildCode == '') return json_show(1004, '发货工单号不能为空');
 
         $info = Db::name('order_out_child')
-            ->where(['is_del' => 0, 'outChildCode' => $outChildCode])
+            ->alias('a')
+            ->field('a.*,b.name wsm_name')
+            ->leftJoin('warehouse_info b','b.wsm_code=a.wsm_code')
+            ->where(['a.is_del' => 0, 'a.outChildCode' => $outChildCode])
             ->findOrEmpty();
 
         return json_show(0, '获取详情成功', $info);

app/admin/controller/WareHouse.php

@@ -239,7 +239,7 @@ class WareHouse extends Base
             ->alias("a")
             ->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
             ->where($condition)
-            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code,a.creater")
+            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.supplierName,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,a.companyName,a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code,a.creater")
             ->page($page,$size)
             ->order("a.addtime desc")
             ->select()
@@ -247,12 +247,12 @@ class WareHouse extends Base
         $all_createrid = array_column($list,'contactor');
         $item = get_company_name_by_uid($all_createrid);
 
-        $all_companyNo = array_column($list,'companyNo');
-        $userCommon = \app\admin\common\User::getIns();
-        $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_companyNo]);
+//        $all_companyNo = array_column($list,'companyNo');
+//        $userCommon = \app\admin\common\User::getIns();
+//        $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_companyNo]);
 
         foreach ($list as $key=>$value){
-			$value['company_name'] = $tmp['data'][$value['companyNo']]??'';
+			$value['company_name'] = $value['companyName'];//$tmp['data'][$value['companyNo']]??'';
             if($value['wsm_type']!=""){
                 $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
                 $value['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -486,7 +486,7 @@ class WareHouse extends Base
             ->alias("a")
             ->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
             ->where($condition)
-            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.updatetime,a.wsm_type,a.companyNo,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")
+            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.supplierName,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.updatetime,a.wsm_type,a.companyNo,a.companyName,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")
             ->order("a.addtime desc")
             ->select()
             ->toArray();

app/admin/route/app.php

@@ -304,6 +304,7 @@ Route::rule('afterExport', 'admin/After/export');
 Route::rule('after_child_list', 'admin/AfterChild/getList');//退货工单列表
 Route::rule('set_order_return_child', 'admin/AfterChild/setOrderReturnChild');//设置退货工单
 Route::rule('delivery_order_return_child', 'admin/AfterChild/deliveryOrderReturnChild');//库管收货
+Route::rule('set_after_child_record', 'admin/AfterChild/setRecord');//设置退货工单标记
 //Route::rule('aftersetwsm','admin/After/setWsm');
 
 Route::rule('processolist', 'admin/Proorder/list');//我的已办