修改货物流转的未出库

core/CoreApp/controllers/Transfer.php

@@ -716,11 +716,20 @@ class Transfer extends Start_Controller {
 				$where  .= " and ctime12 > '$timetk' and ctime12 < '$timetj'";
 				if($type)
             	{
-					$type = ($type==1)?'rk':'ck';
-					if($transfer)
-            		{
-						$where  .= " and $type like '%|".$transfer."|%'";
-            		}
+					if($type == 3){
+						if($transfer)
+						{
+							$where  .= " and rk like '%|".$transfer."|%' and rk != ck";
+						}
+					}else{
+						$type = ($type==1)?'rk':'ck';
+						if($transfer)
+						{
+							$where  .= " and $type like '%|".$transfer."|%'";
+						}
+					}
+					
+
             	}
 				else
 				{
@@ -735,11 +744,16 @@ class Transfer extends Start_Controller {
 				$cr  = "time > '$timetk' and time < '$timetj'";
 				if($transfer)
             	{
-                	$cr  .= " and lx = '".$transfer."'";
+                	$cr  .= " and lx = '".$transfer."' ";
             	}
 				if($type)
             	{
-                	$cr  .= " and type = '".$type."'";
+					if($type == 3){
+						$cr  .= " and is_over = 0 ";
+					}else{
+						$cr  .= " and type = '".$type."' ";
+					}
+                	
             	}
 				$fid = '';
 				$info_list_cr = $this->systemtransfer_cr->find_all($cr);

template/erp/transfer_operate.html

@@ -23,6 +23,7 @@
 <option value="">请选择</option>
 <option value="1">入库</option>
 <option value="2">出库</option>
+<option value="3">未出库</option>
 </select>
 </li>
 <li>颜色：<select name="color" class="select">