提交数据

core/CoreApp/controllers/Whlabel.php

@@ -45,6 +45,7 @@ class Whlabel extends Start_Controller
 		$this->load->_model("Model_logic_u9tools","logic_u9tools");
 		$this->load->_model("Model_whlabelscanlog","whlabelscanlog");
 		$this->load->_model("Model_excel","excelxh");
+		$this->load->_model("Model_whlabelscbf","whlabelscbf");
 	}
 	//定义方法的调用规则 获取URI第二段值
 	public function _remap($arg, $arg_array)
@@ -4135,6 +4136,17 @@ class Whlabel extends Start_Controller
 			}
 			$list = array();
 			$rows = $this->whlabel->find_pc($where, 'enter,sku,warehouse', '*', $order_str);
+
+			$three_month = strtotime('-3 months');
+			$rows_d = $this->whlabelscbf->find_pc($where." and del_time > ".$three_month, 'enter,sku,warehouse', '*', $order_str);
+			
+			$rows_d = array_map(function ($item) {
+				unset($item['del_time']);   // 删除 age 字段
+				return $item;
+			}, $rows_d);
+
+
+			$rows = array_merge($rows, $rows_d);
 			foreach ($rows as $value) {
 				$ck = $this->warehouse->read($value['warehouse']);
 				$warehouse = $ck['title'];

core/CoreApp/models/Model_whlabelscbf.php

@@ -0,0 +1,11 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 
+class Model_whlabelscbf extends Lin_Model 
+{
+	function __construct(){
+	parent::__construct();
+		$this->load->database();
+		$this->table = 'whlabelscbf';
+		$this->load_table('whlabelscbf');
+	}
+	
+}  //end class