Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Project.php

@@ -33,6 +33,7 @@ class Project extends \app\BaseController
         $use_desc = isset($this->post['use_desc'])&&$this->post['use_desc']!=""?trim($this->post['use_desc']):"";
         $budget_total = isset($this->post['budget_total'])&&$this->post['budget_total']!=""?floatval($this->post['budget_total']):"";
         $arrtime = isset($this->post['arrtime'])&&$this->post['arrtime']!=""?$this->post['arrtime']:"";
+        $endtime = isset($this->post['endtime'])&&$this->post['endtime']!=""?$this->post['endtime']:"";
         if($use_desc==""){
             return error_show(1004,"参数use_desc不能为空");
         }
@@ -42,6 +43,9 @@ class Project extends \app\BaseController
         if($arrtime==""){
             return error_show(1004,"参数arrtime不能为空");
         }
+        if($endtime==""){
+            return error_show(1004,"参数endtime不能为空");
+        }
         $low_rate = isset($this->post['low_rate'])&&$this->post['low_rate']!=""?floatval($this->post['low_rate']):"0";
 //        if($low_rate==""){
 //            return error_show(1004,"参数low_rate不能为空");
@@ -75,6 +79,7 @@ class Project extends \app\BaseController
                 "creater"=>$creater,
                 "createrid"=>$createrid,
                 "arrtime"=>$arrtime,
+                "endtime"=>$endtime,
                 "status"=>1,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),

app/admin/controller/Sale.php

@@ -84,6 +84,7 @@ class Sale extends BaseController
                 "supplierNo"=>$goodinfo['supplierNo'],
                 "companyNo"=>$supplierNo,
                 "spuCode"=>$good_code,
+                "orderCode"=>$orderCode,
                 "good_name"=>$goodinfo['good_name'],
                 "sale_price"=>$goodinfo['sale_price'],
                 "total_fee"=>$goodinfo['total_fee'],
@@ -110,6 +111,7 @@ class Sale extends BaseController
             $cgd=[
                 "supplierNo"=>$ct['supplierNo'],
                 "companyNo"=>$supplierNo,
+                "orderCode"=>$orderCode,
                 "spuCode"=>$ct['spuCode'],
                 "good_name"=>$ct['good_name'],
                 "sale_price"=>$ct['sale_price'],
@@ -366,7 +368,20 @@ class Sale extends BaseController
         ];
         $up =Db::name("purchease_order")->insert($cg);
         if($up){
-            return true;
+            $rela=[
+                "orderCode"=>$data['orderCode'],
+                "cgdNo"=>$cgdCode,
+                "good_num"=>$data['good_num'],
+                "wsend_num"=>$data['good_num'],
+                "send_num"=>0,
+                "wait_num"=>0
+            ];
+            $re =Db::name("order_num")->save($rela);
+            if($re==false){
+                return false;
+            }else{
+                return true;
+            }
         }else{
             return false;
         }
@@ -1520,28 +1535,39 @@ class Sale extends BaseController
         if (empty($codeinfo)) {
             return error_show(1002, "未找到出库数据");
         }
-        $iem = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        $goon = Db::name('good')->alias('b')->join("good_type a", "a.good_code=b.good_code", "left")
-            ->where(['a.type_code' => $iem['good_code']])->find();
-        if (empty($goon)) {
-            return error_show(1003, "未找到商品数据");
-        }
-        $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
+        $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
+        if($item['order_type']==3|| $item['order_type']==4){
+//            $good=Db::name("good_zixun")->where(["spuCode"=>$good_code])->find();
+//            if($good==false){
+//                return error_show(1004,"未找到商品数据");
+//            }
 
+            $goodinfo = Db::name("consult_bids")->where(["spuCode"=>$item['good_code'],"is_del"=>0])->find();
+            if($goodinfo==false){
+                return error_show(1004,"未找到商品数据");
+            }
+        }else{
+            $goodinfo = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
+                ->where(['a.skuCode' =>$item['sku_code']])->find();
+            if ($goodinfo == false) {
+                return error_show(1002, "未找到商品数据");
+            }
 
-        $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
-            ->where(["k.wsm_code" => $codeinfo['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
+        }
+        $int = isset($goodinfo['cat_id']) && $goodinfo['cat_id'] != 0 ? made($goodinfo['cat_id']) : [];
+//        $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
+//            ->where(["k.wsm_code" => $codeinfo['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
         $addr = Db::name("order_addr")->where(["id" => $codeinfo['addrid']])->find();
-        $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
+        //$item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
         $codeinfo['good_name'] = isset($item['good_name']) ? $item['good_name'] : "";
         $codeinfo['good_num'] = isset($item['good_num']) ? $item['good_num'] : "";
         $codeinfo['good_code'] = isset($item['good_code']) ? $item['good_code'] : "";
         $codeinfo['origin_price'] = isset($item['origin_price']) ? $item['origin_price'] : "";
         $codeinfo['sale_price'] = isset($item['sale_price']) ? $item['sale_price'] : "";
         $codeinfo['total_price'] = isset($item['total_price']) ? $item['total_price'] : "";
-        $codeinfo['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-        $codeinfo['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-        $codeinfo['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
+//        $codeinfo['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
+//        $codeinfo['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
+//        $codeinfo['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
         $codeinfo['addr'] = GetAddr($addr['addr_code']);
         $codeinfo['addr'] .= isset($addr['addr']) ? $addr['addr'] : "";
         $codeinfo['addr_code'] = isset($addr['addr_code']) ? $addr['addr_code'] : "";
@@ -1583,27 +1609,110 @@ class Sale extends BaseController
         if($addr==""){
             return error_show(1002, "参数addr不能为空");
         }
+        $addr_code = isset($this->post['addr_code'])&&$this->post['addr_code']!="" ? trim($this->post['addr_code']):"";
+        if($addr_code==""){
+            return error_show(1002, "参数addr_code不能为空");
+        }
         $apply_id = GetUserInfo($token);
         if (empty($apply_id) || $apply_id['code'] != 0) {
             return error_show(1002, "申请人数据不存在");
         }
         $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
         $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
-        $addrid = isset($this->post['addrid']) && $this->post['addrid'] !== "" ? intval($this->post['addrid']) : "";
-        $dr = Db::name('order_addr')->where(['id' => $addrid, 'is_del' => 0])->find();
-        if (empty($dr)) {
-            return error_show(1003, "收货人信息未找到");
-        }
-        if ($dr['orderCode'] !== $orderCode) {
-            return error_show(1002, "订单code不存在");
-        }
+//        $addrid = isset($this->post['addrid']) && $this->post['addrid'] !== "" ? intval($this->post['addrid']) : "";
+//        $dr = Db::name('order_addr')->where(['id' => $addrid, 'is_del' => 0])->find();
+//        if (empty($dr)) {
+//            return error_show(1003, "收货人信息未找到");
+//        }
+//        if ($dr['orderCode'] !== $orderCode) {
+//            return error_show(1002, "订单code不存在");
+//        }
         $sendtime = isset($this->post['sendtime']) && $this->post['sendtime'] !== "" ? $this->post['sendtime'] : date("Y-m-d H:i:s");
 
         try {
+            $addrlst =[
+                "orderCode"=>$orderCode,
+                "addr"=>$addr,
+                "addr_code"=>json_encode($addr_code),
+                "contactor"=>$contactor,
+                "mobile"=>$mobile,
+                "customer_code"=>$der['customer_code'],
+                "post_fee"=>$der['post_fee'],
+                "arrive_time"=>$sendtime,
+                "receipt_quantity"=>$send_num,
+                "is_del"=>0,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            $addrid = Db::name("order_addr")->insert($addrlst,true);
+            if($addrid>0){
+                $data = [
+                    "wsm_code" => "",
+                    "orderCode" => $orderCode,
+                    "outCode" => $outCode,
+                    "order_type" => $der['order_type'],
+                    "apply_id" => $rm,
+                    "apply_name" => $ri,
+                    "addrid" => $addrid,
+                    "post_name" => "",
+                    "post_code" =>"",
+                    "post_fee" => "",
+                    "sendtime" => $sendtime,
+                    "send_num" => $send_num,
+                    "check_num" => 0,
+                    "error_num" => 0,
+                    "status" => 1,
+                    "addtime" => date("Y-m-d H:i:s"),
+                    "updatetime" => date("Y-m-d H:i:s")
+                ];
+                $datainfo = Db::name('order_out')->insert($data,true);
+                if($datainfo>0){
+                    Db::commit();
+                    return app_show(0,"出库单新建成功",["outCode"=>$outCode]);
+                }
+            }
+            Db::rollback();
+            return error_show(1004,"出库单新建失败");
 
         } catch (Exception $e) {
             Db::rollback();
             return error_show(1005, $e->getMessage());
         }
     }
+
+
+    public function outSend(){
+       $outCode=isset($this->post['outCode'])&& $this->post['outCode']!=""? trim($this->post['outCode']):"";
+       if($outCode==""){
+           return error_show(1004,"参数outCode不能为空");
+       }
+       $outinfo = Db::name("order_out")->where(["outCode"=>$outCode])->find();
+       if($outinfo==false){
+           return error_show(1004,"发货数据未找到");
+       }
+       $post_name = isset($this->post['post_name']) &&$this->post['post_name']!="" ? trim($this->post['post_name']):"";
+       if($post_name==""){
+           return error_show(1004,"参数post_name不能为空");
+       }
+        $post_code = isset($this->post['post_code']) &&$this->post['post_code']!="" ? trim($this->post['post_code']):"";
+        if($post_code==""){
+            return error_show(1004,"参数post_code不能为空");
+        }
+        $post_fee = isset($this->post['post_fee']) && $this->post['post_fee']!="" ? floatval($this->post['post_fee'])
+            :"";
+        $outinfo['post_name'] = $post_name;
+        $outinfo['post_code'] = $post_code;
+        $outinfo['post_fee'] = $post_fee;
+        $outinfo['sendtime'] = date("Y-m-d H:i:s");
+        $outinfo['status'] = 2;
+        $outinfo['updatetime'] = date("Y-m-d H:i:s");
+        $up =Db::name("order_out")->save($outinfo);
+        if($up){
+            return app_show(0,"发货成功");
+        }else{
+            return error_show(1004,"发货失败");
+        }
+    }
+
+
 }