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

app/admin/controller/Reorder.php

@@ -1276,6 +1276,16 @@ class Reorder extends Base
                                         Db::rollback();
                                         return error_show(1004, "地址发货单更新失败");
                                     }
+
+                            //处理发货申请单流程
+                            ProcessOrder::AddProcess(["id" => $this->uid, "nickname" => $this->uname], [
+                                "order_type" => 'CKD',
+                                "order_code" => $send["outCode"],//出库单号
+                                "order_id" => $send["id"],
+                                "order_status" => 4,//全部退货
+                                "before_status" => $send['status'],
+                                'holder_id=' => $send['apply_id']
+                            ]);
 //                                    $ordersend = Db::name("order_send")->where(["outCode" => $send['outCode']])->find();
 //                                    if($ordersend==false){
 //                                    	Db::rollback();
@@ -1338,8 +1348,7 @@ class Reorder extends Base
                         'holder_id=' => $order['apply_id']
                     ]);
 
-                  	$saleinfo=Db::name("sale_info")->where([["orderCode","=",$orderCode],["num",">",0]])->select()
-					->toArray();
+                  	$saleinfo=Db::name("sale_info")->where([["orderCode","=",$orderCode],["num",">",0]])->select()->toArray();
 					if(empty($saleinfo)) {
 						Db::rollback();
 						return error_show(1005, '商品批次数据未找到');
@@ -1347,8 +1356,7 @@ class Reorder extends Base
 					$tempnum =$thnum;
 					foreach ( $saleinfo as $va){
 					if($tempnum ==0) break;
-					$stock = Db::name("good_stock")->where(["spuCode" => $order['good_code'], 'id' => $va['stockid']])
-                        ->find();
+					$stock = Db::name("good_stock")->where(["spuCode" => $order['good_code'], 'id' => $va['stockid']])->find();
 					if($stock==false) {
 						Db::rollback();
 						return error_show(1005, '商品库存数据未找到');

app/admin/model/ProcessWait.php

@@ -55,9 +55,9 @@ class ProcessWait extends Model
 
         if ($info) {
 
-            //如果下一个节点是中断节点，则将相关记录删除，不再新增
+            //如果下一个节点是中断节点，则将相关记录删除，不再新增（只删除待办数据，221010145800@戴确认）
             if ($info['action_type'] == ActionProcess::$action_type_interrupt) {
-                self::where(['order_type' => $data['order_type'], 'order_code' => $data['order_code'], 'order_id' => $data['order_id']])
+                self::where(['order_type' => $data['order_type'], 'order_code' => $data['order_code'], 'order_id' => $data['order_id'], 'status' => self::$status_wait])
                     ->update(['status' => self::$status_interrupt, 'updatetime' => date('Y-m-d H:i:s')]);
                 return true;
             }

public/index.php

@@ -15,9 +15,9 @@ namespace think;
 require __DIR__ . '/../vendor/autoload.php';
 header('Access-Control-Allow-Origin:*');
 header('Access-Control-Allow-Methods:POST,GET,OPTIONS,DELETE');
-header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
+header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization,sign,appid,noce,timestamp");
 // 执行HTTP应用并响应
-if($_SERVER['REQUEST_METHOD']=="OPTIONS"){
+if ($_SERVER['REQUEST_METHOD'] == "OPTIONS") {
     echo '';
     exit();
 }