ad

app/admin/controller/After.php

@@ -1457,11 +1457,13 @@ class After extends Base
                                 ->where(['a.orderCode' => $info['orderCode']])
                                 ->findOrEmpty();
                             if (!empty($cgd_info)) {
-                                Db::name('purchease_order')
+                               $up= Db::name('purchease_order')
                                     ->where(['is_del' => 0, 'id' => $cgd_info['cgd_id']])
+                                    ->data(['updatetime' => date("Y-m-d H:i:s")])
                                     ->inc('th_num', $info['error_num'])
                                     ->inc('th_fee', round($cgd_info['good_price'] * $info['error_num'], 2))
                                     ->update();
+                               if($up==false) throw new Exception('采购单更新失败');
                             }
                         }
 						 $data = [

app/admin/controller/SaleReport.php

@@ -2664,6 +2664,8 @@ class SaleReport extends Base
 	        'supplierNo' => '',
 	        'companyNo' => '',
 	        'supplier_name' => '',
+	        'status' => '',
+	        'personid' => '',
 	        'start_day' => date('Y-m-01'),
 	        'end_day' => date('Y-m-t')], 'post', 'trim');
 
@@ -2672,7 +2674,12 @@ class SaleReport extends Base
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
-
+		if($param['status']!==''){
+			$where[]=["a.status","=",$param['status']];
+		}
+//		if($param['personid']!==''){
+//			$where[]=["a.status","=",$param['status']];
+//		}
         $data = Db::name('purchease_order')
             ->alias('a')
             ->leftJoin("order_num b", "b.cgdNo=a.cgdNo")
@@ -2763,24 +2770,24 @@ class SaleReport extends Base
                 case 0:
                     //to B
                     $list[$val['supplierNo']]['dtotal_cgd']+=$val['total_cgd'];
-                    $list[$val['supplierNo']]['dtotal_fee']+=$val['total_fee'];
+                    $list[$val['supplierNo']]['dtotal_fee']=bcadd($list[$val['supplierNo']]['dtotal_fee'] , $val['total_fee'],2);
                     $total['dtotal_cgd']+=$val['total_cgd'];
-                    $total['dtotal_fee']+=$val['total_fee'];
+                    $total['dtotal_fee']=bcadd( $total['dtotal_fee'], $val['total_fee'],2);
                     break;
 
                 case 1:
                 case 2:
                     //to C
                     $list[$val['supplierNo']]['wtotal_cgd']+=$val['total_cgd'];
-                    $list[$val['supplierNo']]['wtotal_fee']+=$val['wtotal_fee'];
+                    $list[$val['supplierNo']]['wtotal_fee']=bcadd( $list[$val['supplierNo']]['wtotal_fee'], $val['wtotal_fee'],2);
                     $total['wtotal_cgd']+=$val['total_cgd'];
-                    $total['wtotal_fee']+=$val['wtotal_fee'];
+                    $total['wtotal_fee']=bcadd( $total['wtotal_fee'], $val['wtotal_fee'],2);
                     break;
             }
             $list[$val['supplierNo']]['total_cgd']+=$val['total_cgd'];
-            $list[$val['supplierNo']]['total_fee']+=$val['total_fee'];
+            $list[$val['supplierNo']]['total_fee']=bcadd( $list[$val['supplierNo']]['total_fee'], $val['total_fee'],2);
             $total['total_cgd']+=$val['total_cgd'];
-            $total['total_fee']+=$val['total_fee'];
+            $total['total_fee']=bcadd( $total['total_fee'], $val['total_fee'],2);
 
         }
 
@@ -3151,21 +3158,22 @@ class SaleReport extends Base
 			}
 			switch ($value['use_type']){
 				case 1:
-					$data[$value['supplierNo']]['tob']+=$value['feed_num'];
-					$nmer['tob']+=$value['feed_num'];
+					$data[$value['supplierNo']]['tob']= bcadd($data[$value['supplierNo']]['tob'],$value['feed_num'],2);
+
+					$nmer['tob']=bcadd($nmer['tob'],$value['feed_num'],2);
 					break;
 				case 2:
-					$data[$value['supplierNo']]['toc']+=$value['feed_num'];
-					$nmer['toc']+=$value['feed_num'];
+					$data[$value['supplierNo']]['toc']=bcadd($data[$value['supplierNo']]['toc'],$value['feed_num'],2);
+					$nmer['toc']=bcadd($nmer['toc'],$value['feed_num'],2);
 					break;
 			}
-			$data[$value['supplierNo']]['feed_num']+=$value['feed_num'];
-			$data[$value['supplierNo']]['good_num']+=$value['good_num'];
-			$data[$value['supplierNo']]['total_price']+=$value['total_price'];
+			$data[$value['supplierNo']]['feed_num']=bcadd($data[$value['supplierNo']]['feed_num'],$value['feed_num'],2);
+			$data[$value['supplierNo']]['good_num']=bcadd($data[$value['supplierNo']]['good_num'],$value['good_num'],2);
+			$data[$value['supplierNo']]['total_price']=bcadd($data[$value['supplierNo']]['total_price'],$value['total_price'],2);
 
-			$nmer['feed_num']+=$value['feed_num'];
-			$nmer['good_num']+=$value['good_num'];
-			$nmer['total_price']+=$value['total_price'];
+			$nmer['feed_num']=bcadd($value['feed_num'],$nmer['feed_num'],2);
+			$nmer['good_num']=bcadd($value['good_num'],$nmer['good_num'],2);
+			$nmer['total_price']=bcadd($value['total_price'],$nmer['total_price'],2);
 		}
         return app_show(0, '请求成功', array_values($data));
 	 }
@@ -3207,7 +3215,7 @@ class SaleReport extends Base
 			$value['stock_num'] = Db::name("good_stock")->where("spuCode",$value['good_code'])->sum("usable_stock");
 			if($value['is_stock']==1){
 				$value['good_price'] = Db::name("purchease_order")->where(["spuCode"=>$value['good_code'],"order_source"=>0])->value("good_price",0);
-				$value['total_fee'] = round($value['good_price']*$value['good_num'],2);
+				$value['total_fee'] = bcmul($value['good_price'],$value['good_num'],2);
 			}
 			$data[]= $value;
 		}
@@ -3243,7 +3251,7 @@ class SaleReport extends Base
 			$value['当日剩余可用库存'] = Db::name("good_stock")->where("spuCode",$value['商品编号'])->sum("usable_stock");
 			if($value['is_stock']==1){
 				$value['库存采购单价'] = Db::name("purchease_order")->where(["spuCode"=>$value['商品编号'],"order_source"=>0])->value("good_price",0);
-				$value['当日库存消耗金额'] = round($value['库存采购单价']*$value['当日库存销售'],2);
+				$value['当日库存消耗金额'] = bcmul($value['库存采购单价'],$value['当日库存销售'],2);
 			}
 			unset($value['is_stock']);
 			$data[]= $value;