ed

app/admin/controller/Purch.php

@@ -331,7 +331,7 @@ class Purch extends \app\BaseController
         }
         $cg = Db::name('purchease_order')->where(['cgdNo'=>$cgdNo,'is_del'=>0])->find();
         if($cg==""){
-            return error_show(1002,"未找到商品数据");
+            return error_show(1002,"未找到采购单数据");
         }
         $gd= Db::name('good')->where(['good_code'=>$cg['good_code']])->find();
         if($gd==""){
@@ -438,17 +438,57 @@ class Purch extends \app\BaseController
         if(empty($dio)){
             return error_show(1002,"退货订单未找到");
         }
+        $cgd = Db::name("purchease_order")->where(['cgdNo'=>$dio['cgdNo']])->find();
+        if(empty($cgd)){
+            return error_show(1002,"采购单未找到");
+        }
         $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
         if($status===""){
             return error_show(1002,"参数status不能为空");
         }
-        $dio['status']=$status;
-        $dio['updatetime']=date("Y-m-d H:i:s");
-        $item = Db::name("purchease_diff")->update($dio);
-        if($item){
-            return error_show(0,"更新成功");
-        }else{
+        Db::startTrans();
+        try{
+            $dio['status']=$status;
+            $dio['updatetime']=date("Y-m-d H:i:s");
+            $item = Db::name("purchease_diff")->update($dio);
+            if($item){
+                if($cgd['order_type']==2){
+                    $order = Db::name("sale")->where(["orderCode"=>$cgd['bkcode']])->find();
+                    if(empty($order)){
+                        Db::rollback();
+                        return error_show(1002,"未找到确认单信息");
+                    }
+                    $data=[
+                        "orderCode"=>$cgd['bkcode'],
+                        "good_code"=>$cgd['good_type_code'],
+                        "good_kode"=>$cgd['good_code'],
+                        "good_name"=>$cgd['good_name'],
+                        "diff_weight"=>$dio['diff_weight'],
+                        "diff_price"=>$dio['diff_weight']*$cgd['gold_price'],
+                        "gold_price"=>$cgd['gold_price'],
+                        "status"=>1,
+                        "addtime"=>date("Y-m-d H:i:s"),
+                        "updatetime"=>date("Y-m-d H:i:s")
+                    ];
+                    $cgd = Db::name('sale_diff')->insert($data);
+                    if($cgd){
+                        Db::commit();
+                        return error_show(0,"新建成功");
+                    }else{
+                        Db::rollback();
+                        return error_show(1002,"新建失败");
+                    }
+                }
+                Db::commit();
+                return error_show(0,"更新成功");
+            }else{
+                Db::rollback();
+                return error_show(1002,"更新失败");
+            }
+        }catch (\Exception $e){
+            Db::rollback();
             return error_show(1002,"更新失败");
         }
+
     }
 }

app/admin/controller/Sale.php

@@ -164,14 +164,23 @@ class Sale extends BaseController
     if($orderCode !==""){
         $where[]=['orderCode',"=",$orderCode];
     }
+        $ordertype=isset($this->post['order_type']) && $this->post['order_type'] !=="" ? intval($this->post['order_type'])
+            :"";
+        if($ordertype !==""){
+            $where[]=['order_type',"=",$ordertype];
+        }
     $status=isset($this->post['status']) && $this->post['status'] !=="" ? trim($this->post['status']):"";
     if($status !==""){
         $where[]=['status',"=",$status];
     }
-    $addtime = isset($this->post['addtime']) && $this->post['addtime'] !=="" ? $this->post['addtime'] :"";
-    if($addtime !=""){
-        $where[]= ["addtime",'<=',$addtime];
+    $start = isset($this->post['start']) && $this->post['start'] !=="" ? $this->post['start'] :"";
+    if($start !=""){
+        $where[]= ["addtime",'>=',$start];
     }
+        $end = isset($this->post['end']) && $this->post['end'] !=="" ? $this->post['end'] :"";
+        if($end !=""){
+            $where[]= ["addtime",'<=',$end];
+        }
     $count = Db::name('sale')->where($where)->count();
     $total = ceil($count/$size);
     $page = $page >= $total ? $total : $page;
@@ -706,7 +715,7 @@ class Sale extends BaseController
     public function  difflist(){
         $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] !==""? intval($this->post['size']):"10";
-        $where = [['a.is_del',"=",0]];
+        $where = [];
         $cgdNo = isset($this->post['orderCode']) && $this->post['orderCode']!="" ? trim($this->post['orderCode']):"";
         if($cgdNo!=""){
             $where[]=['a.orderCode',"like", "%$cgdNo%"];
@@ -823,7 +832,7 @@ class Sale extends BaseController
             return error_show(1004,"参数id不能为空");
         }
         $info = Db::name('sale_diff')->alias('a')->join("good b","b.good_code=a.good_kode","left")->where
-        (["a.id"=>$id])->field("a,*,b.cat_id")->find();
+        (["a.id"=>$id])->field("a.*,b.cat_id")->find();
         if(empty($info)){
             return error_show(1004,"订单数据未找到");
         }

app/admin/route/app.php

@@ -250,3 +250,8 @@ Route::rule('reorderdel','admin/Reorder/delete');
 Route::rule('reorderexam','admin/Reorder/exam');
 
 Route::rule('salezxcreate','admin/Salezx/create');
+
+Route::rule('saledifflist','admin/Sale/difflist');
+Route::rule('salediffcheck','admin/Sale/diffcheck');
+Route::rule('salediffinfo','admin/Sale/diffinfo');
+Route::rule('salediffstatus','admin/Sale/diffstatus');