ad

app/admin/controller/Consult.php

@@ -801,7 +801,7 @@ class Consult extends Base
 //        $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
 
         //计算毛利率
-        $budget = get_budget($zxinfo['cat_id'], $relaComNo, $zx['platform_code']);
+        $budget = get_budget($zxinfo['cat_id'], $zx['companyNo'], $zx['platform_code']);
 //        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
 
         //部分参数的大小校验

app/admin/controller/InterOrder.php

@@ -48,8 +48,8 @@ class InterOrder extends Base
 			"good_unit|商品单位"=>"require|max:255|min:1",
 			"good_tax|商品税率"=>"require|float",
 			"good_num|商品数量"=>"require|number|gt:0",
-			"sale_price|销售单价"=>"require|float|gt:0",
-			"cgd_price|采购单价"=>"require|float|gt:0",
+			"sale_price|销售总价"=>"require|float|gt:0",
+			"cgd_price|采购总价"=>"require|float|gt:0",
 			"contactor|收货联系人"=>"require|max:255|min:1",
 			"mobile|收货联系方式"=>"require|max:255|min:1",
 			"addr|收货地址"=>"require|max:255|min:1",
@@ -86,10 +86,11 @@ class InterOrder extends Base
 				"good_unit"=>$item['good_unit'],
 				"good_tax"=>$item['good_tax'],
 				"good_num"=>$item['good_num'],
-				"sale_price"=>$item['sale_price'],
-				"cgd_price"=>$item['cgd_price'],
-				"cgd_tax"=>round(1-($item['cgd_price']/$item['sale_price']),4)*100 ,
-				"sale_total"=>round($item['good_num']*$item['sale_price'],2),
+				"sale_price"=>round($item['sale_total']/$item['good_num'],2),
+				"cgd_price"=>round($item['cgd_total']/$item['good_num'],2),
+				"cgd_tax"=>round(1-($item['cgd_total']/$item['sale_total']),4)*100 ,
+				"sale_total"=>$item['sale_total'],
+				"cgd_total"=>$item['cgd_total'],
 				"contactor"=>$item['contactor'],
 				"mobile"=>$item['mobile'],
 				"addr"=>$item['addr'],
@@ -103,17 +104,6 @@ class InterOrder extends Base
 		return error_show(0,"订单录入成功");
     }
 
-    /**
-     * 保存新建的资源
-     *
-     * @param  \think\Request  $request
-     * @return \think\Response
-     */
-    public function save()
-    {
-
-    }
-
     /**
      * 显示指定的资源
      *
@@ -147,35 +137,11 @@ class InterOrder extends Base
 		->page(intval($page),intval($param['size']))
 		->withAttr("cat_info",function ($v){return made($v);})
 		->withAttr("good_unit",function ($v){return Db::name("unit")->where(["id"=>$v])->value("unit",'');})
-
-			->order("id desc")
+		->order("id desc")
 		->select();
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
-    /**
-     * 显示编辑资源表单页.
-     *
-     * @param  int  $id
-     * @return \think\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * 保存更新的资源
-     *
-     * @param  \think\Request  $request
-     * @param  int  $id
-     * @return \think\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
     /**
      * 删除指定资源
      *

app/admin/controller/OrderOutChild.php

@@ -67,6 +67,7 @@ class OrderOutChild extends Base
             'relaComNo' => '',
             'use_type' => '',
             'IsByMe' => '0',
+            "cgdNo"=>""
         ], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
@@ -88,7 +89,7 @@ class OrderOutChild extends Base
         if ($param['order_type'] != '') $where[] = ['a.order_type', '=', $param['order_type']];
         if ($param['relaComNo'] != '') $where[] = ['a.companyNo', '=', $param['relaComNo']];
         if ($param['use_type'] !== '') $where[] = ['p.use_type', '=', $param['use_type']];
-
+		if ($param['cgdNo'] !== '') $where[] = ['m.cgdNo', '=', $param['cgdNo']];
         $condition = '1=1';
         if($param['IsByMe']==1)$condition = '1=0';
         //只有level2的账号过滤数据权限
@@ -103,7 +104,6 @@ class OrderOutChild extends Base
             	if($param['IsByMe']==0){
 	                 $role = $this->checkDataShare();
 	                if (!empty($role[DataGroupModel::$type_全部])) {
-//	                    if ($condition != '') $condition .= " or ";
 	                    $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
 	                }
             	}
@@ -137,16 +137,18 @@ class OrderOutChild extends Base
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
             ->leftJoin('sale d', 'd.orderCode=a.orderCode AND d.is_del=0')
             ->leftJoin('platform p', 'p.id=d.platform_id AND p.is_del=0')
+            ->leftJoin('order_send m', 'a.outCode=m.outCode')
             ->where($where)
             ->where($condition)
             ->count('a.id');
 
         $list = Db::name('order_out_child')
             ->alias('a')
-            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name,p.use_type')
+            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name,p.use_type,m.cgdNo')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
             ->leftJoin('sale d', 'd.orderCode=a.orderCode AND d.is_del=0')
             ->leftJoin('platform p', 'p.id=d.platform_id AND p.is_del=0')
+            ->leftJoin('order_send m', 'a.outCode=m.outCode')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->where($where)
@@ -193,6 +195,7 @@ class OrderOutChild extends Base
             'relaComNo' => '',
             'use_type' => '',
             'IsByMe' => '0',
+            "cgdNo"=>'',
         ], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
@@ -214,6 +217,7 @@ class OrderOutChild extends Base
         if ($param['order_type'] != '') $where[] = ['a.order_type', '=', $param['order_type']];
         if ($param['relaComNo'] != '') $where[] = ['a.companyNo', '=', $param['relaComNo']];
         if ($param['use_type'] !== '') $where[] = ['p.use_type', '=', $param['use_type']];
+        if ($param['cgdNo'] !== '') $where[] = ['m.cgdNo', '=', $param['cgdNo']];
         $condition = '1=1';
         if($param['IsByMe']==1)$condition = '1=0';
         //只有level2的账号过滤数据权限
@@ -228,7 +232,6 @@ class OrderOutChild extends Base
             	if($param['IsByMe']==0){
 	                 $role = $this->checkDataShare();
 	                if (!empty($role[DataGroupModel::$type_全部])) {
-//	                    if ($condition != '') $condition .= " or ";
 	                    $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
 	                }
             	}
@@ -253,6 +256,7 @@ class OrderOutChild extends Base
             $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
              //库管看到所有的库存品发货申请单
             if (!empty($tmp)) $condition .= " or (a.order_type=1 AND c.contactor=" . $this->uid.")";
+            $condition .= " or (a.order_type <>1 )";
 
         }
 

app/admin/controller/Sale.php

@@ -3481,6 +3481,10 @@ class Sale extends Base
         if ($companyNo != "") {
             $where[] = ['b.supplierNo', "like", "%$companyNo%"];
         }
+        $customer_code = isset($this->post['customerCode']) && $this->post['customerCode'] !== "" ? trim($this->post['customerCode']) : "";
+        if ($customer_code != "") {
+            $where[] = ['b.customer_code', "like", "%$customer_code%"];
+        }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
         if ($relaComNo != '') $where[] = ['b.supplierNo', '=', $relaComNo];
@@ -3499,14 +3503,7 @@ class Sale extends Base
         if ($cgdNo != "") {
             $where[] = ["os.cgdNo", 'like', '%' . $cgdNo . '%'];
         }
-//        $role = $this->checkRole();
         $condition = '';
-//        if (!empty($role['write']) && $this->uid != "") {
-//            // $where[]=["a.apply_id","in",$role['write']];
-//            $condition .= " (b.is_stock=1 and n.contactor = {$this->uid}) or (b.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (" . implode(',',
-//                    $role['write']) . ")";
-//        }
-
         //只有level2的账号过滤数据权限
         if ($this->level == 2) {