Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -4296,6 +4296,23 @@ class Sale extends Base
                     ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s')]);
             }
 
+            //修改状态，添加待办
+            ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
+                "order_code" => $outCode,
+                "status" => 2,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "CKD", 3, $rs);
+
+            //将待办数据变为已办
+            ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
+                "order_code" => $outCode,
+                "order_id" => $rs['id'],
+                "order_status" => 3,
+                "order_type" => 'CKD',
+                "before_status" => 2
+            ]);
+
             if ($res_order_out) {
                 Db::commit();
                 return app_show(0, '收货完成');

app/admin/route/app.php

@@ -182,7 +182,7 @@ Route::rule("goodloglist","admin/Good/loglist");
 Route::rule("goodplist","admin/Good/goodlist");
 Route::rule("getgoodlistbyladder","admin/Good/getGoodListByLadder");
 
-Route::rule("purchlist","admin/Resign/list");
+Route::rule("purchlist","admin/Resign/list");//备库单列表
 Route::rule("purchadd","admin/Resign/add");//创建备库单
 Route::rule("purchcopy","admin/Resign/copy");
 Route::rule("purchedit","admin/Resign/edit");