Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/Sale.php

@@ -14,18 +14,10 @@ public function __construct(App $app)
     parent::__construct($app);
     $this->post=$this->request->post();
 }
-//$var=[];
-//foreach ($info as $value){
-//$str=Db::name('sale_info')->alias('a')->join("order_addr b","b.orderCode=a.orderCode","left")
-//->join("good_stock c","c.wsm_code=a.wsm_code","left")
-//->where(['a.orderCode'=>$value['orderCode'],'b.is_del'=>0])->field('b.contactor,b.mobile,b.addr,b.arrive_time,c.good_type_code,c.usable_stock')->find();
-//    //var_dump($str);
-//if($str==""){
-//Db::rollback();
-//$info = isset($this->post['order_addr'])&& $this->post['order_addr'] !=="" ? $this->post['order_addr']:"";
-//return error_show(1005,"收货信息不能为空");
-//}
-//}
+//            $str=Db::name('sale_info')->alias('a')->join("order_addr b","b.orderCode=a.orderCode","left")
+//                    ->join("good_stock c","c.wsm_code=a.wsm_code","left")
+//                    ->where(['b.is_del'=>0])->field('b.contactor,b.mobile,b.addr,b.arrive_time,c.good_type_code,c.usable_stock')->insertAll();
+
 //$temp =[];
 //$temp['good_type_code']="";
 //$temp['usable_stock']=$str['num'];
@@ -53,20 +45,22 @@ public function create(){
     $total_price=isset($this->post['total_price']) && $this->post['total_price'] !=="" ? trim($this->post['total_price']) :"";
     $post_fee=isset($this->post['post_fee']) && $this->post['post_fee'] !=="" ? trim($this->post['post_fee']) :"";
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
-    $addr_code=isset($this->post['addr_code']) && $this->post['addr_code'] !=="" ? trim($this->post['addr_code']) :"";
-    $addr=isset($this->post['addr']) && $this->post['addr'] !=="" ? trim($this->post['addr']) :"";
-    $contactor=isset($this->post['contactor']) && $this->post['contactor'] !=="" ? intval($this->post['contactor']) :"";
-    if($contactor==""){
-        return error_show(1002,"联系人不能为空");
-    }
-    $mobile = isset($this->post['mobile']) && $this->post['mobile'] !=="" ? intval($this->post['mobile']) :"";
-    if($mobile==""){
-        return error_show(1002,"联系电话不能为空");
-    }
-    $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? intval($this->post['customer_code']) :"";
-    $arrive_time=isset($this->post['arrive_time']) && $this->post['arrive_time'] ? $this->post['arrive_time']:date("Y-m-d H:i:s");
-    if($arrive_time==""){
-        return error_show(1002,"到货日期不能为空");
+//    $contactor=isset($this->post['contactor']) && $this->post['contactor'] !=="" ?trim($this->post['contactor']) :"";
+//    if($contactor==""){
+//        return error_show(1002,"联系人不能为空");
+//    }
+//    $mobile = isset($this->post['mobile']) && $this->post['mobile'] !=="" ? intval($this->post['mobile']) :"";
+//    if($mobile==""){
+//        return error_show(1002,"联系电话不能为空");
+//    }
+//    $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? intval($this->post['customer_code']) :"";
+//    $arrive_time=isset($this->post['arrive_time']) && $this->post['arrive_time'] ? $this->post['arrive_time']:date("Y-m-d H:i:s");
+//    if($arrive_time==""){
+//        return error_show(1002,"到货日期不能为空");
+//    }
+    $va= isset($this->post['order_addr']) && $this->post['order_addr'] !=="" ?  $this->post['order_addr']:"";
+    if($va==""){
+        return error_show(1002,"参数order_addr不能为空");
     }
     Db::startTrans();
       try {
@@ -88,24 +82,29 @@ public function create(){
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $datainfo = Db::name('sale')->insert($data,true);
+        $vat=[];
         if($datainfo>0){
-          $datain=[
-              "addr_code"=>$addr_code,
-              "orderCode"=>$orderCode,
-              "addr"=>$addr,
-              "customer_code"=>$customer_code,
-              "contactor"=>$contactor,
-              "mobile"=>$mobile,
-              "arrive_time"=>$arrive_time,
-              "is_del"=>0,
-              "addtime"=>date("Y-m-d H:i:s"),
-              "updatetime"=>date("Y-m-d H:i:s")
-          ];
-        }
-        $vmp = Db::name('order_addr')->insert($datain);
-        if($vmp){
-            Db::commit();
-            return error_show(0,"销售订单创建成功");
+       foreach ($va as $value){
+        $temp=[];
+        $temp['orderCode']=$orderCode;
+        $temp['contactor']=$value['contactor'];
+        $temp['mobile'] = $value['mobile'];
+        $temp['addr'] = $value['addr'];
+        $temp['addr_code'] =$value['addr_code'];
+        $temp['customer_code'] =$customer_code;
+        $temp['receipt_quantity']=$value['receipt_quantity'];
+        $temp['post_fee'] =0;
+        $temp['is_del'] =0;
+        $temp['addtime'] =date("Y-m-d H:i:s");
+        $temp['updatetime'] =date("Y-m-d H:i:s");
+        $temp['arrive_time']=date("Y-m-d H:i:s");
+           $vat[]=$temp;
+       }
+            $vmp = Db::name('order_addr')->insertAll($vat);
+            if($vmp){
+                Db::commit();
+                return error_show(0,"销售订单创建成功");
+            }
         }
           Db::rollback();
           return error_show(1002,"销售订单创建失败");
@@ -146,7 +145,6 @@ public function edit(){
 //    if($orderCode==""){
 //        return error_show(1002,"销售单code不能为空");
 //    }
-    $orderCode=makeNo("CX");
     $good_code = isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code']) :"";
     if($good_code==""){
         return error_show(1002,"商品code不能为空");
@@ -168,26 +166,16 @@ public function edit(){
     $total_price=isset($this->post['total_price']) && $this->post['total_price'] !=="" ? trim($this->post['total_price']) :"";
     $post_fee=isset($this->post['post_fee']) && $this->post['post_fee'] !=="" ? trim($this->post['post_fee']) :"";
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
-    $addr_code=isset($this->post['addr_code']) && $this->post['addr_code'] !=="" ? trim($this->post['addr_code']) :"";
-    $addr=isset($this->post['addr']) && $this->post['addr'] !=="" ? trim($this->post['addr']) :"";
-    $contactor=isset($this->post['contactor']) && $this->post['contactor'] !=="" ? trim($this->post['contactor']) :"";
-    if($contactor==""){
-        return error_show(1002,"联系人不能为空");
-    }
-    $mobile = isset($this->post['mobile']) && $this->post['mobile'] !=="" ? intval($this->post['mobile']) :"";
-    if($mobile==""){
-        return error_show(1002,"联系电话不能为空");
-    }
-    $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? intval($this->post['customer_code']) :"";
-    $arrive_time=isset($this->post['arrive_time']) && $this->post['arrive_time'] ? $this->post['arrive_time']:date("Y-m-d H:i:s");
-    if($arrive_time==""){
-        return error_show(1002,"商品code不能为空");
+
+    $vr= isset($this->post['order_addr']) && $this->post['order_addr'] !=="" ?  $this->post['order_addr']:"";
+    if($vr==""){
+        return error_show(1002,"参数order_addr不能为空");
     }
+
     Db::startTrans();
     try {
         $datn=[
             "id"=>$id,
-            "orderCode"=>$orderCode,
             "good_code"=>$good_code,
             "customer_code"=>$customer_code,
             "good_name"=>$good_name,
@@ -203,24 +191,32 @@ public function edit(){
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $datninfo = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->save($datn);
-        if($datninfo>0) {
-            $datain = [[
-                "addr_code" => $addr_code,
-                "orderCode" => $orderCode,
-                "addr" => $addr,
-                "customer_code" => $customer_code,
-                "contactor" => $contactor,
-                "mobile" => $mobile,
-                "arrive_time" => $arrive_time,
-                "is_del" => 0,
-                "addtime" => date("Y-m-d H:i:s"),
-                "updatetime" => date("Y-m-d H:i:s")
-            ]];
-            $dat = Db::name('order_addr')->save($datain);
-        }
-        if($dat){
-            Db::commit();
-            return error_show(0,"更新成功");
+        //$vat=[];
+        if($datninfo>0){
+
+            foreach ($vr as $value){
+                $temp=[];
+                isset($value['id'])&&$value['id']!=="" ? $temp['id'] = $value['id']:'';
+                $temp['orderCode']=$etid['orderCode'];
+                $temp['contactor']=$value['contactor'];
+                $temp['mobile'] = $value['mobile'];
+                $temp['addr'] = $value['addr'];
+                $temp['addr_code'] =$value['addr_code'];
+                $temp['customer_code'] =$customer_code;
+                $temp['receipt_quantity']=$value['receipt_quantity'];
+                $temp['post_fee'] =0;
+                $temp['is_del'] =$value['is_del'];
+                isset($value['id'])&&$value['id']!=="" ? '' : $temp['addtime'] =date("Y-m-d H:i:s");
+                $temp['updatetime'] =date("Y-m-d H:i:s");
+                $temp['arrive_time']=date("Y-m-d H:i:s");
+                $dat = Db::name('order_addr')->save($temp);
+                if($dat==false){
+                    Db::rollback();
+                    return error_show(1002,"更新失败");
+                }
+                Db::commit();
+                return error_show(0,"更新成功");
+            }
         }
         Db::rollback();
         return error_show(1002,"更新失败");
@@ -230,9 +226,56 @@ public function edit(){
     }
 }
 public function info(){
-    $id = isset($this->post['id']) && $this->post['id'] !=="" ? trim($this->post['id']):"";
+    $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']):"";
     if($id==""){
         return error_show(1002,"参数id不能为空");
     }
+    $einfo = Db::name('sale')->alias('a')->join("order_addr b","b.orderCode=a.orderCode","left")
+        ->where(['a.id'=>$id,'a.is_del'=>0])->field('b.addr,b.contactor,b.mobile,b.arrive_time,a.*')->find();
+    if(empty($einfo)){
+        return error_show(1002,"未找到销售订单数据");
+    }
+    $fo = Db::name('order_addr')->where(['orderCode'=>$einfo['orderCode']])->select();
+    $einfo['item'][]=$fo;
+    if(empty($einfo)){
+        return error_show(1002,"未找到销售订单数据");
+    }else{
+        return app_show(0,"获取成功",$einfo);
+    }
+}
+public function del(){
+    $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
+    if($id===""){
+        return error_show(1002,"参数id不能为空");
+    }
+    $ed = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->find();
+    if(empty($ed)){
+        return error_show(1002,"未找到销售订单数据");
+    }
+    $str =Db::name('sale')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
+    if($str){
+        return error_show(0,"删除成功");
+    }else{
+        return error_show(1002,"删除失败");
+    }
+}
+public function status(){
+    $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
+    if($id==""){
+        return error_show(1002,"参数id不能为空");
+    }
+    $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
+    if($status==""){
+        return error_show(1002,"订单状态不能为空");
+    }
+    $dio = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->find();
+    if(empty($dio)){
+        return error_show(1002,"销售单信息未找到");
+    }
+    $dio['status']=$status;
+    $dio['updatetime']=date("Y-m-d H:i:s");
+    $st = Db::name('sale')->save($dio);
+    return error_show(0,"订单状态更新成功");
 }
+
 }

app/admin/route/app.php

@@ -96,6 +96,9 @@ Route::rule('infolist','admin/Listcustomer/list');
 Route::rule('salecreate','admin/Sale/create');
 Route::rule('salelist','admin/Sale/list');
 Route::rule('saleedit','admin/Sale/edit');
+Route::rule('saleinfo','admin/Sale/info');
+Route::rule('saledelect','admin/Sale/del');
+Route::rule('salestatus','admin/Sale/status');
 
 Route::rule('checkflist','admin/Check/flist');
 Route::rule('checklist','admin/Check/list');