edit

app/Http/Controllers/Admin/AotuorderController.php

@@ -1217,7 +1217,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']);
+                            ->decrement('decrement', $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']."')";

app/Http/Controllers/Orders/AotuorderController.php

@@ -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('inv_num', $v['goods_num']);
+                            ->decrement('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']."')";

app/Http/Controllers/Orders/OrdersController.php

@@ -539,7 +539,9 @@ class OrdersController extends BaseController
             return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
         }
         $orderinfo = OrderService::getOrderBy('sys_num',  $input['sys_num'],['order_num', 'order_status','customer_id','ser_id','store_type','p_id','category','company_id']);
-
+        $input['company_id'] = $orderinfo['company_id'];
+        $input['ser_id'] = $orderinfo['ser_id'];
+        $input['order_num'] = $orderinfo['order_num'];
         $serial = OrderListService::getOrderListBy('sys_num',  $input['sys_num'] ,'first',['serial_number']);
         $input['order_status'] = $orderinfo['order_status'];
         if ($orderinfo['order_status'] >= 50) {

app/Services/Api/MobileWeb/InventoryService.php

@@ -16,7 +16,7 @@ class InventoryService
     public static function index($request, $show_count = 10)
     {
         $session = $request['session'];
-        $session['company_id'] = 14;
+//        $session['company_id'] = 14;
         if($session['user_type']==1){
             return ['ErrorCode' => 1, 'ErrorMessage'=>'暂无数据', 'data'=>[]];
         }
@@ -68,7 +68,7 @@ class InventoryService
     //获取品牌
     public static function getBrand ( $request ){
         $session = $request['session'];
-        $session['company_id'] = 14;
+//        $session['company_id'] = 14;
         $list_data = DB::table('goods_brand')
             ->where("company_id",$session['company_id'])
             ->where("del_flag",1)
@@ -79,7 +79,7 @@ class InventoryService
     //编辑库存
     public static function edit ( $request, $ip  ){
         $session = $request['session'];
-        $session['company_id'] = 14;
+//        $session['company_id'] = 14;
         $res = Inventory::updateOrCreate(
             [
                 'inv_goodid'     => $request['goodid'],

app/Services/OrderService.php

@@ -1300,7 +1300,7 @@ class OrderService extends Service
                                         ->where("inv_goodid", $v['goods_id'])
                                         ->where("inv_num", '>', 0)
                                         ->where("inv_company_id", $orderinfo['company_id'])
-                                        ->increment('inv_num', $v['goods_num']);
+                                        ->decrement('inv_num', $v['goods_num']);
                                     DB::table('invenrecor')->insert(['iv_serid' => $input['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']]);
                                 } catch (\Exception $e) {
 
@@ -2581,6 +2581,7 @@ class OrderService extends Service
     */
     public static function replaceMsgGood ( $input ){
         $goodsInfo = GoodsService::getGoodsByKey('pg_id',$input['goods_id'],['brand_name', 'version','pg_series']);
+        $OrderMsg = OrderMsg::where('id', $input['msg_id'])->where('sys_num',$input['sys_num'])->first();
         $arr['goods_id'] = $input['goods_id'];//商品id
         $arr['goods_name'] = $goodsInfo['good_name'];//商品名称
         $arr['goods_service'] = 4;//换新
@@ -2597,8 +2598,30 @@ class OrderService extends Service
                 SettlementList::where('sys_num',$input['sys_num'])->where('msg_id',$input['msg_id'])->update(['goods_brand'=>$goodsInfo['brand_name']]);
             }
         }
-        DB::connection()->enableQueryLog();#开启执行日志
+//        DB::connection()->enableQueryLog();#开启执行日志
         $resultMsg = OrderMsg::where('id', $input['msg_id'])->where('sys_num',$input['sys_num'])->update($arr);
+        if($resultMsg){
+            if($input['order_status'] > 10) {
+                try {
+                    $number = OrderList::where('sys_num',$input['sys_num'])->where('order_goods_id',$input['msg_id'])->value("serial_number");
+                    DB::table('inventory')
+                        ->where("inv_serid", $input['ser_id'])
+                        ->where("inv_goodid", $OrderMsg['goods_id'])
+                        ->where("inv_company_id", $input['company_id'])
+                        ->increment('inv_num', $OrderMsg['goods_num']);
+                    DB::table('invenrecor')->insert(['iv_serid' => $input['ser_id'], 'iv_goodid' => $OrderMsg['goods_id'], 'iv_num' => $OrderMsg['goods_num'], 'iv_serial' => $number, 'iv_ordernum' => $input['order_num'], 'iv_company_id' => $input['company_id']]);
+                    DB::table('inventory')
+                        ->where("inv_serid", $input['ser_id'])
+                        ->where("inv_goodid", $OrderMsg['goods_id'])
+                        ->where("inv_num", '>', 0)
+                        ->where("inv_company_id", $input['company_id'])
+                        ->decrement('inv_num', $OrderMsg['goods_num']);
+                    DB::table('invenrecor')->insert(['iv_serid' => $input['ser_id'], 'iv_goodid' => $input['goods_id'], 'iv_num' => '-' . $OrderMsg['goods_num'], 'iv_serial' => $number, 'iv_ordernum' => $input['order_num'], 'iv_company_id' => $input['company_id']]);
+                } catch (\Exception $e) {
+
+                }
+            }
+        }
         return $resultMsg;
     }
     /**|---------------------------------------------------------------------------------