no commit message

2024-10-18 15:27:40 +08:00
parent 9a2a3a2c8a
commit 559c388ea0
103 changed files with 2021 additions and 783 deletions
--- a/webmain/model/goodsModel.php
+++ b/webmain/model/goodsModel.php
@@ -52,7 +52,7 @@ class goodsClassModel extends Model
 	public function getdaishu()
 	{
 		$where = m('admin')->getcompanywhere(1);
-		return $this->db->rows('`[Q]goodm`','`status`=1 and `state`<>1 '.$where.'');
+		return $this->db->rows('`[Q]goodm`','`status`=1 and `type`<>6 and `state`<>1 '.$where.'');
 	}
 	
 	//判断是否存在相同库存