ad

app/admin/controller/Filing.php

@@ -582,7 +582,7 @@ class Filing extends Base
                 'supNo' => $filing['supplierNo'],
                 'supName' => $filing['supplierName'],
                 'zxNo' => '',
-                'platform_order' =>'',
+                'platform_order' =>$filing['filingCode'],
                 'send_num' => 0,
                 'wsend_num' => $filing['num'],
                 'th_num' => 0,

app/admin/controller/Sale.php

@@ -5156,22 +5156,12 @@ class Sale extends Base
 
         $list = Db::name('sale')
             ->alias('a')
-            ->field('a.id sale_id,a.good_code,a.good_name,a.wsend_num,a.total_price,a.order_type,a.status sale_status,a.orderCode,a.cat_id,a.good_createrid,c.id cgd_id,c.status cgd_status,c.cgdNo,c.cgder_id')
+            ->field('a.id sale_id,a.good_code,a.platform_order,a.good_name,a.wsend_num,a.total_price,a.order_type,a.status sale_status,a.orderCode,a.cat_id,a.good_createrid,c.id cgd_id,c.status cgd_status,c.cgdNo,c.cgder_id')
             ->leftJoin('order_num b', 'b.orderCode=a.orderCode')
             ->leftJoin('purchease_order c', 'c.cgdNo=b.cgdNo')
             ->where(['a.is_del' => 0, 'a.orderCode' => $orderCode])
             ->select()
             ->toArray();
-
-//        //贵金属的所有三级分类
-//        $cat_temp = Db::name('cat')
-//            ->field('id')
-//            ->where(['pid' => 6, 'is_del' => 0])
-//            ->buildSql();
-//        $cat_id = Db::name('cat')
-//            ->where('is_del = 0 AND pid IN ' . $cat_temp)
-//            ->column('id');
-
         Db::startTrans();
         try {
 
@@ -5180,19 +5170,32 @@ class Sale extends Base
             foreach ($list as $sale) {
 
                 if ($sale['sale_status'] == 3) throw new \think\Exception($sale['orderCode'] . '已取消，无法重复操作');
-//                if (cat_is_gold($sale['cat_id'])) throw new \think\Exception($sale['orderCode'] . '为贵金属，无法取消');
-//                if ($sale['sale_status']!=0) throw new \think\Exception($sale['orderCode'] . '已发货，无法取消');
                 if ($sale['order_type'] == 1) {
                     if ($sale['sale_status'] != 0) throw new \think\Exception($sale['orderCode'] . '已发货，无法取消');
                     $good = Db::name("good")->where(["spuCode" => $sale['good_code']])->findOrEmpty();
                     if (empty($good)) throw new Exception('未找到商品信息');
-                    $stock = Db::name("good")->where($good)->update(["usable_stock" => $good['usable_stock'] + $sale['wsend_num'], "updatetime" => date("Y-m-d H:i:s")]);
+                    $stock = Db::name("good")->where($good)
+                    ->inc("usable_stock",$sale['wsend_num'])
+                     ->data(["updatetime" => date("Y-m-d H:i:s")])
+                    ->update();
                     if ($stock == false) throw new Exception('商品库存更新失败');
+                }
+                if($sale['order_type'] == 4){
+                    $fill =Db::name("filing")->where(["filingCode"=>$sale["platform_order"]])->findOrEmpty();
+                    if(empty($fill)) throw new Exception($sale['orderCode'] . '未找到对应得报备单');
+                    $fillup=Db::name('filing')
+                    ->where($fill)
+                    ->data([
+                    	"transfer_num"=>$fill["transfer_num"]-$sale['wsend_num'],
+                    	"wait_num"=>$fill["wait_num"]+$sale['wsend_num'],
+                         "status"=>$fill['wait_num']+$sale['wsend_num']==0?4:($fill['transfer_num']-$sale['wsend_num']==0?2:3)
+                    ])
+                    ->update();
+                    if($fillup==false)throw new Exception($sale['platform_order'] . '报备单更新失败');
                 }
 				 $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$sale['orderCode'], "isCgd"=>1]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
 					throw new Exception($fininfo['message']??"结算校验失败");
-//					return json_show(1005, $fininfo['message']??"结算校验失败");
 				}
 				$thtemp=[
 					"orderCode"=>$sale["orderCode"],
@@ -5244,7 +5247,7 @@ class Sale extends Base
                 }
 
             }
-            Db::name('sale')
+           $orderup= Db::name('sale')
                 ->where(['is_del' => 0, 'id' => array_column($list, 'sale_id')])
                 ->update([
                 	'status' => 3,
@@ -5255,8 +5258,11 @@ class Sale extends Base
                 	'send_status' =>3,
                 	'updatetime' => $date
                 	]);
-            Db::name("th_data")->insertAll($th);
-            Db::name('purchease_order')
+            if($orderup==false) throw new \Exception("订单状态更新失败");
+           
+           $thin= Db::name("th_data")->insertAll($th);
+           if($thin==false) throw new \Exception('订单取消失败');
+            $cgdup=Db::name('purchease_order')
                 ->where(['is_del' => 0, 'id' => array_column($list, 'cgd_id')])
                 ->update([
                 	'status' => 4,
@@ -5266,15 +5272,16 @@ class Sale extends Base
                 	'send_num' =>Db::raw("wsend_num"),
                 	'send_status' =>3,
                     'updatetime' => $date]);
-
+			 if($cgdup==false) throw new \Exception('采购单取消失败');
             $out_list = Db::name('order_out')
                 ->where(['is_del' => 0, 'orderCode' => $orderCode])
                 ->select()
                 ->toArray();
             if (!empty($out_list)) {
-                Db::name('order_out')
+               $sen= Db::name('order_out')
                     ->where(['is_del' => 0, 'orderCode' => $orderCode])
                     ->update(['status' => 5, 'updatetime' => $date]);
+                if($sen==false) throw new \Exception('发货单取消失败');
                 foreach ($out_list as $out) {
                     ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                         "order_code" => $out['outCode'],//销售单号
@@ -5300,9 +5307,10 @@ class Sale extends Base
                 ->select()
                 ->toArray();
             if (!empty($ooc_list)) {
-                Db::name('order_out_child')
+               $child= Db::name('order_out_child')
                     ->where(['is_del' => 0, 'orderCode' => $orderCode])
                     ->update(['status' => 5, 'updatetime' => $date]);
+                if ($child == false) throw new Exception('发货工单更新失败');
                 foreach ($ooc_list as $ooc) {
                     $stockinfo = Db::name("good_stock")->where(["spuCode" => $ooc['spuCode'], "wsm_code" => $ooc['wsm_code']])->findOrEmpty();
                     if (empty($stockinfo)) throw new Exception('未找到库存信息');