no commit message

webmain/model/flow/caigouModel.php

@@ -5,21 +5,15 @@ class flow_caigouClassModel extends flowModel
 	
 	
 	private $goodsobj;
-	
+
 	public function initModel()
 	{
 		$this->goodsobj = m('goods');
 	}
 	
-	//审核完成处理,要通知仓库管理员出入库
+	//审核完成处理,是否直接出入库
 	protected function flowcheckfinsh($zt){
-		/*
-		m('goodss')->update('status='.$zt.'',"`mid`='$this->id'");
-		$aid  = '0';
-		$rows = m('goodss')->getall("`mid`='$this->id'",'aid');
-		foreach($rows as $k=>$rs)$aid.=','.$rs['aid'].'';
-		m('goods')->setstock($aid);
-		*/
+		if($zt==1)m('goods')->chukuopts($this->id, $this->modename);
 	}
 	
 	//作废或删除时

webmain/model/flow/goodlyModel.php

@@ -8,14 +8,9 @@ class flow_goodlyClassModel extends flowModel
 		$this->goodsobj = m('goods');
 	}
 	
-	//审核完成处理
+	//审核完成处理,是否直接出入库
 	protected function flowcheckfinsh($zt){
-		/*
-		m('goodss')->update('status='.$zt.'',"`mid`='$this->id'");
-		$aid  = '0';
-		$rows = m('goodss')->getall("`mid`='$this->id'",'aid');
-		foreach($rows as $k=>$rs)$aid.=','.$rs['aid'].'';
-		m('goods')->setstock($aid);*/
+		if($zt==1)m('goods')->chukuopts($this->id, $this->modename);
 	}
 
 	//作废或删除时
@@ -37,7 +32,7 @@ class flow_goodlyClassModel extends flowModel
 				if(!isempt($one['xinghao']))$name.='('.$one['xinghao'].')';
 				if($lx==1){
 					$rows[$k]['aid'] 	= $name;
-					$rows[$k]['count'] 	= 0-$rs['count']; //负数显示为正数
+					//$rows[$k]['count'] 	= 0-$rs['count']; //负数显示为正数
 					if(isset($rs['lygh'])){
 						$rows[$k]['lygh']=arrvalue($lygya, $rs['lygh']);
 						

webmain/model/flow/meetModel.php

@@ -280,6 +280,7 @@ class flow_meetClassModel extends flowModel
 	{
 		$rows 	= $this->getall("`state` in(0,1) and `type`=0 and `startdt` like '".$this->rock->date."%' and `status`=1");
 		$time	= time();
+		$tplnum	= m('option')->getval('meetsmstpltx', 'meettodo');
 		foreach($rows as $k=>$rs){
 			$this->adminmodel->setcompanyid($rs['comid']); //设置对应单位id
 			$zt 	= $rs['state'];
@@ -304,7 +305,7 @@ class flow_meetClassModel extends flowModel
 						$this->meettodos($rs, '您好，会议即将在'.$ssj.'分钟后的'.$dts[1].'开始，请准时参加。');//快到时间通知
 					
 						//短信通知
-						if($ssj<6)$this->sendsms($rs, 'meettodo', array(
+						if($ssj<6)$this->sendsms($rs, $tplnum, array(
 							'fenz' 		=> ''.$ssj.'',
 							'title' 	=> $rs['title'],
 							'time' 		=> $dts[1],

webmain/model/flow/workModel.php

@@ -3,6 +3,7 @@ class flow_workClassModel extends flowModel
 {
 	private $absfile = false;
 	private $statearr;
+	private $updatexm= false;
 
 	public function initModel()
 	{
@@ -107,7 +108,11 @@ class flow_workClassModel extends flowModel
 		$zt  = 0;
 		if(!isempt($this->rs['distid']))$zt = 3;//待执行的状态值
 		$this->updatestatus($zt);
-		
+		if($this->updatexm)m('work')->updateproject($this->rs['projectid']);
+	}
+	
+	protected function flowcheckfinsh($zt){
+		if($this->updatexm)m('work')->updateproject($this->rs['projectid']);
 	}
 	
 	protected function flowaddlog($a)