ad

app/admin/controller/Consult.php

@@ -807,8 +807,6 @@ class Consult extends Base
             "brand_id"=>$brandid,
             "cat_id"=>$cat_id,
             "specinfo"=>json_encode($specinfo),
-//            "color"=>$color,
-//            "material"=>$material,
             "unit_id"=>$unit_id,
             "cost_desc"=>$cost_desc,
             "work_day"=>$work_day,
@@ -838,7 +836,7 @@ class Consult extends Base
             "total_fee"=>$total_fee,
             "supply_area"=>$supply_area,
             "remark"=>$remark,
-            "sale_price"=>0,
+            "sale_price"=>$total_fee,
             "createrid"=>$createrid,
             "creater"=>$creater,
             "status"=>$zxinfo['status']==1 ?1 :2,

app/admin/controller/Project.php

@@ -355,15 +355,16 @@ class Project extends Base
                     "cost_fee"=>$good["cost_fee"],
                     "num"=>$value["num"],
                 ];
-                if($good['is_gold_price']==1){
-                    $price = GoldPrice($god, 0);
-                }else{
-                    $price = GoodPrice($god, 0);
-                }
-                $good['origin_price'] = $price;
+//                if($good['is_gold_price']==1){
+//                    $price = GoldPrice($god, 0);
+//                }else{
+//                    $price = GoodPrice($god, 0);
+//                }
+                $good['origin_price'] = $good["nake_fee"];
             }
             $nobel =\think\facade\Config::get("noble");
             $value['good_name'] = isset($good['good_name'])?$good['good_name']:"";
+            $value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
             $value['brand_id'] = isset($good['brand_id'])?$good['brand_id']:"";
             $brand = Db::name("brand")->where(['id'=>$value["brand_id"]])->find();
             $value['brand_name'] =isset($brand['brand_name']) ? $brand['brand_name']:"";

app/admin/controller/Sale.php

@@ -404,17 +404,53 @@ class Sale extends BaseController
                     $ou =Db::name("order_out")->insert($out);
                     if($ou==false){
                         Db::rollback();
-                        return error_show(1002,"咨询订单创建失败");
+                        return error_show(1002,"发货地址添加创建失败");
                     }
+                    $num = $value['receipt_quantity'];
+                    $orsend=[];
                     foreach ($order as $val){
-
+                        $tep=[];$ornum=0;
+                        if($val['wsend_num']>=$num){
+                            $val['wsend_num']-=$num;
+                            $val['send_num']+=$num;
+                            $ornum =$num;
+                            $num=0;
+                        }else{
+                            $num-=$val['wsend_num'];
+                            $val['send_num']+=$val['wsend_num'];
+                            $ornum =$val['wsend_num'];
+                            $val['wsend_num']=0;
+                        }
+                        $or =Db::name("order_num")->save($val);
+                        if($or==false){
+                            Db::rollback();
+                            return error_show(1002,"发货地址添加创建失败");
+                        }
+                        $tep=[
+                            "cgdNo"=>$val['cgdNo'],
+                            "outCode"=>$outCode,
+                            "send_num"=>$ornum,
+                            "status"=>1,
+                            "addtime"=>date("Y-m-d H:i:s"),
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                        $sen=Db::name("order_send")->save($tep);
+                        if($sen==false){
+                            Db::rollback();
+                            return error_show(1002,"发货地址添加创建失败");
+                        }
+                        if($num==0){
+                            break;
+                        }
                     }
 
                 }else{
                     Db::rollback();
-                    return error_show(1002,"咨询订单创建失败");
+                    return error_show(1002,"发货地址添加创建失败");
                 }
             }
+            Db::commit();
+            return app_show(0,"发货地址添加完成");
         }catch(\Exception $e){
             Db::rollback();
             return error_show(1002,$e->getMessage());
@@ -1661,7 +1697,12 @@ class Sale extends BaseController
 //            return error_show(1002, "订单code不存在");
 //        }
         $sendtime = isset($this->post['sendtime']) && $this->post['sendtime'] !== "" ? $this->post['sendtime'] : date("Y-m-d H:i:s");
-
+        $order =Db::name("order_num")->where(["orderCode"=>$orderCode,"status"=>1])->where([["wsend_num",">=",0]])
+            ->select()->toArray();
+        if(empty($order)){
+            return error_show(1004,"未找到可以发货得采购单数据");
+        }
+        Db::startTrans();
         try {
             $addrlst =[
                 "orderCode"=>$orderCode,
@@ -1700,6 +1741,43 @@ class Sale extends BaseController
                 ];
                 $datainfo = Db::name('order_out')->insert($data,true);
                 if($datainfo>0){
+                    $num = $send_num;
+                    foreach ($order as $val){
+                        $tep=[];
+                        $ornum=0;
+                        if($val['wsend_num']>=$num){
+                            $val['wsend_num']-=$num;
+                            $val['send_num']+=$num;
+                            $ornum =$num;
+                            $num=0;
+                        }else{
+                            $num-=$val['wsend_num'];
+                            $val['send_num']+=$val['wsend_num'];
+                            $ornum =$val['wsend_num'];
+                            $val['wsend_num']=0;
+                        }
+                        $or =Db::name("order_num")->save($val);
+                        if($or==false){
+                            Db::rollback();
+                            return error_show(1002,"发货地址添加创建失败");
+                        }
+                        $tep=[
+                            "cgdNo"=>$val['cgdNo'],
+                            "outCode"=>$outCode,
+                            "send_num"=>$ornum,
+                            "status"=>1,
+                            "addtime"=>date("Y-m-d H:i:s"),
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                        $sen=Db::name("order_send")->save($tep);
+                        if($sen==false){
+                            Db::rollback();
+                            return error_show(1002,"发货地址添加创建失败");
+                        }
+                        if($num==0){
+                            break;
+                        }
+                    }
                     Db::commit();
                     return app_show(0,"出库单新建成功",["outCode"=>$outCode]);
                 }