Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Reorder.php

@@ -1381,6 +1381,15 @@ class Reorder extends Base
                             Db::rollback();
                             return error_show(1005,"地址已发货");
                         }
+                                    $send['send_num'] = 0;
+                                    $send['is_del'] =1;
+                                    $send['remark'] ='全退';
+                                    $send['updatetime'] = date("Y-m-d H:i:s");
+                                    $outup = Db::name("order_out")->save($send);
+                                    if ($outup == false) {
+                                        Db::rollback();
+                                        return error_show(1004, "地址发货单更新失败");
+                                    }
                         if($order['is_stock']==1){
                                 $val['is_del'] = 1;
                                 $val['updatetime'] = date("Y-m-d H:i:s");

app/admin/controller/Sale.php

@@ -1104,7 +1104,7 @@ class Sale extends Base
                     "order_id" => $datainfo,
                     "order_status" => $data['status'],
                     "before_status" => 0,
-                    'holder_id' => $data['apply_id']
+                    'holder_id' => $data['apply_id'],
                 ]);
                 $old_zx_status = $zx['status'];
                 $sa = Db::name("consult_info")->where($zx)->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
@@ -1249,6 +1249,8 @@ class Sale extends Base
                                     "order_status" => 0,
                                     "before_status" => 0,
                                     'holder_id'=>$out['apply_id'],
+                                    'wait_id'=>$supplier_temp_info['personid'],
+                                    'wait_name'=>$supplier_temp_info['person'],
                                 ]);
 
                                 //将发货编号添加到台账中
@@ -1764,7 +1766,9 @@ class Sale extends Base
                             "order_id" => $ou,
                             "order_status" => 0,
                             "before_status" => 0,
-                            'holder_id'=>$out['apply_id'],
+                            'holder_id'=>$data['rm'],
+                            'wait_id'=>$supplier_temp_info['personid'],
+                            'wait_name'=>$supplier_temp_info['person'],
                         ]);
                         $order['send_num'] += $value['receipt_quantity'];
                         $order['wsend_num'] -= $value['receipt_quantity'];
@@ -2080,6 +2084,11 @@ class Sale extends Base
                         } else {
                             $standing_book_data['outCode'][] = $outCode;
                             //修改状态，添加待办
+                            $roleid = config('app.wsm_cgder_role');
+                            $uids = Db::name('user_role')
+                                ->where('is_del', 0)
+                                ->whereIn('roleid', $roleid)
+                                ->column('uid');
                             ActionLog::logAdd($this->post['token'], [
                                 "order_code" => $outCode,//出库单号
                                 "status" => 0,//这里的status是之前的值
@@ -2094,6 +2103,7 @@ class Sale extends Base
                                 "order_status" => 0,
                                 "before_status" => 0,
                                 'holder_id'=>$out['apply_id'],
+                              'handle_user_list' => implode(',', $uids)
                             ]);
                         }
                     } else {

app/command/ImportOrderFromCHandleData.php

@@ -412,6 +412,12 @@ class ImportOrderFromCHandleData extends Command
                                 $ou = Db::name("order_out")->insert($out);
                                 if ($ou == false) throw new Exception('发货地址添加创建失败');
                                 else {
+                                	    //修改状态，添加待办
+		                            $roleid = config('app.wsm_cgder_role');
+		                            $uids = Db::name('user_role')
+		                                ->where('is_del', 0)
+		                                ->whereIn('roleid', $roleid)
+		                                ->column('uid');
                                     //修改状态，添加待办
                                     ActionLog::logAdd(['id' => $rm, 'nickname' => $ri], [
                                         "order_code" => $outCode,//出库单号
@@ -426,7 +432,8 @@ class ImportOrderFromCHandleData extends Command
                                         "order_id" => 0,
                                         "order_status" => 0,
                                         "before_status" => 0,
-                                        'holder_id' => $out['apply_id']
+                                        'holder_id' =>  $rm,
+                                        'handle_user_list' => $is_stock==1?implode(',', $uids):""
                                     ]);
 
                                     $standing_book_data['outCode'] = $outCode;