edit

app/Http/Controllers/Orders/AotuorderController.php

@@ -173,17 +173,17 @@ class AotuorderController extends BaseController
                 }
                 if(empty($or_ser_id)) {
                     if ($xian == 1) {
-                        CommonService::startmysql();
+//                        CommonService::startmysql();
                         $ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("find_in_set('" . $dress['are_id'] . "',bs_areid) and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
-                        CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
+//                        CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
                         if (!$ser) {
                             $ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
                             $xian = 2;
                         }
                     } else {
-                        CommonService::startmysql();
+//                        CommonService::startmysql();
                         $ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
-                        CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
+//                        CommonService::addLog('自动派单', CommonService::showmysql(), $sys_num,'AotuorderController');
                     }
                 }else{
                     if ($xian == 1) {
@@ -649,7 +649,7 @@ class AotuorderController extends BaseController
                             ->where("inv_goodid", $v['goods_id'])
                             ->where("inv_num", '>', 0)
                             ->where("inv_company_id", $orderinfo['company_id'])
-                            ->increment('decrement', $v['goods_num']);
+                            ->increment('inv_num', $v['goods_num']);
                         DB::table('invenrecor')->insert(['iv_serid' => $ser_id, 'iv_goodid' => $v['goods_id'], 'iv_num' => '-' . $v['goods_num'], 'iv_serial' => $number, 'iv_ordernum' => $orderinfo['order_num'], 'iv_company_id' => $orderinfo['company_id']]);
                         // $gsql = "UPDATE `gone_inventory` SET `inv_num`=`inv_num`-1 WHERE `inv_serid`='".$ser_id."' and `inv_goodid`='".$v['goods_id']."' and `inv_num`>0 and `inv_company_id`='".$orderinfo['company_id']."';";
                         // $sql = "INSERT INTO `gone_invenrecor`( `iv_serid`, `iv_goodid`, `iv_num`,`iv_serial`,`iv_ordernum`,`iv_company_id`) VALUES ('".$ser_id."','".$v['goods_id']."','-1','".$number."','".$orderinfo['order_num']."')";
@@ -659,6 +659,8 @@ class AotuorderController extends BaseController
                         //                    DB::update($sql);
                     }catch (\Exception $e){
 
+                        CommonService::addLog($orderinfo['order_num'], $e->getMessage(), $number,'invenrecor');
+                        CommonService::addLog($orderinfo['order_num'], $e->getLine(), $number,'invenrecor');
                     }
                 }
                 //$order_visit->startTrans();

app/Http/Controllers/Orders/OrderListController.php

@@ -932,22 +932,20 @@ class OrderListController extends BaseController
     		$data['ser_id'] = 0;
     		$data['order_status'] = 10;
     		$resultOrder = Orders::where('sys_num',$input['sys_num'])->update($data);
-
-    		/* $sqlgid = "SELECT count(*) as num,`goods_id` FROM `gone_order_msg` WHERE `sys_num`='".$input['sys_num']."' group by `goods_id`";
-    		$goodid = DB::select($sqlgid);
+            $goodid=DB::table('order_msg')->where('sys_num',$input['sys_num'])->whereNotIn('goods_service',[2,3])->select('goods_id','goods_num')->get()->toArray();
     		//库存有关
     		if ($goodid){
     			$gsql = "";
-    			$sql = "INSERT INTO `gone_invenrecor`( `iv_serid`, `iv_goodid`, `iv_num`,`iv_serial`) VALUES";
+    			$sql = "INSERT INTO `gone_invenrecor`( `iv_serid`, `iv_goodid`, `iv_num`,`iv_serial`,`iv_ordernum`,`iv_company_id`) VALUES";
     			foreach( $goodid as $kgi => $vgi){
-    				$gsql .= "UPDATE `gone_inventory` SET `inv_num`=`inv_num`+".$vgi['num']." WHERE `inv_serid`='".$orderListArr['ser_id']."' and `inv_goodid`='".$vgi['goods_id']."';";
-    				$sql .= "('".$orderListArr['ser_id']."','".$vgi['goods_id']."','+".$vgi['num']."','+".$orderListArr['serial_number']."'),";
+    				$gsql .= "UPDATE `gone_inventory` SET `inv_num`=`inv_num`+".$vgi['goods_num']." WHERE `inv_serid`='".$orderListArr['ser_id']."' and `inv_goodid`='".$vgi['goods_id']."' and `inv_company_id`='".$orderListArr['company_id']."';";
+    				$sql .= "('".$orderListArr['ser_id']."','".$vgi['goods_id']."','+".$vgi['goods_num']."','".$orderListArr['serial_number']."','".$orderListArr['order_num']."','".$orderListArr['company_id']."'),";
     			}
 
     			$sql = trim($sql,',');
     			DB::insert($sql);
     			DB::update($gsql);
-    		} */
+    		}
     		if($resultOrder){
     			DB::table("aftercust")->where("afc_order",$orderListArr['order_num'])->where("afc_refund",4)->update(['afc_state'=>'4']);//电话沟通单状态：1：未处理；2：需跟进；3：待审核；4：已完成
     			//计算接单率