wugg 2 years ago
parent
commit
3d58f44953

+ 1 - 1
app/admin/controller/Purch.php

@@ -114,7 +114,7 @@ class Purch extends Base
 //            $whereor[]=["po.cgder_id","in",$role['write']];
 //            $whereor[]=["sip.personid","=",$this->uid];
             $whereor[]=["sip.personid","in",$role['write']];
-            $whereor[]=["po.cgder_id","=",$this->uid];
+//            $whereor[]=["po.cgder_id","=",$this->uid];
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["po.cgder_id", 'in', get_company_item_user_by_name($company_name)];

+ 1 - 1
app/admin/controller/Sale.php

@@ -3795,7 +3795,7 @@ class Sale extends Base
 	                      Db::rollback();
 	                      return error_show(1004,"库存bn数据新增失败");
 	                 }
-	                 $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num']);
+	                 $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num'],0);
 	                 if($bnup==false){
 	                      Db::rollback();
 	                      return error_show(1004,"库存bn库存数更新失败");

+ 6 - 4
app/admin/model/GoodStockInfo.php

@@ -55,7 +55,7 @@ class GoodStockInfo extends Model
 	* @throws \think\db\exception\DbException
 	* @throws \think\db\exception\ModelNotFoundException
 	*/
-	static function SaleBn($stockid,int $num){
+	static function SaleBn($stockid,int $num,int $isstock=1){
 		$arr = self::where([["balance_num",">",0]])->where(["stockid"=>$stockid])->select()->toArray();
 		if(empty($arr)) throw new Exception("库存批次数量不足","1006");
 		$list=[];
@@ -82,7 +82,7 @@ class GoodStockInfo extends Model
 				$num=0;
 		    }
 			self::update($update,$item);
-		    self::name("good_stock")->where($stock[$item['stockid']])->update($stockup);
+		    $isstock==0 ?? self::name("good_stock")->where($stock[$item['stockid']])->update($stockup);
 		    $list[]=$temp;
 		}
 		return $list;
@@ -113,8 +113,8 @@ class GoodStockInfo extends Model
 	* @throws \think\db\exception\DbException
 	* @throws \think\db\exception\ModelNotFoundException
 	 */
-	static function OrderBn(string $orderCode, $stockid,int $num){
-        $bnArr=self::SaleBn($stockid,$num);
+	static function OrderBn(string $orderCode, $stockid,int $num,int $isstock=1){
+        $bnArr=self::SaleBn($stockid,$num,$isstock);
         if(empty($bnArr)) throw new Exception("未找到Bn库存数据",1006);
         $ordBn=[];
         foreach ($bnArr as $value){
@@ -235,4 +235,6 @@ class GoodStockInfo extends Model
 		}
 		return $result;
 	}
+
+
 }