преди 7 месеца · c5d80fc6cc
--- a/.user.ini
+++ b/.user.ini
@@ -0,0 +1 @@
 
				+open_basedir=/www/wwwroot/1.wepolicy.cn/:/tmp/
			
--- a/.well-known/acme-challenge/py2ZZAKT7_C_KvqBkZIBSYMLXRbGRE6kTjdNlU5rGHQ
+++ b/.well-known/acme-challenge/py2ZZAKT7_C_KvqBkZIBSYMLXRbGRE6kTjdNlU5rGHQ
@@ -0,0 +1 @@
 
				+py2ZZAKT7_C_KvqBkZIBSYMLXRbGRE6kTjdNlU5rGHQ.g08JR1D1oqzUu8uSRzemtcHIMHh-NIa29o3LoMj77Ps
			
--- a/.well-known/pki-validation/fileauth.txt
+++ b/.well-known/pki-validation/fileauth.txt
@@ -0,0 +1 @@
 
				+2024071400000018ybebeaaecw7wbk1n7ixwvehv725iffj96uzoqtk57jo7lumc
			
--- a/404.html
+++ b/404.html
@@ -0,0 +1,26 @@
 
				+<!doctype html>
			
 
				+<html>
			
 
				+<head>
			
 
				+<meta charset="utf-8">
			
 
				+<meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
			
 
				+<title>404</title>
			
 
				+<style>
			
 
				+	body{
			
 
				+		background-color:#444;
			
 
				+		font-size:14px;
			
 
				+	}
			
 
				+	h3{
			
 
				+		font-size:60px;
			
 
				+		color:#eee;
			
 
				+		text-align:center;
			
 
				+		padding-top:30px;
			
 
				+		font-weight:normal;
			
 
				+	}
			
 
				+</style>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+<h3>404，您请求的文件不存在!</h3>
			
 
				+</body>
			
 
				+</html>
			
--- a/a.xlsx
+++ b/a.xlsx
--- a/core/CoreApp/controllers/Aa.php
+++ b/core/CoreApp/controllers/Aa.php
--- a/core/CoreApp/controllers/Aatest.php
+++ b/core/CoreApp/controllers/Aatest.php
@@ -0,0 +1,83 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Aatest extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+        parent::__construct();
			
 
				+        $this->load->library('session');
			
 
				+		$this->load->_model('Model_whlabel','whlabel');
			
 
				+		$this->load->_model('Model_warehouse','warehouse');
			
 
				+		$this->load->_model('Model_productprice','productprice');
			
 
				+		$this->load->_model('Model_excel','excel');
			
 
				+		$this->load->_model('Model_fullorder','fullorder');
			
 
				+		$this->load->_model('Model_fullordertt','fullordertt');
			
 
				+		$this->load->_model('Model_fullordersmt','fullordersmt');
			
 
				+		$this->load->_model('Model_outbound','outbound');
			
 
				+		$this->load->_model('Model_express','express');
			
 
				+		$this->load->_model('Model_shop','shop');
			
 
				+		$this->load->_model('Model_typeclass','typeclass');
			
 
				+		$this->load->_model('Model_country','country');
			
 
				+		$this->load->_model('Model_kdniao','kdniao');
			
 
				+		$this->load->_model('Model_notice','notice');
			
 
				+		$this->load->_model('Model_dhl','dhl');
			
 
				+		$this->load->_model('Model_dhlhz','dhlhz');
			
 
				+		$this->load->_model('Model_usps','usps');
			
 
				+		$this->load->_model('Model_fedex','fedex');
			
 
				+		$this->load->_model('Model_fedex_cby','fedex_cby');
			
 
				+		$this->load->_model('Model_ups','ups');
			
 
				+		$this->load->_model('Model_ali','ali');
			
 
				+		$this->load->_model('Model_dpd','dpd');
			
 
				+		$this->load->_model('Model_shop','shop');
			
 
				+		$this->load->_model('Model_user','user');
			
 
				+		$this->load->_model('Model_whlabel','whlabel');
			
 
				+		$this->load->_model('Model_specialstock','specialstock');
			
 
				+		$this->load->_model('Model_ck','ck');
			
 
				+		$this->load->_model('Model_whlabellabel','whlabellabel');
			
 
				+		$this->load->_model('Model_apiyy','apiyy');
			
 
				+		$this->load->helper('url');
			
 
				+		$this->load->_model('Model_whlabel_fc','whlabel_fc');
			
 
				+		$this->load->_model('Model_systemtransfer','systemtransfer');
			
 
				+		$this->load->_model('Model_classid','classid');
			
 
				+		$this->load->_model('Model_allocation','allocation');
			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');
			
 
				+		$this->load->_model('Model_fullorderpaypal','fullorderpaypal');
			
 
				+    	//$this->load->_model('Model_fedexv1','fedexv1');
			
 
				+		$this->load->_model('Model_logic_crm','logic_crm');
			
 
				+		$this->load->_model("Model_fullorder","fullorder");
			
 
				+		$this->load->_model("Model_express","express");
			
 
				+		$this->load->_model("Model_logic_ding","logic_ding");
			
 
				+    }
			
 
				+
			
 
				+    //定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		
			
 
				+		if($arg == 'fout')
			
 
				+        {
			
 
				+             $this->_fout();
			
 
				+        }else{
			
 
				+			$this->_a($arg_array);
			
 
				+		}
			
 
				+    }
			
 
				+
			
 
				+    public function _a($arg_array){
			
 
				+        
			
 
				+        
			
 
				+        $this->logic_ding->sendToDing("程序测试 20250115  !!换秘钥!!");
			
 
				+		die;
			
 
				+        
			
 
				+//         $d = $this->fullorder->get_number("KISS-50102-034");
			
 
				+// 		$ex = $this->express->read($d['express']);
			
 
				+// 		;
			
 
				+	
			
 
				+// 		$this->logic_crm->sendOutWarehouse($d,$ex);
			
 
				+//         die;
			
 
				+        
			
 
				+	
			
 
				+	    
			
 
				+    }
			
 
				+	public function _fout()
			
 
				+	{
			
 
				+		
			
 
				+        $this->fedexv1->makeAccessToken();
			
 
				+		
			
 
				+	}
			
 
				+}
			
--- a/core/CoreApp/controllers/Ab.php
+++ b/core/CoreApp/controllers/Ab.php
--- a/core/CoreApp/controllers/Ac.php
+++ b/core/CoreApp/controllers/Ac.php
--- a/core/CoreApp/controllers/Amazonbarcode.php
+++ b/core/CoreApp/controllers/Amazonbarcode.php
@@ -16,6 +16,10 @@ class Amazonbarcode extends Start_Controller {
 
				 		else if($arg == 'print')

			
 
				         {

			
 
				              $this->_print();

			
 
				+        }

			
 
				+		else if($arg == 'usaprint')

			
 
				+        {

			
 
				+             $this->_usaprint();

			
 
				         }

			
 
				 		else if($arg == 'see')

			
 
				         {

			
@@ -78,7 +82,7 @@ class Amazonbarcode extends Start_Controller {
 
				 		    {

			
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				-			$info_list = $this->amazonbarcode->find_all($where,'id,title,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				+			$info_list = $this->amazonbarcode->find_all($where,'id,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				             foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
 
				 				if($value['time'] != 0)

			
@@ -97,7 +101,7 @@ class Amazonbarcode extends Start_Controller {
 
				 				{

			
 
				 					$info_list[$key]['addtime'] = '';

			
 
				 				}

			
 
				-				$info_list[$key]['cz'] = "<span class='amazonbarprint' data-id='".$value['id']."' data-num='".$value['num']."'>打印</span>";

			
 
				+				$info_list[$key]['cz'] = "<span class='amazonbarprint' data-id='".$value['id']."' data-num='".$value['num']."'>国内</span><span style='margin-left:10px;background: #2ca8a1;' class='usaamazonbarprint' data-id='".$value['id']."' data-num='".$value['num']."'>美仓</span>";

			
 
				             }

			
 
				 			$total = $this->amazonbarcode->find_count($where);

			
 
				 		    $pagenum = ceil($total/$perpage);

			
@@ -151,7 +155,7 @@ class Amazonbarcode extends Start_Controller {
 
				 		    {

			
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				-			$info_list = $this->amazonbarcode->find_all($where,'id,title,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				+			$info_list = $this->amazonbarcode->find_all($where,'id,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				             foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
 
				 				if($value['time'] != 0)

			
@@ -255,6 +259,29 @@ class Amazonbarcode extends Start_Controller {
 
				 		}

			
 
				 	}

			
 
				 	

			
 
				+	public function _usaprint()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+			$v = $this->input->post('s');

			
 
				+			$va = explode(',',rtrim($v,','));

			
 
				+			$n = $this->input->post('n');

			
 
				+			$sl = $this->input->post('sl');

			
 
				+			$text = array();$text['data'] = array();$time = time();

			
 
				+			$data = $this->amazonbarcode->read($va[$n]);

			
 
				+			$rows = array('number'=>$data['number'],'usanumber'=>str_replace(array('#','*'),array('',''),$data['number']),'label'=>$data['label'],'label2'=>$data['label2'],'num'=>$sl,'data'=>$v,'n'=>$n-1);

			
 
				+			if($this->amazonbarcode->save(array('print'=>1,'time'=>$time),$data['id']))

			
 
				+        	{

			
 
				+         		echo json_encode(array('rows'=>($rows),'success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{	

			
 
				+           		echo json_encode(array('msg'=>'数据写入异常，请重新打印！','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+	}

			
 
				+	

			
 
				 	public function _addexcel()

			
 
				 	{

			
 
				 		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
@@ -301,11 +328,10 @@ class Amazonbarcode extends Start_Controller {
 
				 				{

			
 
				 					continue;

			
 
				 				}

			
 
				-				$post['title'] =  $value['0'];

			
 
				-				$post['number'] =  $value['1'];

			
 
				-				$post['label'] =  ($value['2'])?$value['2']:'';

			
 
				-				$post['label2'] =  ($value['3'])?$value['3']:'';

			
 
				-				$post['num'] =  $value['4'];

			
 
				+				$post['number'] =  $value['0'];

			
 
				+				$post['label'] =  ($value['1'])?$value['1']:'';

			
 
				+				$post['label2'] =  ($value['2'])?$value['2']:'';

			
 
				+				$post['num'] =  $value['3'];

			
 
				 				$post['addtime'] =  $time;

			
 
				 				if(!is_numeric($post['num']))

			
 
				 				{

			
--- a/core/CoreApp/controllers/Api.php
+++ b/core/CoreApp/controllers/Api.php
--- a/core/CoreApp/controllers/Apicjgx.php
+++ b/core/CoreApp/controllers/Apicjgx.php
@@ -0,0 +1,247 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+/**
			
 
				+ * 作为检测车间功效的定时任务
			
 
				+ */
			
 
				+class Apicjgx extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+		parent::__construct();
			
 
				+        $this->load->_model('Model_systemtransfer','systemtransfer');
			
 
				+        $this->load->_model("Model_systemtransfer_cr",'systemtransfer_cr');
			
 
				+        $this->load->_model("Model_transfer",'transfer');
			
 
				+        $this->load->_model("Model_fullorder","fullorder");
			
 
				+        $this->load->_model("Model_fullordersmt","fullordersmt");
			
 
				+        $this->load->_model("Model_fullordertt","fullordertt");
			
 
				+    }
			
 
				+    //定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg ==  'cjgx' ){
			
 
				+            //执行车间效率检测
			
 
				+            $this->_cjgx();
			
 
				+        }else{
			
 
				+            $this->_index();
			
 
				+        }
			
 
				+    }
			
 
				+    public function  _index(){
			
 
				+        echo "程序异常";
			
 
				+    }
			
 
				+
			
 
				+    public function dd($val){
			
 
				+        echo "<pre>";
			
 
				+        var_dump($val);
			
 
				+        die;
			
 
				+    }
			
 
				+
			
 
				+    public function _cjgx(){
			
 
				+        $limit_time = time() - 3600*24*30;
			
 
				+        $list = $this->systemtransfer->find_all("status < 10 and time >= ".$limit_time);
			
 
				+        if(empty($list)){
			
 
				+            die(json_encode(array('code'=>0,'msg'=>'没有需要检测的工单'),JSON_UNESCAPED_UNICODE));
			
 
				+        }
			
 
				+        echo date('Y-m-d H:i:s')."开始执行车间效率检测".PHP_EOL;
			
 
				+        foreach ($list as $val){
			
 
				+            $this->doSingleData($val);
			
 
				+        }
			
 
				+        echo date('Y-m-d H:i:s')."执行车间效率检测结束".PHP_EOL;
			
 
				+        
			
 
				+    }
			
 
				+    //单独处理每个工单的状态判断
			
 
				+    public function doSingleData($info){
			
 
				+        $lbrk = array_reverse(explode('|',trim($info['rk'],'|')));
			
 
				+       
			
 
				+		$lbck = array_reverse(explode('|',trim($info['ck'],'|')));
			
 
				+        //如果是11 说明是成品库 说明已经入库完毕了 表示已经完毕 
			
 
				+        if($lbrk[0] == 11){
			
 
				+            $this->checkOver($info['id']);
			
 
				+            return;
			
 
				+        }
			
 
				+        //检测出入库都存在时 是否做过标记  在出库的时候已经同步过了
			
 
				+        if($lbrk[0] == $lbck[0]){
			
 
				+            // if(!in_array($lbrk[0],[11,12,15,16])){
			
 
				+            //     $this->checkIsOver($info,$lbrk[0]);
			
 
				+            //     return;
			
 
				+            // }
			
 
				+            return ;
			
 
				+        }
			
 
				+        //如果是 成品库 布标打印 发块 滞销款 不做处理  再次判定状态是否是 超时一次 超时两次 
			
 
				+        if(!in_array($lbrk[0],[11,12,15,16])){
			
 
				+            $this->jdgeTimeOut($info,$lbrk[0]);
			
 
				+        }
			
 
				+       
			
 
				+    }
			
 
				+    //如果检测到最后的入库是
			
 
				+    /**
			
 
				+     * $id  工单主键id
			
 
				+     */
			
 
				+    public function checkOver($id){
			
 
				+        $this->systemtransfer->save(array('status'=>10),$id);
			
 
				+        $this->load->database();
			
 
				+        //同步表示 此单已经到成品库 完结了
			
 
				+        $this->db->where('fid',$id);
			
 
				+        $this->db->update('systemtransfer_cr',array('is_over'=>3));
			
 
				+        $this->db->affected_rows();
			
 
				+    }
			
 
				+    //检测是否已经完结 如果完结 且已经标记 那么不做处理 如果为做标记 那么就坐下处理
			
 
				+    /**
			
 
				+     * $fid  工单主键id
			
 
				+     * $lx  车间id
			
 
				+     */
			
 
				+    public function checkIsOver($info,$lx){
			
 
				+        $fid = $info['id'];
			
 
				+        $list = $this->systemtransfer_cr->find_all("fid = ".$fid,"*",'id desc',0,2);
			
 
				+        //如果查到的数据小于2 那么就说明此单异常
			
 
				+        if(count($list) < 2){
			
 
				+            //echo json_encode(array('code'=>0,'msg'=>'程序异常','data'=>['info'=>$info,'list'=>$list]),JSON_UNESCAPED_UNICODE);
			
 
				+            return ;
			
 
				+        }
			
 
				+      
			
 
				+        //如果查到的数据不等于指定的车间id 说明程序异常了 先不执行
			
 
				+        if(($list[0]['lx'] != $lx) || ($list[1]['lx'] != $lx)){
			
 
				+            return ;
			
 
				+        }
			
 
				+       
			
 
				+        if(($list[0]['is_over'] == 0) || ($list[1]['is_over'] == 0)){
			
 
				+            
			
 
				+            if($list[1]['orver_flag'] == 2){
			
 
				+                $this->systemtransfer_cr->save(['is_over'=>1,'orver_flag'=>2],$list[0]['id']);
			
 
				+            }else{
			
 
				+                $this->systemtransfer_cr->save(['is_over'=>1],$list[0]['id']);
			
 
				+            }
			
 
				+            $this->systemtransfer_cr->save(['is_over'=>1],$list[1]['id']);
			
 
				+            
			
 
				+        }
			
 
				+       
			
 
				+        return ;
			
 
				+
			
 
				+    }
			
 
				+    //判定是否超时
			
 
				+    public function jdgeTimeOut($info,$lx){
			
 
				+        $list = $this->systemtransfer_cr->find_all("fid = ".$info['id'],"*",'id desc',0,1);
			
 
				+        if(empty($list)){
			
 
				+            return ;
			
 
				+        }
			
 
				+        if($list[0]['lx'] != $lx){
			
 
				+            return ;
			
 
				+        }
			
 
				+        //查询流转部分要求
			
 
				+        $depart_info  = $this->transfer->find("id = ".$lx);
			
 
				+        if(empty($depart_info)){
			
 
				+            return ;
			
 
				+        }
			
 
				+        $now_time = time();
			
 
				+        $ru_time =  $list[0]['time'];//扫描时间
			
 
				+        // $overtime_one = $depart_info['overtime_one'] * 3600;
			
 
				+        // $overtime_two = $depart_info['overtime_two'] * 3600;
			
 
				+        //如果时间节点一样 就不再执行了
			
 
				+        if($depart_info['overtime_one'] == $depart_info['overtime_two']){
			
 
				+            return ;
			
 
				+        }
			
 
				+        $overtime_one = $depart_info['overtime_one'] * 3600 ;
			
 
				+        $overtime_two = $depart_info['overtime_two']  * 3600;
			
 
				+
			
 
				+        //不选超时
			
 
				+        if(($now_time - $ru_time) < $overtime_one){
			
 
				+            return ;
			
 
				+        }
			
 
				+        $limit_time = [
			
 
				+            'overtime_one'=> $depart_info['overtime_one'],
			
 
				+            'overtime_two'=>$depart_info['overtime_two'],
			
 
				+        ];
			
 
				+        
			
 
				+        $remain_time = $now_time - $ru_time;
			
 
				+        
			
 
				+        $num = $this->weektimes($ru_time , $now_time);
			
 
				+        if($num > 0 ){
			
 
				+            $remain_time = $remain_time - 24 * 3600 * $num;
			
 
				+        }
			
 
				+        //前处理有时间1 就是超时提醒
			
 
				+        // if($lx == 5){
			
 
				+        //     //超时一次的
			
 
				+        //     if(($now_time - $ru_time) >= $overtime_one ){
			
 
				+        //         if($list['0']['orver_flag'] == 0){
			
 
				+        //             $this->systemtransfer_cr->save(['orver_flag'=>1,'limit_time_str'=> json_encode($limit_time)],$list['0']['id']);
			
 
				+        //         }
			
 
				+        //     }
			
 
				+        // }else{
			
 
				+            //超时一次的
			
 
				+            if(( $remain_time) >= $overtime_one && ( $remain_time) < $overtime_two){
			
 
				+                if($list['0']['orver_flag'] == 0){
			
 
				+                    
			
 
				+                    $type = $this->checkOrderInfo($info['number']);
			
 
				+                    if($type == 1){//订单取消了或者其他原因 在没出库的情况下就完成了
			
 
				+                        $this->systemtransfer_cr->save(['orver_flag'=>3],$list[0]['id']);
			
 
				+                    }elseif($type == 10){
			
 
				+                        $this->systemtransfer_cr->save(['orver_flag'=>1,'limit_time_str'=> json_encode($limit_time)],$list[0]['id']);
			
 
				+                    }
			
 
				+                   
			
 
				+                }
			
 
				+            }
			
 
				+            //超时2次的
			
 
				+            if(( $remain_time) >= $overtime_two){
			
 
				+                if($list[0]['orver_flag'] <= 1){
			
 
				+                    //$this->systemtransfer_cr->save(['orver_flag'=>2,'limit_time_str'=> json_encode($limit_time)],$list['0']['id']);
			
 
				+                    
			
 
				+                    $type = $this->checkOrderInfo($info['number']);
			
 
				+                    if($type == 1){//订单取消了或者其他原因 在没出库的情况下就完成了
			
 
				+                        $this->systemtransfer_cr->save(['orver_flag'=>3],$list[0]['id']);
			
 
				+                    }elseif($type == 10){
			
 
				+                        $this->systemtransfer_cr->save(['orver_flag'=>2,'limit_time_str'=> json_encode($limit_time)],$list[0]['id']);
			
 
				+                    }else{
			
 
				+
			
 
				+                    }
			
 
				+                }
			
 
				+            }
			
 
				+        //}
			
 
				+       
			
 
				+    }
			
 
				+    //检测是否含有周日
			
 
				+    protected function weektimes($start_time,$endstime)
			
 
				+    {
			
 
				+        //是否有周六周日
			
 
				+         $week_array = [7, 1, 2, 3, 4, 5, 6];
			
 
				+         $i = 0;
			
 
				+         while ($start_time <= $endstime) {
			
 
				+             $now_time = date('Y-m-d', $start_time);
			
 
				+             // 可根据自己想要的返回格式进行调整
			
 
				+             $alltime[$i]['week'] = $week_array[date("w", strtotime($now_time))];
			
 
				+             $start_time = strtotime('+1 day', $start_time);
			
 
				+             $i++;
			
 
				+         }
			
 
				+         $list = [];
			
 
				+         foreach ($alltime as $key => $value) {
			
 
				+         		//周日数组
			
 
				+             if ($value['week'] > 6) {
			
 
				+                 $list[] = $value['week'];
			
 
				+             }
			
 
				+         }
			
 
				+         
			
 
				+         
			
 
				+        return count($list);
			
 
				+    }
			
 
				+    
			
 
				+     //检验订单的状态 
			
 
				+    protected function checkOrderInfo($number){
			
 
				+        $nu = $this->fullorder->get_number($number);
			
 
				+        if(!$nu)
			
 
				+        {
			
 
				+            $nu = $this->fullordersmt->get_number($number);
			
 
				+            if(!$nu)
			
 
				+            {
			
 
				+                $nu = $this->fullordertt->get_number($number);
			
 
				+            }
			
 
				+        }
			
 
				+        //此单已取消！请联系店员核实
			
 
				+        if($nu['state'] == '214' || $nu['state'] == '217')
			
 
				+        {
			
 
				+            return 1;
			
 
				+        }
			
 
				+        //因为某些原因订单虽然现实是完成 但是实际上是终止了 所以就按照取消计算吧  
			
 
				+        // if($nu['state'] == '216' || $nu['state'] == '215')
			
 
				+        // {
			
 
				+        //     return 1;
			
 
				+        // }
			
 
				+        return 10;
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/core/CoreApp/controllers/Apiexpress.php
+++ b/core/CoreApp/controllers/Apiexpress.php
@@ -0,0 +1,79 @@
 
				+<?php
			
 
				+defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Apiexpress extends Start_Controller {
			
 
				+    public function __construct(){
			
 
				+		parent::__construct();
			
 
				+        $this->load->_model('Model_logic_order','logic_order');
			
 
				+        $this->load->_model('Model_logic_tools','logic_tools');
			
 
				+        $this->load->_model('Model_awlgx','awlgx');
			
 
				+        $this->load->_model("Model_express","express");
			
 
				+    }
			
 
				+    //定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+       
			
 
				+        if($arg == 'search')
			
 
				+        {
			
 
				+            $this->search($arg_array);
			
 
				+        }else{
			
 
				+            $this->_a();
			
 
				+        }
			
 
				+    }
			
 
				+    public function _a(){
			
 
				+        die();
			
 
				+    }
			
 
				+    /**
			
 
				+     * 搜索订单状态和快递信息接口
			
 
				+     * @param $arg_array[0] string 请求店铺 
			
 
				+     * @param $arg_array[1] string 请求单号
			
 
				+     */
			
 
				+    public function search($arg_array){
			
 
				+        $shop = $arg_array[0];
			
 
				+        $order_no = $arg_array[1];
			
 
				+        
			
 
				+        if(empty($shop)){
			
 
				+            die($this->logic_tools->ret_json(-1,"请求店铺异常"));
			
 
				+        }
			
 
				+        if(empty($order_no)){
			
 
				+            die($this->logic_tools->ret_json(-1,"请求单号异常"));
			
 
				+        }
			
 
				+        $table_name = $this->logic_tools->getOrderTable($shop);
			
 
				+        $info = $this->logic_order->getInfoByTableName($table_name,"orderinfo = ".$order_no);
			
 
				+        if(empty($info)){
			
 
				+            die($this->logic_tools->ret_json(-1,"未查询到订单信息"));
			
 
				+        }
			
 
				+        $receive_time = "";//客户签到时间
			
 
				+        $shipping_time = "";//快递接受发货时间
			
 
				+        $express_trace = [];
			
 
				+        $express_info = $this->express->read($info['express']);
			
 
				+        
			
 
				+        if(!empty($info['excontent'])){
			
 
				+            $tmp_arr =  explode("<br />",$info['excontent']);
			
 
				+            array_pop($tmp_arr);
			
 
				+            $re_arr = array_reverse($tmp_arr);
			
 
				+            $shipping_time_arr = explode("[",$re_arr[0] ) ;
			
 
				+            $shipping_time = $shipping_time_arr[0];
			
 
				+            if($info['expressstate'] == 6){
			
 
				+                $receive_tmp_arr =  explode("[",$tmp_arr[0] ) ;
			
 
				+                $receive_time = $receive_tmp_arr[0];
			
 
				+            }
			
 
				+            $express_trace = $re_arr;
			
 
				+        }
			
 
				+        
			
 
				+        $ret_arr = [
			
 
				+            "express_name"=>$express_info['iscode'],
			
 
				+            "waybill"=>$info['waybill'],
			
 
				+            "preparing"=>empty($info['dtime'])?"":date("Y-m-d H:i:s",$info['dtime']),//店家处理
			
 
				+            "warehouse_processing"=>empty($info['printtime'])?"":date("Y-m-d H:i:s",$info['printtime']),//工厂处理
			
 
				+            "shipping"=>$shipping_time,//快递发货
			
 
				+            "received"=>$receive_time,//客户收货
			
 
				+            "express_trace"=>$express_trace,//快递跟踪信息
			
 
				+        ];
			
 
				+        echo "<pre>";
			
 
				+        var_dump($ret_arr);
			
 
				+        die;
			
 
				+        die($this->logic_tools->ret_json(1,"success",$ret_arr));
			
 
				+
			
 
				+
			
 
				+    }
			
 
				+}
			
--- a/core/CoreApp/controllers/Apismt.php
+++ b/core/CoreApp/controllers/Apismt.php
--- a/core/CoreApp/controllers/Apitt.php
+++ b/core/CoreApp/controllers/Apitt.php
--- a/core/CoreApp/controllers/Apixw.php
+++ b/core/CoreApp/controllers/Apixw.php
--- a/core/CoreApp/controllers/Apiyy.php
+++ b/core/CoreApp/controllers/Apiyy.php
@@ -55,10 +55,18 @@ class Apiyy extends Start_Controller {
 
				 		if($arg == 'c')

			
 
				         {

			
 
				              $this->_c();

			
 
				+        }

			
 
				+		else if($arg == 'cs')

			
 
				+        {

			
 
				+             $this->_cs($arg_array);

			
 
				         }

			
 
				 		else if($arg == 'excel')

			
 
				         {

			
 
				              $this->_excel($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'xxpl')

			
 
				+        {

			
 
				+             $this->_xxpl();

			
 
				         }

			
 
				 		else if($arg == 'rz')

			
 
				         {

			
@@ -144,13 +152,17 @@ class Apiyy extends Start_Controller {
 
				 		$f = array('fullordersmt','fullordertt','fullorder');

			
 
				 		foreach($f as $v)

			
 
				 		{

			
 
				-		    $d = $this->$v->find_all("librarytime > '".(time()-(5*24*3600))."' and (type = '13' or type = '16') and dbapi < 99");

			
 
				+		    $d = $this->$v->find_all("librarytime > '".(time()-(12*24*3600))."' and (type = '13' or type = '16') and dbapi < 99");

			
 
				 			if($d)

			
 
				 			{

			
 
				 		        $h = $this->_list($d,$v);

			
 
				 			    foreach($h as $vv)

			
 
				 			    {

			
 
				 				    $x = 0;$c = 0;

			
 
				+					if(!isset($vv[0]))

			
 
				+					{

			
 
				+						continue;

			
 
				+					}

			
 
				 				    $xs = $this->apiyy->_cxxsdd($vv['0']);

			
 
				 				    $chd = $this->apiyy->_cxchd($vv['0']);

			
 
				 				    if(isset($xs['Data'][0]))

			
@@ -305,6 +317,10 @@ class Apiyy extends Start_Controller {
 
				 				$pm = array_filter($pm);//去除空值

			
 
				 				$zh = implode(" ",$pm);

			
 
				 				$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));

			
 
				+				if(!isset($ts[1]))

			
 
				+				{

			
 
				+					$ts[1] = '无';

			
 
				+				}

			
 
				 				$lh = $this->apiyy->get_cjlp(array('jm'=>$jm,'title'=>$ts[1],'zh'=>$zh,'bm'=>$bm.implode("",$bmpx)));

			
 
				 				if(isset($lh['Data'][0]))

			
 
				 				{

			
@@ -360,10 +376,13 @@ class Apiyy extends Start_Controller {
 
				 					$c = $this->apiyy->get_chd($chd);

			
 
				 					$chdfs = $c['1'];

			
 
				 					$chdjs = json_encode($c['0']);

			
 
				-					if($c['Data'][0]['m_isSucess'] == 1)

			
 
				-			    	{

			
 
				-						$chdcg += 1;

			
 
				-			        }

			
 
				+					if(isset($c['Data']))

			
 
				+					{

			
 
				+					    if($c['Data'][0]['m_isSucess'] == 1)

			
 
				+			    	    {

			
 
				+						    $chdcg += 1;

			
 
				+			            }

			
 
				+					}

			
 
				 				}

			
 
				 				$xx[$k]['fhf'] = $chdfs;

			
 
				 				$xx[$k]['fhs'] = $chdjs;

			
@@ -375,4 +394,291 @@ class Apiyy extends Start_Controller {
 
				 		}

			
 
				 		return $xx;

			
 
				 	}

			
 
				+	

			
 
				+	

			
 
				+	

			
 
				+	public function _cs($arg_array)

			
 
				+	{

			
 
				+		$asd = array();

			
 
				+		$data = $this->fullorder->get_number($arg_array[0]);

			
 
				+		$fullorder = 'fullorder';

			
 
				+		$xx = array();

			
 
				+

			
 
				+			$xx[$k] = array(0=>$data['number'],'xsf'=>'','xss'=>'','fhf'=>'','fhs'=>'',4=>$data['id']);

			
 
				+			$kh = $this->shop->read($data['shop']);

			
 
				+			$classid = $this->classid->sku();

			
 
				+		    $tcall = $this->typeclass->find_all();

			
 
				+			$typeclass = array();

			
 
				+			foreach ($tcall as $v)

			
 
				+			{

			
 
				+				$tcjm[$v['id']] = array($v['jm'],$v['classid']);

			
 
				+				$typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);

			
 
				+			}

			
 
				+			$bm = '03';

			
 
				+			$xysc = array();

			
 
				+			$data['lh'] = array();

			
 
				+			$scid = '';$cw = '';$lc = 0;

			
 
				+			$sku = explode(';',trim($data['fpdata'],';'));

			
 
				+			$whlabelsc = explode('|',trim($data['whlabel'],'|'));

			
 
				+			foreach($sku as $key=>$val)

			
 
				+			{

			
 
				+				if(stripos($val,'-131-') !== false)

			
 
				+				{

			
 
				+					continue;

			
 
				+				}

			
 
				+				$pm = $classid;

			
 
				+		    	$jm = $classid;

			
 
				+				$bmpx = array(13=>'',16=>'',18=>'',25=>'',26=>'',41=>'');

			
 
				+				$features = str_replace(array('-163-','-164-','-165-','-166-'),'-',$val);

			
 
				+				$ts = explode('|',trim($features,'|'));

			
 
				+				if(stripos($ts[0],',') !== false)

			
 
				+				{

			
 
				+					$ft = explode(',',$ts[0]);

			
 
				+			    	$features = explode('-',trim($ft[1],'-'));

			
 
				+					$features[] = $ft[0];

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$features = explode('-',trim($ts[0],'-'));

			
 
				+				}

			
 
				+				foreach($features as $k=>$v)

			
 
				+				{

			
 
				+					if(isset($typeclass[$v]) && isset($bmpx[$typeclass[$v]['classid']]))

			
 
				+					{

			
 
				+						if($typeclass[$v]['bm'] != '')

			
 
				+						{

			
 
				+							$bmpx[$typeclass[$v]['classid']] = $typeclass[$v]['bm'];

			
 
				+						

			
 
				+						}

			
 
				+					}

			
 
				+					if($v != 0)

			
 
				+					{

			
 
				+						if(isset($pm[$typeclass[$v]['classid']]))

			
 
				+						{

			
 
				+							if($typeclass[$v]['title'] == '9A')

			
 
				+							{

			
 
				+								$pm[$typeclass[$v]['classid']] = '9A';

			
 
				+							}

			
 
				+							else if($typeclass[$v]['title'] == '10A')

			
 
				+							{

			
 
				+								$pm[$typeclass[$v]['classid']] = '10A';

			
 
				+							}

			
 
				+							else

			
 
				+							{

			
 
				+								$clzh = $typeclass[$v]['zh'];

			
 
				+								if(stripos($typeclass[$v]['zh'],'|') !== false)

			
 
				+								{

			
 
				+									$clzh = explode('|',rtrim($typeclass[$v]['zh'],'|'));

			
 
				+									$clzh = $clzh[0];

			
 
				+								}

			
 
				+								$pm[$typeclass[$v]['classid']] = $clzh;

			
 
				+							}

			
 
				+						}

			
 
				+						if(isset($jm[$typeclass[$v]['classid']]))

			
 
				+						{

			
 
				+							if($typeclass[$v]['jm'])

			
 
				+							{

			
 
				+						    	$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];

			
 
				+							}

			
 
				+						}

			
 
				+					}

			
 
				+				}

			
 
				+				$jm = array_filter($jm);//去除空值

			
 
				+				$jm = implode("-",$jm);

			
 
				+				$pm = array_filter($pm);//去除空值

			
 
				+				$zh = implode(" ",$pm);

			
 
				+				$zh = preg_replace("/\r\n|\r|\n/",'',trim($zh,' '));

			
 
				+				if(!isset($ts[1]))

			
 
				+				{

			
 
				+					$ts[1] = '无';

			
 
				+				}

			
 
				+				$lh = $this->apiyy->get_cjlp(array('jm'=>$jm,'title'=>$ts[1],'zh'=>$zh,'bm'=>$bm.implode("",$bmpx)));

			
 
				+				if(isset($lh['Data'][0]))

			
 
				+				{

			
 
				+					if($lh['Data'][0]['m_isSucess'] != 1)

			
 
				+					{

			
 
				+						if($lh['Data'][0]['m_errorMsg'] != '料号 已存在，请重新输入！')

			
 
				+						{

			
 
				+							$xx[$k][1] = $lh;

			
 
				+							$this->apiyy->insert(array('number'=>$data['number'],'error'=>$lh['Data'][0]['m_errorMsg'],'type'=>'料号','cs'=>$fullorder));

			
 
				+							continue;

			
 
				+						}

			
 
				+					}

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$this->apiyy->insert(array('number'=>$data['number'],'error'=>json_encode($lh),'type'=>'料号','cs'=>$fullorder));

			
 
				+					continue;

			
 
				+				}

			
 
				+				$data['lh'][] = array('sku'=>$jm,'ts'=>$ts[2]);

			
 
				+				if(stripos($val,'-131-') !== false)

			
 
				+				{

			
 
				+					continue;

			
 
				+				}

			
 
				+				if(stripos($val,'-126-') !== false)

			
 
				+				{

			
 
				+					$drck = '12003';//进入发条库

			
 
				+				}

			
 
				+				else if(stripos($val,'-127-') !== false)

			
 
				+				{

			
 
				+					$drck = '12004';//进入发块库

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$drck = '12006';//其它进入完成库

			
 
				+				}

			
 
				+			}

			
 
				+		    $data['yyid'] = $kh['yyid'];

			
 
				+		    @$ay = $this->apiyy->_neworder($data,$classid,$tcall);

			
 
				+			echo "<pre>";

			
 
				+			print_r(array($data,$classid,$tcall));

			
 
				+			echo "<pre>";

			
 
				+			print_r($ay);

			
 
				+			exit;

			
 
				+			

			
 
				+			$xx[$k]['xsf'] = $ay['fs'];

			
 
				+			$xx[$k]['xss'] = $ay['fh'];

			
 
				+		    if($ay['c'] != 0)

			
 
				+		    {

			
 
				+				$this->$fullorder->save(array('dbapi'=>0),$data['id']);

			
 
				+				$this->apiyy->insert(array('number'=>$data['number'],'type'=>'销售订单','error'=>$ay['error'],'cs'=>$fullorder));

			
 
				+		    }

			
 
				+			else

			
 
				+		    {

			
 
				+				$this->$fullorder->save(array('dbapi'=>99),$data['id']);

			
 
				+				$chdfs = '';$chdjs = '';$chdcg = 0;

			
 
				+				foreach($data['lh'] as $k=>$v)

			
 
				+				{

			
 
				+					$chd = array('number'=>$data['number'],'i'=>$k+1,'ts'=>$v['ts']);

			
 
				+					$c = $this->apiyy->get_chd($chd);

			
 
				+					$chdfs = $c['1'];

			
 
				+					$chdjs = json_encode($c['0']);

			
 
				+					if(isset($c['Data']))

			
 
				+					{

			
 
				+					    if($c['Data'][0]['m_isSucess'] == 1)

			
 
				+			    	    {

			
 
				+						    $chdcg += 1;

			
 
				+			            }

			
 
				+					}

			
 
				+				}

			
 
				+				$xx[$k]['fhf'] = $chdfs;

			
 
				+				$xx[$k]['fhs'] = $chdjs;

			
 
				+			    if($chdcg == count($data['lh']))

			
 
				+			    {

			
 
				+					$cs = $this->$fullorder->save(array('dbapi'=>100),$data['id']);

			
 
				+			    }

			
 
				+		    }

			
 
				+		}

			
 
				+		

			
 
				+		

			
 
				+		

			
 
				+		public function _xxpl()

			
 
				+	{

			
 
				+		

			
 
				+		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				+		$config['upload_path'] = '.'.$dir ;

			
 
				+		$config['file_name'] = date('Ymd_His_',time()).rand(1000,9999);

			
 
				+        $config['allowed_types'] = 'xls|xlsx|csv';

			
 
				+        $config['max_size'] = 10240;

			
 
				+		$this->load->library('upload', $config);

			
 
				+		$this->upload->initialize($config);

			
 
				+        if ($this->upload->do_upload('userfile'))

			
 
				+        {

			
 
				+			$full_path = $dir.$this->upload->data('file_name');

			
 
				+			$fileName = '.' . $full_path;

			
 
				+            if (!file_exists($fileName)) 

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>"上传失败，请重试",'success'=>false));exit;

			
 
				+            }

			
 
				+			else

			
 
				+			{

			
 
				+				require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				+				@$phpExcel = PHPExcel_IOFactory::load($fileName);// 载入当前文件

			
 
				+				@$phpExcel->setActiveSheetIndex(0);// 设置为默认表

			
 
				+				$sheetCount = $phpExcel->getSheetCount();// 获取表格数量

			
 
				+				$row = $phpExcel->getActiveSheet()->getHighestRow();// 获取行数

			
 
				+				$column = $phpExcel->getActiveSheet()->getHighestColumn();// 获取列数

			
 
				+				++$column;//如果列数大于26行

			
 
				+				$list = array();

			
 
				+				for ($i = 2; $i <= $row; $i++) // 行数循环

			
 
				+				{

			
 
				+					$data = array();

			
 
				+                    for ($c = 'A'; $c != $column; $c++)  // 列数循环

			
 
				+	                {

			
 
				+						$data[] = $phpExcel->getActiveSheet()->getCell($c . $i)->getValue();

			
 
				+                    }

			
 
				+					$list[] = $data;

			
 
				+                }

			
 
				+			}

			
 
				+			$cw = [];$d = [];

			
 
				+			foreach ($list as $v)

			
 
				+		    {

			
 
				+				$v = $v[0];

			
 
				+				$fullorder_name = 'fullorder';

			
 
				+				$y = $this->fullorder->get_number($v);

			
 
				+				if(!$y)

			
 
				+				{

			
 
				+					$fullorder_name = 'fullordersmt';

			
 
				+					$y = $this->fullordersmt->get_number($v);

			
 
				+					if(!$y)

			
 
				+					{

			
 
				+						$fullorder_name = 'fullordertt';

			
 
				+						$y = $this->fullordertt->get_number($v);

			
 
				+						if(!$y)

			
 
				+				    	{

			
 
				+							$cw[] = [$v,'无数据'];

			
 
				+						}

			
 
				+						

			
 
				+					}

			
 
				+				}

			
 
				+				$d[$fullorder_name][] = $y;

			
 
				+			}

			
 
				+			foreach($d as $key=>$val)

			
 
				+			{

			
 
				+				$h = $this->_list($val,$key);

			
 
				+			    foreach($h as $vv)

			
 
				+			    {

			
 
				+				    $x = 0;$c = 0;

			
 
				+					if(!isset($vv[0]))

			
 
				+					{

			
 
				+						continue;

			
 
				+					}

			
 
				+				    $xs = $this->apiyy->_cxxsdd($vv['0']);

			
 
				+				    $chd = $this->apiyy->_cxchd($vv['0']);

			
 
				+				    if(isset($xs['Data'][0]))

			
 
				+				    {

			
 
				+					    $vv[] = '成功';

			
 
				+					    $x = 1;

			
 
				+				    }

			
 
				+				    else

			
 
				+				    {

			
 
				+				    	$vv[] = '无';

			
 
				+				    }

			
 
				+				    if(isset($chd['Data'][0]))

			
 
				+				    {

			
 
				+				    	$vv[] = '成功';

			
 
				+					    $c = 1;

			
 
				+				    }

			
 
				+				    else

			
 
				+				    {

			
 
				+				    	$vv[] = '无';

			
 
				+				    }

			
 
				+				    if($x==1 && $c==1)

			
 
				+				    {

			
 
				+					    $this->$v->save(array('dbapi'=>99),$vv[4]);

			
 
				+				    }

			
 
				+				    $asd[] = $vv;

			
 
				+				}

			
 
				+			}

			
 
				+			echo "<pre>";

			
 
				+				print_r($cw);

			
 
				+				echo "<pre>";

			
 
				+				print_r($asd);

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			echo json_encode(array('msg'=>'上传失败！','t'=>$this->upload->display_errors(),'success'=>false));exit;

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				 }
			
--- a/core/CoreApp/controllers/Aptsmt.php
+++ b/core/CoreApp/controllers/Aptsmt.php
--- a/core/CoreApp/controllers/Boss.php
+++ b/core/CoreApp/controllers/Boss.php
@@ -11,6 +11,7 @@ class Boss extends Start_Controller {
 
				 		$this->load->_model('Model_fedex_cby','fedex_cby');

			
 
				 		$this->load->_model('Model_fullorder_smt','fullorder_smt');

			
 
				 		$this->load->_model('Model_fullordersmt','fullordersmt');

			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');

			
 
				 		$this->load->_model('Model_customersmt','customersmt');

			
 
				 		$this->load->_model('Model_country','country');

			
 
				 		$this->load->_model('Model_hl','hl');

			
@@ -47,6 +48,9 @@ class Boss extends Start_Controller {
 
				 		$this->load->_model('Model_setting','setting');

			
 
				 		$this->load->_model('Model_pay','pay');

			
 
				 		$this->load->_model('Model_shopsku','shopsku');

			
 
				+		$this->load->_model('Model_classid','classid');

			
 
				+		$this->load->_model('Model_weight','weight');

			
 
				+		$this->load->_model('Model_country','country');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -90,6 +94,14 @@ class Boss extends Start_Controller {
 
				 		else if($arg == 'excelshop')

			
 
				         {

			
 
				              $this->_excelshop();

			
 
				+        }

			
 
				+		else if($arg == 'ggdd')

			
 
				+        {

			
 
				+             $this->_ggdd();

			
 
				+        }

			
 
				+		else if($arg == 'qt')

			
 
				+        {

			
 
				+             $this->_qt();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -106,6 +118,15 @@ class Boss extends Start_Controller {
 
				 		$this->data['sctime'] = $setting['sctime'];

			
 
				         $this->_Template('boss',$this->data);

			
 
				 	}

			
 
				+	public function _qt()

			
 
				+	{

			
 
				+		$setting = $this->setting->get_settings();

			
 
				+		$this->data['excelpass'] = $setting['excelpass'];

			
 
				+		$this->data['excelusernum'] = $setting['excelusernum'];

			
 
				+		$this->data['exceljmnum'] = $setting['exceljmnum'];

			
 
				+		$this->data['sctime'] = $setting['sctime'];

			
 
				+        $this->_Template('boss_qt',$this->data);

			
 
				+	}

			
 
				 	public function _out($arg_array)

			
 
				 	{

			
 
				 		$post = $this->input->post(NULL, TRUE);

			
@@ -156,7 +177,17 @@ class Boss extends Start_Controller {
 
				 								$outtype = 2;

			
 
				 								if(!$y)

			
 
				 								{

			
 
				-									echo json_encode(array('msg'=>'无此数据','success'=>false));exit;

			
 
				+									$fullorder_name = 'fullorderxw';$outtype = 1;

			
 
				+									$y = $this->fullorderxw->get_waybill($order);

			
 
				+									if(!$y)

			
 
				+				    				{

			
 
				+										$y = $this->fullorderxw->get_number($order);

			
 
				+										$outtype = 2;

			
 
				+										if(!$y)

			
 
				+										{

			
 
				+											echo json_encode(array('msg'=>'无此数据','success'=>false));exit;

			
 
				+										}

			
 
				+									}

			
 
				 								}

			
 
				 							}

			
 
				 						}

			
@@ -200,36 +231,69 @@ class Boss extends Start_Controller {
 
				 				{

			
 
				 					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-2','success'=>false));exit;

			
 
				 				}

			
 
				-				else if(strlen($y['waybill']) == 18 && $y['express'] != 3)

			
 
				+				else if(strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67)

			
 
				 				{

			
 
				 					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-3','success'=>false));exit;

			
 
				 				}

			
 
				 			}

			
 
				-			if(($y['express'] == '24' || $y['express'] == '3' || $y['express'] == '28' || $y['express'] == '33' || $y['express'] == '42') && $y['type'] != 6)//杭州除外

			
 
				-			{

			
 
				-				$numweight = str_replace('kg','',$weight);

			
 
				-				if($weight == '' || $numweight < '0.1' || !is_numeric($numweight))

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>'此单需要称重！','success'=>false));exit;

			
 
				-				}

			
 
				-				$yzweight = explode('.',$numweight);

			
 
				-				if($yzweight[0] == '')

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>'重量错误，请重新称重！','success'=>false));exit;

			
 
				-				}

			
 
				-				if($numweight > '0.98' &&  $y['express'] == '3')

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>'UPS大于0.98公斤需要拆包！','success'=>false));exit;

			
 
				-				}

			
 
				-				if($numweight > '2' &&  $y['express'] == '37')

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>'杭州DHL大于2公斤需要联系店员！','success'=>false));exit;

			
 
				-				}

			
 
				-				if($numweight >= '10' && ($y['express'] == '24' || $y['express'] == '31'))

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>'联邦不能大于10公斤！','success'=>false));exit;

			
 
				-				}

			
 
				-			}

			
 
				+// 			if(($y['express'] == '24' || $y['express'] == '3' || $y['express'] == '28' || $y['express'] == '33' || $y['express'] == '42') && $y['type'] != 6)//杭州除外

			
 
				+// 			{

			
 
				+// 				$numweight = str_replace('kg','',$weight);

			
 
				+// 				if($weight == '' || $numweight < '0.1' || !is_numeric($numweight))

			
 
				+// 				{

			
 
				+// 					echo json_encode(array('msg'=>'此单需要称重！','success'=>false));exit;

			
 
				+// 				}

			
 
				+// 				$yzweight = explode('.',$numweight);

			
 
				+// 				if($yzweight[0] == '')

			
 
				+// 				{

			
 
				+// 					echo json_encode(array('msg'=>'重量错误，请重新称重！','success'=>false));exit;

			
 
				+// 				}

			
 
				+// 				if($numweight > '0.98' &&  $y['express'] == '3')

			
 
				+// 				{

			
 
				+// 					echo json_encode(array('msg'=>'UPS大于0.98公斤需要拆包！','success'=>false));exit;

			
 
				+// 				}

			
 
				+// 				if($numweight > '2' &&  $y['express'] == '37')

			
 
				+// 				{

			
 
				+// 					echo json_encode(array('msg'=>'杭州DHL大于2公斤需要联系店员！','success'=>false));exit;

			
 
				+// 				}

			
 
				+// 				if($numweight >= '10' && ($y['express'] == '24' || $y['express'] == '31'))

			
 
				+// 				{

			
 
				+// 					echo json_encode(array('msg'=>'联邦不能大于10公斤！','success'=>false));exit;

			
 
				+// 				}

			
 
				+// 			}

			
 
				+            $numweight = str_replace('kg','',$weight);

			
 
				+            //根据要求 USPS-USA  FEDEX-US2  USPS-US2  这三个快递方式除外的所有快递都需要称重再发货  或者说是【国内发货】的都需要称重

			
 
				+        	$express_info = $this->express->read($y['express']);

			
 
				+			if(empty($express_info)){

			
 
				+				echo json_encode(array('msg'=>'该快递信息异常，请联系技术！','success'=>false));exit;

			
 
				+			}

			
 
				+			$weight_limit = $express_info['weight_limit']*1;

			
 
				+		    if($weight_limit  > 0){

			
 
				+                	if($weight == '' || $numweight < '0.1' || !is_numeric($numweight))

			
 
				+    				{

			
 
				+    					echo json_encode(array('msg'=>'此单需要称重！','success'=>false));exit;

			
 
				+    				}

			
 
				+    				$yzweight = explode('.',$numweight);

			
 
				+    				if($yzweight[0] == '')

			
 
				+    				{

			
 
				+    					echo json_encode(array('msg'=>'重量错误，请重新称重！','success'=>false));exit;

			
 
				+    				}

			
 
				+                    if($numweight < ($y['jweight']/1000)){

			
 
				+        				json_encode(array('msg'=>'重量小于净重，请重新称重！','success'=>false));exit;

			
 
				+        			}

			
 
				+    				//Fedex(杭州),UPS,DHL官方-美国 需要判断实际重量和净重差 其他快递不需要

			
 
				+    				if(in_array($y['express'],[3,24,42])){

			
 
				+    				   	//规定实际重量不允许超过 净重为1kg

			
 
				+        				if($numweight -($y['jweight']/1000) > 1 )

			
 
				+        				{

			
 
				+        					echo json_encode(array('msg'=>'称重重量和净重相差过大，请找成会或梦体处理！','success'=>false));exit;

			
 
				+        				}

			
 
				+    				}

			
 
				+    			

			
 
				+    				if($weight_limit < $numweight){

			
 
				+    					echo json_encode(array('msg'=>$express['servicename'].'大于'.$weight_limit.'公斤需要拆包！','success'=>false));exit;

			
 
				+    				}

			
 
				+            }

			
 
				 			if(((time() - $y['printtime']) > (15*24*3600) || $y['printtime'] < 1590211800) && $y['express'] == '24' && $y['type'] != 6)//杭州店铺除外

			
 
				 			{

			
 
				 				echo json_encode(array('yd'=>1,'id'=>$y['id'],'express'=>$y['express'],'name'=>$fullorder_name,'success'=>true));exit;

			
@@ -445,6 +509,7 @@ class Boss extends Start_Controller {
 
				 		$x=0;$product = '';//product 每单多产品链接组合

			
 
				 		$purchase = 0;$cost = 0;//每单所有产品总成本价格；

			
 
				 		$whlabel = '|';//库存产品码

			
 
				+		$cscs = array();$cscs = $issku;

			
 
				 		$nr = '';$cs = array();

			
 
				 		$t = array('/\-\-/','/\+/','/\#Color/','/\#Long/','/-[1-4]-/','/(\w+)~(\w+)-/');

			
 
				 		$h = array('-','-','','','-','');

			
@@ -455,7 +520,6 @@ class Boss extends Start_Controller {
 
				 		$varsku = strtolower($varsku);//转小写

			
 
				 		$sku = explode(',',$varsku);//多产品分割为多数组

			
 
				 		$pd = explode(',',$issku);

			
 
				-		$cid = array();

			
 
				 		$slpx = array();

			
 
				 		$tqjcskua = array();//先检测是否只匹配品名

			
 
				 		$tqjcskub = array();

			
@@ -466,30 +530,42 @@ class Boss extends Start_Controller {
 
				 		foreach ($sku as $k=>$value) 

			
 
				 		{

			
 
				 			//查找是否有头套和HD开始

			
 
				+			$cid = array();

			
 
				 			$cf = explode('-',trim($value,'-'));

			
 
				 			$cf = array_filter($cf);

			
 
				 			foreach ($cf as $v) 

			
 
				 		    {

			
 
				-				if(isset($dtc[$v]['id']))

			
 
				+				if(isset($dtc[$v]['id']) && isset($dtc[$v]['jm']))

			
 
				 				{

			
 
				 				    $cid[$dtc[$v]['classid']] = array('id'=>$dtc[$v]['id'],'spare'=>$v,'jm'=>$dtc[$v]['jm']);

			
 
				 				}

			
 
				 			}

			
 
				-			if(isset($cid['44']) && isset($cid['18']) && isset($dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['id']))

			
 
				-			{

			
 
				-				$value = '-'.$value.'-'; 

			
 
				-				$sku[$k] = '-'.$sku[$k].'-'; 

			
 
				-				$pd[$k] = '-'.$pd[$k].'-';

			
 
				-				$value = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$value);

			
 
				-				$value = str_replace('-'.$cid['44']['spare'],'-',$value);

			
 
				-				$sku[$k] = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$sku[$k]);

			
 
				-				$sku[$k] = str_replace('-'.$cid['44']['spare'],'-',$sku[$k]);

			
 
				-				$pd[$k] = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$pd[$k]);

			
 
				-				$pd[$k] = str_replace('-'.$cid['44']['spare'],'-',$pd[$k]);

			
 
				-				$value = strtolower(trim($value,'-'));

			
 
				-				$pd[$k] = strtolower(trim($pd[$k],'-'));

			
 
				-				$sku[$k] = strtolower(trim($sku[$k],'-'));

			
 
				+			if(isset($cid['44']) && isset($cid['18']))

			
 
				+			{

			
 
				+				if(isset($dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['id']))

			
 
				+				{

			
 
				+				    $value = '-'.$value.'-'; 

			
 
				+				    $sku[$k] = '-'.$sku[$k].'-'; 

			
 
				+				    $pd[$k] = '-'.$pd[$k].'-';

			
 
				+				    $value = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$value);

			
 
				+				    $value = str_replace('-'.$cid['44']['spare'],'-',$value);

			
 
				+				    $sku[$k] = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$sku[$k]);

			
 
				+				    $sku[$k] = str_replace('-'.$cid['44']['spare'],'-',$sku[$k]);

			
 
				+				    $pd[$k] = str_replace('-'.$cid['18']['spare'].'-','-'.$dtc[strtolower($cid['44']['jm']).$cid['18']['spare']]['spare'].'-',$pd[$k]);

			
 
				+				    $pd[$k] = str_replace('-'.$cid['44']['spare'],'-',$pd[$k]);

			
 
				+				    $value = strtolower(trim($value,'-'));

			
 
				+				    $pd[$k] = strtolower(trim($pd[$k],'-'));

			
 
				+				    $sku[$k] = strtolower(trim($sku[$k],'-'));

			
 
				+				}

			
 
				+				else if(stripos($value,'-transparent') !== false || stripos($value,'-tr') === false)

			
 
				+				{

			
 
				+					$value = str_replace(array('-transparent','-tr'),'',$value);

			
 
				+					$sku[$k] = str_replace(array('-transparent','-tr'),'',$sku[$k]);

			
 
				+					$pd[$k] = str_replace(array('-transparent','-tr'),'',$pd[$k]);

			
 
				+					

			
 
				+				}

			
 
				 			}

			
 
				+			

			
 
				 			//查找是否有头套和HD结束

			
 
				 			if(isset($dtc[$value]['classid']))

			
 
				 			{

			
@@ -590,8 +666,8 @@ class Boss extends Start_Controller {
 
				 			//等级-真人发类型-化纤发编号-颜色-花型-蕾丝头套种类-化纤头套类型-多尺寸-单尺寸-Clip类型-礼物类型-马尾类型-重量-长度-头路设计-蕾丝尺寸25-蕾丝尺寸26-类型-密度-发帽大小-蕾丝颜色-化纤其它属性-头套其它属性-头套属性 100为头套额外附加

			
 
				 			$cp = array(16=>126,22=>'',13=>80,14=>'',43=>'',8=>57,15=>'');//产品默认ID内容

			
 
				 			//16->类目、22->真人发类型、13->等级、14->长度、8->颜色、15->曲度（花型）

			
 
				-			$cptt = array(16=>128,13=>80,43=>'',8=>'57',15=>'',18=>'',6=>30,10=>72,9=>'',39=>'');//头套

			
 
				-			$cpcp = array(16=>130,13=>80,14=>'',33=>'',8=>57,15=>'',38=>'');//卡子发,7=>33重量

			
 
				+			$cptt = array(16=>128,13=>80,43=>'',8=>'57',15=>'',18=>'',6=>30,10=>72,9=>'',44=>'',39=>'');//头套

			
 
				+			$cpcp = array(16=>130,13=>80,14=>'',33=>'',8=>57,15=>'',38=>'',7=>'');//卡子发,7=>33重量

			
 
				 			$cpgi = array(16=>131,34=>'');//礼物

			
 
				 			$cpac = array(16=>133,35=>'');//配件

			
 
				 			$cphxtt = array(16=>1297,13=>80,14=>'',40=>'',8=>57,15=>'',41=>'',42=>'');

			
@@ -599,19 +675,20 @@ class Boss extends Start_Controller {
 
				 			if((preg_match('/\d\*\df/',$pd[$x]) ||  preg_match('/\df/',$pd[$x]) ||  stripos($pd[$x],'+F') !== false || stripos($pd[$x],'Frontal') !== false) && stripos($pd[$x],'wig') === false && stripos($pd[$x],'Bob') === false)

			
 
				 			{

			
 
				 				$u27 = (stripos($pd[$x],'SilkBaseFrontal') !== false)?199:197;

			
 
				-				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,26=>191,9=>'');//蕾丝发块

			
 
				+				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,26=>191,9=>'',44=>'');//蕾丝发块

			
 
				 				$fc = 1;

			
 
				 			}

			
 
				 			else if((preg_match('/\d\*\dc/',$pd[$x]) || preg_match('/\dc/',$pd[$x]) || stripos($pd[$x],'+C') !== false || stripos($pd[$x],'Closure') !== false) && stripos($pd[$x],'wig') === false && stripos($pd[$x],'Bob') === false)

			
 
				 			{

			
 
				 				$u27 = (stripos($pd[$x],'SilkBaseClosure') !== false)?196:195;

			
 
				-				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,25=>182,9=>'');//蕾丝发块

			
 
				+				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,25=>182,9=>'',44=>'');//蕾丝发块

			
 
				 				if(stripos($pd[$x],'2*6') !== false)

			
 
				 				{

			
 
				 					$cplf[12] = 76;

			
 
				 				}

			
 
				 				$fc = 1;

			
 
				 			}

			
 
				+			$ceshi = array();

			
 
				 			$cpcppd = 0;

			
 
				 			$cpcptype = $this->typeclass->find_all("classid = 33");

			
 
				 			foreach ($cpcptype as $v) 

			
@@ -619,7 +696,7 @@ class Boss extends Start_Controller {
 
				 				$val = explode('|',trim($v['spare'],'|'));

			
 
				 				foreach ($val as $vv) 

			
 
				 		    	{

			
 
				-					if(stripos($pd[$x],$vv) !== false)

			
 
				+					if(stripos('-'.$pd[$x].'-','-'.$vv.'-') !== false)

			
 
				 					{

			
 
				 						$cpcppd++;

			
 
				 					}

			
@@ -933,9 +1010,10 @@ class Boss extends Start_Controller {
 
				 			$whlabel = '';

			
 
				 			$product = '';

			
 
				 		}

			
 
				-		return array('title'=>preg_replace(array('/(\s+)/','/分\s/u'),array(' ','分'),trim($nr,'；')),'purchase'=>$purchase,'cost'=>$cost,'product'=>str_replace(array('---','--'),array('-','-'),$product),'whlabel'=>$whlabel,'wcslpx'=>trim($wcslpx,'|'),'cs'=>$sku);

			
 
				+		return array('title'=>preg_replace(array('/(\s+)/','/分\s/u'),array(' ','分'),trim($nr,'；')),'purchase'=>$purchase,'cost'=>$cost,'product'=>str_replace(array('---','--'),array('-','-'),$product),'whlabel'=>$whlabel,'wcslpx'=>trim($wcslpx,'|'),'cs'=>$cscs);

			
 
				 	}

			
 
				 	

			
 
				+	

			
 
				 	public function _spexcel()

			
 
				 	{

			
 
				 		$tc = array();

			
@@ -966,6 +1044,14 @@ class Boss extends Start_Controller {
 
				 			}

			
 
				 		}

			
 
				 		$post = $this->input->post(NULL, TRUE);

			
 
				+		$tcall = $this->typeclass->find_all();

			
 
				+			$typeclass = array();

			
 
				+			foreach ($tcall as $v)

			
 
				+			{

			
 
				+				$tcjm[$v['id']] = array($v['jm'],$v['classid']);

			
 
				+				$typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);

			
 
				+			}

			
 
				+			$classid = $this->classid->sku();

			
 
				 		if(isset($_GET['category']))

			
 
				 		{

			
 
				 			$timetk = $this->input->get('timetk',true);

			
@@ -1082,7 +1168,8 @@ class Boss extends Start_Controller {
 
				 					$fg = str_replace(array('-163-','-164-','-165-','-166-','-0-','-126-','-127-','-128-','-197-','-195-'),'-',$title[0]);

			
 
				 					$fg = explode(',',$fg);

			
 
				 					$fg = explode('-',trim($fg[1].$fg[0],'-'));

			
 
				-					$pm = array(13=>'',22=>'',8=>'',15=>'',18=>'','100'=>'',33=>'',34=>'',35=>'','dc'=>'','c'=>'',12=>'',25=>'',26=>'',14=>'',27=>'',10=>'',6=>'',9=>'',39=>'',999=>'',9999=>'');//品名顺序

			
 
				+					$pm = array();

			
 
				+					//$pm = array(13=>'',22=>'',8=>'',15=>'',18=>'','100'=>'',33=>'',34=>'',35=>'','dc'=>'','c'=>'',12=>'',25=>'',26=>'',14=>'',27=>'',10=>'',6=>'',9=>'',39=>'',999=>'',9999=>'');//品名顺序

			
 
				 					foreach($fg as $vv)

			
 
				 					{

			
 
				 						if(isset($tc[$vv]['zh']))

			
@@ -1091,6 +1178,42 @@ class Boss extends Start_Controller {
 
				 						    $pm[$tc[$vv]['classid']] = $zh[0];

			
 
				 						}

			
 
				 					}

			
 
				+					

			
 
				+					$features = str_replace(array('-163-','-164-','-165-','-166-'),'-',$v);

			
 
				+					$tsk = explode('|',trim($features,'|'));

			
 
				+					if(stripos($tsk[0],',') !== false)

			
 
				+					{

			
 
				+						$ftt = explode(',',$tsk[0]);

			
 
				+			    		$features = explode('-',trim($ftt[1],'-'));

			
 
				+						$features[] = $ftt[0];

			
 
				+					}

			
 
				+					else

			
 
				+					{

			
 
				+						$features = explode('-',trim($tsk[0],'-'));

			
 
				+					}

			
 
				+					$jm = $classid;

			
 
				+					$jm = $classid;

			
 
				+					foreach($features as $vv)

			
 
				+					{

			
 
				+						if($vv != 0)

			
 
				+						{

			
 
				+							if(!isset($typeclass[$vv]))

			
 
				+							{

			
 
				+								continue;

			
 
				+							}

			
 
				+							if(isset($jm[$typeclass[$vv]['classid']]))

			
 
				+							{

			
 
				+								if($typeclass[$vv]['jm'])

			
 
				+								{

			
 
				+						    		$jm[$typeclass[$vv]['classid']] = $typeclass[$vv]['jm'];

			
 
				+								}

			
 
				+							}

			
 
				+						}

			
 
				+					}

			
 
				+					$jm = array_filter($jm);//去除空值

			
 
				+				    $jm = implode("-",$jm);

			
 
				+					

			
 
				+					

			
 
				 					$zh = implode(" ",$pm);

			
 
				 					$zh = str_replace('自然色 ','',rtrim($zh,' '));

			
 
				 					$zh = str_replace(array('        ','       ','      ','     ','    ','   ','  '),' ',$zh);

			
@@ -1103,7 +1226,7 @@ class Boss extends Start_Controller {
 
				 						$wh = explode('-',$w[$k]);

			
 
				 						$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");

			
 
				 						$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';

			
 
				-						$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'n'=>$title[2]);

			
 
				+						$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'j'=>$jm,'n'=>$title[2]);

			
 
				 					}

			
 
				 				}

			
 
				 			}

			
@@ -1114,6 +1237,7 @@ class Boss extends Start_Controller {
 
				             <td>名称</td>

			
 
				 			<td>中文</td>

			
 
				 			<td>SKU</td>

			
 
				+			<td>用友料号</td>

			
 
				             <td>数量</td>

			
 
				             </tr>

			
 
				             </table>"; 

			
@@ -1506,25 +1630,27 @@ class Boss extends Start_Controller {
 
				 				$t = $j-($n*24*60*60)+($i*24*60*60);

			
 
				 				foreach($shop as $val)

			
 
				 				{

			
 
				-				    $data = $this->fullorder->find_all("$time > '$t' and $time < '".($t+24*3600)."' and shop = '".$val['id']."'");

			
 
				+				    $data = $this->fullorder->find_all("source != 1 and $time > '$t' and $time < '".($t+24*3600)."' and shop = '".$val['id']."'");

			
 
				 					$dd = 0;$m = 0;

			
 
				 				    foreach($data as $v)

			
 
				 				    {

			
 
				 					    $customer = $this->customer->get_email($v['email'],$v['shop']);

			
 
				-					    $customernum = $this->fullorder->find_count("email = '".$v['email']."' and shop = '".$v['shop']."'");

			
 
				+					    $customernum = $this->fullorder->find_count("$time < '".($t+24*3600)."' and email = '".$v['email']."' and shop = '".$v['shop']."'");

			
 
				 						preg_match_all('/[0-9]/u',$v['phone'],$result);

			
 
				 						$numphone = join('',$result[0]);

			
 
				-						$customerc = $this->customer->find_all("type = 1 and shop = '".$v['shop']."' and address = '".$v['address']."' and numphone = '".$numphone."'",'*','id desc');

			
 
				+						//$customerc = $this->customer->find_all("shop = '".$v['shop']."' and address = '".$v['address']."' and numphone = '".$numphone."'",'*','id desc');

			
 
				 						if($customer)

			
 
				 						{

			
 
				-							if(($customer['type'] == 1 && $customernum > 1) || (isset($customerc[0]['num']) && $customerc[0]['num'] > 1))// || $customerc['type'] == 1 && $customerc['num'] > 1

			
 
				+							if($customernum > 1)// || (isset($customerc[0]['num']) && $customerc[0]['num'] > 1) // || $customerc['type'] == 1 && $customerc['num'] > 1

			
 
				 							{

			
 
				 								$dd++;

			
 
				 								$m += $v['shouldmoney'];

			
 
				 							}

			
 
				 						}

			
 
				 				    }

			
 
				-					$d[] = array(date('Y-m-d',$t),$val['shopname'],count($data),sprintf("%01.2f",array_sum(array_column($data,'shouldmoney'))),$dd,$m);

			
 
				+					$ddzb = ($dd==0 || count($data) == 0)?0:sprintf("%01.2f",$dd/count($data)*100).'%';

			
 
				+					$ddjezb = ($m==0 || array_sum(array_column($data,'shouldmoney')) == 0)?0:sprintf("%01.2f",$m/array_sum(array_column($data,'shouldmoney'))*100).'%';

			
 
				+					$d[] = array(date('Y-m-d',$t),$val['shopname'],count($data),sprintf("%01.2f",array_sum(array_column($data,'shouldmoney'))),$dd,$m,$ddzb,$ddjezb);

			
 
				 				}

			
 
				 		    }

			
 
				 			$title = "老客户数据统计".date('Y-m-d H-i-s',time()); 

			
@@ -1536,6 +1662,8 @@ class Boss extends Start_Controller {
 
				 			<td>订单金额 </td>

			
 
				 			<td>老客户订单数</td>

			
 
				             <td>老客户订单金额</td>

			
 
				+			<td>老客户订单数占比</td>

			
 
				+            <td>老客户订单金额占比</td>

			
 
				             </tr>

			
 
				             </table>"; 

			
 
				             $filename = $title.".xls"; 

			
@@ -1632,4 +1760,52 @@ class Boss extends Start_Controller {
 
				 			echo json_encode(array('msg'=>'清除完成！','success'=>true));exit;

			
 
				 		}

			
 
				 	}

			
 
				+	

			
 
				+	public function _ggdd()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['number']))

			
 
				+		{

			
 
				+			$number = $this->input->post('number',true);

			
 
				+			$guarantee = $this->input->post('guarantee',true);

			
 
				+			$quantity = $this->input->post('quantity',true);

			
 
				+			$post = array();

			
 
				+			if($guarantee)

			
 
				+			{

			
 
				+				$post['guarantee'] = $guarantee;

			
 
				+			}

			
 
				+			if($quantity)

			
 
				+			{

			
 
				+				$post['quantity'] = $quantity;

			
 
				+			}

			
 
				+			if(!$number || $number == '' || $number == NULL)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'没有编号信息','success'=>false));exit;

			
 
				+			}

			
 
				+			if(!$post)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'没有修改信息','success'=>false));exit;

			
 
				+			}

			
 
				+			$fullorder_name = 'fullorder';

			
 
				+			$y = $this->fullorder->get_number($number);

			
 
				+			if(!$y)

			
 
				+			{

			
 
				+				$fullorder_name = 'fullordersmt';

			
 
				+				$y = $this->fullordersmt->get_number($number);

			
 
				+				if(!$y)

			
 
				+				{

			
 
				+					$fullorder_name = 'fullordertt';

			
 
				+					$y = $this->fullordertt->get_number($number);

			
 
				+					if(!$y)

			
 
				+					{

			
 
				+						echo json_encode(array('msg'=>'无此编号数据','success'=>false));exit;

			
 
				+										

			
 
				+					}

			
 
				+						

			
 
				+				}

			
 
				+			}

			
 
				+			$this->$fullorder_name->save($post,$y['id']);

			
 
				+			echo json_encode(array('msg'=>'修改完成！','success'=>true));exit;

			
 
				+		}

			
 
				+	}

			
 
				 }	
			
--- a/core/CoreApp/controllers/Color.php
+++ b/core/CoreApp/controllers/Color.php
@@ -9,6 +9,7 @@ class Color extends Start_Controller {
 
				 		$this->load->_model('Model_fullorder','fullorder');

			
 
				 		$this->load->_model('Model_fullordertt','fullordertt');

			
 
				 		$this->load->_model('Model_fullordersmt','fullordersmt');

			
 
				+		$this->load->_model('Model_excel','excel');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -36,6 +37,10 @@ class Color extends Start_Controller {
 
				 		else if($arg == 'del')

			
 
				         {

			
 
				              $this->_del();

			
 
				+        }

			
 
				+		else if($arg == 'ex')

			
 
				+        {

			
 
				+             $this->_ex();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -53,6 +58,9 @@ class Color extends Start_Controller {
 
				 			$title = $this->input->post('title',true);

			
 
				 			$content = $this->input->post('content',true);

			
 
				 			$warehouse = $this->input->post('warehouse',true);

			
 
				+			$type = $this->input->post('type',true);

			
 
				+			$state = $this->input->post('state',true);

			
 
				+			$developer = $this->input->post('developer',true);

			
 
				 			$timetk = $this->input->post('timetk',true);

			
 
				 			$timetj = $this->input->post('timetj',true);

			
 
				 			$timetk = strtotime($timetk);

			
@@ -69,6 +77,17 @@ class Color extends Start_Controller {
 
				 			if($warehouse)

			
 
				             {

			
 
				                 $where  .= " and warehouse = '$warehouse'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($state)

			
 
				+            {

			
 
				+                $where  .= " and state = '$state'";

			
 
				+            }

			
 
				+            if($developer){

			
 
				+                 $where  .= " and developer = '$developer'";

			
 
				             }

			
 
				 			if($timetk && $timetj)

			
 
				             {

			
@@ -85,20 +104,68 @@ class Color extends Start_Controller {
 
				 		    {

			
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				-			$info_list = $this->color->find_all($where,'id,title,color,lowe,img,content,time',$order_str,$start,$perpage);

			
 
				+			$info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,img,developer,craft_process,content,time',$order_str,$start,$perpage);

			
 
				 			foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
 
				+				

			
 
				+				if(empty($value['developer'])){

			
 
				+				    $info_list[$key]['developer'] = '';

			
 
				+				}

			
 
				+				if(empty($value['craft_process'])){

			
 
				+				    $info_list[$key]['craft_process'] = '';

			
 
				+				}

			
 
				+				if($value['state'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '在售款';

			
 
				+				}

			
 
				+				else if($value['state'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '已停售';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '未选择';

			
 
				+				}

			
 
				+				

			
 
				+				if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '编号款配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '颜色配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '曲度配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 4)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '其他配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 5)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '化纤编号款';

			
 
				+				}

			
 
				+				else if($value['type'] == 6)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '化纤颜色';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '未选择';

			
 
				+				}

			
 
				 				$colorimg = explode('|',$value['img']);

			
 
				 				$v = $colorimg[0];

			
 
				 					$lx = explode(".",$v);

			
 
				 					$lx = strtolower(end($lx));

			
 
				 					if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				 					{

			
 
				-						$info_list[$key]['img'] = '<video src="'.$v.'" controls="controls" title="点击视频左上角删除"></video>';

			
 
				+						$info_list[$key]['img'] = '<video src="'.$v.'" controls="controls"';

			
 
				 					}

			
 
				 					else if($v != '')

			
 
				 					{

			
 
				-			 		   $info_list[$key]['img'] = "<img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','/img/thumb?src='),'',$v)."&w=200&h=100' data-src='".$v."'>";

			
 
				+			 		   $info_list[$key]['img'] = "<img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','/img/thumb?src='),'',$v)."&w=100&h=100' data-src='".$v."'>";

			
 
				 					}

			
 
				 					else

			
 
				 					{

			
@@ -176,11 +243,14 @@ class Color extends Start_Controller {
 
				 			$lx = strtolower(end($lx));

			
 
				 			if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				 			{

			
 
				-				$img .= '<video src="'.$v.'" controls="controls" title="点击视频左上角删除"></video>';

			
 
				+				$img .= '<span class="deldata"><video src="'.$v.'" controls="controls"></video>'."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				 			}

			
 
				 			else if($v != '')

			
 
				 			{

			
 
				-			    $img .= "<img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','/img/thumb?src='),'',$v)."&w=500&h=500' data-src='".$v."'>";

			
 
				+			   $url = str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','https://1.wepolicy.cn/','/img/thumb?src='),'',$v);

			
 
				+				$url = explode('&',$url);

			
 
				+				$url = $url[0];

			
 
				+			    $img .= '<span class="deldata"><a href="'.$url.'" target="_blank">'."<img src='".site_url('img/thumb')."?src=".$url."&w=500&h=500' data-src='".$v."'></a>"."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				 			}

			
 
				 			else

			
 
				 			{

			
@@ -223,7 +293,7 @@ class Color extends Start_Controller {
 
				 			}

			
 
				 			else if($v != '')

			
 
				 			{

			
 
				-			    $img[] = array('tp',"<a href='".$v."' download='".$color['number']."第".$i."张图片'><img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','img/thumb?src='),'',$v)."&w=500&h=500' data-src='".$v."'></a>");

			
 
				+			    $img[] = array('tp',"<a href='".$v."' download='第".$i."张图片'><img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','img/thumb?src='),'',$v)."&w=300&h=300' data-src='".$v."'></a>");

			
 
				 			}

			
 
				 			$i++;

			
 
				 		}

			
@@ -257,4 +327,135 @@ class Color extends Start_Controller {
 
				             echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				 		}

			
 
				     }

			
 
				+	

			
 
				+	public function _ex()

			
 
				+	{

			
 
				+		$title = $this->input->get('title',true);

			
 
				+			$content = $this->input->get('content',true);

			
 
				+			$warehouse = $this->input->get('warehouse',true);

			
 
				+			$type = $this->input->get('type',true);

			
 
				+			$developer = $this->input->post('developer',true);

			
 
				+			$state = $this->input->get('state',true);

			
 
				+			$timetk = $this->input->get('timetk',true);

			
 
				+			$timetj = $this->input->get('timetj',true);

			
 
				+			$timetk = strtotime($timetk);

			
 
				+			$timetj = strtotime($timetj);

			
 
				+			$where = "1=1";

			
 
				+			if($title)

			
 
				+            {

			
 
				+                $where  .= " and title like '%$title%'";

			
 
				+            }

			
 
				+			if($content)

			
 
				+            {

			
 
				+                $where  .= " and content like '%$content%'";

			
 
				+            }

			
 
				+			if($warehouse)

			
 
				+            {

			
 
				+                $where  .= " and warehouse = '$warehouse'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($state)

			
 
				+            {

			
 
				+                $where  .= " and state = '$state'";

			
 
				+            }

			
 
				+            if($developer)

			
 
				+            {

			
 
				+                $where  .= " and developer = '$developer'";

			
 
				+            }

			
 
				+			if($timetk && $timetj)

			
 
				+            {

			
 
				+                $where  .= " and time > '$timetk' and time < '$timetj'";

			
 
				+            }

			
 
				+			//数据排序

			
 
				+            $order_str = "id desc";

			
 
				+			$info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,img,developer,craft_process,time');

			
 
				+			foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+		        if(empty($value['developer'])){

			
 
				+				    $info_list[$key]['developer'] = '';

			
 
				+				}

			
 
				+				if(empty($value['craft_process'])){

			
 
				+				    $info_list[$key]['craft_process'] = '';

			
 
				+				}

			
 
				+				

			
 
				+				if($value['state'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '在售款';

			
 
				+				}

			
 
				+				else if($value['state'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '已停售';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '未选择';

			
 
				+				}

			
 
				+				

			
 
				+				if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '编号款配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '颜色配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '曲度配图';

			
 
				+				}

			
 
				+				else if($value['type'] == 4)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '编号款配图';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '未选择';

			
 
				+				}

			
 
				+				/**

			
 
				+				$colorimg = explode('|',$value['img']);

			
 
				+				$v = $colorimg[0];

			
 
				+				//foreach ($colorimg as $v) 

			
 
				+		       // {

			
 
				+					$lx = explode(".",$v);

			
 
				+					$lx = strtolower(end($lx));

			
 
				+					if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				+					{

			
 
				+						$info_list[$key]['img'] = '<video src="'.$v.'" controls="controls"';

			
 
				+					}

			
 
				+					else if($v != '')

			
 
				+					{

			
 
				+			 		   $info_list[$key]['img'] = "<img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','/img/thumb?src='),'',$v)."&w=200&h=100' data-src='".$v."'>";

			
 
				+					}

			
 
				+					else

			
 
				+					{

			
 
				+						$info_list[$key]['img'] = '';

			
 
				+					}

			
 
				+				//}

			
 
				+				**/

			
 
				+				$info_list[$key]['img'] = '<a href="http://'.$_SERVER['HTTP_HOST'].'/color/see/'.$value['id'].'" target="_blank">点击查看</a>';

			
 
				+				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);

			
 
				+				unset($info_list[$key]['id']);

			
 
				+			}

			
 
				+		    $title = "新品/新色配图"; 

			
 
				+            $titlename = "<table border=1>

			
 
				+            <tr align='center'>

			
 
				+			<td>标题</td>

			
 
				+			<td>是否在售</td>

			
 
				+			<td>配图类型</td>

			
 
				+			<td>色号</td>

			
 
				+			<td>曲度</td>

			
 
				+			<td>备注</td>

			
 
				+			<td style='height:100px;width:200px;'>图片</td>

			
 
				+			<td>开发人</td>

			
 
				+			<td>工艺流程</td>

			
 
				+			<td>添加时间</td>

			
 
				+            </tr>

			
 
				+            </table>";

			
 
				+            $filename = $title.".xls";

			
 
				+			$tail = "";

			
 
				+            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);

			
 
				+    }

			
 
				 }
			
--- a/core/CoreApp/controllers/Colour.php
+++ b/core/CoreApp/controllers/Colour.php
@@ -206,11 +206,14 @@ class Colour extends Start_Controller {
 
				 			$lx = strtolower(end($lx));

			
 
				 			if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				 			{

			
 
				-				$img .= '<video src="'.$v.'" controls="controls" title="点击视频左上角删除"></video>';

			
 
				+				$img .= '<span class="deldata"><video src="'.$v.'" controls="controls"></video>'."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				 			}

			
 
				 			else if($v != '')

			
 
				 			{

			
 
				-			    $img .= "<img src='".site_url('img/thumb')."?src=".str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','https://1.wepolicy.cn/','/img/thumb?src='),'',$v)."&w=500&h=500' data-src='".$v."'>";

			
 
				+				$url = str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','https://1.wepolicy.cn/','/img/thumb?src='),'',$v);

			
 
				+				$url = explode('&',$url);

			
 
				+				$url = $url[0];

			
 
				+			    $img .= '<span class="deldata"><a href="'.$url.'" target="_blank">'."<img src='".site_url('img/thumb')."?src=".$url."&w=500&h=500' data-src='".$v."'></a>"."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				 			}

			
 
				 			else

			
 
				 			{

			
--- a/core/CoreApp/controllers/Company.php
+++ b/core/CoreApp/controllers/Company.php
@@ -0,0 +1,119 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Company extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->_model('Model_company','company');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')

			
 
				+        {

			
 
				+             $this->_del();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			$this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$title = $this->input->post('title',true);

			
 
				+			$where = "1=1";

			
 
				+			if($title)

			
 
				+            {

			
 
				+                $where  .= " and title like '%$title%'";

			
 
				+            }

			
 
				+			//数据排序

			
 
				+            $order_str = "id desc";

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+			$info_list = $this->company->find_all($where,'id,title',$order_str,$start,$perpage);

			
 
				+			$total = $this->company->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+        $this->_Template('company',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['title']))

			
 
				+		{

			
 
				+			if($this->company->insert($post))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$this->_Template('company_add',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['id']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id',true);

			
 
				+			if($this->company->save($post,$id))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$arg_array = $arg_array[0];

			
 
				+		$company = $this->company->read($arg_array);

			
 
				+		$this->data['company'] = $company;

			
 
				+		$this->_Template('company_edit',$this->data);

			
 
				+	}

			
 
				+	//删除

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->company->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+}
			
--- a/core/CoreApp/controllers/Container.php
+++ b/core/CoreApp/controllers/Container.php
@@ -0,0 +1,240 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Container extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->library('session');

			
 
				+		$this->load->_model('Model_container','container');

			
 
				+		$this->load->_model('Model_excel','excel');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')//添加

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')//修改

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'see')

			
 
				+        {

			
 
				+             $this->_see($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')

			
 
				+        {

			
 
				+             $this->_del($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'excel')

			
 
				+        {

			
 
				+             $this->_excel();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index($arg_array);

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$title = $this->input->post('title',true);

			
 
				+			$name = $this->input->post('name',true);

			
 
				+			$timetk = $this->input->post('timetk',true);

			
 
				+			$timetj = $this->input->post('timetj',true);

			
 
				+			$timetk = strtotime($timetk);

			
 
				+			$timetj = strtotime($timetj);

			
 
				+			$where = "1=1 ";

			
 
				+            //数据排序

			
 
				+            $order_str = "id asc";

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+			if($title)

			
 
				+			{

			
 
				+				$where .= " and title like '%$title%'";

			
 
				+			}

			
 
				+			if($name)

			
 
				+			{

			
 
				+				$where .= " and name like '%$name%'";

			
 
				+			}

			
 
				+			if($timetk && $timetj)

			
 
				+            {

			
 
				+                $where  .= " and time > '$timetk' and time < '$timetj'";

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->container->find_all($where,'id,title,num,weight,zweight,volume,type,yt,name,time',$order_str,$start,$perpage);

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				$info_list[$key]['time'] = date("Y-m-d H:i:s",$value['time']);

			
 
				+				if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'A-必须发';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'B-如果发不完可先发走一部分';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'C-拼箱用，可发可不发';

			
 
				+				}

			
 
				+            }

			
 
				+		    $total = $this->container->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('container',$this->data);

			
 
				+	}

			
 
				+	//添加

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['title']))

			
 
				+		{

			
 
				+			$post['time'] = time();

			
 
				+			if($this->container->insert($post))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$this->_Template('container_add',$this->data);

			
 
				+	}

			
 
				+	//修改

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['id']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id',true);

			
 
				+			if($this->container->save($post,$id))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$arg_array = $arg_array[0];

			
 
				+		$container = $this->container->read($arg_array);

			
 
				+		$this->data['container'] = $container;

			
 
				+		$this->_Template('container_edit',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	//删除

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->container->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	public function _excel()

			
 
				+    {

			
 
				+		$post = $this->input->get(NULL, TRUE);

			
 
				+		if(isset($post['timetk']))  

			
 
				+		{

			
 
				+		    $page = $this->input->get('page',true);

			
 
				+		    $perpage = $this->input->get('perpage',true);

			
 
				+			$timetk = $this->input->get('timetk',true);

			
 
				+			$timetj = $this->input->get('timetj',true);

			
 
				+			$title = $this->input->get('title',true);

			
 
				+			$name = $this->input->get('name',true);

			
 
				+			$timetk = $this->input->get('timetk',true);

			
 
				+			$timetj = $this->input->get('timetj',true);

			
 
				+			$timetk = strtotime($timetk);

			
 
				+			$timetj = strtotime($timetj);

			
 
				+			$dowid = $this->input->get('a');

			
 
				+			$wid = "";

			
 
				+			if($dowid != "")

			
 
				+			{

			
 
				+				$id_arr =  explode(',',rtrim($dowid,','));

			
 
				+				$wid  .= " id = 0 or";

			
 
				+				foreach ($id_arr as $v) 

			
 
				+		        {

			
 
				+                    $wid  .= " id = '$v' or";

			
 
				+                }

			
 
				+				$wid = " and".rtrim($wid,'or');

			
 
				+			}

			
 
				+			$where = "1=1";

			
 
				+			if($timetk && $timetj)

			
 
				+            {

			
 
				+                $where  .= " and time > '$timetk' and time < '$timetj'";

			
 
				+            }

			
 
				+			if($title)

			
 
				+            {

			
 
				+                $where  .= " and title like '%$title%'";

			
 
				+            }

			
 
				+			if($name)

			
 
				+            {

			
 
				+                $where  .= " and name like '%$name%'";

			
 
				+            }

			
 
				+			 $info_list = $this->container->find_all($where.$wid,'title,num,weight,zweight,volume,type,yt,name,time','id desc');

			
 
				+			  foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				$info_list[$key]['time'] = date("Y-m-d H:i:s",$value['time']);

			
 
				+				if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'A-必须发';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'B-如果发不完可先发走一部分';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = 'C-拼箱用，可发可不发';

			
 
				+				}

			
 
				+            }

			
 
				+			$title = '货柜物品'.date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj); 

			
 
				+            $titlename = "<table border=1>

			
 
				+            <tr>

			
 
				+<td>货物名称</td>

			
 
				+<td>数量</td>

			
 
				+<td>单位重量(千克)</td>

			
 
				+<td>总重量（千克)</td>

			
 
				+<td>预估体积(立方米)</td>

			
 
				+<td>优先级</td>

			
 
				+<td>用途</td>

			
 
				+<td>提交人</td>

			
 
				+<td>提交时间</td>        

			
 
				+  </tr>

			
 
				+            </table>"; 

			
 
				+            $filename = $title.".xls"; 

			
 
				+			$tail = "\n";

			
 
				+            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);

			
 
				+		}

			
 
				+	}

			
 
				+}
			
--- a/core/CoreApp/controllers/Country.php
+++ b/core/CoreApp/controllers/Country.php
@@ -6,6 +6,7 @@ class Country extends Start_Controller {
 
				 		$this->load->_model('Model_country','country');

			
 
				 		$this->load->_model('Model_typeclass','typeclass');

			
 
				 		$this->load->_model('Model_express','express');

			
 
				+		$this->load->_model('Model_excel','excel');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -25,6 +26,10 @@ class Country extends Start_Controller {
 
				 		else if($arg == 'rows')//获取数据

			
 
				         {

			
 
				              $this->_rows();

			
 
				+        }

			
 
				+		else if($arg == 'excel')//获取数据

			
 
				+        {

			
 
				+             $this->_excel();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -170,13 +175,52 @@ class Country extends Start_Controller {
 
				 	public function _rows()

			
 
				 	{

			
 
				 		$this->load->library('pagination');

			
 
				-

			
 
				-$config['base_url'] = 'http://127.0.0.1/country/rows';

			
 
				-$config['total_rows'] = 200;

			
 
				-$config['per_page'] = 20;

			
 
				-

			
 
				-$this->pagination->initialize($config);

			
 
				-

			
 
				-echo $this->pagination->create_links();

			
 
				+		$config['base_url'] = 'http://127.0.0.1/country/rows';

			
 
				+		$config['total_rows'] = 200;

			
 
				+		$config['per_page'] = 20;

			
 
				+		$this->pagination->initialize($config);

			
 
				+		echo $this->pagination->create_links();

			
 
				+	}

			
 
				+	

			
 
				+	public function _excel()

			
 
				+	{

			
 
				+		$post = $this->input->get(NULL, TRUE);

			
 
				+		if(isset($post['excel']))

			
 
				+		{

			
 
				+			$express = $this->express->find_all();

			
 
				+			$ex = array();

			
 
				+			foreach ($express as $v) 

			
 
				+		    {

			
 
				+				$ex[$v['id']] = $v['servicename'];

			
 
				+			}

			
 
				+            $info_list = $this->country->find_all('1=1','name,zname,ename,threebitcode,al,lb,express','name asc');

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				if($value['express'] > 0)

			
 
				+					{

			
 
				+						$info_list[$key]['express'] = $ex[$value['express']];

			
 
				+					}

			
 
				+					else

			
 
				+					{

			
 
				+						$info_list[$key]['express'] = '';

			
 
				+					}

			
 
				+            }

			
 
				+			$title = "国家信息"; 

			
 
				+            $titlename = "<table border=1>

			
 
				+            <tr><th colspan='6' align='left'><h3>".$title."<h3></th></tr>

			
 
				+            <tr>

			
 
				+            <td>国家名称</td>

			
 
				+            <td>中文名称</td>

			
 
				+			<td>英文名称</td>

			
 
				+			<td>三字码</td>

			
 
				+			<td>阿里编码</td>

			
 
				+			<td>联邦编码</td>

			
 
				+			<td>默认物流</td>

			
 
				+            </tr>

			
 
				+            </table>"; 

			
 
				+            $filename = $title.".xls"; 

			
 
				+			$tail = "\n"; 

			
 
				+            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);

			
 
				+		}

			
 
				 	}

			
 
				 }
			
--- a/core/CoreApp/controllers/Customer.php
+++ b/core/CoreApp/controllers/Customer.php
@@ -21,6 +21,10 @@ class Customer extends Start_Controller {
 
				 		$this->load->_model('Model_classid','classid');

			
 
				 		$this->load->_model('Model_apiyy','apiyy');

			
 
				 		$this->load->_model('Model_whlabel_fc','whlabel_fc');

			
 
				+		$this->load->_model('Model_hl','hl');

			
 
				+		$this->load->_model('Model_productdescribe','productdescribe');

			
 
				+		$this->load->_model('Model_shopsku','shopsku');

			
 
				+		$this->load->_model('Model_api','api');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -52,6 +56,10 @@ class Customer extends Start_Controller {
 
				 		else if($arg == 'excela')

			
 
				         {

			
 
				              $this->_excela();

			
 
				+        }

			
 
				+		else if($arg == 'temuexcel')

			
 
				+        {

			
 
				+             $this->_temuexcel();

			
 
				         }

			
 
				 		else if($arg == 'excel')//下载excel

			
 
				         {

			
@@ -848,6 +856,7 @@ class Customer extends Start_Controller {
 
				 			$post['address'] = str_replace(array('/( |　| |\s)/',"'"),array(' ',"’"),$address);

			
 
				 			//$post['address2'] = $this->input->post('address2',true);

			
 
				 			$post['count'] = $this->input->post('count',true);

			
 
				+			$post['time'] = time();

			
 
				 			$str = $post['phone'];

			
 
				 			if(!$post['shop'])

			
 
				 			{

			
@@ -1235,6 +1244,10 @@ class Customer extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'总申报价值不可超出'.$express['sbjz'],'success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['shouldmoney'] > $express['shouldmoney'] && $express['shouldmoney'] != 0)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'订单金额不可超出'.$express['shouldmoney'],'success'=>false));exit;

			
 
				+			}

			
 
				 			if($express['ioss'] == 1 && $post['ioss'] == '')

			
 
				 			{

			
 
				 				 echo json_encode(array('msg'=>'此快递方式必须选择IOSS！','success'=>false));exit;

			
@@ -1247,14 +1260,22 @@ class Customer extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'地址不可留空！','success'=>false));exit;

			
 
				 			}

			
 
				-			if($post['express'] == '2' && $post['zzl'] >= '16' && $post['js'] == '0')

			
 
				+			if($post['express'] == '2' && $post['zzl'] > '16' && $post['js'] == '0')

			
 
				 			{

			
 
				-				//echo json_encode(array('msg'=>'总重量大于等于16不可选FIRST CLASS','success'=>false));exit;

			
 
				+				echo json_encode(array('msg'=>'重量大于16不可按Ground Advantage提交！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '2' && isset($post['js']) && $post['js'] == '0'&& $post['qm'] == '1')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'Ground Advantage不可使用签名服务！','success'=>false));exit;

			
 
				 			}

			
 
				 			if(($post['express'] == '3' || $post['express'] == '42' || $post['express'] == '24') && $post['shouldmoney'] < 1)

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'零金额订单不可发 UPS/DHL官方-美国/Fedex(杭州)','success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['express'] == '42' && $post['zsbjz'] < 1)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'零申报金额不可发 DHL官方-美国','success'=>false));exit;

			
 
				+			}

			
 
				 			if($post['express'] == '6' && $post['province'] == '')

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'选择DPEX必须填写州信息','success'=>false));exit;

			
@@ -1537,6 +1558,266 @@ class Customer extends Start_Controller {
 
				 		}

			
 
				     }

			
 
				 	

			
 
				+	

			
 
				+	

			
 
				+	public function _temuexcel()

			
 
				+	{

			
 
				+		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				+		$config['upload_path'] = '.'.$dir ;

			
 
				+		$config['file_name'] = date('Ymd_His_',time()).rand(1000,9999);

			
 
				+        $config['allowed_types'] = 'xls|xlsx';

			
 
				+        $config['max_size'] = 10240;

			
 
				+		$this->load->library('upload', $config);

			
 
				+		$this->upload->initialize($config);

			
 
				+        if ($this->upload->do_upload('userfile'))

			
 
				+        {

			
 
				+			$full_path = $dir.$this->upload->data('file_name');

			
 
				+			$fileName = '.' . $full_path;

			
 
				+            if (!file_exists($fileName)) 

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>"上传失败，请重试",'success'=>false));exit;

			
 
				+            }

			
 
				+			else

			
 
				+			{

			
 
				+				require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				+				@$phpExcel = PHPExcel_IOFactory::load($fileName);// 载入当前文件

			
 
				+				@$phpExcel->setActiveSheetIndex(0);// 设置为默认表

			
 
				+				$sheetCount = $phpExcel->getSheetCount();// 获取表格数量

			
 
				+				$row = $phpExcel->getActiveSheet()->getHighestRow();// 获取行数

			
 
				+				$column = $phpExcel->getActiveSheet()->getHighestColumn();// 获取列数

			
 
				+				++$column;//如果列数大于26行

			
 
				+				$list = array();

			
 
				+				for ($i = 2; $i <= $row; $i++) // 行数循环

			
 
				+				{

			
 
				+					$data = array();

			
 
				+                    for ($c = 'A'; $c != $column; $c++)  // 列数循环

			
 
				+	                {

			
 
				+						$data[] = $phpExcel->getActiveSheet()->getCell($c . $i)->getValue();

			
 
				+                    }

			
 
				+					$list[] = $data;

			
 
				+                }

			
 
				+			}

			
 
				+			$i = 0;

			
 
				+			$gethl = $this->hl->get_hl();//获取即时汇率

			
 
				+			$dictionaries = $this->typeclass->find_all('spare!= "" and classid != 1 and classid != 2 and classid != 3 and classid != 4 and classid != 5 and classid != 11 and classid != 16 and classid != 17 and classid != 20 and classid != 21 and classid != 23 and classid != 24 and classid != 29 and classid != 30 and classid != 31 and classid != 32');

			
 
				+			$dtc = array();

			
 
				+			foreach ($dictionaries as $v) 

			
 
				+			{

			
 
				+				if(stripos($v['spare'],'|') !== false)//如果有多个值

			
 
				+				{

			
 
				+					$v['spare'] = explode('|',$v['spare']);

			
 
				+					foreach ($v['spare'] as $k=>$vs) 

			
 
				+		        	{

			
 
				+						if(stripos($v['zh'],'|') !== false)

			
 
				+						{

			
 
				+							$vzh = explode('|',$v['zh']);

			
 
				+							$dtc[strtolower($vs)] = array('classid'=>$v['classid'],'zh'=>$vzh[$k],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$vs);

			
 
				+						}

			
 
				+						else

			
 
				+						{

			
 
				+					   	 $dtc[strtolower($vs)] = array('classid'=>$v['classid'],'zh'=>$v['zh'],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$vs);

			
 
				+						}

			
 
				+					}

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$dtc[strtolower($v['spare'])] = array('classid'=>$v['classid'],'zh'=>$v['zh'],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$v['spare']);

			
 
				+				}

			
 
				+			

			
 
				+			}

			
 
				+			$dk = array();

			
 
				+			$dictionaries2 = $this->typeclass->find_all();

			
 
				+			foreach ($dictionaries2 as $v)

			
 
				+			{

			
 
				+				$dtctitle[$v['id']] = $v['title'];

			
 
				+				$dk[$v['id']] = $v['bqsku'];

			
 
				+			}

			
 
				+			/*  匹配结束  */    

			
 
				+			/*  价格加入  */  

			
 
				+			$money = array();

			
 
				+			$productdescribe = $this->productdescribe->find_all('1=1');

			
 
				+			foreach ($productdescribe as $v) 

			
 
				+			{

			
 
				+				$money[$v['number']] = array();

			
 
				+			}

			
 
				+			/*  价格加入  */

			
 
				+			/*  匹配ID加入  */

			
 
				+			$int = array();

			
 
				+			$intdata = $this->typeclass->find_all('classid=14','id,spare');

			
 
				+			foreach ($intdata as $v) 

			
 
				+			{

			
 
				+				$v['spare'] = explode('|',$v['spare']);

			
 
				+				$int[$v['id']] = $v['spare'][0];

			
 
				+			}	

			
 
				+			/*  匹配ID加入  */

			
 
				+			$zjsku = array();

			
 
				+			$shopsku = $this->shopsku->find_all();

			
 
				+			foreach ($shopsku as $val) 

			
 
				+			{

			
 
				+				$ss = explode(',',trim($val['shop'],','));

			
 
				+				foreach ($ss as $v) 

			
 
				+			    {

			
 
				+					if(isset($zjsku[$v]))

			
 
				+					{

			
 
				+						$zjsku[$v] .= ','.trim($val['sku'],',');

			
 
				+					}

			
 
				+					else

			
 
				+					{

			
 
				+						$zjsku[$v] = trim($val['sku'],',');

			
 
				+					}

			
 
				+				}

			
 
				+			}	

			
 
				+			/*  匹配ID结束  */

			
 
				+		    $this->db->trans_begin();

			
 
				+		    foreach ($list as $key=>$value)

			
 
				+		    {

			
 
				+				$addtess = ($value['15']!='--'?$value['15'].' ':'').($value['14']!='--'?$value['14'].' ':'').$value['13'];

			
 
				+				$addtess = str_replace(array('/( |　| |\s)/',"'"),array(' ',"’"),$addtess);

			
 
				+				$repeat = $this->customer->find_all('phone = "'.$value[11].'" and address = "'.($value['15']!='--'?$value['15'].' ':'').($value['14']!='--'?$value['14'].' ':'').$value['13'].'" and shop = 19');//判断电话地址

			
 
				+				$sku = $value['8'];

			
 
				+				$je = (isset($value['28']))?$value['28']:0;

			
 
				+				$value['29'] = str_replace('/','-',$value['29']);

			
 
				+				$dtime = strtotime($value['29']);

			
 
				+				$post['name'] = ($value['10'] && $value['10'] != 'NULL')?str_replace(array('/( |　| |\s)/',"'"),array(' ',"’"),$value['10']):'';

			
 
				+				$post['email'] = $value['12'];

			
 
				+				if($value['20'] != '')

			
 
				+				{

			
 
				+					$country = $this->country->get_ename(str_replace(array('/( |　| |\s)/',"'"),array(' ',"’"),$value['20']));

			
 
				+					$post['country'] = $country['id'];

			
 
				+				}

			
 
				+				$post['level'] = 4;

			
 
				+				$post['phone'] = $value['11']?$value['11']:'';

			
 
				+				$post['province'] = $value['18']?$value['18']:'';

			
 
				+				$post['city'] = $value['17']?$value['17']:'';

			
 
				+				$post['address'] = $addtess;

			
 
				+				$post['zipcode'] = $value['19']?$value['19']:'';

			
 
				+				$post['shop'] = 19;

			
 
				+				$post['source'] = 2;

			
 
				+				$post['type'] = 1;

			
 
				+				$post['count'] = '';

			
 
				+				$post['time'] = $dtime;

			
 
				+				$str = $post['phone'];

			
 
				+				preg_match_all('/[0-9]/u',$str,$result);

			
 
				+				$numphone = join('',$result[0]);

			
 
				+				$post['numphone'] = $numphone;

			
 
				+				if(!isset($repeat[0]))

			
 
				+				{

			
 
				+		    	    $this->customer->insert($post);

			
 
				+                }

			
 
				+				else

			
 
				+				{

			
 
				+					$this->customer->save(array('num'=>$repeat[0]['num']+1),$repeat[0]['id']);

			
 
				+				}

			
 
				+				$sbsku = '';

			
 
				+				$whlabel = $this->whlabel->get_sku($sku);

			
 
				+				if($whlabel)

			
 
				+				{

			
 
				+					$w = explode('-',trim($whlabel['features'],'-'));

			
 
				+					foreach ($w as $v)

			
 
				+		            {

			
 
				+						if(isset($dk[$v]))

			
 
				+						{

			
 
				+							$sbsku .= $dk[$v].'-';

			
 
				+						}

			
 
				+					}

			
 
				+				}

			
 
				+				$sbsku = trim($sbsku,'-');

			
 
				+				$time = time();

			
 
				+				$shop = $this->shop->read(19);

			
 
				+				$ddpost['orderremarks'] = isset($value['30'])?$value['30']:'';

			
 
				+				$ddpost['shop'] = $shop['id'];//店铺ID

			
 
				+				$ddpost['user'] = $shop['shopuser'];//店铺负责人

			
 
				+				$orderid = 0;

			
 
				+				$ddpost['orderid'] = 0;

			
 
				+				$ddpost['product'] = '';//产品名称

			
 
				+				$ddpost['link'] = '';//产品链接

			
 
				+				$ddpost['issku'] = $sku;

			
 
				+				$ddpost['quantity'] = rtrim($value['3'],';');

			
 
				+				$ddpost['clientremarks'] = '';//客户备注

			
 
				+				$ddpost['paypal'] = '';//交易号

			
 
				+				$ddpost['guarantee'] = '';//卖家保障

			
 
				+				$ddpost['parameter'] = '';//属性

			
 
				+				$ddpost['shippingmethod'] = '';//用户选择快递方式及运费金额

			
 
				+				$ddpost['source'] = 2;//订单类型

			
 
				+				$ddpost['type'] = 1;//发货仓库

			
 
				+				$ddpost['capital'] = 3;//资金支付状况，全部付款

			
 
				+				$num = $this->fullorder->find_count('gtime = "'.date('Ymd',$dtime).'" and shop = 19');

			
 
				+				$ddpost['number'] = $shop['shortname'].'-'.substr(date('ymd',$dtime),1).'-'.(substr(strval($num+1+1000),1,3));//编号

			
 
				+				$ddpost['orderinfo'] =  preg_replace('/[^0-9]/', '', $value['0']);//订单号

			
 
				+				$d = $this->fullorder->get_orderinfo($ddpost['orderinfo']);

			
 
				+				if(isset($d['id']))

			
 
				+				{

			
 
				+					$i++;

			
 
				+					continue;

			
 
				+				}

			
 
				+				$ddpost['insurance'] = 0;//运输保险费用

			
 
				+				$ddpost['baddress'] = '';

			
 
				+				$ddpost['saddress'] = '';

			
 
				+				$ddpost['country'] = $country['id'];//此国家的ID

			
 
				+				$ddpost['al'] = $country['lb'];//联邦名称

			
 
				+				$ddpost['bname'] = $post['name'];//名称

			
 
				+				$ddpost['sname'] = $post['name'];//名称

			
 
				+				$ddpost['client'] = $post['name'];//公司名称

			
 
				+				$ddpost['name'] = $post['name'];//收件人名称

			
 
				+				$ddpost['phone'] = $post['phone'];//收件人电话

			
 
				+				$ddpost['email'] = $post['email'];//客户邮箱

			
 
				+				$ddpost['zipcode'] = $post['zipcode'];//收件人邮编

			
 
				+				$ddpost['province'] = $post['province'];//收件人省份

			
 
				+				$ddpost['city'] = $post['city'];//收件人城市

			
 
				+				$ddpost['address'] = $post['address'];//收件人地址

			
 
				+				$ddpost['shouldmoney'] = $je;//应收金额

			
 
				+				$ddpost['skje'] = $je;//收款金额

			
 
				+				$ddpost['ismoney'] = '';//支付币种金额

			
 
				+				$ddpost['shouldmoney'] = $je;//金额

			
 
				+			    $ddpost['budget'] = $je;//预估到帐金额

			
 
				+				$ddpost['buytime'] = $dtime;//格式化付款时间

			
 
				+				$ddpost['dtime'] = $dtime;//订单时间

			
 
				+				$ddpost['gtime'] = date('Ymd',$dtime);//格式化订单时间

			
 
				+				$ddpost['currencytitle'] = 'USD';//结算币种名称

			
 
				+				$ddpost['currency'] = 219;//钱币ID

			
 
				+				$ddpost['time'] = time();//同步时间

			
 
				+				$ddpost['shopify'] = 0;//同步时间

			
 
				+				$ddpost['hl'] = '6.4';//汇率

			
 
				+				$matching = $this->api->matching($ddpost['quantity'],$sbsku,$dtc,$money,$int,$dtctitle,$shop);

			
 
				+				$ddpost['shipremarks'] = $matching['title'];

			
 
				+				$ddpost['cost'] = $matching['cost'];

			
 
				+				$ddpost['purchase'] = $matching['purchase'];

			
 
				+				$ddpost['fpdata'] = $matching['product'];

			
 
				+				$ddpost['whlabel'] = $matching['whlabel'];

			
 
				+				$ddpost['slpx'] = $matching['wcslpx'];

			
 
				+				$ddpost['state'] = 207;

			
 
				+				$ddpost['type'] = 17;

			
 
				+				$this->fullorder->insert($ddpost);

			
 
				+			}

			
 
				+			if ($this->db->trans_status() === FALSE)

			
 
				+            {

			
 
				+				$this->db->trans_commit();

			
 
				+				echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+            }

			
 
				+            else

			
 
				+            {

			
 
				+				if(count($list) == $i)

			
 
				+				{

			
 
				+					$til = '导入全部失败！请检查导入信息';

			
 
				+				}

			
 
				+				else if(count($list) > $i && $i != 0)

			
 
				+				{

			
 
				+					$til = '部分导入成功！'.$i.'条信息有问题，请排查';

			
 
				+				}

			
 
				+				else  if($i < 1)

			
 
				+				{

			
 
				+					$til = '导入成功！';

			
 
				+				}

			
 
				+                $this->db->trans_commit();

			
 
				+				echo json_encode(array('msg'=>$til,'success'=>true));exit;

			
 
				+            }

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			echo json_encode(array('msg'=>'上传失败！','t'=>$this->upload->display_errors(),'success'=>false));exit;

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				 	public function _indexexcel()//通过计数，2020/02/21已校准

			
 
				 	{

			
 
				 		$user = $this->user->get_api($_SESSION['api']);

			
--- a/core/CoreApp/controllers/Customersmt.php
+++ b/core/CoreApp/controllers/Customersmt.php
@@ -657,6 +657,10 @@ class Customersmt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'总申报价值不可超出'.$express['sbjz'],'success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['shouldmoney'] > $express['shouldmoney'] && $express['shouldmoney'] != 0)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'订单金额不可超出'.$express['shouldmoney'],'success'=>false));exit;

			
 
				+			}

			
 
				 			if($express['ioss'] == 1 && $post['ioss'] == '')

			
 
				 			{

			
 
				 				 echo json_encode(array('msg'=>'此快递方式必须选择IOSS！','success'=>false));exit;

			
@@ -665,14 +669,22 @@ class Customersmt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'此快递方地址不可超出'.$express['addresssize'].'个字符','success'=>false));exit;

			
 
				 			}

			
 
				-			if($post['express'] == '2' && $post['zzl'] >= '16' && $post['js'] == '0')

			
 
				+			if($post['express'] == '2' && $post['zzl'] > '16' && $post['js'] == '0')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'重量大于16不可按Ground Advantage提交！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '2' && isset($post['js']) && $post['js'] == '0'&& $post['qm'] == '1')

			
 
				 			{

			
 
				-				//echo json_encode(array('msg'=>'总重量大于等于16不可选FIRST CLASS','success'=>false));exit;

			
 
				+				echo json_encode(array('msg'=>'Ground Advantage不可使用签名服务！','success'=>false));exit;

			
 
				 			}

			
 
				 			if(($post['express'] == '3' || $post['express'] == '42' || $post['express'] == '24') && $post['shouldmoney'] < 1)

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'零金额订单不可发 UPS/DHL官方-美国/Fedex(杭州)','success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['express'] == '42' && $post['zsbjz'] < 1)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'零申报金额不可发 DHL官方-美国','success'=>false));exit;

			
 
				+			}

			
 
				 			if($post['express'] == '6' && $post['province'] == '')

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'选择DPEX必须填写州信息','success'=>false));exit;

			
@@ -786,6 +798,7 @@ class Customersmt extends Start_Controller {
 
				 		$this->data['bm'] = $bm;

			
 
				 		$wlshop = $this->shop->find_all('1=1 and '.rtrim($sid,'or'));

			
 
				 		$this->data['wlshop'] = $wlshop;

			
 
				+		$this->data['user'] = $user;

			
 
				 		$this->_Template('customersmt_mdedit',$this->data);

			
 
				 	}

			
 
				 	//上传excel

			
--- a/core/CoreApp/controllers/Customertt.php
+++ b/core/CoreApp/controllers/Customertt.php
@@ -1245,6 +1245,10 @@ class customertt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'总申报价值不可超出'.$express['sbjz'],'success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['shouldmoney'] > $express['shouldmoney'] && $express['shouldmoney'] != 0)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'订单金额不可超出'.$express['shouldmoney'],'success'=>false));exit;

			
 
				+			}

			
 
				 			if($express['ioss'] == 1 && $post['ioss'] == '')

			
 
				 			{

			
 
				 				 echo json_encode(array('msg'=>'此快递方式必须选择IOSS！','success'=>false));exit;

			
@@ -1257,14 +1261,22 @@ class customertt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'地址不可留空！','success'=>false));exit;

			
 
				 			}

			
 
				-			if($post['express'] == '2' && $post['zzl'] >= '16' && $post['js'] == '0')

			
 
				+			if($post['express'] == '2' && $post['zzl'] > '16' && $post['js'] == '0')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'重量大于16不可按Ground Advantage提交！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '2' && isset($post['js']) && $post['js'] == '0'&& $post['qm'] == '1')

			
 
				 			{

			
 
				-				//echo json_encode(array('msg'=>'总重量大于等于16不可选FIRST CLASS','success'=>false));exit;

			
 
				+				echo json_encode(array('msg'=>'Ground Advantage不可使用签名服务！','success'=>false));exit;

			
 
				 			}

			
 
				 			if(($post['express'] == '3' || $post['express'] == '42' || $post['express'] == '24') && $post['shouldmoney'] < 1)

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'零金额订单不可发 UPS/DHL官方-美国/Fedex(杭州)','success'=>false));exit;

			
 
				 			}

			
 
				+			if($post['express'] == '42' && $post['zsbjz'] < 1)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'零申报金额不可发 DHL官方-美国','success'=>false));exit;

			
 
				+			}

			
 
				 			if($post['express'] == '6' && $post['province'] == '')

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'选择DPEX必须填写州信息','success'=>false));exit;

			
--- a/core/CoreApp/controllers/Customerxw.php
+++ b/core/CoreApp/controllers/Customerxw.php
@@ -9,7 +9,7 @@ class customerxw extends Start_Controller {
 
				 		$this->load->_model('Model_country','country');

			
 
				 		$this->load->_model('Model_express','express');

			
 
				 		$this->load->_model('Model_fullorder','fullorder');

			
 
				-		$this->load->_model('Model_fullordertt','fullordertt');

			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');

			
 
				 		$this->load->_model('Model_excel','excel');

			
 
				 		$this->load->_model('Model_whlabel','whlabel');

			
 
				 		$this->load->_model('Model_warehouse','warehouse');

			
@@ -177,7 +177,7 @@ class customerxw extends Start_Controller {
 
				 				$info_list[$key]['source'] = $source['title'];

			
 
				 				if($value['email'] != '0' && $value['email'] != '' && $value['email'] != '无')

			
 
				 		        {

			
 
				-					$gnum =  $this->fullordertt->find_count("email = '".$value['email']."' and shop = '".$value['shop']."' and mergeid = 0 and buytime > '$timetk' and buytime < '$timetj'");

			
 
				+					$gnum =  $this->fullorderxw->find_count("email = '".$value['email']."' and shop = '".$value['shop']."' and mergeid = 0 and buytime > '$timetk' and buytime < '$timetj'");

			
 
				 				}

			
 
				 		        else

			
 
				 				{

			
@@ -412,7 +412,7 @@ class customerxw extends Start_Controller {
 
				 				{

			
 
				 					$info_list[$key]['time'] = "无";

			
 
				 				}

			
 
				-				//$gmcs = $this->fullordertt->find_count("email = '".$value['email']."' time > '$timetk' and time < '$timetj'");

			
 
				+				//$gmcs = $this->fullorderxw->find_count("email = '".$value['email']."' time > '$timetk' and time < '$timetj'");

			
 
				 				//$info_list[$key]['num'] = $gmcs;

			
 
				 				$info_list[$key]['numphone'] = ($value['num'] > 0)?sprintf("%01.2f",$value['money']/$value['num']):0;

			
 
				 				$info_list[$key]['type'] = "<p><a href='javascript:void(0);' class='window' data-h='/customerxw/mdedit/".$value['id']."' data-t='客户下单'><b>下单</b></a></p><a class='customer' data-type='2' data-t='yr' data-id='".$value['id']."' href='javascript:void(0);'>移入黑名单</a>";

			
@@ -933,11 +933,11 @@ class customerxw extends Start_Controller {
 
				 		$this->data['wlshop'] = $wlshop;

			
 
				 		if($customerxw['email'] != '0' && $customerxw['email'] != '' && $customerxw['email'] != '无')

			
 
				 		{

			
 
				-		    $fdata =  $this->fullordertt->find_all('email = "'.$customerxw['email'].'" and shop = "'.$customerxw['shop'].'" and mergeid = 0','orderinfo,state,product,name,email,dtime,shouldmoney','id desc');

			
 
				+		    $fdata =  $this->fullorderxw->find_all('email = "'.$customerxw['email'].'" and shop = "'.$customerxw['shop'].'" and mergeid = 0','orderinfo,state,product,name,email,dtime,shouldmoney','id desc');

			
 
				 		    foreach ($fdata as $k=>$v) 

			
 
				 		    {

			
 
				-				$d = $this->fullordertt->get_orderinfo($v['orderinfo']);

			
 
				-				$fdata[$k]['orderinfo'] = "<a href='/fullordertt/readonly/".$d['id']."'>".$v['orderinfo']."</a>";

			
 
				+				$d = $this->fullorderxw->get_orderinfo($v['orderinfo']);

			
 
				+				$fdata[$k]['orderinfo'] = "<a href='/fullorderxw/readonly/".$d['id']."'>".$v['orderinfo']."</a>";

			
 
				 		    	$typeclass = $this->typeclass->read($v['state']);

			
 
				 		    	$fdata[$k]['state'] = $typeclass['spare'];

			
 
				 		    	$fdata[$k]['dtime'] = date('Y-m-d',$v['dtime']);

			
@@ -965,7 +965,7 @@ class customerxw extends Start_Controller {
 
				 				$customerxw = $this->customerxw->read($v);

			
 
				 				if($customerxw['email'] != '0' && $customerxw['email'] != '' && $customerxw['email'] != '无')

			
 
				 				{

			
 
				-		    		$fdata =  $this->fullordertt->find_count('email = "'.$customerxw['email'].'" and shop = "'.$customerxw['shop'].'" and mergeid = 0');

			
 
				+		    		$fdata =  $this->fullorderxw->find_count('email = "'.$customerxw['email'].'" and shop = "'.$customerxw['shop'].'" and mergeid = 0');

			
 
				 		        }

			
 
				 				if($fdata > 0)

			
 
				 				{

			
@@ -1033,7 +1033,7 @@ class customerxw extends Start_Controller {
 
				 			$customerxwid = $this->input->post('customerxwid',true);

			
 
				 			$shop = $this->input->post('shop',true);

			
 
				 			$sp = $this->shop->read($shop);

			
 
				-			$num = $this->fullordertt->find_count('shop = "'.$sp['id'].'" and gtime = "'.date('Ymd',time()).'"');

			
 
				+			$num = $this->fullorderxw->find_count('shop = "'.$sp['id'].'" and gtime = "'.date('Ymd',time()).'"');

			
 
				 			$post['source'] = 1;//订单类型：1.线下订单2.PC3.手机

			
 
				 			$post['state'] = 207;//订单状态：207等待发货

			
 
				 			$post['review'] = 2;//审核状态：1.未送审2.待审核3.不通过4取消重审5.审核通过6.自动通过

			
@@ -1052,7 +1052,7 @@ class customerxw extends Start_Controller {
 
				 			$post['number'] = $sp['shortname'].'-'.substr(date('ymd',time()),1).'-'.(substr(strval($num+1+1000),1,3));//编号 

			
 
				 			if($orderinfo != "")

			
 
				 			{

			
 
				-				$ordefin = $this->fullordertt->get_orderinfo($orderinfo);

			
 
				+				$ordefin = $this->fullorderxw->get_orderinfo($orderinfo);

			
 
				 				if($ordefin)

			
 
				 				{

			
 
				 					echo json_encode(array('msg'=>'订单号重复！','success'=>false));exit;

			
@@ -1069,7 +1069,7 @@ class customerxw extends Start_Controller {
 
				 			/**

			
 
				 			if($post['paypal'] != '')

			
 
				 			{

			
 
				-			    $pp = $this->fullordertt->get_paypal($post['paypal']);	

			
 
				+			    $pp = $this->fullorderxw->get_paypal($post['paypal']);	

			
 
				 			    if($pp)

			
 
				 			    {

			
 
				 				    echo json_encode(array('msg'=>'此交易号的订单已存在！','success'=>false));exit;

			
@@ -1300,7 +1300,7 @@ class customerxw extends Start_Controller {
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-			    if($this->fullordertt->insert($post))

			
 
				+			    if($this->fullorderxw->insert($post))

			
 
				         	    {

			
 
				 					$cusnum = $this->customerxw->read($customerxwid);

			
 
				 					$this->customerxw->save(array('num'=>$cusnum['num']+1,'time'=>$post['buytime']),$customerxwid);

			
@@ -1365,7 +1365,7 @@ class customerxw extends Start_Controller {
 
				 			//查询净重结束

			
 
				 					$cusnum = $this->customerxw->read($customerxwid);

			
 
				 					$this->customerxw->save(array('num'=>$cusnum['num']+1,'time'=>$post['buytime']),$customerxwid);

			
 
				-					$this->fullordertt->insert($post);

			
 
				+					$this->fullorderxw->insert($post);

			
 
				 					echo json_encode(array('msg'=>'下单成功','success'=>true));exit;

			
 
				 		}

			
 
				 		$arg_array = $arg_array[0];//用户ID

			
@@ -1848,7 +1848,7 @@ class customerxw extends Start_Controller {
 
				                 foreach ($info_list as $key=>$value) 

			
 
				 		        {

			
 
				 					$value['time'] = date('Y-m-d H:i:s',$value['time']);

			
 
				-					$d = $this->fullordertt->find_count('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,name,email,dtime,shouldmoney','time desc');

			
 
				+					$d = $this->fullorderxw->find_count('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,name,email,dtime,shouldmoney','time desc');

			
 
				 					if($d > 1)

			
 
				 					{

			
 
				 						$info_list[] = $v;

			
@@ -1864,7 +1864,7 @@ class customerxw extends Start_Controller {
 
				 				$fdata = $this->customerxw->find_all($where.$wid,'email,shop','time desc');

			
 
				 				foreach ($fdata as $key=>$value) 

			
 
				 		        {

			
 
				-					$d = $this->fullordertt->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');

			
 
				+					$d = $this->fullorderxw->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');

			
 
				 					if($nu == 2)

			
 
				 					{

			
 
				 					    if(count($d) > 1)

			
@@ -2104,12 +2104,12 @@ class customerxw extends Start_Controller {
 
				 			    $time[] = date('Y-m-d',$t);

			
 
				 				$ct = strtotime(date('Ymd',$t));

			
 
				 				$ctj = strtotime(date('Ymd',$t+24*3600));

			
 
				-				$info_list = $this->fullordertt->find_all("mergeid = '0' and dtime > '$ct' and dtime < '$ctj' and (".rtrim($fgshop,'or').")");

			
 
				+				$info_list = $this->fullorderxw->find_all("mergeid = '0' and dtime > '$ct' and dtime < '$ctj' and (".rtrim($fgshop,'or').")");

			
 
				 				foreach ($info_list as $value)

			
 
				 		    	{

			
 
				 					if($value['email'] != '0' && $value['email'] != '' && $value['email'] != '无')

			
 
				 		        	{

			
 
				-						$gnum =  $this->fullordertt->find_count("email = '".$value['email']."' and shop = '".$value['shop']."' and mergeid = 0");

			
 
				+						$gnum =  $this->fullorderxw->find_count("email = '".$value['email']."' and shop = '".$value['shop']."' and mergeid = 0");

			
 
				 						if($gnum >1)

			
 
				 						{

			
 
				 							$onum += 1;

			
--- a/core/CoreApp/controllers/Devicemaster.php
+++ b/core/CoreApp/controllers/Devicemaster.php
@@ -0,0 +1,389 @@
 
				+<?php 
			
 
				+defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Devicemaster extends Start_Controller {
			
 
				+    public function __construct(){
			
 
				+		parent::__construct();
			
 
				+        $this->load->library('session');
			
 
				+        $this->load->_model('Model_devicemaster','devicemaster');
			
 
				+		
			
 
				+	}
			
 
				+	//定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'add')
			
 
				+        {
			
 
				+             $this->_add();
			
 
				+        }
			
 
				+		else if($arg == 'edit')
			
 
				+        {
			
 
				+             $this->_edit($arg_array);
			
 
				+        }
			
 
				+		else if($arg == 'see')
			
 
				+        {
			
 
				+             $this->_see($arg_array);
			
 
				+        }
			
 
				+        else if($arg == 'data')
			
 
				+        {
			
 
				+            
			
 
				+             $this->_data();
			
 
				+        }
			
 
				+		else if($arg == 'del')
			
 
				+        {
			
 
				+             $this->_del();
			
 
				+        }
			
 
				+        else if($arg == 'indexexcel'){
			
 
				+            $this->_indexexcel();
			
 
				+        }
			
 
				+		else
			
 
				+		{
			
 
				+			$this->_index();
			
 
				+		}
			
 
				+    }
			
 
				+
			
 
				+    public $depart_list =[
			
 
				+        1=>"独立站",
			
 
				+        2=>"Tiktok",
			
 
				+        3=>"亚马逊",
			
 
				+        4=>"速卖通",
			
 
				+        5=>"其他",
			
 
				+    ];
			
 
				+    public $plat_list = [
			
 
				+        1=>"独立站",
			
 
				+        2=>"Tiktok",
			
 
				+        3=>"亚马逊",
			
 
				+        4=>"速卖通",
			
 
				+        5=>"其他",
			
 
				+    ];
			
 
				+    public $type_list = [
			
 
				+        1=>"站内",
			
 
				+        2=>"站外",
			
 
				+    ];
			
 
				+    public $shop_list = [
			
 
				+        1=>"Alipearl",
			
 
				+        2=>"WestKiss",
			
 
				+        3=>"Asteria",
			
 
				+        4=>"Wiggins",
			
 
				+        5=>"Yolissa",
			
 
				+        6=>"SuperNova",
			
 
				+        7=>"无",
			
 
				+    ];
			
 
				+
			
 
				+    public function _index(){
			
 
				+        
			
 
				+
			
 
				+        $this->data['depart_list'] = $this->depart_list;
			
 
				+        $this->data['plat_list'] = $this->plat_list;
			
 
				+        $this->data['type_list'] = $this->type_list;
			
 
				+        $this->data['shop_list']=$this->shop_list;
			
 
				+        
			
 
				+        $this->_Template("devicemaster",$this->data);
			
 
				+    }
			
 
				+
			
 
				+    public function _add(){
			
 
				+       
			
 
				+       
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(!empty($post))
			
 
				+		{
			
 
				+            $information = [];
			
 
				+            $tmp = $this->input->post('information',true);
			
 
				+            foreach($tmp as $v){
			
 
				+                if(!empty($v)){
			
 
				+                    $information[] = $v;
			
 
				+                }
			
 
				+               
			
 
				+            }
			
 
				+            $time = date("Y-m-d H:i:s",time());
			
 
				+            $insert_data  =[
			
 
				+                'depart_id'=>$this->input->post('depart_id',true),
			
 
				+                'type_id'=>$this->input->post('type_id',true),
			
 
				+                'plat_id'=>$this->input->post('plat_id',true),
			
 
				+                'shop_id'=>$this->input->post('shop_id',true),
			
 
				+                'mobile_type'=>$this->input->post('mobile_type',true),
			
 
				+                'mobile_color'=>$this->input->post('mobile_color',true),
			
 
				+                'mobile'=>$this->input->post('mobile',true),
			
 
				+                'mobile_user'=>$this->input->post('mobile_user',true),
			
 
				+                'id_account'=>$this->input->post('id_account',true),
			
 
				+                'id_password'=>$this->input->post('id_password',true),
			
 
				+                'unlock_password'=>$this->input->post('unlock_password',true),
			
 
				+                'remarks'=>$this->input->post('remarks',true),
			
 
				+                'purpose'=>$this->input->post('purpose',true),
			
 
				+                "information"=>json_encode($information,JSON_UNESCAPED_UNICODE),
			
 
				+                "is_delete"=>0,
			
 
				+                "create_time"=>$time,
			
 
				+                "update_time"=>$time
			
 
				+            ];
			
 
				+			
			
 
				+			if($this->devicemaster->insert( $insert_data))
			
 
				+        	{
			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+		}
			
 
				+        $this->data['depart_list'] = $this->depart_list;
			
 
				+        $this->data['plat_list'] = $this->plat_list;
			
 
				+        $this->data['type_list'] = $this->type_list;
			
 
				+        $this->data['shop_list']=$this->shop_list;
			
 
				+		$this->_Template('devicemaster_add',$this->data);
			
 
				+    }
			
 
				+    public function _edit($arg_array){
			
 
				+        $post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['id'])){
			
 
				+            $id = $this->input->post('id',true);
			
 
				+            $information = [];
			
 
				+            $tmp = $this->input->post('information',true);
			
 
				+            foreach($tmp as $v){
			
 
				+                if(!empty($v)){
			
 
				+                    $information[] = $v;
			
 
				+                }
			
 
				+               
			
 
				+            }
			
 
				+            $time = date("Y-m-d H:i:s",time());
			
 
				+            $update_data  =[
			
 
				+                'depart_id'=>$this->input->post('depart_id',true),
			
 
				+                'type_id'=>$this->input->post('type_id',true),
			
 
				+                'plat_id'=>$this->input->post('plat_id',true),
			
 
				+                'shop_id'=>$this->input->post('shop_id',true),
			
 
				+                'mobile_type'=>$this->input->post('mobile_type',true),
			
 
				+                'mobile_color'=>$this->input->post('mobile_color',true),
			
 
				+                'mobile'=>$this->input->post('mobile',true),
			
 
				+                'mobile_user'=>$this->input->post('mobile_user',true),
			
 
				+                'id_account'=>$this->input->post('id_account',true),
			
 
				+                'id_password'=>$this->input->post('id_password',true),
			
 
				+                'unlock_password'=>$this->input->post('unlock_password',true),
			
 
				+                'remarks'=>$this->input->post('remarks',true),
			
 
				+                'purpose'=>$this->input->post('purpose',true),
			
 
				+                "information"=>json_encode($information,JSON_UNESCAPED_UNICODE),
			
 
				+                "is_delete"=>0,
			
 
				+                "update_time"=>$time
			
 
				+            ];
			
 
				+			if($this->devicemaster->save($update_data,$id))
			
 
				+        	{
			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+        }
			
 
				+        $id= $arg_array[0];
			
 
				+        $info = $this->devicemaster->read($id);
			
 
				+        $info['information'] = json_decode($info['information'],true);
			
 
				+        $this->data['depart_list'] = $this->depart_list;
			
 
				+        $this->data['plat_list'] = $this->plat_list;
			
 
				+        $this->data['type_list'] = $this->type_list;
			
 
				+        $this->data['shop_list']=$this->shop_list;
			
 
				+        $this->data['info'] = $info;
			
 
				+
			
 
				+        $this->_Template('devicemaster_edit',$this->data);
			
 
				+    }
			
 
				+    public function _see(){
			
 
				+        
			
 
				+    }
			
 
				+    public function _del(){
			
 
				+        $post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['s']))
			
 
				+		{
			
 
				+            $id_arr = $this->input->post('s');
			
 
				+            $id_arr =  explode(',',$id_arr);
			
 
				+            if(!$id_arr)
			
 
				+            {
			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;
			
 
				+            }
			
 
				+            $time = date("Y-m-d H:i:s",time());
			
 
				+            //循环删除记录
			
 
				+            foreach ($id_arr as $v)
			
 
				+		    {
			
 
				+                if(!empty($v)){
			
 
				+                    $this->devicemaster->save(['is_delete'=>1,'delete_time'=>$time],$v);
			
 
				+                }
			
 
				+                
			
 
				+            }
			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));
			
 
				+
			
 
				+          
			
 
				+          
			
 
				+		}
			
 
				+    }
			
 
				+
			
 
				+    public function _data(){
			
 
				+        $post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['page']))  
			
 
				+		{
			
 
				+		    $page = $this->input->post('page',true);
			
 
				+		    $perpage = $this->input->post('perpage',true);
			
 
				+            
			
 
				+            $depart_id = $this->input->post('depart_id',true);
			
 
				+            $type_id = $this->input->post('type_id',true);
			
 
				+            $plat_id = $this->input->post('plat_id',true);
			
 
				+            $shop_id = $this->input->post('shop_id',true);
			
 
				+            $mobile= $this->input->post('mobile',true);
			
 
				+            $mobile_user = $this->input->post('mobile_user',true);
			
 
				+
			
 
				+
			
 
				+            $where = " is_delete = 0";
			
 
				+            if($depart_id)
			
 
				+            {
			
 
				+                $where  .= " and depart_id = '$depart_id'";
			
 
				+            }
			
 
				+            if($type_id)
			
 
				+            {
			
 
				+                $where  .= " and type_id = '$type_id'";
			
 
				+            }
			
 
				+            if($plat_id)
			
 
				+            {
			
 
				+                $where  .= " and plat_id = '$plat_id'";
			
 
				+            }
			
 
				+            if( $shop_id)
			
 
				+            {
			
 
				+                $where  .= " and shop_id = ' $shop_id'";
			
 
				+            }
			
 
				+
			
 
				+
			
 
				+		    if($mobile)
			
 
				+            {
			
 
				+                $where  .= " and mobile like '%$mobile%'";
			
 
				+            }
			
 
				+			 if($mobile_user)
			
 
				+            {
			
 
				+                $where  .= " and mobile_user like '%$mobile_user%'";
			
 
				+            }
			
 
				+            //数据排序
			
 
				+            $order_str = "id asc";
			
 
				+            if(empty($page))
			
 
				+		    {
			
 
				+                $start = 0;
			
 
				+		    	$perpage = 1;
			
 
				+            }
			
 
				+		    else
			
 
				+		    {
			
 
				+                $start = ($page - 1)*$perpage;
			
 
				+            }
			
 
				+            //取得信息列表
			
 
				+            $info_list = $this->devicemaster->find_all($where,'id,mobile,mobile_user,depart_id,type_id,shop_id,plat_id,mobile_type,mobile_color,id_account,id_password,unlock_password,remarks,purpose,information',$order_str,$start,$perpage);
			
 
				+            //格式化数据
			
 
				+            foreach ($info_list as $key=>$value) 
			
 
				+		    {
			
 
				+		    	// if($value['status'] == 1)
			
 
				+				// {
			
 
				+				// 	$info_list[$key]['status'] = '正常';
			
 
				+				// }
			
 
				+				// else
			
 
				+				// {
			
 
				+				// 	$info_list[$key]['status'] = '禁用';
			
 
				+				// }
			
 
				+				
			
 
				+                if(isset($this->depart_list[$info_list[$key]['depart_id']])){
			
 
				+                    $info_list[$key]['depart_id'] = $this->depart_list[$info_list[$key]['depart_id']];
			
 
				+                }
			
 
				+                if(isset($this->plat_list[$info_list[$key]['plat_id']])){
			
 
				+                    $info_list[$key]['plat_id'] =$this->plat_list[$info_list[$key]['plat_id']];
			
 
				+                }
			
 
				+                if(isset($this->shop_list[$info_list[$key]['shop_id']])){
			
 
				+                    $info_list[$key]['shop_id'] = $this->shop_list[$info_list[$key]['shop_id']];
			
 
				+                }
			
 
				+                if(isset($this->type_list[$info_list[$key]['type_id']])){
			
 
				+                    $info_list[$key]['type_id'] = $this->type_list[$info_list[$key]['type_id']];
			
 
				+                }
			
 
				+                $information_str = "";
			
 
				+                $information = json_decode($info_list[$key]['information'],true);
			
 
				+                if(empty($information)){
			
 
				+                    $info_list[$key]['information'] = "";
			
 
				+                }else{
			
 
				+                    foreach($information as $index=>$item){
			
 
				+                        $information_str .="<div style='margin-bottom:3px;border:1px dashed #000'>".$item."</div>";
			
 
				+                    }
			
 
				+                    $info_list[$key]['information'] =  $information_str;
			
 
				+                } 
			
 
				+               
			
 
				+            }
			
 
				+		    $total = $this->devicemaster->find_count($where);
			
 
				+		    $pagenum = ceil($total/$perpage);
			
 
				+		    $over = $total-($start+$perpage);
			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
			
 
				+		    echo json_encode($rows);exit;
			
 
				+		}
			
 
				+    }
			
 
				+    public function _indexexcel(){
			
 
				+        $depart_id = $this->input->post('depart_id',true);
			
 
				+        $type_id = $this->input->post('type_id',true);
			
 
				+        $plat_id = $this->input->post('plat_id',true);
			
 
				+        $shop_id = $this->input->post('shop_id',true);
			
 
				+        $mobile= $this->input->post('mobile',true);
			
 
				+        $mobile_user = $this->input->post('mobile_user',true);
			
 
				+
			
 
				+
			
 
				+        $where = " is_delete = 0";
			
 
				+        if($depart_id)
			
 
				+        {
			
 
				+            $where  .= " and depart_id = '$depart_id'";
			
 
				+        }
			
 
				+        if($type_id)
			
 
				+        {
			
 
				+            $where  .= " and type_id = '$type_id'";
			
 
				+        }
			
 
				+        if($plat_id)
			
 
				+        {
			
 
				+            $where  .= " and plat_id = '$plat_id'";
			
 
				+        }
			
 
				+        if( $shop_id)
			
 
				+        {
			
 
				+            $where  .= " and shop_id = ' $shop_id'";
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        if($mobile)
			
 
				+        {
			
 
				+            $where  .= " and mobile like '%$mobile%'";
			
 
				+        }
			
 
				+            if($mobile_user)
			
 
				+        {
			
 
				+            $where  .= " and mobile_user like '%$mobile_user%'";
			
 
				+        }
			
 
				+        //数据排序
			
 
				+        $order_str = "id asc";
			
 
				+         
			
 
				+        //取得信息列表
			
 
				+        $info_list = $this->devicemaster->find_all($where,'id,mobile,mobile_user,depart_id,type_id,shop_id,plat_id,mobile_type,mobile_color,id_account,id_password,unlock_password,remarks,purpose,information',$order_str,0,null);
			
 
				+
			
 
				+        //格式化数据
			
 
				+        $final_list = [];
			
 
				+        foreach ($info_list as $key=>$value) 
			
 
				+        {
			
 
				+
			
 
				+            $final_list[$key]['ID'] = $value['id'];
			
 
				+            $final_list[$key]['手机号'] = $value['mobile'];
			
 
				+            $final_list[$key]['手机用户'] = $value['mobile_user'];
			
 
				+            $final_list[$key]['部门'] = isset($this->depart_list[$value['depart_id']])?$this->depart_list[$value['depart_id']]:'';
			
 
				+            $final_list[$key]['平台'] = isset($this->plat_list[$value['plat_id']])?$this->plat_list[$value['plat_id']]:'';
			
 
				+            $final_list[$key]['店铺'] = isset($this->shop_list[$value['shop_id']])?$this->shop_list[$value['shop_id']]:'';
			
 
				+            $final_list[$key]['手机类型'] = $value['mobile_type'];
			
 
				+            $final_list[$key]['手机颜色'] = $value['mobile_color'];
			
 
				+            $final_list[$key]['ID账号'] = $value['id_account'];
			
 
				+            $final_list[$key]['ID密码'] = $value['id_password'];
			
 
				+            $final_list[$key]['解锁密码'] = $value['unlock_password'];
			
 
				+            $final_list[$key]['备注'] = $value['remarks'];
			
 
				+            $final_list[$key]['用途'] = $value['purpose'];
			
 
				+
			
 
				+            
			
 
				+            
			
 
				+            $information_str = "";
			
 
				+            $information = json_decode($info_list[$key]['information'],true);
			
 
				+            if(empty($information)){
			
 
				+                $information_str = "";
			
 
				+            }else{
			
 
				+                // foreach($information as $index=>$item){
			
 
				+                //     $information_str .= $item.";";
			
 
				+                // }
			
 
				+                $information_str = json_encode($information,JSON_UNESCAPED_UNICODE);
			
 
				+            } 
			
 
				+            $final_list[$key]['信息'] = $information_str;
			
 
				+            
			
 
				+        }
			
 
				+        echo json_encode(['data'=>$final_list,'success'=>true,'msg'=>'导出成功']);exit;
			
 
				+		
			
 
				+    }
			
 
				+}
			
--- a/core/CoreApp/controllers/Errorlog.php
+++ b/core/CoreApp/controllers/Errorlog.php
@@ -0,0 +1,51 @@
 
				+<?php
			
 
				+defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+/**
			
 
				+ * 由于钉釘现在接口限流了 没办法这边写一个接收器 作为接收需要监听信息的日志记录
			
 
				+ */
			
 
				+class Errorlog extends Start_Controller {
			
 
				+    public function __construct(){
			
 
				+		parent::__construct();
			
 
				+        $this->load->_model("Model_logic_tools","logic_tools");
			
 
				+        $this->load->_model("Model_logic_ding","logic_ding");
			
 
				+        $this->load->_model("Model_zzerrlog","zzerrlog");
			
 
				+    }
			
 
				+    //定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'ding')//添加
			
 
				+        {
			
 
				+             $this->_ding();
			
 
				+        }
			
 
				+		else
			
 
				+		{
			
 
				+			 die('No direct script access allowed');
			
 
				+		}
			
 
				+    }
			
 
				+    public function _ding(){
			
 
				+        //$ip = $_SERVER['REMOTE_ADDR'];  后期仅仅限制部署服务器的ip就好
			
 
				+        $param = json_decode(file_get_contents('php://input'), true);
			
 
				+        $key = $param['bs'];//核验秘钥
			
 
				+        
			
 
				+        $key = $this->logic_tools->toolsjiemi($key);
			
 
				+      
			
 
				+        $check_key = $this->logic_ding->getKey();
			
 
				+
			
 
				+    
			
 
				+        if($check_key != $key){
			
 
				+            die('No direct script access allowed');
			
 
				+        }
			
 
				+        $content = $param['content'];
			
 
				+        if(!is_string( $content)){
			
 
				+             $content = json_encode($content);
			
 
				+        }
			
 
				+        //保存要监听的数据到日志表中
			
 
				+        $this->zzerrlog->insert([
			
 
				+            'content'=>$content,
			
 
				+            'created_time'=>date("Y-m-d H:i:s"),
			
 
				+            'time'=>time(),
			
 
				+        ]);
			
 
				+
			
 
				+
			
 
				+    }
			
 
				+}
			
--- a/core/CoreApp/controllers/Express.php
+++ b/core/CoreApp/controllers/Express.php
@@ -34,6 +34,10 @@ class Express extends Start_Controller {
 
				 		else if($arg == 'packing')//修改packing数据

			
 
				         {

			
 
				              $this->_packing();

			
 
				+        }

			
 
				+		else if($arg == 'read')

			
 
				+        {

			
 
				+             $this->_read();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -72,7 +76,7 @@ class Express extends Start_Controller {
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				             //取得信息列表

			
 
				-            $info_list = $this->express->find_all($where,'id,servicename,title,url,printcode,cxcode,type,out,addresssize,off,idsort',$order_str,$start,$perpage);

			
 
				+            $info_list = $this->express->find_all($where,'id,servicename,title,url,iscode,aecode,printcode,cxcode,type,out,addresssize,yjtime,off,idsort',$order_str,$start,$perpage);

			
 
				 			foreach ($info_list as $k=>$v) 

			
 
				 		    {

			
 
				 				if($v['type'] == '1')

			
@@ -385,4 +389,22 @@ class Express extends Start_Controller {
 
				 			}

			
 
				 		}

			
 
				     }

			
 
				+	

			
 
				+	public function _read()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['id']))  

			
 
				+		{

			
 
				+			$id = $this->input->post('id');

			
 
				+			$data = $this->express->read($id);

			
 
				+			if(isset($data['id']) && $data['xxts'] != '')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>$data['xxts'],'success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('success'=>false));exit;

			
 
				+			}

			
 
				+		}

			
 
				+	}

			
 
				 }
			
--- a/core/CoreApp/controllers/Finance.php
+++ b/core/CoreApp/controllers/Finance.php
@@ -1244,7 +1244,8 @@ class Finance extends Start_Controller {
 
				 			}

			
 
				 				$info_lista = $this->fullorder->find_all($where.$sidwhere,'fpdata,number');

			
 
				 				$info_listb = $this->fullordersmt->find_all($where.$sidwhere,'fpdata,number');

			
 
				-				$info_list = array_merge($info_lista,$info_listb);

			
 
				+				$info_listc = $this->fullordertt->find_all($where.$sidwhere,'fpdata,number');

			
 
				+				$info_list = array_merge($info_lista,$info_listb,$info_listc);

			
 
				 				//echo "<pre>";

			
 
				 				//print_r($info_list);

			
 
				 				//exit();

			
@@ -1261,7 +1262,7 @@ class Finance extends Start_Controller {
 
				 						}

			
 
				 					    $fpdata = explode('|',trim($v,'|'));

			
 
				 					    $xqdata = explode(',',trim($fpdata[0],','));

			
 
				-					    $cc = $typeclass[$xqdata[0]]['spare'];

			
 
				+						 $cc = $typeclass[$xqdata[0]]['ae'];

			
 
				 						if(!isset($xqdata[1]))

			
 
				 						{

			
 
				 							$cw[] = array($value['fpdata'],$value['number']);

			
--- a/core/CoreApp/controllers/Fullorder.php
+++ b/core/CoreApp/controllers/Fullorder.php
--- a/core/CoreApp/controllers/Fullorderexcel.php
+++ b/core/CoreApp/controllers/Fullorderexcel.php
@@ -5,6 +5,7 @@ class Fullorderexcel extends Start_Controller {
 
				 		$this->load->library('session');

			
 
				 		$this->load->_model('Model_fullorder','fullorder');

			
 
				 		$this->load->_model('Model_fullordertt','fullordertt');

			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');

			
 
				 		$this->load->_model('Model_fullorder_smt','fullorder_smt');

			
 
				 		$this->load->_model('Model_fullordersmt','fullordersmt');

			
 
				 		$this->load->_model('Model_fullorderexcel','fullorderexcel');

			
@@ -32,6 +33,15 @@ class Fullorderexcel extends Start_Controller {
 
				 		$this->load->_model('Model_transfer','transfer');

			
 
				 		$this->load->_model('Model_classid','classid');

			
 
				 		$this->load->_model('Model_whlabel_type','whlabel_type');

			
 
				+		$this->load->_model('Model_power','power');

			
 
				+		$this->load->_model('Model_productdescribe','productdescribe');

			
 
				+		$this->load->_model('Model_shopsku','shopsku');

			
 
				+		$this->load->_model('Model_is','is');

			
 
				+		$this->load->_model('Model_whlabel_qh','whlabel_qh');

			
 
				+		$this->load->_model('Model_emaildata','emaildata');

			
 
				+		$this->load->_model('Model_afspaypal','afspaypal');

			
 
				+		$this->load->_model('Model_producttitle','producttitle');

			
 
				+		$this->load->_model('Model_message','message');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -67,6 +77,10 @@ class Fullorderexcel extends Start_Controller {
 
				 		else if($arg == 'xxpl')//线下批量导入

			
 
				         {

			
 
				              $this->_xxpl();

			
 
				+        }

			
 
				+		else if($arg == 'skuzh')//sku转中文

			
 
				+        {

			
 
				+             $this->_skuzh();

			
 
				         }

			
 
				 		else if($arg == 'cs')

			
 
				         {

			
@@ -149,8 +163,11 @@ class Fullorderexcel extends Start_Controller {
 
				 			$post['type'] = $this->input->post('type',true);

			
 
				 			$post['content'] = $this->input->post('content',true);

			
 
				 			$post['contentzh'] = $this->input->post('contentzh',true);

			
 
				-			if($this->fullorderexcel->insert($post))

			
 
				+			$addid = $this->fullorderexcel->insert($post);

			
 
				+			if($addid)

			
 
				         	{

			
 
				+				$adminid = $this->power->read(1);

			
 
				+				$this->power->save(array("excelid"=>$adminid['excelid'].$addid.'|',"exceltext"=>$adminid['exceltext'].$post['title'].'|'),$adminid['id']);

			
 
				 				echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				        	 	}

			
 
				        		else

			
@@ -244,6 +261,10 @@ class Fullorderexcel extends Start_Controller {
 
				 				$sid .= " id = ".$value." or";

			
 
				 			}

			
 
				 			$userexcel = explode('|',trim($user['excelshop'],'|'));

			
 
				+			if($user['excelshop'] == '')

			
 
				+			{

			
 
				+				echo "没有下载权限";exit;

			
 
				+			}

			
 
				 			foreach ($userexcel as $value) 

			
 
				 		    {

			
 
				 				$excelshop .= " shop =  ".$value." or";

			
@@ -315,7 +336,7 @@ class Fullorderexcel extends Start_Controller {
 
				 			$px = $this->input->get('px',true);

			
 
				 			$fexcel = $this->fullorderexcel->read($fexcel);

			
 
				 			$classid = $this->fullorderexcelclassid->read($fexcel['type']);

			
 
				-			$where = "mergeid = 0 and (".rtrim($fgshop,'or').")";

			
 
				+			$where = "1 = 1 and (".rtrim($fgshop,'or').")";

			
 
				 			if($warehouse)

			
 
				             {

			
 
				                 $where  .= " and type = '$warehouse'";

			
@@ -525,6 +546,7 @@ class Fullorderexcel extends Start_Controller {
 
				             foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
 
				 				$data = $this->$sj->read($value['id']);

			
 
				+				$data = str_replace(array("'"),array("’"),$data);

			
 
				 				if(isset($value['email']) && $usp['excelpass'] == '1')

			
 
				 				{

			
 
				 					$emailpass = $this->setting->get_excelpass($value['email']);

			
@@ -963,7 +985,7 @@ class Fullorderexcel extends Start_Controller {
 
				 				{

			
 
				 					if($value['js'] == '0')

			
 
				 					{

			
 
				-						$info_list[$key]['js'] = 'FIRST CLASS';

			
 
				+						$info_list[$key]['js'] = 'Ground Advantage';

			
 
				 					}

			
 
				 					else if($value['js'] == '1')

			
 
				 					{

			
@@ -973,6 +995,14 @@ class Fullorderexcel extends Start_Controller {
 
				 					{

			
 
				 						$info_list[$key]['js'] = 'EXPRESS';

			
 
				 					}

			
 
				+					else if($value['js'] == '3')

			
 
				+					{

			
 
				+						$info_list[$key]['js'] = 'IP';

			
 
				+					}

			
 
				+					else if($value['js'] == '4')

			
 
				+					{

			
 
				+						$info_list[$key]['js'] = 'FICP';

			
 
				+					}

			
 
				 				}

			
 
				 				if(isset($value['type']))

			
 
				 				{

			
@@ -1221,6 +1251,16 @@ class Fullorderexcel extends Start_Controller {
 
				 		{

			
 
				 			$dataorder[$v['orderinfo']] = $v;

			
 
				 		}

			
 
				+		$tdata = $this->fullordertt->find_all('shop = "'.$readid.'" and dtime > "'.(time()-30*24*3600).'" and review > 4 and state = 207 and (dlz < 1 or dlz = 3)');

			
 
				+		foreach ($tdata as $v) 

			
 
				+		{

			
 
				+			$dataorder[$v['orderinfo']] = $v;

			
 
				+		}

			
 
				+		$xdata = $this->fullorderxw->find_all('shop = "'.$readid.'" and dtime > "'.(time()-30*24*3600).'" and review > 4 and state = 207 and (dlz < 1 or dlz = 3)');

			
 
				+		foreach ($xdata as $v) 

			
 
				+		{

			
 
				+			$dataorder[$v['orderinfo']] = $v;

			
 
				+		}

			
 
				 		/*  订单加入键值-j  */

			
 
				 		/*  店铺加入键值-j  */

			
 
				 		$fshop = $this->shop->find_all('1=1');

			
@@ -1283,13 +1323,10 @@ class Fullorderexcel extends Start_Controller {
 
				 					$list[] = $data;

			
 
				                 }

			
 
				 			}

			
 
				-			$i = 0;$j = 0;$ed = array();

			
 
				+			$i = 0;$j = 0;$ed = array();$cscs = array();

			
 
				+			$this->db->trans_begin();

			
 
				 		    foreach ($list as $key=>$value)

			
 
				 		    {

			
 
				-				if($value['0'] == "")

			
 
				-				{

			
 
				-					continue;

			
 
				-				}

			
 
				 				$ddh = preg_replace('/\D/s','',$value['0']);

			
 
				 				$ydh = preg_replace('/\W/s','',$value['1']);

			
 
				 				$shop = $datashop[$readid];

			
@@ -1303,9 +1340,76 @@ class Fullorderexcel extends Start_Controller {
 
				 				}

			
 
				 				if(isset($dataorder[$orid])) 

			
 
				 				{

			
 
				-					$sp = $this->shop->read($arg_array[0]);

			
 
				-					if($sp['type'] == 269)//独立站前缀需要添加ID

			
 
				+					if($shop['type'] == 269)//独立站前缀需要添加ID

			
 
				 					{

			
 
				+						$time = time();

			
 
				+						$xg = $dataorder[$orid];

			
 
				+						$oldw = $xg['waybill'];

			
 
				+					    $ex = $dataex[$xg['express']];

			
 
				+					    $warehouse = $datack[$xg['type']];

			
 
				+						$msg = $ydh;

			
 
				+						$xg['waybill'] = $ydh;

			
 
				+						$fs = $this->notice->find_all("shop = '".$xg['shop']."' and message = '1' and state = '1' and type = '4' and ktime < '$time' and jtime > '$time'");

			
 
				+						if(isset($fs[0]))

			
 
				+						{

			
 
				+							$fs = $fs[0];

			
 
				+							$fs['email'] = $this->emaildata->read($fs['email']);

			
 
				+							if(($xg['dlzemail'] == 1 && $msg != $oldw) || $xg['dlzemail'] == 0)

			
 
				+							{

			
 
				+								$ck = $this->notice->get_god($xg,$shop,$ex,$fs);

			
 
				+								if($ck == 1)

			
 
				+								{

			
 
				+									$ckemail = '邮件发送成功，';

			
 
				+					    			$this->fullorder->save(array('dlzemail'=>1,'dlzemailtime'=>time()),$xg['id']);

			
 
				+								}

			
 
				+							}

			
 
				+						}

			
 
				+						if($msg != $oldw)

			
 
				+						{

			
 
				+				    		if($xg['source'] != 1)

			
 
				+				    		{

			
 
				+								$ms = $this->message->find_all("express like '%,".$xg['express'].",%'");

			
 
				+								if(!isset($ms[0]))

			
 
				+								{

			
 
				+									$ms = $this->message->read(2);

			
 
				+								}

			
 
				+								else

			
 
				+								{

			
 
				+									$ms = $ms[0];

			
 
				+								}

			
 
				+								$ddh = substr($xg['orderinfo'],1);

			
 
				+								$shopifyid = $xg['shopify'];

			
 
				+				        		//独立站地址更新订单状态、物流信息

			
 
				+								$shopname = $shop['brandname'];  //店铺名

			
 
				+								$buyername = $xg['bname'];   //Bill Name

			
 
				+								$email_call = $shop['shopid']; //发货人邮箱;

			
 
				+								$phone = $shop['shopphone'];   //发货人电话

			
 
				+								$track_type = $ex['title'];   //快递名称

			
 
				+								$service = $ex['title'];   //快递追踪名称

			
 
				+								$track_link = $ex['url'];   //快递查询网址

			
 
				+								$logistics_number = $ydh;    //运单号

			
 
				+								$t= array('%buyername%','%email_call%','%track_type%','%service%','%track_link%','%logistics_number%','%shop%','%phone%','%jtime%');

			
 
				+								$h= array($buyername,$email_call,$track_type,$service,$track_link,$logistics_number,$shopname,$phone,$ex['yjtime']);

			
 
				+								$remark = str_replace($t,$h,$ms['content']);

			
 
				+			    				@$gx = $this->api->get_gx($ddh,$ydh,$xg,$shop,$ex,$remark,$shopifyid);

			
 
				+				    		}

			
 
				+				    		else if($xg['source'] == 1)

			
 
				+				    		{

			
 
				+					    		$gx['res'] = 3;

			
 
				+					    		$gx['state'] = 216;

			
 
				+				    		}

			
 
				+						}

			
 
				+						else

			
 
				+						{

			
 
				+							$gx['res'] = $xg['dlz'];

			
 
				+							$gx['state'] = $xg['state'];

			
 
				+						}

			
 
				+						$xg['iscode'] = $ex['title'];

			
 
				+		        		$xg['url'] = $shop['shopname'];

			
 
				+						@$chuanshu = $this->api->get_paypal($xg);

			
 
				+						//$this->afspaypal->insert(array('number'=>$xg['number'],'cs'=>$chuanshu));

			
 
				+						$this->fullorder->save(array('waybill'=>$msg,'state'=>$gx['state'],'dlz'=>$gx['res']),$xg['id']);

			
 
				+						/**

			
 
				 					    $xg = $dataorder[$arg_array[0].$ddh];

			
 
				 					    $ex = $dataex[$xg['express']];

			
 
				 					    $warehouse = $datack[$xg['type']];

			
@@ -1339,8 +1443,9 @@ class Fullorderexcel extends Start_Controller {
 
				 						    $j++;

			
 
				 						    continue;

			
 
				 					    }

			
 
				+						**/

			
 
				 					}

			
 
				-					else if($sp['type'] == 270)//速卖通对接发货声明

			
 
				+					else if($shop['type'] == 270)//速卖通对接发货声明

			
 
				 					{

			
 
				 						$xg = $dataorder[$ddh];

			
 
				 					    $ex = $dataex[$xg['express']];

			
@@ -1451,6 +1556,14 @@ class Fullorderexcel extends Start_Controller {
 
				 				}

			
 
				 				sleep(1);//停留1秒

			
 
				 			}

			
 
				+			if ($this->db->trans_status() === FALSE)

			
 
				+			{

			
 
				+    			$this->db->trans_rollback();

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+    			$this->db->trans_commit();

			
 
				+			}

			
 
				 			if($i+$j > 0)

			
 
				 			{

			
 
				 				$time = date('Ymd',time());

			
@@ -1887,9 +2000,41 @@ class Fullorderexcel extends Start_Controller {
 
				 	    }

			
 
				 	}

			
 
				 	

			
 
				-	

			
 
				+	public function _gggs($sku,$s,$j,$k)

			
 
				+	{

			
 
				+		$companytitle = array(9=>3,10=>2,11=>1,12=>4);

			
 
				+		$this->load->database();

			
 
				+		$this->db->select('id');

			
 
				+    				  $this->db->from('crowd_whlabel');

			
 
				+   				      $this->db->where('warehouse', '5');

			
 
				+   				      $this->db->where('sku', $sku);

			
 
				+    				  $this->db->where('state', '0');

			
 
				+    				  $this->db->limit($s,$k);

			
 
				+    				  $query = $this->db->get();

			
 
				+    				  $ids = array_column($query->result_array(), 'id');

			
 
				+    				  if (!empty($ids)) 

			
 
				+					  {

			
 
				+        				  // 更新

			
 
				+        				  $this->db->where_in('id', $ids);

			
 
				+						  $this->db->update('crowd_whlabel', array('companytitle' => $companytitle[$j]));

			
 
				+       				      return $this->db->affected_rows();

			
 
				+					  }

			
 
				+	}

			
 
				 	public function _xxpl()

			
 
				 	{

			
 
				+		

			
 
				+		 $this->load->database();

			
 
				+    $data = ['type' => ''];

			
 
				+    $this->db->update('crowd_whlabel', $data);

			
 
				+

			
 
				+

			
 
				+	$wt = array();

			
 
				+			$whlabel_type = $this->whlabel_type->find_all();

			
 
				+			foreach ($whlabel_type as $v) 

			
 
				+			{

			
 
				+				$wt[$v['title']] = $v['id'];

			
 
				+			}

			
 
				+			

			
 
				 		/*  订单加入键值-j  */

			
 
				 		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				 		$config['upload_path'] = '.'.$dir ;

			
@@ -1926,13 +2071,66 @@ class Fullorderexcel extends Start_Controller {
 
				 					$list[] = $data;

			
 
				                 }

			
 
				 			}

			
 
				-			$j = 0;$ed = array();

			
 
				 			$wt = array();

			
 
				 			$whlabel_type = $this->whlabel_type->find_all();

			
 
				 			foreach ($whlabel_type as $v) 

			
 
				 			{

			
 
				 				$wt[$v['title']] = $v['id'];

			
 
				 			}

			
 
				+			$j = 0;$ed = array();$e = 0;$c = 0;$cs = array();

			
 
				+			foreach ($list as $v)

			
 
				+		    {

			
 
				+			

			
 
				+			 $this->load->database();

			
 
				+

			
 
				+    // 设置更新数据

			
 
				+    $data = ['type' => $wt[$v[1]]];

			
 
				+

			
 
				+    // 添加条件：SKU 为 123456 且 warehouse 为 5

			
 
				+    $this->db->where('SKU', $v[0]);

			
 
				+    $this->db->where('warehouse', '5');

			
 
				+

			
 
				+    // 批量更新

			
 
				+    $this->db->update('crowd_whlabel', $data);

			
 
				+			}

			
 
				+			

			
 
				+			

			
 
				+			/** 导入缺货

			
 
				+			$time = time();

			
 
				+			

			
 
				+				$whlabel = $this->whlabel->get_sku($v[0]);

			
 
				+				if($whlabel)

			
 
				+				{

			
 
				+					$this->whlabel_qh->insert(array('sku'=>$whlabel['sku'],'features'=>$whlabel['features'],'num'=>$v['1'],'gtime'=>date('Ym',$time),'gxtime'=>date('Ymd',$time)));

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$ed[] = $v['0'];

			
 
				+					$j++;

			
 
				+				}

			
 
				+			}

			
 
				+			**/

			
 
				+			/**

			
 
				+			更换等级

			
 
				+			 $this->load->database();

			
 
				+

			
 
				+    // 设置更新数据

			
 
				+    $data = ['type' => $wt[$v[1]]];

			
 
				+

			
 
				+    // 添加条件：SKU 为 123456 且 warehouse 为 5

			
 
				+    $this->db->where('SKU', $v[0]);

			
 
				+    $this->db->where('warehouse', '5');

			
 
				+

			
 
				+    // 批量更新

			
 
				+    $this->db->update('crowd_whlabel', $data);

			
 
				+			

			
 
				+			**/

			
 
				+			/**

			
 
				+			$whlabel_type = $this->whlabel_type->find_all();

			
 
				+			foreach ($whlabel_type as $v) 

			
 
				+			{

			
 
				+				$wt[$v['title']] = $v['id'];

			
 
				+			}

			
 
				 			foreach ($list as $v)

			
 
				 		    {

			
 
				 				$w = $this->whlabel->find_all("sku = '".$v[0]."' and warehouse = 5");

			
@@ -1949,9 +2147,10 @@ class Fullorderexcel extends Start_Controller {
 
				 					$j++;

			
 
				 				}

			
 
				 			}

			
 
				+			**/

			
 
				 				

			
 
				 			

			
 
				-			if($j > 0)

			
 
				+			if($e > 0)

			
 
				 			{

			
 
				 				$time = date('Ymd',time());

			
 
				 				$title = '错误信息-'.$time;

			
@@ -1970,8 +2169,168 @@ class Fullorderexcel extends Start_Controller {
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				echo json_encode(array('msg'=>'添加成功!'.$i,'error'=>$cs,'success'=>true));exit;

			
 
				+				echo json_encode(array('msg'=>'添加成功!'.$c,'success'=>true));exit;

			
 
				+			}

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			echo json_encode(array('msg'=>'上传失败！','t'=>$this->upload->display_errors(),'success'=>false));exit;

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	

			
 
				+	public function _skuzh()

			
 
				+	{

			
 
				+		/*  订单加入键值-j  */

			
 
				+		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				+		$config['upload_path'] = '.'.$dir ;

			
 
				+		$config['file_name'] = date('Ymd_His_',time()).rand(1000,9999);

			
 
				+        $config['allowed_types'] = 'xls|xlsx|csv';

			
 
				+        $config['max_size'] = 10240;

			
 
				+		$this->load->library('upload', $config);

			
 
				+		$this->upload->initialize($config);

			
 
				+        if ($this->upload->do_upload('userfile'))

			
 
				+        {

			
 
				+			$full_path = $dir.$this->upload->data('file_name');

			
 
				+			$fileName = '.' . $full_path;

			
 
				+            if (!file_exists($fileName)) 

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>"上传失败，请重试",'success'=>false));exit;

			
 
				+            }

			
 
				+			else

			
 
				+			{

			
 
				+				require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				+				@$phpExcel = PHPExcel_IOFactory::load($fileName);// 载入当前文件

			
 
				+				@$phpExcel->setActiveSheetIndex(0);// 设置为默认表

			
 
				+				$sheetCount = $phpExcel->getSheetCount();// 获取表格数量

			
 
				+				$row = $phpExcel->getActiveSheet()->getHighestRow();// 获取行数

			
 
				+				$column = $phpExcel->getActiveSheet()->getHighestColumn();// 获取列数

			
 
				+				++$column;//如果列数大于26行

			
 
				+				$list = array();

			
 
				+				for ($i = 2; $i <= $row; $i++) // 行数循环

			
 
				+				{

			
 
				+					$data = array();

			
 
				+                    for ($c = 'A'; $c != $column; $c++)  // 列数循环

			
 
				+	                {

			
 
				+						$data[] = $phpExcel->getActiveSheet()->getCell($c . $i)->getValue();

			
 
				+                    }

			
 
				+					$list[] = $data;

			
 
				+                }

			
 
				 			}

			
 
				+			$dictionaries = $this->typeclass->find_all('spare!= "" and classid != 1 and classid != 2 and classid != 3 and classid != 4 and classid != 5 and classid != 11 and classid != 16 and classid != 17 and classid != 20 and classid != 21 and classid != 23 and classid != 24 and classid != 29 and classid != 30 and classid != 31 and classid != 32');

			
 
				+			$dtc = array();

			
 
				+			foreach ($dictionaries as $v) 

			
 
				+			{

			
 
				+				if(stripos($v['spare'],'|') !== false)//如果有多个值

			
 
				+				{

			
 
				+					$v['spare'] = explode('|',$v['spare']);

			
 
				+					foreach ($v['spare'] as $k=>$vs) 

			
 
				+		        	{

			
 
				+						if(stripos($v['zh'],'|') !== false)

			
 
				+						{

			
 
				+							$vzh = explode('|',$v['zh']);

			
 
				+							$dtc[strtolower($vs)] = array('classid'=>$v['classid'],'zh'=>$vzh[$k],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$vs);

			
 
				+						}

			
 
				+						else

			
 
				+						{

			
 
				+					   	 $dtc[strtolower($vs)] = array('classid'=>$v['classid'],'zh'=>$v['zh'],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$vs);

			
 
				+						}

			
 
				+					}

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$dtc[strtolower($v['spare'])] = array('classid'=>$v['classid'],'zh'=>$v['zh'],'id'=>$v['id'],'jm'=>$v['jm'],'spare'=>$v['spare']);

			
 
				+				}

			
 
				+			

			
 
				+			}

			
 
				+			$dictionaries2 = $this->typeclass->find_all();

			
 
				+			foreach ($dictionaries2 as $v)

			
 
				+			{

			
 
				+				$dtctitle[$v['id']] = $v['title'];

			
 
				+			}

			
 
				+			/*  匹配结束  */    

			
 
				+			/*  价格加入  */  

			
 
				+			$money = array();

			
 
				+			$productdescribe = $this->productdescribe->find_all('1=1');

			
 
				+			foreach ($productdescribe as $v) 

			
 
				+			{

			
 
				+				$money[$v['number']] = array();

			
 
				+			}

			
 
				+			/*  价格加入  */

			
 
				+			/*  匹配ID加入  */

			
 
				+			$int = array();

			
 
				+			$intdata = $this->typeclass->find_all('classid=14','id,spare');

			
 
				+			foreach ($intdata as $v) 

			
 
				+			{

			
 
				+				$v['spare'] = explode('|',$v['spare']);

			
 
				+				$int[$v['id']] = $v['spare'][0];

			
 
				+			}	

			
 
				+			/*  匹配ID加入  */

			
 
				+			$zjsku = array();

			
 
				+			$shopsku = $this->shopsku->find_all();

			
 
				+			foreach ($shopsku as $val) 

			
 
				+			{

			
 
				+				$ss = explode(',',trim($val['shop'],','));

			
 
				+				foreach ($ss as $v) 

			
 
				+			    {

			
 
				+					if(isset($zjsku[$v]))

			
 
				+					{

			
 
				+						$zjsku[$v] .= ','.trim($val['sku'],',');

			
 
				+					}

			
 
				+					else

			
 
				+					{

			
 
				+						$zjsku[$v] = trim($val['sku'],',');

			
 
				+					}

			
 
				+				}

			
 
				+			}	

			
 
				+			/*  匹配ID结束  */

			
 
				+			$q = '1;';

			
 
				+			$is = $this->is->find_all('1=1','*','number asc');//获取仓库平匹配表

			
 
				+			$shop = $this->shop->read(19);

			
 
				+			if(isset($zjsku[$shop['id']]))//判断是否找到店铺SKU

			
 
				+			{

			
 
				+				$sku = rtrim($sku,',').','.$zjsku[$shop['id']];

			
 
				+			}

			
 
				+			$ed = array();

			
 
				+			foreach ($list as $v)

			
 
				+		    {

			
 
				+				$r = $this->api->matching(trim($q,';'),$v['2'],$dtc,$money,$int,$dtctitle,$shop);

			
 
				+				$p = '';

			
 
				+				$product = explode(';',trim($r['product'],';'));

			
 
				+				if($r['title'] != '' && $product)

			
 
				+				{

			
 
				+			    	foreach ($product as $val) 

			
 
				+			    	{

			
 
				+				    	$vc = explode('|',$val);

			
 
				+						if(isset($vc[1]))

			
 
				+						{

			
 
				+				    	    $p .= $vc[1].'<br>';

			
 
				+						}

			
 
				+			    	}

			
 
				+					$r['title'] = str_replace(array('<','>'),array('&lt;','&gt;'),$r['title']);

			
 
				+			    	$ed[] = array($v['0'],$v['1'],$r['title'],$v['3'],$v['4'],$v['5']);

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$ed[] = array($v['0'],$v['1'],$v['2'].' SKU错误',$v['3'],$v['4'],$v['5']);

			
 
				+				}

			
 
				+			}

			
 
				+				

			
 
				+			

			
 
				+			$time = date('Ymd',time());

			
 
				+			$title = 'sku转换'.$time;

			
 
				+        	$titlename = "<table border=1><tr><td>退款日期</td><td>订单号</td><td>SKU</td><td退款金额</td><td退款情况具体描述</td><可用/不可用</td></tr></table>";

			
 
				+			$tail = "\n";

			
 
				+        	$filename = $title.".xls";

			
 
				+        	@$ecl = $this->excel->get_fz3($ed,$titlename,$filename,$tail);

			
 
				+			$dir = '/data/excel/'.$time.'/';

			
 
				+			$file_name = 'sku转换 '.$time.rand(1000,9999);

			
 
				+			if(!is_dir('.'.$dir))mkdir('.'.$dir,0777);

			
 
				+			$myfile = fopen(".".$dir.$file_name.".xls", "w") or die();

			
 
				+			fwrite($myfile,$ecl);

			
 
				+			fclose($myfile);

			
 
				+			$error = $dir.$file_name.'.xls';

			
 
				+			echo json_encode(array('msg'=>'转换成功!','error'=>$error,'success'=>true));exit;

			
 
				         }

			
 
				 		else

			
 
				 		{

			
--- a/core/CoreApp/controllers/Fullordersmt.php
+++ b/core/CoreApp/controllers/Fullordersmt.php
@@ -38,6 +38,8 @@ class Fullordersmt extends Start_Controller {
 
				 		$this->load->_model('Model_transfer','transfer');

			
 
				 		$this->load->_model('Model_systemtransfer','systemtransfer');

			
 
				 		$this->load->_model('Model_power','power');

			
 
				+		$this->load->_model('Model_setting','setting');

			
 
				+		$this->load->_model('Model_returngoods','returngoods');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -173,6 +175,10 @@ class Fullordersmt extends Start_Controller {
 
				 		else if($arg == 'epod')

			
 
				         {

			
 
				              $this->_epod();

			
 
				+        }

			
 
				+		else if($arg == 'ddcf')

			
 
				+        {

			
 
				+             $this->_ddcf();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -279,7 +285,7 @@ class Fullordersmt extends Start_Controller {
 
				             }

			
 
				 			if($number)

			
 
				             {

			
 
				-                $where  .= " and number = '$number'";

			
 
				+                $where  .= " and number like '$number%'";

			
 
				             }

			
 
				 			if($email)

			
 
				             {

			
@@ -374,7 +380,7 @@ class Fullordersmt extends Start_Controller {
 
				 				{

			
 
				 					if($customer['type'] == 1 && $customer['num'] > 1)

			
 
				 					{

			
 
				-						$lkh .= "<p style='color:#FF3333'>老客户</p>";

			
 
				+						$lkh .= "<p style='color:#FF3333'>老客户(".$customer['num'].")</p>";

			
 
				 					}

			
 
				 					else if($customer['type'] == 2)

			
 
				 					{

			
@@ -470,7 +476,14 @@ class Fullordersmt extends Start_Controller {
 
				 				{

			
 
				 				    $express = $this->express->read($value['express']);

			
 
				 					$expressservicename = $express['servicename'];

			
 
				-				if($value['express'] != 1){$expressservicename = "<font style='color:#f64b4b'>".$express['servicename']."</font>";}

			
 
				+					if($value['express'] != 1 && $value['express'] != 63)

			
 
				+					{

			
 
				+						$expressservicename = "<font style='color:#f64b4b'>".$express['servicename']."</font>";

			
 
				+					}

			
 
				+					else if($value['express'] == 63)

			
 
				+					{

			
 
				+						$expressservicename = "<font style='color:#a910f8'>".$express['servicename']."</font>";

			
 
				+					}

			
 
				 				    $info_list[$key]['express'] = $expressservicename;

			
 
				 				}

			
 
				 				else

			
@@ -595,6 +608,7 @@ class Fullordersmt extends Start_Controller {
 
				 		$this->data['power'] = $vip;

			
 
				 		$country = $this->country->find_all('1=1','id,name','name asc');//所有国家信息

			
 
				 		$this->data['country'] = $country;

			
 
				+		$this->data['user'] = $user;

			
 
				 		$this->_Template('fullordersmt',$this->data);

			
 
				 	}

			
 
				 	

			
@@ -807,7 +821,7 @@ class Fullordersmt extends Start_Controller {
 
				 					$way += 1;

			
 
				 				}

			
 
				 			}

			
 
				-			if(($post['express'] == 2 && ($post['type'] != 5 && $post['type'] != 8)) || ($post['express'] != 2 && ($post['type'] == 5 || $post['type'] == 8)))

			
 
				+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'此快递方式必须选择美国仓！','success'=>false));exit;

			
 
				 			}

			
@@ -893,9 +907,17 @@ class Fullordersmt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'总申报价值不可超出'.$express['sbjz'],'success'=>false));exit;

			
 
				 			}

			
 
				-			if($post['express'] == '2' && $post['zzl'] >= '16' && $post['js'] == '0')

			
 
				+			if($post['shouldmoney'] > $express['shouldmoney'] && $express['shouldmoney'] != 0)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'订单金额不可超出'.$express['shouldmoney'],'success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '2' && $post['zzl'] > '16' && $post['js'] == '0')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'重量大于16不可按Ground Advantage提交！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '2' && isset($post['js']) && $post['js'] == '0'&& $post['qm'] == '1')

			
 
				 			{

			
 
				-				//echo json_encode(array('msg'=>'总重量大于等于16不可选FIRST CLASS','success'=>false));exit;

			
 
				+				echo json_encode(array('msg'=>'Ground Advantage不可使用签名服务！','success'=>false));exit;

			
 
				 			}

			
 
				 			if(($post['express'] == '3' || $post['express'] == '42' || $post['express'] == '24' || $post['express'] == '31') && $post['shouldmoney'] < 1)

			
 
				 			{

			
@@ -905,6 +927,22 @@ class Fullordersmt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'选择DPEX必须填写州信息','success'=>false));exit;

			
 
				 			}

			
 
				+			if(($post['express'] == '24' || $post['express'] == '3') && $post['shouldmoney'] == 0)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'0金额订单不可发UPS/Fedex(杭州)！！！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == '42' && $post['zsbjz'] < 1)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'零申报金额不可发 DHL官方-美国','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['country'] == '35' && $post['zsbjz'] > 20)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'加拿大不可申报超过20美金！！！','success'=>false));exit;

			
 
				+			}

			
 
				+			if($post['express'] == 2 && strlen($post['zipcode']) != 5)//如果usps 邮编不是5位

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'USPS-USA的邮编需按5位数格式提交！','success'=>false));exit;

			
 
				+			}

			
 
				 			/**

			
 
				 			if($editstate == 216 && $data['state'] != 216)

			
 
				 			{

			
@@ -952,6 +990,15 @@ class Fullordersmt extends Start_Controller {
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'此单已占用库存并出库，无法更改仓库！','success'=>false));exit;

			
 
				 			}

			
 
				+			$expt = $this->express->read($post['express']);

			
 
				+			if($expt['pt'] != '' && stripos($post['fpdata'],$expt['pt']) !== false)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>$expt['ptts'],'success'=>false));exit;

			
 
				+			}

			
 
				+			if($expt['province'] != '' && stripos($expt['province'],$post['province'].'、') !== false)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'此省/州不可使用 '.$expt['servicename'],'success'=>false));exit;

			
 
				+			}

			
 
				 			/**

			
 
				 			if($warehouse['zd'] == '1' && $warehouse['ys'] != '1' && $thisdata['library'] == '2' && $post['fpdata'] != $thisdata['fpdata'])

			
 
				 			{

			
@@ -1044,10 +1091,21 @@ class Fullordersmt extends Start_Controller {
 
				 		}

			
 
				 		$arg_array = $arg_array[0];$fpdata = array();

			
 
				 		$fullordersmt = $this->fullordersmt->read($arg_array);

			
 
				+		$returngoods = $this->returngoods->get_orderinfo($fullordersmt['orderinfo']);

			
 
				+		$this->data['returngoods'] = $returngoods?1:0;

			
 
				 		$fullordersmt['parameter'] = str_replace(",","---",$fullordersmt['parameter']);

			
 
				 		$country = $this->country->find_all('1=1','id,name','name asc');//所有国家信息

			
 
				 		$express = $this->express->find_all('1=1');//所有快递配置信息

			
 
				 		$this->data['fullordersmt'] = $fullordersmt;

			
 
				+		if($fullordersmt['express'] == 2)

			
 
				+		{

			
 
				+			$zzhl = 'oz';

			
 
				+		}

			
 
				+		else

			
 
				+		{

			
 
				+			$zzhl = 'kg';

			
 
				+		}

			
 
				+		$this->data['zzhl'] = $zzhl;

			
 
				 		$this->data['country'] = $country;

			
 
				 		$this->data['express'] = $express;

			
 
				 		$this->data['dtime'] = date('Y-m-d H:i:s',$fullordersmt['dtime']);

			
@@ -1231,6 +1289,7 @@ class Fullordersmt extends Start_Controller {
 
				 		    $this->data['warehouse'] = $warehouse;

			
 
				 			$this->data['xwuser'] = 1;

			
 
				 		}

			
 
				+		$this->data['user'] = $user;

			
 
				 		$this->_Template('fullordersmt_edit',$this->data);

			
 
				 	}

			
 
				 	//不可修改

			
@@ -1338,6 +1397,15 @@ class Fullordersmt extends Start_Controller {
 
				 			{

			
 
				 				 echo json_encode(array('msg'=>'仓库货物验证中，请稍后再试！','success'=>false));exit;

			
 
				 			}

			
 
				+			$expt = $this->express->read($post['express']);

			
 
				+			if($expt['pt'] != '' && stripos($post['fpdata'],$expt['pt']) !== false)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>$expt['ptts'],'success'=>false));exit;

			
 
				+			}

			
 
				+			if($expt['province'] != '' && stripos($expt['province'],$ud['province'].'、') !== false)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'此省/州不可使用 '.$expt['servicename'],'success'=>false));exit;

			
 
				+			}

			
 
				 			/**

			
 
				 			if($warehouse['zd'] == '1' && $warehouse['ys'] != '1' && $thisdata['library'] == '2' && $post['fpdata'] != $thisdata['fpdata'])

			
 
				 			{

			
@@ -1431,9 +1499,20 @@ class Fullordersmt extends Start_Controller {
 
				 		}

			
 
				 		$arg_array = $arg_array[0];$fpdata = array();

			
 
				 		$fullordersmt = $this->fullordersmt->read($arg_array);

			
 
				+		$returngoods = $this->returngoods->get_orderinfo($fullordersmt['orderinfo']);

			
 
				+		$this->data['returngoods'] = $returngoods?1:0;

			
 
				 		$fullordersmt['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$fullordersmt['shipremarks']);

			
 
				 		$fullordersmt['parameter'] = str_replace(",","---",$fullordersmt['parameter']);

			
 
				 		$this->data['fullordersmt'] = $fullordersmt;

			
 
				+		if($fullordersmt['express'] == 2)

			
 
				+		{

			
 
				+			$zzhl = 'oz';

			
 
				+		}

			
 
				+		else

			
 
				+		{

			
 
				+			$zzhl = 'kg';

			
 
				+		}

			
 
				+		$this->data['zzhl'] = $zzhl;

			
 
				 		$this->data['countrys'] = $this->country->find_all();

			
 
				 		$this->data['express'] = $this->express->find_all();

			
 
				 		$warehouse = $this->warehouse->read($fullordersmt['type']);

			
@@ -1654,6 +1733,7 @@ class Fullordersmt extends Start_Controller {
 
				 						}

			
 
				 				}

			
 
				 		$this->data['systemwigsout'] = $outread;

			
 
				+		$this->data['user'] = $user;

			
 
				 		$this->_Template('fullordersmt_readonly',$this->data);

			
 
				 	}

			
 
				 	//浏览列表

			
@@ -2213,11 +2293,11 @@ class Fullordersmt extends Start_Controller {
 
				 				$post['shouldmoney'] = $u['shouldmoney'];//购买应收金额

			
 
				 				$post['budget'] = $u['budget'];//预估到帐金额

			
 
				 				$post['expressmoney']= $u['expressmoney'];//物流金额

			
 
				-				$post['refundy'] = $u['refundy'];//补/退原额

			
 
				-				$post['refundj'] = $u['refundj'];//补/退净额

			
 
				+				//$post['refundy'] = $u['refundy'];//补/退原额

			
 
				+				//$post['refundj'] = $u['refundj'];//补/退净额

			
 
				 				$post['cost']  = $u['cost'];//成本金额

			
 
				-				$post['zzl']  = $u['zzl'];//总重量

			
 
				-				$post['zsbjz']  = $u['zsbjz'];//总申报价值

			
 
				+				//$post['zzl']  = $u['zzl'];//总重量

			
 
				+				//$post['zsbjz']  = $u['zsbjz'];//总申报价值

			
 
				 				$post['ts']  = $u['ts'];//条数

			
 
				 				$post['cost']  = $u['cost'];//成本金额

			
 
				 				//追加

			
@@ -2227,8 +2307,8 @@ class Fullordersmt extends Start_Controller {
 
				 				$post['paypal'] = $u['paypal'];//交易号

			
 
				 				$post['clientremarks'] = $u['clientremarks'];//客户留言

			
 
				 				$post['product'] = $u['product'];//商品名称

			
 
				-				$post['sku'] = $u['sku'];//sku

			
 
				-				$post['orderremarks'] = $u['orderremarks'];//订单备注

			
 
				+				//$post['issku'] = $u['issku'];//sku

			
 
				+				//$post['orderremarks'] = $u['orderremarks'];//订单备注

			
 
				 				$post['shipremarks'] = $u['shipremarks'];//仓库品名

			
 
				 				//产品追加

			
 
				 				$post['fpdata'] = $u['fpdata'];//产品内容

			
@@ -2246,24 +2326,24 @@ class Fullordersmt extends Start_Controller {
 
				 						{

			
 
				 							$this->fullordersmthb->insert($v);

			
 
				 						}

			
 
				-				        $post['shouldmoney'] += $v['shouldmoney'];//购买应收金额

			
 
				+				       $post['shouldmoney'] += $v['shouldmoney'];//购买应收金额

			
 
				 				        $post['budget'] += $v['budget'];//预估到帐金额

			
 
				 				        $post['expressmoney'] += $v['expressmoney'];//物流金额

			
 
				-				        $post['refundy'] += $v['refundy'];//补/退原额

			
 
				-				        $post['refundj'] += $v['refundj'];//补/退净额

			
 
				+				        //$post['refundy'] += $v['refundy'];//补/退原额

			
 
				+				        //$post['refundj'] += $v['refundj'];//补/退净额

			
 
				 				        $post['cost'] += $v['cost'];//成本金额

			
 
				 				        //$post['zzl']  += $v['zzl'];//总重量

			
 
				-				        $post['zsbjz']  += $v['zsbjz'];//总申报价值

			
 
				+				        //$post['zsbjz']  += $v['zsbjz'];//总申报价值

			
 
				 				        $post['ts']  += $v['ts'];//条数

			
 
				 						

			
 
				-						$post['rpaypal'] .= $v['rpaypal'];//补/退交易号

			
 
				-						$post['rtext'] .= $v['rtext'];//补/退原因

			
 
				-						$post['pay'] .= (stripos($post['pay'],$v['pay']) !== false)?'':';'.$v['pay'];//付款方式

			
 
				-						$post['paypal'] .= $v['paypal'];//交易号

			
 
				+						//$post['rpaypal'] .= $v['rpaypal'];//补/退交易号

			
 
				+						//$post['rtext'] .= $v['rtext'];//补/退原因

			
 
				+						//$post['pay'] .= (stripos($post['pay'],$v['pay']) !== false)?'':';'.$v['pay'];//付款方式

			
 
				+						//$post['paypal'] .= $v['paypal'];//交易号

			
 
				 						$post['clientremarks'] .= $v['clientremarks'];//客户留言

			
 
				 						$post['product'] .= $v['product'];//商品名称

			
 
				-						$post['sku'] .= $v['sku'];//sku

			
 
				-						$post['orderremarks'] .= $v['orderremarks'];//订单备注

			
 
				+						//$post['issku'] .= $v['issku'];//sku

			
 
				+						//$post['orderremarks'] .= $v['orderremarks'];//订单备注

			
 
				 						$post['shipremarks'] .= $v['shipremarks'];//仓库品名

			
 
				 						

			
 
				 						$post['fpdata'] .= $v['fpdata'];//产品内容

			
@@ -2292,10 +2372,11 @@ class Fullordersmt extends Start_Controller {
 
				 						}

			
 
				 						$zsl += count($wl);

			
 
				 						$zccsl += $i;

			
 
				-					    $this->fullordersmt->save(array('merge'=>$id,'mergeid'=>1,'orderremarks'=>$v['orderremarks'].'已合并到'.$u['orderinfo'].'('.$u['number'].')','shouldmoney'=>0,'print'=>1,'libraryconfirm'=>1),$v['id']);

			
 
				+					    $this->fullordersmt->save(array('merge'=>$id,'mergeid'=>1,'orderremarks'=>' 《合并信息》：'.'已合并到'.$u['orderinfo'].'('.$u['number'].')中； '.$v['orderremarks'],'shouldmoney'=>0,'print'=>1,'libraryconfirm'=>1,'shouldmoney'=>0,'budget'=>0,'whlabel'=>'','fpdata'=>'','shipremarks'=>''),$v['id']);

			
 
				 					}

			
 
				 				}

			
 
				 				//计算出单条价值

			
 
				+				/**

			
 
				 				if($post['zsbjz'] < 1 || $post['ts'] < 1)

			
 
				 				{

			
 
				 					$post['dtsbjz'] = 0;

			
@@ -2304,7 +2385,8 @@ class Fullordersmt extends Start_Controller {
 
				 				{

			
 
				 				    $post['dtsbjz']  = $post['zsbjz']/$post['ts'];//单条申报价

			
 
				 				}

			
 
				-				$post['orderremarks'] .= ' 由'.rtrim($order,'、').'合并';

			
 
				+				**/

			
 
				+				$post['orderremarks'] = '  《合并信息》：由'.rtrim($order,'、').'合并而来； '.$u['orderremarks'];;

			
 
				 				

			
 
				 				$post['merge'] = $id;

			
 
				 				

			
@@ -3417,7 +3499,7 @@ class Fullordersmt extends Start_Controller {
 
				 			{

			
 
				 				 echo json_encode(array('msg'=>'仓库货物验证中，请稍后再试！','success'=>false));exit;

			
 
				 			}

			
 
				-			if(($post['express'] == 2 && ($post['type'] != 5 && $post['type'] != 8)) || ($post['express'] != 2 && ($post['type'] == 5 || $post['type'] == 8)))

			
 
				+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))

			
 
				 			{

			
 
				 				echo json_encode(array('msg'=>'此快递方式必须选择美国仓！','success'=>false));exit;

			
 
				 			}

			
@@ -3555,14 +3637,7 @@ class Fullordersmt extends Start_Controller {
 
				 			$province = $this->input->post('province',true);

			
 
				 			$zipcode = $this->input->post('zipcode',true);

			
 
				 			$barcode = $this->usps->get_address(array('address'=>$address,'address2'=>$address2,'city'=>$city,'province'=>$province,'zipcode'=>$zipcode));

			
 
				-			if(isset($barcode['Address']['Error']['Description']))

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>$barcode['Address']['Error']['Description'],'success'=>false));exit;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-			 	echo json_encode(array('msg'=>'地址通过，可以使用','success'=>true));exit;

			
 
				-			}

			
 
				+			echo $barcode;

			
 
				 		}

			
 
				 	}

			
 
				 	//订单退货

			
@@ -4218,4 +4293,48 @@ class Fullordersmt extends Start_Controller {
 
				 		    }

			
 
				 		}

			
 
				 	}

			
 
				+	public function _ddcf()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['number']))

			
 
				+		{

			
 
				+			$number = $this->input->post('number',true);

			
 
				+			$data = $this->fullordersmt->get_number($number);

			
 
				+			if(!$data)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'没有找到此订单','success'=>false));exit;

			
 
				+			}

			
 
				+			if($data['review'] != 1 && $data['review'] != 2)

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'必须是 待审核 状态才能拆分','success'=>false));exit;

			
 
				+			}

			
 
				+			$cfnum = explode('-',trim($number,'-'));

			
 
				+			if((count($cfnum)> 3 && stripos($pd[$x],'-PF-') !== false) || (count($cfnum)> 4 && stripos($pd[$x],'-PF-') === false))

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'只能在原单操作拆分','success'=>false));exit;

			
 
				+			}

			
 
				+			$num = $this->fullordersmt->find_count("number like '".$number."%'");

			
 
				+			$data['number'] = $data['number'].'-'.$num;

			
 
				+			$data['orderinfo'] = $data['shop'].date('ymdHis',time()).rand(0,1);

			
 
				+			$data['shouldmoney'] = 0;

			
 
				+			$data['budget'] = 0;

			
 
				+			$data['shipremarks'] = '';

			
 
				+			$data['source'] = 1;

			
 
				+			unset($data['id']);

			
 
				+			unset($data['jweight']);

			
 
				+			unset($data['fpcount']);

			
 
				+			unset($data['returndata']);

			
 
				+			unset($data['waybill']);

			
 
				+			unset($data['oldwaybill']);

			
 
				+			unset($data['printtime']);

			
 
				+			if($this->fullordersmt->insert($data))

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'拆分成功！新订单编号：'.$data['number'],'success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'拆分失败，请重试','success'=>false));exit;

			
 
				+			}

			
 
				+		}

			
 
				+	}

			
 
				 }
			
--- a/core/CoreApp/controllers/Fullordertt.php
+++ b/core/CoreApp/controllers/Fullordertt.php
--- a/core/CoreApp/controllers/Fullorderxw.php
+++ b/core/CoreApp/controllers/Fullorderxw.php
@@ -712,7 +712,7 @@ class Fullorderxw extends Start_Controller {
 
				 		{

			
 
				 			$pid .= " id = ".$v." or";

			
 
				 		}

			
 
				-		$fullorderexcel = $this->fullorderexcel->find_all("type = '100006' and (".rtrim($pid,'or').")",'*','idorder desc');//导出模板

			
 
				+		$fullorderexcel = $this->fullorderexcel->find_all("type = '100008' and (".rtrim($pid,'or').")",'*','idorder desc');//导出模板

			
 
				 		$this->data['fullorderexcel'] = $fullorderexcel;

			
 
				 		$error = $this->fullorderxw->find_count("failed !='' and mergeid = 0 and print != 3 and (".rtrim($fgshop,'or').") and dtime > '".(time()-90*24*3600)."'");

			
 
				 		$this->data['error'] = $error;

			
@@ -4082,7 +4082,7 @@ class Fullorderxw extends Start_Controller {
 
				 		{

			
 
				 			$pid .= " id = ".$v." or";

			
 
				 		}

			
 
				-		$fullorderexcel = $this->fullorderexcel->find_all("type = '100006' and (".rtrim($pid,'or').")",'*','idorder desc');//导出模板

			
 
				+		$fullorderexcel = $this->fullorderexcel->find_all("type = '100008' and (".rtrim($pid,'or').")",'*','idorder desc');//导出模板

			
 
				 		$this->data['fullorderexcel'] = $fullorderexcel;

			
 
				 		$this->_Template('fullorderxw_error',$this->data);

			
 
				 	}

			
@@ -4098,14 +4098,7 @@ class Fullorderxw extends Start_Controller {
 
				 			$province = $this->input->post('province',true);

			
 
				 			$zipcode = $this->input->post('zipcode',true);

			
 
				 			$barcode = $this->usps->get_address(array('address'=>$address,'address2'=>$address2,'city'=>$city,'province'=>$province,'zipcode'=>$zipcode));

			
 
				-			if(isset($barcode['Address']['Error']['Description']))

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>$barcode['Address']['Error']['Description'],'success'=>false));exit;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-			 	echo json_encode(array('msg'=>'地址通过，可以使用','success'=>true));exit;

			
 
				-			}

			
 
				+			echo $barcode;

			
 
				 		}

			
 
				 	}

			
 
				 	//清除退货信息

			
--- a/core/CoreApp/controllers/Img.php
+++ b/core/CoreApp/controllers/Img.php
@@ -32,12 +32,21 @@ class Img extends Admin_Controller {
 
				 		$this->upload->initialize($config);

			
 
				         if ($this->upload->do_upload('userfile'))

			
 
				         {

			
 
				-			$full_path = $dir.$this->upload->data('file_name');

			
 
				-            echo json_encode(array('ok'=>1,'lx'=>$this->upload->data('file_ext'),'filename'=>$full_path));

			
 
				+			$data = $this->upload->data();

			
 
				+			// 获取原文件名和文件后缀

			
 
				+            $file_name = $data['file_name'];

			
 
				+            $file_ext = strtolower($data['file_ext']); // 将后缀变为小写

			
 
				+            // 生成新的文件名

			
 
				+             $new_file_name = $data['raw_name'] . $file_ext;

			
 
				+            // 重命名文件

			
 
				+            rename($data['full_path'], $data['file_path'] . $new_file_name);

			
 
				+			$full_path = $dir.$new_file_name;

			
 
				+            echo json_encode(array('ok'=>1,'lx'=>$file_ext,'filename'=>$full_path));

			
 
				         }

			
 
				 		else

			
 
				 		{

			
 
				-			echo json_encode(array('msg'=>$this->upload->display_errors()));

			
 
				+			$cw = str_replace(array('<p>','</p>'),'',$this->upload->display_errors());

			
 
				+			echo json_encode(array('msg'=>$cw));

			
 
				 		}

			
 
				     }

			
 
				 	//编辑器上传图

			
--- a/core/CoreApp/controllers/Message.php
+++ b/core/CoreApp/controllers/Message.php
@@ -0,0 +1,151 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Message extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->library('session');

			
 
				+		$this->load->_model('Model_message','message');

			
 
				+		$this->load->_model('Model_express','express');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')//修改

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')//修改

			
 
				+        {

			
 
				+             $this->_del();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$exdata = $this->express->find_all();

			
 
				+		$ex = array();

			
 
				+		foreach ($exdata as $v)

			
 
				+		{

			
 
				+			$ex[$v['id']] = $v['servicename'];

			
 
				+		}

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$express = $this->input->post('express',true);

			
 
				+			$where = "1=1";

			
 
				+			if($express)

			
 
				+            {

			
 
				+                $where  .= " and express like '%,$express,%'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "id desc";

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->message->find_all($where,'id,express,content',$order_str,$start,$perpage);

			
 
				+			foreach ($info_list as $k=>$v) 

			
 
				+		    {

			
 
				+				$e = '';

			
 
				+				foreach (explode(',',trim($v['express'],',')) as $val) 

			
 
				+		        {

			
 
				+					$e .= $ex[$val].'，';

			
 
				+				}

			
 
				+				$info_list[$k]['express'] = rtrim($e,'，');

			
 
				+		    }

			
 
				+		    $total = $this->message->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('message',$this->data);

			
 
				+	}

			
 
				+	//入库操作

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL);

			
 
				+		if(isset($post['content']))

			
 
				+		{

			
 
				+			$express = $this->input->post('express');

			
 
				+			$post['express'] = ','.$express;

			
 
				+			if($post['express'] == ',')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'请选择物流','success'=>false));exit;

			
 
				+			}

			
 
				+			if($this->message->insert($post))

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'提交成功','success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'提交失败','success'=>false));exit;

			
 
				+			}

			
 
				+		}

			
 
				+		$this->_Template('message_add',$this->data);

			
 
				+	}

			
 
				+	//修改产品

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL);

			
 
				+		if(isset($post['content']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id');

			
 
				+			$express = $this->input->post('express',true);

			
 
				+			$post['express'] = ','.$express;

			
 
				+			if($post['express'] == ',')

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'请选择物流','success'=>false));exit;

			
 
				+			}

			
 
				+			if($this->message->save($post,$id))

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'修改失败','success'=>false));exit;

			
 
				+			}

			
 
				+			

			
 
				+		}

			
 
				+		$message = $this->message->read($arg_array[0]);

			
 
				+		$this->data['message'] = $message ;

			
 
				+		$this->_Template('message_edit',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->message->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+		

			
 
				+}
			
--- a/core/CoreApp/controllers/Notice.php
+++ b/core/CoreApp/controllers/Notice.php
@@ -15,6 +15,7 @@ class Notice extends Start_Controller {
 
				 		$this->load->_model('Model_emaildata','emaildata');

			
 
				 		$this->load->_model('Model_als','als');

			
 
				 		$this->load->_model('Model_apitt','apitt');

			
 
				+		$this->load->_model('Model_producttitle','producttitle');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
--- a/core/CoreApp/controllers/Printcode.php
+++ b/core/CoreApp/controllers/Printcode.php
@@ -19,6 +19,10 @@ class Printcode extends Start_Controller {
 
				 		else if($arg == 'see')

			
 
				         {

			
 
				              $this->_see();

			
 
				+        }

			
 
				+		else if($arg == 'yz')

			
 
				+        {

			
 
				+             $this->_yz();

			
 
				         }

			
 
				 		else if($arg == 'add')

			
 
				         {

			
@@ -183,6 +187,13 @@ class Printcode extends Start_Controller {
 
				 		$this->_Template('printcode',$this->data);

			
 
				 	}

			
 
				 	

			
 
				+	

			
 
				+	public function _yz()

			
 
				+	{

			
 
				+		$this->_Template('printcode_yz',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	

			
 
				 	public function _add()

			
 
				 	{

			
 
				 		$post = $this->input->post(NULL, TRUE);

			
--- a/core/CoreApp/controllers/Producttitle.php
+++ b/core/CoreApp/controllers/Producttitle.php
@@ -0,0 +1,121 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Producttitle extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->_model('Model_producttitle','producttitle');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')//添加

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')//修改

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')//修改

			
 
				+        {

			
 
				+             $this->_del();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$title = $this->input->post('title',true);

			
 
				+			$where = "1=1 ";

			
 
				+            //数据排序

			
 
				+            $order_str = "id asc";

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+			if($title)

			
 
				+			{

			
 
				+				$where .= " and title like '%$title%'";

			
 
				+			}

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->producttitle->find_all($where,'id,title,th',$order_str,$start,$perpage);

			
 
				+		    $total = $this->producttitle->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('producttitle',$this->data);

			
 
				+	}

			
 
				+	//添加

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL);

			
 
				+		if(isset($post['title']))

			
 
				+		{

			
 
				+			if($this->producttitle->insert($post))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$this->_Template('producttitle_add',$this->data);

			
 
				+	}

			
 
				+	//修改

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL);

			
 
				+		if(isset($post['id']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id',true);

			
 
				+			if($this->producttitle->save($post,$id))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$arg_array = $arg_array[0];

			
 
				+		$producttitle = $this->producttitle->read($arg_array);

			
 
				+		$this->data['producttitle'] = $producttitle;

			
 
				+		$this->_Template('producttitle_edit',$this->data);

			
 
				+	}

			
 
				+	//删除

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->producttitle->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+}
			
--- a/core/CoreApp/controllers/Queue.php
+++ b/core/CoreApp/controllers/Queue.php
@@ -0,0 +1,42 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+/**
			
 
				+ * 该类执行队列使用
			
 
				+ */
			
 
				+class Queue extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+		parent::__construct();
			
 
				+		$this->load->_model("Model_zztmpdata",'zztmpdata');
			
 
				+        $this->load->_model("Model_logic_crm",'logic_crm');
			
 
				+	}
			
 
				+
			
 
				+    //定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'coq')//
			
 
				+        {
			
 
				+             $this->_crm_order_queue();
			
 
				+        }
			
 
				+		
			
 
				+		else 
			
 
				+        {
			
 
				+             return ;
			
 
				+        }
			
 
				+    }
			
 
				+    //通知向crm 同步订单出库 订单派送 订单
			
 
				+    protected function _crm_order_queue(){
			
 
				+       
			
 
				+        $time =time()-24*3600 *3;
			
 
				+        $list = $this->zztmpdata->find_all("act_name = 'crm_order' and create_time > ".$time,"*","id asc",0,100);
			
 
				+        //$list = $this->zztmpdata->find_all("id = 181","*","id desc",0,50);
			
 
				+        foreach($list as $v){
			
 
				+            
			
 
				+            $order_info = json_decode($v['content'],true);
			
 
				+            // if($order_info['shop'] != 4){
			
 
				+            //     $this->zztmpdata->remove($v['id']);
			
 
				+            // }
			
 
				+            $this->logic_crm->panduan($order_info,$v['type'],[]);
			
 
				+            $this->zztmpdata->remove($v['id']);
			
 
				+            usleep(10);
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/core/CoreApp/controllers/Registration.php
+++ b/core/CoreApp/controllers/Registration.php
@@ -114,7 +114,7 @@ class Registration extends Start_Controller {
 
				 				$where  .= " and phone like '%$phone%'";

			
 
				             }

			
 
				             //取得信息列表

			
 
				-            $info_list = $this->registration->find_all($where,'id,number,state,objective,address,stime,product,name,phone,content,usacontent',$order_str,$start,$perpage);

			
 
				+            $info_list = $this->registration->find_all($where,'id,number,state,objective,address,stime,product,name,phone,content,usacontent,img',$order_str,$start,$perpage);

			
 
				 			 //格式化数据

			
 
				             foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
@@ -172,6 +172,33 @@ class Registration extends Start_Controller {
 
				 			    {

			
 
				 				    $info_list[$key]['content'] = "<font style='color:#F00'>".$value['content']."</font>";

			
 
				 			    }

			
 
				+		$returnsimg = explode('|',trim($d['img'],'|'));

			
 
				+		$img = '';$i=1;

			
 
				+		if($d['img'] != '')

			
 
				+		{

			
 
				+		foreach ($returnsimg as $k=>$v) 

			
 
				+		{

			
 
				+			

			
 
				+			$lx = explode(".",$v);

			
 
				+			$lx = strtolower(end($lx));

			
 
				+			if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				+			{

			
 
				+				$img .= "<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em>";

			
 
				+			}

			
 
				+			else if($v != '')

			
 
				+			{

			
 
				+			   $url = str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','https://1.wepolicy.cn/','/img/thumb?src='),'',$v);

			
 
				+				$url = explode('&',$url);

			
 
				+				$url = $url[0];

			
 
				+			    $img .= "<img src='".site_url('img/thumb')."?src=".$url."&w=150&h=150' data-src='".$v."'></a>"."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em>";

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				$img = '';

			
 
				+			}

			
 
				+		}

			
 
				+		}

			
 
				+		$info_list[$key]['img'] = $img;

			
 
				             }

			
 
				 		    $total = $this->registration->find_count($where);

			
 
				 		    $pagenum = ceil($total/$perpage);

			
@@ -188,6 +215,11 @@ class Registration extends Start_Controller {
 
				 		if(isset($post['state']))

			
 
				 		{

			
 
				 			$post['number'] = $this->input->post('number',true);

			
 
				+			$img = $this->input->post('img',true);

			
 
				+			if($img)

			
 
				+			{

			
 
				+				$post['img'] = $img;

			
 
				+			}

			
 
				 			$post['orderinfo'] = $this->input->post('orderinfo',true);

			
 
				 			$post['objective'] = $this->input->post('objective',true);

			
 
				 			$post['thproduct'] = $this->input->post('thproduct',true);

			
@@ -241,6 +273,11 @@ class Registration extends Start_Controller {
 
				 			$id = $this->input->post('id',true);

			
 
				 			$t = 0;

			
 
				 			$post['number'] = $this->input->post('number',true);

			
 
				+			$img = $this->input->post('img',true);

			
 
				+			if($img)

			
 
				+			{

			
 
				+				$post['img'] = $img;

			
 
				+			}

			
 
				 			$post['orderinfo'] = $this->input->post('orderinfo',true);

			
 
				 			$post['objective'] = $this->input->post('objective',true);

			
 
				 			$post['thproduct'] = $this->input->post('thproduct',true);

			
@@ -284,6 +321,33 @@ class Registration extends Start_Controller {
 
				 		}

			
 
				 		$arg_array = $arg_array[0];

			
 
				 		$registration = $this->registration->read($arg_array);

			
 
				+		$returnsimg = explode('|',trim($registration['img'],'|'));

			
 
				+		$img = '';$i=1;

			
 
				+		if($registration['img'] != '')

			
 
				+		{

			
 
				+		foreach ($returnsimg as $k=>$v) 

			
 
				+		{

			
 
				+			

			
 
				+			$lx = explode(".",$v);

			
 
				+			$lx = strtolower(end($lx));

			
 
				+			if($lx == "3gp" || $lx == "rmvb" || $lx == "flv" || $lx == "wmv" || $lx == "avi" || $lx == "mkv" || $lx == "wav" || $lx == "mp4")

			
 
				+			{

			
 
				+				$img .= '<span class="deldata"><video src="'.$v.'" controls="controls"></video>'."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				+			}

			
 
				+			else if($v != '')

			
 
				+			{

			
 
				+			   $url = str_replace(array('http://'.$_SERVER['HTTP_HOST'],'http://erp.hnwmzp.cn','https://erp.hnwmzp.cn','http://1.wepolicy.cn/','https://1.wepolicy.cn/','/img/thumb?src='),'',$v);

			
 
				+				$url = explode('&',$url);

			
 
				+				$url = $url[0];

			
 
				+			    $img .= '<span class="deldata"><a href="'.$url.'" target="_blank">'."<img src='".site_url('img/thumb')."?src=".$url."&w=500&h=500' data-src='".$v."'></a>"."<em style='width:30px;height:30px;line-height:30px;text-align: center;display: inline-block;position: absolute;top: 0px;right: 20px;z-index: 10;background-color: #FFF;cursor: pointer;' title='点击删除'>X</em></span>";

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				$img = '';

			
 
				+			}

			
 
				+		}

			
 
				+		}

			
 
				+		$registration['img'] = $img;

			
 
				 		$this->data['registration'] = $registration;

			
 
				 		$this->_Template('registration_edit',$this->data);

			
 
				 	}

			
--- a/core/CoreApp/controllers/Returncw.php
+++ b/core/CoreApp/controllers/Returncw.php
@@ -0,0 +1,373 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Returncw extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->_model('Model_returncw','returncw');

			
 
				+		$this->load->_model('Model_fullorder','fullorder');

			
 
				+		$this->load->_model('Model_fullordersmt','fullordersmt');

			
 
				+		$this->load->_model('Model_fullordertt','fullordertt');

			
 
				+		$this->load->_model('Model_shop','shop');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')//添加

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')//修改

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')//修改

			
 
				+        {

			
 
				+             $this->_del();

			
 
				+        }

			
 
				+		else if($arg == 'rows')//修改

			
 
				+        {

			
 
				+             $this->_rows();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$number = $this->input->post('number',true);

			
 
				+			$shop = $this->input->post('shop',true);

			
 
				+			$type = $this->input->post('type',true);

			
 
				+			$state = $this->input->post('state',true);

			
 
				+			$where = "1=1 ";

			
 
				+            //数据排序

			
 
				+            $order_str = "time desc";

			
 
				+			if($number)

			
 
				+            {

			
 
				+                $where  .= " and number = '$number'";

			
 
				+            }

			
 
				+			if($shop)

			
 
				+            {

			
 
				+                $where  .= " and shop = '$shop'";

			
 
				+            }

			
 
				+			if($type != '')

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($state != '')

			
 
				+            {

			
 
				+                $where  .= " and state = '$state'";

			
 
				+            }

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->returncw->find_all($where,'id,fullorder,shop,number,type,state,read,time,edittime',$order_str,$start,$perpage);

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				if($value['fullorder'] == 'fullorder')

			
 
				+				{

			
 
				+					$info_list[$key]['fullorder'] = '独立站';

			
 
				+				}

			
 
				+				else if($value['fullorder'] == 'fullordersmt')

			
 
				+				{

			
 
				+					$info_list[$key]['fullorder'] = '速卖通';

			
 
				+				}

			
 
				+				else if($value['fullorder'] == 'fullordertt')

			
 
				+				{

			
 
				+					$info_list[$key]['fullorder'] = 'TikTok';

			
 
				+				}

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_list[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['type'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '未提交';

			
 
				+				}

			
 
				+				else if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '待初审';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '初审通过';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '初审拒绝';

			
 
				+				}

			
 
				+				if($value['state'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '财务审核中';

			
 
				+				}

			
 
				+				else if($value['state'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['state'] = '财务通过';

			
 
				+				}

			
 
				+				else if($value['state'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '财务拒绝';

			
 
				+				}

			
 
				+            }

			
 
				+		    $total = $this->returncw->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('returncw',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	//添加

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['returncwid']))

			
 
				+		{

			
 
				+			$post['type'] = $this->input->post('type',true);

			
 
				+			$post['notice'] = $this->input->post('notice',true);

			
 
				+			$post['returncwid'] = $this->input->post('returncwid',true);

			
 
				+			$post['returncwname'] = $this->input->post('returncwname',true);

			
 
				+			$post['shortname'] = $this->input->post('shortname',true);

			
 
				+			$post['returncwuser'] = $this->input->post('returncwuser',true);

			
 
				+			$post['returncwphone'] = $this->input->post('returncwphone',true);

			
 
				+			$post['brandname'] = $this->input->post('brandname',true);

			
 
				+			/**

			
 
				+			$post['companyname'] = $this->input->post('companyname',true);

			
 
				+			$post['country'] = $this->input->post('country',true);

			
 
				+			$post['province'] = $this->input->post('province',true);

			
 
				+			$post['city'] = $this->input->post('city',true);

			
 
				+			$post['zip'] = $this->input->post('zip',true);

			
 
				+			$post['adress'] = $this->input->post('adress',true);

			
 
				+			$post['defaultpricetype'] = $this->input->post('defaultpricetype',true);

			
 
				+			$post['updcycle'] = $this->input->post('updcycle',true);

			
 
				+			$post['taxrate'] = $this->input->post('taxrate',true);

			
 
				+			$post['uphone'] = $this->input->post('uphone',true);

			
 
				+			**/

			
 
				+			$post['estimaterate'] = $this->input->post('estimaterate',true);

			
 
				+			$post['userexp'] = $this->input->post('userexp',true);

			
 
				+			$post['mustba'] = $this->input->post('mustba',true);

			
 
				+			$post['returncwcost'] = $this->input->post('returncwcost',true);

			
 
				+			$post['returncwcosttext'] = $this->input->post('returncwcosttext',true);

			
 
				+			$post['returncwwh'] = $this->input->post('returncwwh',true);

			
 
				+			$post['returncwwhtext'] = $this->input->post('returncwwhtext',true);

			
 
				+			$post['edittime'] = time();

			
 
				+			$post['addtime'] = time();

			
 
				+			$px = $this->returncw->find_all("1=1",'*','px desc');

			
 
				+			$post['px'] = $px[0]['px']+10;

			
 
				+			$s = $post;

			
 
				+			$s['id'] = $post['yyid'];

			
 
				+			$s['name'] = $post['shortname'];

			
 
				+			if($post['type'] == '1514')

			
 
				+			{

			
 
				+				$z = '跨境';

			
 
				+			}

			
 
				+			else if($post['type'] == '269')

			
 
				+			{

			
 
				+				$z = '独-';

			
 
				+			}

			
 
				+			else if($post['type'] == '1514')

			
 
				+			{

			
 
				+				$z = '速-';

			
 
				+			}

			
 
				+			$tc = $this->apiyy->get_cjkh($s);

			
 
				+			if(isset($tc['Data'][0]))

			
 
				+			{

			
 
				+				

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>$tc['Data'][0]['ErrorMsg'],'success'=>false));exit;

			
 
				+			}

			
 
				+			if($this->returncw->insert($post))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$this->_Template('returncw_add',$this->data);

			
 
				+	}

			
 
				+	//修改

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['id']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id',true);

			
 
				+			$ps = $this->returncw->read($id);

			
 
				+			$post['type'] = $this->input->post('type',true);

			
 
				+			$post['notice'] = $this->input->post('notice',true);

			
 
				+			$post['returncwid'] = $this->input->post('returncwid',true);

			
 
				+			$post['returncwname'] = $this->input->post('returncwname',true);

			
 
				+			$post['shortname'] = $this->input->post('shortname',true);

			
 
				+			$post['returncwuser'] = $this->input->post('returncwuser',true);

			
 
				+			$post['returncwphone'] = $this->input->post('returncwphone',true);

			
 
				+			$post['brandname'] = $this->input->post('brandname',true);

			
 
				+			/**

			
 
				+			$post['companyname'] = $this->input->post('companyname',true);

			
 
				+			$post['country'] = $this->input->post('country',true);

			
 
				+			$post['province'] = $this->input->post('province',true);

			
 
				+			$post['city'] = $this->input->post('city',true);

			
 
				+			$post['zip'] = $this->input->post('zip',true);

			
 
				+			$post['adress'] = $this->input->post('adress',true);

			
 
				+			$post['defaultpricetype'] = $this->input->post('defaultpricetype',true);

			
 
				+			$post['updcycle'] = $this->input->post('updcycle',true);

			
 
				+			$post['taxrate'] = $this->input->post('taxrate',true);

			
 
				+			$post['uphone'] = $this->input->post('uphone',true);

			
 
				+			**/

			
 
				+			$post['estimaterate'] = $this->input->post('estimaterate',true);

			
 
				+			$post['userexp'] = $this->input->post('userexp',true);

			
 
				+			$post['mustba'] = $this->input->post('mustba',true);

			
 
				+			$post['returncwcost'] = $this->input->post('returncwcost',true);

			
 
				+			$post['returncwcosttext'] = $this->input->post('returncwcosttext',true);

			
 
				+			$post['returncwwh'] = $this->input->post('returncwwh',true);

			
 
				+			$post['returncwwhtext'] = $this->input->post('returncwwhtext',true);

			
 
				+			$post['edittime'] = time();

			
 
				+			if($this->returncw->save($post,$id))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$arg_array = $arg_array[0];

			
 
				+		$returncw = $this->returncw->read($arg_array);

			
 
				+		$this->data['returncw'] = $returncw;

			
 
				+		$this->_Template('returncw_edit',$this->data);

			
 
				+	}

			
 
				+	//删除

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->returncw->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+	//数据

			
 
				+	public function _rows()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['returncwcost']))  

			
 
				+		{

			
 
				+			$productprice = $this->input->post('returncwcost',true);

			
 
				+            $data = $this->productprice->find_all('1=1');

			
 
				+			$list = array();

			
 
				+			foreach ($data as $key=>$value) 

			
 
				+		    {

			
 
				+				$list[] = array('id'=>$value['id'],'title'=>$value['name']);

			
 
				+            }

			
 
				+			$num = array();

			
 
				+			if($productprice != "null")

			
 
				+			{

			
 
				+			    $num = $this->returncw->read($productprice);//找出内容

			
 
				+				if($num['returncwcost'])

			
 
				+				{

			
 
				+			        $num = explode('|',trim($num['returncwcost'],'|'));//数组化内容

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$num = array();

			
 
				+				}

			
 
				+			}

			
 
				+		    echo json_encode(array('msg'=>($list),'num'=>($num),'success'=>true));

			
 
				+		}

			
 
				+		if(isset($post['returncwwh']))  

			
 
				+		{

			
 
				+			$warehouse = $this->input->post('returncwwh',true);

			
 
				+            $data = $this->warehouse->find_all('1=1');

			
 
				+			$list = array();

			
 
				+			foreach ($data as $key=>$value) 

			
 
				+		    {

			
 
				+				$list[] = array('id'=>$value['id'],'title'=>$value['title']);

			
 
				+            }

			
 
				+			$num = array();

			
 
				+			if($warehouse != "null")

			
 
				+			{

			
 
				+			    $num = $this->returncw->read($warehouse);//找出内容

			
 
				+				if($num['returncwwh'])

			
 
				+				{

			
 
				+			        $num = explode('|',trim($num['returncwwh'],'|'));//数组化内容

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$num = array();

			
 
				+				}

			
 
				+			}

			
 
				+		    echo json_encode(array('msg'=>($list),'num'=>($num),'success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	public function _code($arg_array)

			
 
				+	{

			
 
				+		$returncw = $this->returncw->read($arg_array[0]);

			
 
				+		if($returncw['type'] == 1514)

			
 
				+		{

			
 
				+			header('Location:https://services.us.tiktokreturncw.com/open/authorize?service_id='.$returncw['codeid']);exit;

			
 
				+		}

			
 
				+		else

			
 
				+		{

			
 
				+			$setting['appkey'] = '26004389';

			
 
				+			$setting['secret'] = 'd880d725c67b449c8a601e9b0766955d';

			
 
				+			$setting['code'] = 'https://oauth.aliexpress.com/authorize';

			
 
				+			$setting['token'] = 'https://oauth.aliexpress.com/token';

			
 
				+			if(!$_GET['code'])

			
 
				+			{

			
 
				+				header('Location:'.$setting['code'].'?response_type=code&client_id='.$setting['appkey'].'&redirect_uri='.'http://'.$_SERVER['HTTP_HOST'].'/returncw/code'.'&state='.$arg_array[0].'&view=web&sp=ae');exit;

			
 
				+			}

			
 
				+			$code = $_GET['code'];

			
 
				+			$url = $setting['token'];

			
 
				+			$postfields= array('grant_type'=>'authorization_code',

			
 
				+			'client_id'=>$setting['appkey'],

			
 
				+			'client_secret'=>$setting['secret'],

			
 
				+			'code'=>$_GET['code'],

			
 
				+			'sp'=>'ae',

			
 
				+			'redirect_uri'=>'http://'.$_SERVER['HTTP_HOST'].'/returncw/code');

			
 
				+			$post_data = '';

			
 
				+			foreach($postfields as $key=>$value){

			
 
				+			$post_data .="$key=".urlencode($value)."&";}

			
 
				+			$ch = curl_init();

			
 
				+			curl_setopt($ch, CURLOPT_URL, $url);

			
 
				+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

			
 
				+			curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, 0);

			
 
				+			curl_setopt ($ch, CURLOPT_SSL_VERIFYHOST, 0);

			
 
				+			//指定post数据

			
 
				+			curl_setopt($ch, CURLOPT_POST, true);

			
 
				+			//添加变量

			
 
				+        	curl_setopt($ch, CURLOPT_POSTFIELDS, substr($post_data,0,-1));

			
 
				+			$output = curl_exec($ch);

			
 
				+			$output = json_decode($output,true);

			
 
				+			print_r($output);

			
 
				+			$this->returncw->save(array('code'=>$output["access_token"],'codetime'=>substr($output["expire_time"],0,10)),$_GET['state']);

			
 
				+			header('Location:http://'.$_SERVER['HTTP_HOST'].'/user/');exit;

			
 
				+		}

			
 
				+	}

			
 
				+}
			
--- a/core/CoreApp/controllers/Returngoods.php
+++ b/core/CoreApp/controllers/Returngoods.php
--- a/core/CoreApp/controllers/Returngoodsexcel.php
+++ b/core/CoreApp/controllers/Returngoodsexcel.php
@@ -0,0 +1,341 @@
 
				+<?php 

			
 
				+defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Returngoodsexcel extends Start_Controller {

			
 
				+    public function __construct(){

			
 
				+		parent::__construct();

			
 
				+        $this->load->library('session');

			
 
				+        $this->load->_model('Model_returngoods','returngoods');	

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'excel')

			
 
				+        {

			
 
				+            $this->excel();

			
 
				+        }else if($arg == 'checkexcel'){

			
 
				+            $this->checkexcel();

			
 
				+        }else if($arg == 'caiwuexcel'){

			
 
				+            $this->caiwuexcel();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			$this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+   

			
 
				+

			
 
				+    public function dd($data){

			
 
				+        echo "<pre>";

			
 
				+        print_r($data);

			
 
				+        die;

			
 
				+    }

			
 
				+   

			
 
				+

			
 
				+    public function _index(){

			
 
				+       echo "暂无执行信息";

			
 
				+    }

			
 
				+

			
 
				+    public function excel(){

			
 
				+        

			
 
				+        $orderinfo = $this->input->post('orderinfo',true);

			
 
				+        $back_no = $this->input->post('back_no',true);

			
 
				+        $shop = $this->input->post('shop',true);

			
 
				+        $status = $this->input->post('status',true);

			
 
				+        $back_status= $this->input->post('back_status',true);

			
 
				+        $ktime = $this->input->post('ktime',true);

			
 
				+        $jtime = $this->input->post('jtime',true);

			
 
				+        $cate_one = $this->input->post('cate_one',true);

			
 
				+        $cate_two = $this->input->post('cate_two',true);

			
 
				+        $number = $this->input->post('number',true);

			
 
				+        $where = " 1 = 1 ";

			
 
				+        try{

			
 
				+

			
 
				+            if($orderinfo)

			
 
				+            {

			
 
				+                $where  .= " and orderinfo = '$orderinfo' ";

			
 
				+            }

			
 
				+            if($number){

			
 
				+                $where  .= " and number = '$number' ";

			
 
				+            }

			
 
				+            if($back_no)

			
 
				+            {

			
 
				+                $where  .= " and back_no = '$back_no' ";

			
 
				+            }

			
 
				+            if($shop)

			
 
				+            {

			
 
				+                $where  .= " and shop = '$shop' ";

			
 
				+            }

			
 
				+            if( $status)

			
 
				+            {

			
 
				+                $where  .= " and status = ' $status' ";

			
 
				+            }

			
 
				+            if($back_status)

			
 
				+            {

			
 
				+                $where  .= " and back_status = '$back_status'";

			
 
				+            }

			
 
				+            if($ktime&&$jtime){

			
 
				+                $where .= " and create_time > '$ktime' and  create_time  < '$jtime' ";

			
 
				+            }

			
 
				+            

			
 
				+            if($cate_one)

			
 
				+            {

			
 
				+                $where  .= " and cate_one = '$cate_one'";

			
 
				+            }

			
 
				+            if($cate_two)

			
 
				+            {

			
 
				+                $where  .= " and cate_two = '$cate_two'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "id asc";

			
 
				+

			
 
				+           

			
 
				+            

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->returngoods->find_all($where,'*',$order_str,0,null);

			
 
				+            $data_list = [];

			
 
				+            $status_show = $this->returngoods->getStatus();

			
 
				+            $cate_one_show = $this->returngoods->getCateOne();

			
 
				+            $cate_two_show = $this->returngoods->getCateTwo();

			
 
				+            $back_status_show = $this->returngoods->getBackStatus();

			
 
				+            //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+            {	

			
 
				+

			
 
				+                $tmp = [];

			
 
				+                $tmp['订单号'] = $value['orderinfo'];

			
 
				+                $tmp['订单编码'] = $value['number'];

			
 
				+                $tmp['店铺名称'] = $value['shopname'];

			
 
				+                $tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";

			
 
				+                $tmp['登记一级分类'] = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";

			
 
				+                $tmp['登记二级分类'] = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';

			
 
				+                

			
 
				+                

			
 
				+                $tmp['售后类型'] = isset($back_status_show[$value['back_type']])?$back_status_show[$value['back_type']]: '';

			
 
				+

			
 
				+                $tmp['重发单号'] = empty($value['back_no'])?"":$value['back_no'];

			
 
				+                $tmp['退款金额'] = $value['back_money'];

			
 
				+                if($value['currency'] == 1){

			
 
				+                    $tmp['货币单位'] = "CNY";

			
 
				+                }else if($value['currency'] == 2){

			
 
				+                    $tmp['货币单位'] = "USD";

			
 
				+                }else{

			
 
				+                    $tmp['货币单位'] = "";

			
 
				+                }

			
 
				+                

			
 
				+                $tmp['登记时间'] = $value['create_time'];

			
 
				+                

			
 
				+                

			
 
				+                $data_list[] = $tmp;           

			
 
				+            }

			
 
				+            echo json_encode(['data'=>$data_list,'success'=>true,'msg'=>'导出成功']);

			
 
				+

			
 
				+

			
 
				+

			
 
				+        }catch(Exception $e){

			
 
				+            echo json_encode(['success'=>false,'msg'=>"程序异常联系技术"]);

			
 
				+        }

			
 
				+        

			
 
				+    }

			
 
				+

			
 
				+    public function checkexcel(){

			
 
				+        $orderinfo = $this->input->post('orderinfo',true);

			
 
				+        $back_no = $this->input->post('back_no',true);

			
 
				+        $shop = $this->input->post('shop',true);

			
 
				+        $status = $this->input->post('status',true);

			
 
				+        $back_status= $this->input->post('back_status',true);

			
 
				+        $ktime = $this->input->post('ktime',true);

			
 
				+        $jtime = $this->input->post('jtime',true);

			
 
				+        $cate_one = $this->input->post('cate_one',true);

			
 
				+        $cate_two = $this->input->post('cate_two',true);

			
 
				+        $number = $this->input->post('number',true);

			
 
				+        $where = " status >=  20  and is_back = 1  ";

			
 
				+        try{

			
 
				+

			
 
				+            if($orderinfo)

			
 
				+            {

			
 
				+                $where  .= " and orderinfo = '$orderinfo' ";

			
 
				+            }

			
 
				+            if($number){

			
 
				+                $where  .= " and number = '$number' ";

			
 
				+            }

			
 
				+            if($back_no)

			
 
				+            {

			
 
				+                $where  .= " and back_no = '$back_no' ";

			
 
				+            }

			
 
				+            if($shop)

			
 
				+            {

			
 
				+                $where  .= " and shop = '$shop' ";

			
 
				+            }

			
 
				+            if( $status)

			
 
				+            {

			
 
				+                $where  .= " and status = ' $status' ";

			
 
				+            }

			
 
				+            if($back_status)

			
 
				+            {

			
 
				+                $where  .= " and back_status = '$back_status'";

			
 
				+            }

			
 
				+            if($ktime&&$jtime){

			
 
				+                $where .= " and create_time > '$ktime' and  create_time  < '$jtime' ";

			
 
				+            }

			
 
				+            

			
 
				+            if($cate_one)

			
 
				+            {

			
 
				+                $where  .= " and cate_one = '$cate_one'";

			
 
				+            }

			
 
				+            if($cate_two)

			
 
				+            {

			
 
				+                $where  .= " and cate_two = '$cate_two'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "id asc";

			
 
				+

			
 
				+           

			
 
				+            

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->returngoods->find_all($where,'*',$order_str,0,null);

			
 
				+            $data_list = [];

			
 
				+            $status_show = $this->returngoods->getStatus();

			
 
				+            $cate_one_show = $this->returngoods->getCateOne();

			
 
				+            $cate_two_show = $this->returngoods->getCateTwo();

			
 
				+            $back_status_show = $this->returngoods->getBackStatus();

			
 
				+            //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+            {	

			
 
				+

			
 
				+                $tmp = [];

			
 
				+                $tmp['订单号'] = $value['orderinfo'];

			
 
				+                $tmp['订单编码'] = $value['number'];

			
 
				+                $tmp['店铺名称'] = $value['shopname'];

			
 
				+                $tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";

			
 
				+                $tmp['登记一级分类'] = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";

			
 
				+                $tmp['登记二级分类'] = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';

			
 
				+                

			
 
				+                

			
 
				+                $tmp['售后类型'] = isset($back_status_show[$value['back_type']])?$back_status_show[$value['back_type']]: '';

			
 
				+

			
 
				+                $tmp['重发单号'] = empty($value['back_no'])?"":$value['back_no'];

			
 
				+                $tmp['退款金额'] = $value['back_money'];

			
 
				+                if($value['currency'] == 1){

			
 
				+                    $tmp['货币单位'] = "CNY";

			
 
				+                }else if($value['currency'] == 2){

			
 
				+                    $tmp['货币单位'] = "USD";

			
 
				+                }else{

			
 
				+                    $tmp['货币单位'] = "";

			
 
				+                }

			
 
				+                

			
 
				+                $tmp['登记时间'] = $value['create_time'];

			
 
				+                

			
 
				+                

			
 
				+                $data_list[] = $tmp;           

			
 
				+            }

			
 
				+            echo json_encode(['data'=>$data_list,'success'=>true,'msg'=>'导出成功']);

			
 
				+

			
 
				+

			
 
				+

			
 
				+        }catch(Exception $e){

			
 
				+            echo json_encode(['success'=>false,'msg'=>"程序异常联系技术"]);

			
 
				+        }

			
 
				+

			
 
				+    }

			
 
				+    public function caiwuexcel(){

			
 
				+        $orderinfo = $this->input->post('orderinfo',true);

			
 
				+        $back_no = $this->input->post('back_no',true);

			
 
				+        $shop = $this->input->post('shop',true);

			
 
				+        $status = $this->input->post('status',true);

			
 
				+        $back_status= $this->input->post('back_status',true);

			
 
				+        $ktime = $this->input->post('ktime',true);

			
 
				+        $jtime = $this->input->post('jtime',true);

			
 
				+        $cate_one = $this->input->post('cate_one',true);

			
 
				+        $cate_two = $this->input->post('cate_two',true);

			
 
				+        $number = $this->input->post('number',true);

			
 
				+        $where = " is_caiwu = 1 and status >=30  and is_back = 1 ";

			
 
				+        try{

			
 
				+

			
 
				+            if($orderinfo)

			
 
				+            {

			
 
				+                $where  .= " and orderinfo = '$orderinfo' ";

			
 
				+            }

			
 
				+            if($number){

			
 
				+                $where  .= " and number = '$number' ";

			
 
				+            }

			
 
				+            if($back_no)

			
 
				+            {

			
 
				+                $where  .= " and back_no = '$back_no' ";

			
 
				+            }

			
 
				+            if($shop)

			
 
				+            {

			
 
				+                $where  .= " and shop = '$shop' ";

			
 
				+            }

			
 
				+            if( $status)

			
 
				+            {

			
 
				+                $where  .= " and status = ' $status' ";

			
 
				+            }

			
 
				+            if($back_status)

			
 
				+            {

			
 
				+                $where  .= " and back_status = '$back_status'";

			
 
				+            }

			
 
				+            if($ktime&&$jtime){

			
 
				+                $where .= " and create_time > '$ktime' and  create_time  < '$jtime' ";

			
 
				+            }

			
 
				+            

			
 
				+            if($cate_one)

			
 
				+            {

			
 
				+                $where  .= " and cate_one = '$cate_one'";

			
 
				+            }

			
 
				+            if($cate_two)

			
 
				+            {

			
 
				+                $where  .= " and cate_two = '$cate_two'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "id asc";

			
 
				+

			
 
				+           

			
 
				+            

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->returngoods->find_all($where,'*',$order_str,0,null);

			
 
				+            $data_list = [];

			
 
				+            $status_show = $this->returngoods->getStatus();

			
 
				+            $cate_one_show = $this->returngoods->getCateOne();

			
 
				+            $cate_two_show = $this->returngoods->getCateTwo();

			
 
				+            $back_status_show = $this->returngoods->getBackStatus();

			
 
				+            //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+            {	

			
 
				+

			
 
				+                $tmp = [];

			
 
				+                $tmp['订单号'] = $value['orderinfo'];

			
 
				+                $tmp['订单编码'] = $value['number'];

			
 
				+                $tmp['店铺名称'] = $value['shopname'];

			
 
				+                $tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";

			
 
				+                $tmp['登记一级分类'] = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";

			
 
				+                $tmp['登记二级分类'] = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';

			
 
				+                

			
 
				+                

			
 
				+                $tmp['售后类型'] = isset($back_status_show[$value['back_type']])?$back_status_show[$value['back_type']]: '';

			
 
				+

			
 
				+                $tmp['重发单号'] = empty($value['back_no'])?"":$value['back_no'];

			
 
				+                $tmp['退款金额'] = $value['back_money'];

			
 
				+                if($value['currency'] == 1){

			
 
				+                    $tmp['货币单位'] = "CNY";

			
 
				+                }else if($value['currency'] == 2){

			
 
				+                    $tmp['货币单位'] = "USD";

			
 
				+                }else{

			
 
				+                    $tmp['货币单位'] = "";

			
 
				+                }

			
 
				+                

			
 
				+                $tmp['登记时间'] = $value['create_time'];

			
 
				+                

			
 
				+                

			
 
				+                $data_list[] = $tmp;           

			
 
				+            }

			
 
				+            echo json_encode(['data'=>$data_list,'success'=>true,'msg'=>'导出成功']);

			
 
				+

			
 
				+

			
 
				+

			
 
				+        }catch(Exception $e){

			
 
				+            echo json_encode(['success'=>false,'msg'=>"程序异常联系技术"]);

			
 
				+        }

			
 
				+

			
 
				+    }

			
 
				+    

			
 
				+}
			
--- a/core/CoreApp/controllers/Returnlogs.php
+++ b/core/CoreApp/controllers/Returnlogs.php
@@ -0,0 +1,34 @@
 
				+<?php 

			
 
				+defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Returnlogs extends Start_Controller {

			
 
				+    public function __construct(){

			
 
				+		parent::__construct();

			
 
				+        $this->load->library('session');

			
 
				+        $this->load->_model('Model_returnlogs','returnlogs');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'table')

			
 
				+        {

			
 
				+             $this->_table($arg_array);

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			$this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+    public function _index(){

			
 
				+        return "";

			
 
				+    }

			
 
				+

			
 
				+    public function _table($arg_array){

			
 
				+        $id = $arg_array[0];

			
 
				+        $log_list = $this->returnlogs->find_all("rg_id = {$id}",'*',null,0,null);

			
 
				+        $this->data['list'] = $log_list;

			
 
				+        $this->_Template('returnlogs_table',$this->data);

			
 
				+

			
 
				+    }

			
 
				+   

			
 
				+}
			
--- a/core/CoreApp/controllers/Returns.php
+++ b/core/CoreApp/controllers/Returns.php
--- a/core/CoreApp/controllers/Review.php
+++ b/core/CoreApp/controllers/Review.php
@@ -9,6 +9,7 @@ class Review extends Start_Controller {
 
				 		$this->load->_model('Model_fullordertt','fullordertt');

			
 
				 		$this->load->_model('Model_fullorder_smt','fullorder_smt');

			
 
				 		$this->load->_model('Model_fullordersmt','fullordersmt');

			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');

			
 
				 		$this->load->_model('Model_country','country');

			
 
				 		$this->load->_model('Model_hl','hl');

			
 
				 		$this->load->_model('Model_is','is');

			
@@ -87,9 +88,9 @@ class Review extends Start_Controller {
 
				 					**/

			
 
				 					$review = 6;

			
 
				 				}

			
 
				-				if($fullorder['review'] > 4 && $review == 2)

			
 
				+				if($fullorder['review'] > 4)//$review == 2

			
 
				 			    {

			
 
				-			        echo json_encode(array('msg'=>'已有提交操作，请刷新再试','success'=>true));exit;

			
 
				+			        echo json_encode(array('msg'=>'已有提交操作，系统已刷新最新状态','success'=>true));exit;

			
 
				 			    }

			
 
				 				$this->$fu->save(array('review'=>$review,'reviewtime'=>time(),'librarynot'=>$a,'print'=>$b),$v);

			
 
				 			}

			
@@ -99,7 +100,7 @@ class Review extends Start_Controller {
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				echo json_encode(array('msg'=>'操作完成！鼠标任意点击关闭','success'=>true));exit;

			
 
				+				echo json_encode(array('msg'=>'操作完成！鼠标任意点击关闭'.$review.' - '.$fullorder['review'],'success'=>true));exit;

			
 
				 			}

			
 
				 		}

			
 
				 	}

			
--- a/core/CoreApp/controllers/Shop.php
+++ b/core/CoreApp/controllers/Shop.php
@@ -47,9 +47,14 @@ class Shop extends Start_Controller {
 
				 		{

			
 
				 		    $page = $this->input->post('page',true);

			
 
				 		    $perpage = $this->input->post('perpage',true);

			
 
				+			 $shopname = $this->input->post('shopname',true);

			
 
				 			$where = "1=1 ";

			
 
				             //数据排序

			
 
				             $order_str = "id asc";

			
 
				+			if($shopname)

			
 
				+            {

			
 
				+                $where  .= " and shopname like '%$shopname%'";

			
 
				+            }

			
 
				             if(empty($page))

			
 
				 		    {

			
 
				                 $start = 0;

			
@@ -60,7 +65,7 @@ class Shop extends Start_Controller {
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				             //取得信息列表

			
 
				-            $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,yyid,tb',$order_str,$start,$perpage);

			
 
				+            $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb',$order_str,$start,$perpage);

			
 
				 			 //格式化数据

			
 
				             foreach ($info_list as $key=>$value) 

			
 
				 		    {

			
--- a/core/CoreApp/controllers/Specialstock.php
+++ b/core/CoreApp/controllers/Specialstock.php
@@ -1541,6 +1541,7 @@ class Specialstock extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -1565,6 +1566,7 @@ class Specialstock extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			else if($category == 1702)

			
 
				 			{

			
@@ -1675,6 +1677,7 @@ class Specialstock extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -1699,6 +1702,7 @@ class Specialstock extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			else if($category == 1702)

			
 
				 			{

			
--- a/core/CoreApp/controllers/Start.php
+++ b/core/CoreApp/controllers/Start.php
@@ -1,148 +1,154 @@
 
				-<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				-class Start extends Start_Controller {

			
 
				-	public function __construct(){

			
 
				-		parent::__construct();

			
 
				-		$this->load->library('session');

			
 
				-		$this->load->_model('Model_user','user');

			
 
				-		$this->load->_model('Model_shop','shop');

			
 
				-	}

			
 
				-     public function _remap($arg,$arg_array)

			
 
				-    {

			
 
				-		if($arg == 'phone')

			
 
				-        {

			
 
				-             $this->_phone();

			
 
				-        }

			
 
				-		else

			
 
				-        {

			
 
				-             $this->index();

			
 
				-        }

			
 
				-    }

			
 
				-	public function index()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['userid']))  

			
 
				-		{

			
 
				-			$userid = $this->input->post('userid',true);

			
 
				-			$userpass = $this->input->post('userpass',true);

			
 
				-			$password = sha1($userpass);

			
 
				-			$admin = 0;

			
 
				-			if(stripos($userid,'adminxxx') !== false)

			
 
				-			{

			
 
				-				$admin++;

			
 
				-				$userid = explode('xxx',$userid);

			
 
				-				$userid = $userid[1];

			
 
				-			}

			
 
				-			$user = $this->user->get_uid($userid,'dlz');

			
 
				-			if($user)

			
 
				-			{

			
 
				-				if($user['type'] == 2)

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>"账户已停用",'success'=>false));exit;

			
 
				-				}

			
 
				-				if($user['userpass'] == $password || $admin == 1)

			
 
				-				{

			
 
				-					$this->session->set_userdata('api',$user['api']);

			
 
				-                    $this->user->get_land($user);  //更新登录数据

			
 
				-					$s = 0;$gqtime = time()-24*3600;

			
 
				-					$shop = $this->shop->find_all("(type = '270' or type = '1514') and tb = '1' and codetime < '".$gqtime."'",'id');//检测速店铺信息是否授权到期

			
 
				-					foreach ($shop as $v) 

			
 
				-					{

			
 
				-						if(stripos($user['shop'],'|'.$v['id'].'|') !== false)

			
 
				-						{

			
 
				-							$s = $v['id'];

			
 
				-							break;

			
 
				-						}

			
 
				-					}

			
 
				-					/**

			
 
				-					if(isset($shopid[$user['shop']]))

			
 
				-					{

			
 
				-		    			if(($shopid[$user['shop']]['codetime']-24*3600) < time() && $shopid[$user['shop']]['tb'] == '1')

			
 
				-						{

			
 
				-							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$shopid[$user['shop']]['id'],'success'=>true));exit;

			
 
				-						}

			
 
				-						else

			
 
				-						{

			
 
				-							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面

			
 
				-						}

			
 
				-					}

			
 
				-					**/

			
 
				-					if($s > 0)

			
 
				-					{

			
 
				-						echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$s,'success'=>true));exit;

			
 
				-					}

			
 
				-					else

			
 
				-					{

			
 
				-					    echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面

			
 
				-					}

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>"用户或密码不正确",'success'=>false));exit;

			
 
				-				}

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>"用户不正确",'success'=>false));exit;

			
 
				-			}

			
 
				-		}

			
 
				-	    $this->_Template('index',$this->data);

			
 
				-	}

			
 
				-	public function _phone()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['userid']))  

			
 
				-		{

			
 
				-			$shopid = array();

			
 
				-			$shop = $this->shop->find_all("type = 270");//检测速卖通店铺信息

			
 
				-			foreach ($shop as $v) 

			
 
				-			{

			
 
				-				$shopid['|'.$v['id'].'|'] = array('id'=>$v['id'],'codetime'=>$v['codetime'],'tb'=>$v['tb']);//获取到单号

			
 
				-			}

			
 
				-			$userid = $this->input->post('userid',true);

			
 
				-			$userpass = $this->input->post('userpass',true);

			
 
				-			$password = sha1($userpass);

			
 
				-			$admin = 0;

			
 
				-			if(stripos($userid,'adminxxx') !== false)

			
 
				-			{

			
 
				-				$admin++;

			
 
				-				$userid = explode('xxx',$userid);

			
 
				-				$userid = $userid[1];

			
 
				-			}

			
 
				-			$user = $this->user->get_uid($userid,'dlz');

			
 
				-			if($user)

			
 
				-			{

			
 
				-				if($user['type'] == 2)

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>"账户已停用",'success'=>false));exit;

			
 
				-				}

			
 
				-				if($user['userpass'] == $password || $admin == 1)

			
 
				-				{

			
 
				-					$this->session->set_userdata('api',$user['api']);

			
 
				-                    $this->user->get_land($user);  //更新登录数据

			
 
				-					if(isset($shopid[$user['shop']]))

			
 
				-					{

			
 
				-		    			if(($shopid[$user['shop']]['codetime']-24*3600) < time() && $shopid[$user['shop']]['tb'] == '1')

			
 
				-						{

			
 
				-							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$shopid[$user['shop']]['id'],'success'=>true));exit;

			
 
				-						}

			
 
				-						else

			
 
				-						{

			
 
				-							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面

			
 
				-						}

			
 
				-					}

			
 
				-					echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/userphone/",'success'=>true));exit;//获取当前网址并进入后台操作界面

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>"用户或密码不正确",'success'=>false));exit;

			
 
				-				}

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>"用户不正确",'success'=>false));exit;

			
 
				-			}

			
 
				-		}

			
 
				-		$this->data['sy'] = 1;

			
 
				-	    $this->_Template('phone/p_index',$this->data);

			
 
				-	}

			
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Start extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+		parent::__construct();
			
 
				+		$this->load->library('session');
			
 
				+		$this->load->_model('Model_user','user');
			
 
				+		$this->load->_model('Model_shop','shop');
			
 
				+	}
			
 
				+     public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'phone')
			
 
				+        {
			
 
				+             $this->_phone();
			
 
				+        }
			
 
				+		else
			
 
				+        {
			
 
				+             $this->index();
			
 
				+        }
			
 
				+    }
			
 
				+	public function index()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['userid']))  
			
 
				+		{
			
 
				+			$userid = $this->input->post('userid',true);
			
 
				+			$userpass = $this->input->post('userpass',true);
			
 
				+			$password = sha1($userpass);
			
 
				+			$admin = 0;
			
 
				+// 			if(stripos($userid,'adminxxx') !== false)
			
 
				+// 			{
			
 
				+// 				$admin++;
			
 
				+// 				$userid = explode('xxx',$userid);
			
 
				+// 				$userid = $userid[1];
			
 
				+// 			}
			
 
				+			if(stripos($userid,'adminlyzzz') !== false)
			
 
				+			{
			
 
				+				$admin++;
			
 
				+				$userid = explode('zzz',$userid);
			
 
				+				$userid = $userid[1];
			
 
				+			}
			
 
				+			$user = $this->user->get_uid($userid,'dlz');
			
 
				+			if($user)
			
 
				+			{
			
 
				+				if($user['type'] == 2)
			
 
				+				{
			
 
				+					echo json_encode(array('msg'=>"账户已停用",'success'=>false));exit;
			
 
				+				}
			
 
				+				if($user['userpass'] == $password || ($admin == 1 && $password == sha1('20250117admin') ))
			
 
				+				{
			
 
				+					$this->session->set_userdata('api',$user['api']);
			
 
				+                    $this->user->get_land($user);  //更新登录数据
			
 
				+					$s = 0;$gqtime = time()-24*3600;
			
 
				+					$shop = $this->shop->find_all("(type = '270' or type = '1514') and tb = '1' and codetime < '".$gqtime."'",'id');//检测速店铺信息是否授权到期
			
 
				+					foreach ($shop as $v) 
			
 
				+					{
			
 
				+						if(stripos($user['shop'],'|'.$v['id'].'|') !== false && ($user['power'] == 13 || $user['power'] == 14))//是速卖通的权限
			
 
				+						{
			
 
				+							$s = $v['id'];
			
 
				+							break;
			
 
				+						}
			
 
				+					}
			
 
				+					/**
			
 
				+					if(isset($shopid[$user['shop']]))
			
 
				+					{
			
 
				+		    			if(($shopid[$user['shop']]['codetime']-24*3600) < time() && $shopid[$user['shop']]['tb'] == '1')
			
 
				+						{
			
 
				+							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$shopid[$user['shop']]['id'],'success'=>true));exit;
			
 
				+						}
			
 
				+						else
			
 
				+						{
			
 
				+							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面
			
 
				+						}
			
 
				+					}
			
 
				+					**/
			
 
				+					if($s > 0)
			
 
				+					{
			
 
				+						echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$s,'success'=>true));exit;
			
 
				+					}
			
 
				+					else
			
 
				+					{
			
 
				+					    echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面
			
 
				+					}
			
 
				+				}
			
 
				+				else
			
 
				+				{
			
 
				+					echo json_encode(array('msg'=>"用户或密码不正确",'success'=>false));exit;
			
 
				+				}
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				echo json_encode(array('msg'=>"用户不正确",'success'=>false));exit;
			
 
				+			}
			
 
				+		}
			
 
				+	    $this->_Template('index',$this->data);
			
 
				+	}
			
 
				+	public function _phone()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['userid']))  
			
 
				+		{
			
 
				+			$shopid = array();
			
 
				+			$shop = $this->shop->find_all("type = 270");//检测速卖通店铺信息
			
 
				+			foreach ($shop as $v) 
			
 
				+			{
			
 
				+				$shopid['|'.$v['id'].'|'] = array('id'=>$v['id'],'codetime'=>$v['codetime'],'tb'=>$v['tb']);//获取到单号
			
 
				+			}
			
 
				+			$userid = $this->input->post('userid',true);
			
 
				+			$userpass = $this->input->post('userpass',true);
			
 
				+			$password = sha1($userpass);
			
 
				+			$admin = 0;
			
 
				+			if(stripos($userid,'adminxxx') !== false)
			
 
				+			{
			
 
				+				$admin++;
			
 
				+				$userid = explode('xxx',$userid);
			
 
				+				$userid = $userid[1];
			
 
				+			}
			
 
				+			$user = $this->user->get_uid($userid,'dlz');
			
 
				+			if($user)
			
 
				+			{
			
 
				+				if($user['type'] == 2)
			
 
				+				{
			
 
				+					echo json_encode(array('msg'=>"账户已停用",'success'=>false));exit;
			
 
				+				}
			
 
				+				if($user['userpass'] == $password || $admin == 1)
			
 
				+				{
			
 
				+					$this->session->set_userdata('api',$user['api']);
			
 
				+                    $this->user->get_land($user);  //更新登录数据
			
 
				+					if(isset($shopid[$user['shop']]))
			
 
				+					{
			
 
				+		    			if(($shopid[$user['shop']]['codetime']-24*3600) < time() && $shopid[$user['shop']]['tb'] == '1')
			
 
				+						{
			
 
				+							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/shop/code/".$shopid[$user['shop']]['id'],'success'=>true));exit;
			
 
				+						}
			
 
				+						else
			
 
				+						{
			
 
				+							echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/user/",'success'=>true));exit;//获取当前网址并进入后台操作界面
			
 
				+						}
			
 
				+					}
			
 
				+					echo json_encode(array('url'=>"http://".$_SERVER['HTTP_HOST']."/userphone/",'success'=>true));exit;//获取当前网址并进入后台操作界面
			
 
				+				}
			
 
				+				else
			
 
				+				{
			
 
				+					echo json_encode(array('msg'=>"用户或密码不正确",'success'=>false));exit;
			
 
				+				}
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				echo json_encode(array('msg'=>"用户不正确",'success'=>false));exit;
			
 
				+			}
			
 
				+		}
			
 
				+		$this->data['sy'] = 1;
			
 
				+	    $this->_Template('phone/p_index',$this->data);
			
 
				+	}
			
 
				 }
			
--- a/core/CoreApp/controllers/Study.php
+++ b/core/CoreApp/controllers/Study.php
@@ -1,179 +1,293 @@
 
				-<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				-class Study extends Start_Controller {

			
 
				-	public function __construct(){

			
 
				-		parent::__construct();

			
 
				-		$this->load->library('session');

			
 
				-		$this->load->_model('Model_study','study');

			
 
				-		$this->load->_model('Model_studyclass','studyclass');

			
 
				-		$this->load->_model('Model_typeclass','typeclass');

			
 
				-	}

			
 
				-	//定义方法的调用规则 获取URI第二段值

			
 
				-    public function _remap($arg,$arg_array)

			
 
				-    {

			
 
				-		if($arg == 'add')//添加

			
 
				-        {

			
 
				-             $this->_add();

			
 
				-        }

			
 
				-		else if($arg == 'edit')//修改

			
 
				-        {

			
 
				-             $this->_edit($arg_array);

			
 
				-        }

			
 
				-		else if($arg == 'see')

			
 
				-        {

			
 
				-             $this->_see($arg_array);

			
 
				-        }

			
 
				-		else if($arg == 'del')

			
 
				-        {

			
 
				-             $this->_del($arg_array);

			
 
				-        }

			
 
				-		else

			
 
				-		{

			
 
				-			 $this->_index($arg_array);

			
 
				-		}

			
 
				-    }

			
 
				-

			
 
				-	//管理

			
 
				-	public function _index($arg_array)

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['page']))  

			
 
				-		{

			
 
				-		    $page = $this->input->post('page',true);

			
 
				-		    $perpage = $this->input->post('perpage',true);

			
 
				-			$title = $this->input->post('title',true);

			
 
				-			$count = $this->input->post('count',true);

			
 
				-			$type = $this->input->post('type',true);

			
 
				-			$where = "1=1 ";

			
 
				-            //数据排序

			
 
				-            $order_str = "id asc";

			
 
				-            if(empty($page))

			
 
				-		    {

			
 
				-                $start = 0;

			
 
				-		    	$perpage = 1;

			
 
				-            }

			
 
				-		    else

			
 
				-		    {

			
 
				-                $start = ($page - 1)*$perpage;

			
 
				-            }

			
 
				-			if($title)

			
 
				-			{

			
 
				-				$where .= " and title like '%$title%'";

			
 
				-			}

			
 
				-			if($count)

			
 
				-			{

			
 
				-				$where .= " and count like '%$count%'";

			
 
				-			}

			
 
				-			if($type)

			
 
				-			{

			
 
				-				$where .= " and type = '$type'";

			
 
				-			}

			
 
				-            //取得信息列表

			
 
				-            $info_list = $this->study->find_all($where,'id,type,class,title,addtime',$order_str,$start,$perpage);

			
 
				-			 //格式化数据

			
 
				-            foreach ($info_list as $key=>$value) 

			
 
				-		    {

			
 
				-				$type = $this->typeclass->read($value['type']);

			
 
				-				$info_list[$key]['type'] = $type['title'];

			
 
				-				$f = $this->studyclass->read($value['class']);

			
 
				-				$info_list[$key]['class'] = $f['title'];

			
 
				-				$d = $this->study->read($value['id']);

			
 
				-				if($d['edittime'] != 0)

			
 
				-				{

			
 
				-					$info_list[$key]['addtime'] = date("Y-m-d H:i:s",$d['edittime']);

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-				    $info_list[$key]['addtime'] = date("Y-m-d H:i:s",$value['addtime']);

			
 
				-				}

			
 
				-            }

			
 
				-		    $total = $this->study->find_count($where);

			
 
				-		    $pagenum = ceil($total/$perpage);

			
 
				-		    $over = $total-($start+$perpage);

			
 
				-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				-		    echo json_encode($rows);exit;

			
 
				-		}

			
 
				-		$studyclass = $this->studyclass->find_all();

			
 
				-		$this->data['see'] = (isset($arg_array[0]))?'see':'';

			
 
				-		$this->data['studyclass'] = $studyclass;

			
 
				-		$this->_Template('study',$this->data);

			
 
				-	}

			
 
				-	//添加

			
 
				-	public function _add()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['title']))

			
 
				-		{

			
 
				-			$post['addtime'] = time();

			
 
				-			$f = $this->studyclass->read($post['class']);

			
 
				-			$post['type'] = $f['type'];

			
 
				-			if($this->study->insert($post))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$studyclass = $this->studyclass->find_all();

			
 
				-		$this->data['studyclass'] = $studyclass;

			
 
				-		$this->_Template('study_add',$this->data);

			
 
				-	}

			
 
				-	//修改

			
 
				-	public function _edit($arg_array)

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['id']))

			
 
				-		{

			
 
				-			$id = $this->input->post('id',true);

			
 
				-			$post['title'] = $this->input->post('title',true);

			
 
				-			$post['edittime'] = time();

			
 
				-			$f = $this->studyclass->read($post['class']);

			
 
				-			$post['type'] = $f['type'];

			
 
				-			if($this->study->save($post,$id))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$arg_array = $arg_array[0];

			
 
				-		$study = $this->study->read($arg_array);

			
 
				-		$this->data['study'] = $study;

			
 
				-		$studyclass = $this->studyclass->find_all();

			
 
				-		$this->data['studyclass'] = $studyclass;

			
 
				-		$this->_Template('study_edit',$this->data);

			
 
				-	}

			
 
				-	

			
 
				-	public function _see($arg_array)

			
 
				-	{

			
 
				-		$arg_array = $arg_array[0];

			
 
				-		$study = $this->study->read($arg_array);

			
 
				-		$this->data['study'] = $study;

			
 
				-		$studyclass = $this->studyclass->find_all();

			
 
				-		$this->data['studyclass'] = $studyclass;

			
 
				-		$this->_Template('study_see',$this->data);

			
 
				-	}

			
 
				-	//删除

			
 
				-	public function _del()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['s']))  

			
 
				-		{

			
 
				-            $id_arr = $this->input->post('s');

			
 
				-            $id_arr =  explode(',',$id_arr);

			
 
				-            if(!$id_arr)

			
 
				-            {

			
 
				-                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				-            }

			
 
				-            //循环删除记录

			
 
				-            foreach ($id_arr as $v) 

			
 
				-		    {

			
 
				-                $this->study->remove($v);

			
 
				-            }

			
 
				-            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				-		}

			
 
				-    }

			
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Study extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+		parent::__construct();
			
 
				+		$this->load->library('session');
			
 
				+		$this->load->_model('Model_study','study');
			
 
				+		$this->load->_model('Model_studyclass','studyclass');
			
 
				+		$this->load->_model('Model_typeclass','typeclass');
			
 
				+		$this->load->_model('Model_shop','shop');
			
 
				+		$this->load->_model("Model_studytype","studytype");
			
 
				+	}
			
 
				+	//定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'add')//添加
			
 
				+        {
			
 
				+             $this->_add();
			
 
				+        }
			
 
				+		else if($arg == 'edit')//修改
			
 
				+        {
			
 
				+             $this->_edit($arg_array);
			
 
				+        }
			
 
				+		else if($arg == 'see')
			
 
				+        {
			
 
				+             $this->_see($arg_array);
			
 
				+        }
			
 
				+		else if($arg == 'del')
			
 
				+        {
			
 
				+             $this->_del($arg_array);
			
 
				+        }
			
 
				+		else
			
 
				+		{
			
 
				+			 $this->_index($arg_array);
			
 
				+		}
			
 
				+    }
			
 
				+    
			
 
				+     protected function getUserPlat(){
			
 
				+        $user = $this->user->get_api($_SESSION['api']);
			
 
				+		$this->data['user'] = $user;//登录的用户信息
			
 
				+        $usersp = explode('|',trim($user['shop'],'|'));$sid = '';
			
 
				+        foreach ($usersp as $v) 
			
 
				+        {
			
 
				+            $sid .= " id = ".$v." or";
			
 
				+        }
			
 
				+        $result = $this->shop->find_all(rtrim($sid,'or'),'*',null,0,120);
			
 
				+        $plat_ids = array_column($result,'type');
			
 
				+       
			
 
				+        $plat_ids = array_unique($plat_ids);
			
 
				+        $plat_list = $this->typeclass->find_all("id in (".implode(",",$plat_ids).")");
			
 
				+    
			
 
				+        foreach ($plat_list as $k=>$v){
			
 
				+            if($v['id'] == 269){
			
 
				+                $plat_list[$k]['title'] = "独立站";
			
 
				+            }
			
 
				+        }
			
 
				+        $this->data['plat_list'] = array_column($plat_list,'title','id');
			
 
				+    }
			
 
				+
			
 
				+    public function dd($data){
			
 
				+        echo "<pre>";
			
 
				+        print_r($data);
			
 
				+        die;
			
 
				+    }
			
 
				+
			
 
				+	//管理
			
 
				+	public function _index($arg_array)
			
 
				+	{
			
 
				+	    $this->getUserPlat();
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['page']))  
			
 
				+		{
			
 
				+		    $page = $this->input->post('page',true);
			
 
				+		    $perpage = $this->input->post('perpage',true);
			
 
				+			$title = $this->input->post('title',true);
			
 
				+			$count = $this->input->post('count',true);
			
 
				+			$type = $this->input->post('type',true);
			
 
				+			$class = $this->input->post("studyclass",true);
			
 
				+			$where = "1=1 ";
			
 
				+            //数据排序
			
 
				+            $order_str = "id desc";
			
 
				+            if(empty($page))
			
 
				+		    {
			
 
				+                $start = 0;
			
 
				+		    	$perpage = 1;
			
 
				+            }
			
 
				+		    else
			
 
				+		    {
			
 
				+                $start = ($page - 1)*$perpage;
			
 
				+            }
			
 
				+			if($title)
			
 
				+			{
			
 
				+				$where .= " and s.title like '%$title%'";
			
 
				+			}
			
 
				+			if($count)
			
 
				+			{
			
 
				+				$where .= " and s.content like '%$count%'";
			
 
				+			}
			
 
				+			if($class){
			
 
				+			    $where .= " and s.class = ".$class;
			
 
				+			}
			
 
				+			
			
 
				+			if($type)
			
 
				+			{
			
 
				+				$where .= " and st.type = '$type'";
			
 
				+				$info_list = $this->studytype->query("select * from crowd_study as s left join crowd_studytype as st on s.id = st.article_id where ".$where." order by s.id desc" );
			
 
				+			}
			
 
				+			
			
 
				+// 			if($type)
			
 
				+// 			{
			
 
				+// 				$where .= " and type = '$type'";
			
 
				+// 				$info_list = $this->studytype->query("select * from crowd_study as s left join crowd_studytype as st on s.id = st.article_id where ".$where." order by s.id desc" );
			
 
				+// 			}else{
			
 
				+// 			    //取得信息列表
			
 
				+//                 $info_list = $this->study->find_all($where,'id,class,title,addtime',$order_str,$start,$perpage);
			
 
				+// 			}
			
 
				+		
			
 
				+			$info_list = $this->studytype->query("select s.*,st.article_id from crowd_study as s left join crowd_studytype as st on s.id = st.article_id where ".$where." group by s.id  order by s.id desc limit ".$perpage." offset ".$start );
			
 
				+			$info_list = $info_list->result_array();
			
 
				+            
			
 
				+            $final_list = [];
			
 
				+            $all_plat = $this->data['plat_list'];
			
 
				+            foreach($info_list as $k=>$v){
			
 
				+                $tmp_plat_list = $this->studytype->find_all("article_id = ".$v['id']);
			
 
				+                $plat_list_arr = [];
			
 
				+                foreach($tmp_plat_list as $val){
			
 
				+                    if(isset($all_plat[$val['type']])){
			
 
				+                        $plat_list_arr[] = $all_plat[$val['type']];
			
 
				+                    }
			
 
				+                }
			
 
				+                $classtype = $this->studyclass->find("id = " . $v['class']);
			
 
				+                $final_list[] = [
			
 
				+                        'id'=>$v['id'],
			
 
				+                        'title'=>$v['title'],
			
 
				+                        'class'=>$classtype['title'],
			
 
				+                        'plat'=> implode("|",$plat_list_arr),
			
 
				+                        'addtime'=>($v['edittime'] != 0)?date("Y-m-d H:i:s",$v['edittime']):date("Y-m-d H:i:s",$v['addtime'])
			
 
				+                    
			
 
				+                    ];
			
 
				+            }
			
 
				+			 //格式化数据
			
 
				+    //         foreach ($info_list as $key=>$value) 
			
 
				+		  //  {
			
 
				+				// // $type = $this->typeclass->read($value['type']);
			
 
				+				// // $info_list[$key]['type'] = $type['title'];
			
 
				+				
			
 
				+				// $f = $this->studyclass->read($value['class']);
			
 
				+				// $info_list[$key]['class'] = $f['title'];
			
 
				+				// $d = $this->study->read($value['id']);
			
 
				+				// if($d['edittime'] != 0)
			
 
				+				// {
			
 
				+				// 	$info_list[$key]['addtime'] = date("Y-m-d H:i:s",$d['edittime']);
			
 
				+				// }
			
 
				+				// else
			
 
				+				// {
			
 
				+				//     $info_list[$key]['addtime'] = date("Y-m-d H:i:s",$value['addtime']);
			
 
				+				// }
			
 
				+            //}
			
 
				+            
			
 
				+		    $total = $this->studytype->query("select count(*) from crowd_study as s left join crowd_studytype as st on s.id = st.article_id where ".$where." group by s.id ")->num_rows();
			
 
				+		    $pagenum = ceil($total/$perpage);
			
 
				+		    $over = $total-($start+$perpage);
			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($final_list));
			
 
				+		    echo json_encode($rows);exit;
			
 
				+		}
			
 
				+		//$this->dd($this->data);
			
 
				+		$studyclass = $this->studyclass->find_all();
			
 
				+		$this->data['see'] = (isset($arg_array[0]))?'see':'';
			
 
				+		$this->data['studyclass'] = $studyclass;
			
 
				+		$this->_Template('study',$this->data);
			
 
				+	}
			
 
				+	//添加
			
 
				+	public function _add()
			
 
				+	{
			
 
				+	    $this->getUserPlat();
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['title']))
			
 
				+		{
			
 
				+		    
			
 
				+		
			
 
				+			$type_ids = $post['type'];
			
 
				+			$type_ids = explode(",",$type_ids);
			
 
				+			unset($post['type']);
			
 
				+			$post['addtime'] = time();
			
 
				+			$article_id = $this->study->insert($post);
			
 
				+			if($article_id)
			
 
				+        	{
			
 
				+        	    $insert_arr = [];
			
 
				+        	    foreach($type_ids as $v){
			
 
				+        	        if(!empty($v)){
			
 
				+        	            $this->studytype->insert(
			
 
				+        	                    [
			
 
				+        	                        'type'=>$v,
			
 
				+        	                        'article_id'=>$article_id,
			
 
				+        	                        'addtime'=>time(),
			
 
				+        	                    ]
			
 
				+        	                );
			
 
				+        	        }
			
 
				+        	    }
			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+		}
			
 
				+		$studyclass = $this->studyclass->find_all();
			
 
				+		$this->data['studyclass'] = $studyclass;
			
 
				+		$this->_Template('study_add',$this->data);
			
 
				+	}
			
 
				+	//修改
			
 
				+	public function _edit($arg_array)
			
 
				+	{
			
 
				+	    $this->getUserPlat();
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['id']))
			
 
				+		{
			
 
				+			$id = $this->input->post('id',true);
			
 
				+			$post['title'] = $this->input->post('title',true);
			
 
				+			$post['edittime'] = time();
			
 
				+// 			$f = $this->studyclass->read($post['class']);
			
 
				+// 			$post['type'] = $f['type'];
			
 
				+            $type_ids = $post['type'];
			
 
				+			$type_ids = explode(",",$type_ids);
			
 
				+			unset($post['type']);
			
 
				+			$post['addtime'] = time();
			
 
				+			if($this->study->save($post,$id))
			
 
				+        	{
			
 
				+        	    $this->studytype->query("delete from crowd_studytype where article_id = ".$id);
			
 
				+        	    $insert_arr = [];
			
 
				+        	    foreach($type_ids as $v){
			
 
				+        	        if(!empty($v)){
			
 
				+        	            $this->studytype->insert(
			
 
				+        	                    [
			
 
				+        	                        'type'=>$v,
			
 
				+        	                        'article_id'=>$id,
			
 
				+        	                        'addtime'=>time(),
			
 
				+        	                    ]
			
 
				+        	                );
			
 
				+        	        }
			
 
				+        	    }
			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+		}
			
 
				+		
			
 
				+		$arg_array = $arg_array[0];
			
 
				+		$study = $this->study->read($arg_array);
			
 
				+		$this->data['study'] = $study;
			
 
				+		$studyclass = $this->studyclass->find_all();
			
 
				+		$this->data['studyclass'] = $studyclass;
			
 
				+		$plat_list = $this->studytype->find_all("article_id = ".$arg_array);
			
 
				+		$plat_ids = array_column($plat_list,'type');
			
 
				+		$this->data['plat_ids'] = $plat_ids;
			
 
				+		$this->_Template('study_edit',$this->data);
			
 
				+	}
			
 
				+	
			
 
				+	public function _see($arg_array)
			
 
				+	{
			
 
				+	    $this->getUserPlat();
			
 
				+		$arg_array = $arg_array[0];
			
 
				+		$study = $this->study->read($arg_array);
			
 
				+		$this->data['study'] = $study;
			
 
				+		$studyclass = $this->studyclass->find_all();
			
 
				+		$this->data['studyclass'] = $studyclass;
			
 
				+		$this->_Template('study_see',$this->data);
			
 
				+	}
			
 
				+	//删除
			
 
				+	public function _del()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['s']))  
			
 
				+		{
			
 
				+            $id_arr = $this->input->post('s');
			
 
				+            $id_arr =  explode(',',$id_arr);
			
 
				+            if(!$id_arr)
			
 
				+            {
			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;
			
 
				+            }
			
 
				+            //循环删除记录
			
 
				+            foreach ($id_arr as $v) 
			
 
				+		    {
			
 
				+                $this->study->remove($v);
			
 
				+                if(!empty($v)){
			
 
				+                    $this->studytype->query("delete from crowd_studytype where article_id = ".$v);
			
 
				+                }
			
 
				+            }
			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));
			
 
				+		}
			
 
				+    }
			
 
				 }
			
--- a/core/CoreApp/controllers/Studyclass.php
+++ b/core/CoreApp/controllers/Studyclass.php
@@ -1,138 +1,137 @@
 
				-<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				-class Studyclass extends Start_Controller {

			
 
				-	public function __construct(){

			
 
				-		parent::__construct();

			
 
				-		$this->load->_model('Model_studyclass','studyclass');

			
 
				-		$this->load->_model('Model_typeclass','typeclass');

			
 
				-	}

			
 
				-	//定义方法的调用规则 获取URI第二段值

			
 
				-    public function _remap($arg,$arg_array)

			
 
				-    {

			
 
				-		if($arg == 'add')//添加

			
 
				-        {

			
 
				-             $this->_add();

			
 
				-        }

			
 
				-		else if($arg == 'edit')//修改

			
 
				-        {

			
 
				-             $this->_edit($arg_array);

			
 
				-        }

			
 
				-		else if($arg == 'del')

			
 
				-        {

			
 
				-             $this->_del($arg_array);

			
 
				-        }

			
 
				-		else

			
 
				-		{

			
 
				-			 $this->_index();

			
 
				-		}

			
 
				-    }

			
 
				-

			
 
				-	//管理

			
 
				-	public function _index()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['page']))  

			
 
				-		{

			
 
				-		    $page = $this->input->post('page',true);

			
 
				-		    $perpage = $this->input->post('perpage',true);

			
 
				-			$title = $this->input->post('title',true);

			
 
				-			$type = $this->input->post('type',true);

			
 
				-			$where = "1=1 ";

			
 
				-            //数据排序

			
 
				-            $order_str = "id asc";

			
 
				-            if(empty($page))

			
 
				-		    {

			
 
				-                $start = 0;

			
 
				-		    	$perpage = 1;

			
 
				-            }

			
 
				-		    else

			
 
				-		    {

			
 
				-                $start = ($page - 1)*$perpage;

			
 
				-            }

			
 
				-			if($title)

			
 
				-			{

			
 
				-				$where .= " and title like '%$title%'";

			
 
				-			}

			
 
				-			if($type)

			
 
				-			{

			
 
				-				$where .= " and type = '$type'";

			
 
				-			}

			
 
				-            //取得信息列表

			
 
				-            $info_list = $this->studyclass->find_all($where,'id,type,title,addtime',$order_str,$start,$perpage);

			
 
				-			 //格式化数据

			
 
				-            foreach ($info_list as $key=>$value) 

			
 
				-		    {

			
 
				-				$type = $this->typeclass->read($value['type']);

			
 
				-				$info_list[$key]['type'] = $type['title'];

			
 
				-				$info_list[$key]['addtime'] = date("Y-m-d H:i:s",$value['addtime']);

			
 
				-            }

			
 
				-		    $total = $this->studyclass->find_count($where);

			
 
				-		    $pagenum = ceil($total/$perpage);

			
 
				-		    $over = $total-($start+$perpage);

			
 
				-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				-		    echo json_encode($rows);exit;

			
 
				-		}

			
 
				-		$this->_Template('studyclass',$this->data);

			
 
				-	}

			
 
				-	//添加

			
 
				-	public function _add()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['title']))

			
 
				-		{

			
 
				-			$post['title'] = $this->input->post('title',true);

			
 
				-			$post['addtime'] = time();

			
 
				-			if($this->studyclass->insert($post))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$this->_Template('studyclass_add',$this->data);

			
 
				-	}

			
 
				-	//修改

			
 
				-	public function _edit($arg_array)

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['id']))

			
 
				-		{

			
 
				-			$id = $this->input->post('id',true);

			
 
				-			$post['title'] = $this->input->post('title',true);

			
 
				-			$post['edittime'] = time();

			
 
				-			if($this->studyclass->save($post,$id))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$arg_array = $arg_array[0];

			
 
				-		$studyclass = $this->studyclass->read($arg_array);

			
 
				-		$this->data['studyclass'] = $studyclass;

			
 
				-		$this->_Template('studyclass_edit',$this->data);

			
 
				-	}

			
 
				-	//删除

			
 
				-	public function _del()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['s']))  

			
 
				-		{

			
 
				-            $id_arr = $this->input->post('s');

			
 
				-            $id_arr =  explode(',',$id_arr);

			
 
				-            if(!$id_arr)

			
 
				-            {

			
 
				-                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				-            }

			
 
				-            //循环删除记录

			
 
				-            foreach ($id_arr as $v) 

			
 
				-		    {

			
 
				-                $this->studyclass->remove($v);

			
 
				-            }

			
 
				-            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				-		}

			
 
				-    }

			
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');
			
 
				+class Studyclass extends Start_Controller {
			
 
				+	public function __construct(){
			
 
				+		parent::__construct();
			
 
				+		$this->load->_model('Model_studyclass','studyclass');
			
 
				+		$this->load->_model('Model_typeclass','typeclass');
			
 
				+	}
			
 
				+	//定义方法的调用规则 获取URI第二段值
			
 
				+    public function _remap($arg,$arg_array)
			
 
				+    {
			
 
				+		if($arg == 'add')//添加
			
 
				+        {
			
 
				+             $this->_add();
			
 
				+        }
			
 
				+		else if($arg == 'edit')//修改
			
 
				+        {
			
 
				+             $this->_edit($arg_array);
			
 
				+        }
			
 
				+		else if($arg == 'del')
			
 
				+        {
			
 
				+             $this->_del($arg_array);
			
 
				+        }
			
 
				+		else
			
 
				+		{
			
 
				+			 $this->_index();
			
 
				+		}
			
 
				+    }
			
 
				+
			
 
				+	//管理
			
 
				+	public function _index()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['page']))  
			
 
				+		{
			
 
				+		    $page = $this->input->post('page',true);
			
 
				+		    $perpage = $this->input->post('perpage',true);
			
 
				+			$title = $this->input->post('title',true);
			
 
				+			$type = $this->input->post('type',true);
			
 
				+			$where = "1=1 ";
			
 
				+            //数据排序
			
 
				+            $order_str = "id asc";
			
 
				+            if(empty($page))
			
 
				+		    {
			
 
				+                $start = 0;
			
 
				+		    	$perpage = 1;
			
 
				+            }
			
 
				+		    else
			
 
				+		    {
			
 
				+                $start = ($page - 1)*$perpage;
			
 
				+            }
			
 
				+			if($title)
			
 
				+			{
			
 
				+				$where .= " and title like '%$title%'";
			
 
				+			}
			
 
				+			if($type)
			
 
				+			{
			
 
				+				$where .= " and type = '$type'";
			
 
				+			}
			
 
				+            //取得信息列表
			
 
				+            $info_list = $this->studyclass->find_all($where,'id,title,addtime',$order_str,$start,$perpage);
			
 
				+			 //格式化数据
			
 
				+            foreach ($info_list as $key=>$value) 
			
 
				+		    {
			
 
				+			
			
 
				+				$info_list[$key]['addtime'] = date("Y-m-d H:i:s",$value['addtime']);
			
 
				+            }
			
 
				+		    $total = $this->studyclass->find_count($where);
			
 
				+		    $pagenum = ceil($total/$perpage);
			
 
				+		    $over = $total-($start+$perpage);
			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
			
 
				+		    echo json_encode($rows);exit;
			
 
				+		}
			
 
				+		$this->_Template('studyclass',$this->data);
			
 
				+	}
			
 
				+	//添加
			
 
				+	public function _add()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['title']))
			
 
				+		{
			
 
				+			$post['title'] = $this->input->post('title',true);
			
 
				+			$post['addtime'] = time();
			
 
				+			if($this->studyclass->insert($post))
			
 
				+        	{
			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+		}
			
 
				+		$this->_Template('studyclass_add',$this->data);
			
 
				+	}
			
 
				+	//修改
			
 
				+	public function _edit($arg_array)
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['id']))
			
 
				+		{
			
 
				+			$id = $this->input->post('id',true);
			
 
				+			$post['title'] = $this->input->post('title',true);
			
 
				+			$post['edittime'] = time();
			
 
				+			if($this->studyclass->save($post,$id))
			
 
				+        	{
			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;
			
 
				+       	 	}
			
 
				+       		else
			
 
				+        	{
			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;
			
 
				+        	}
			
 
				+		}
			
 
				+		$arg_array = $arg_array[0];
			
 
				+		$studyclass = $this->studyclass->read($arg_array);
			
 
				+		$this->data['studyclass'] = $studyclass;
			
 
				+		$this->_Template('studyclass_edit',$this->data);
			
 
				+	}
			
 
				+	//删除
			
 
				+	public function _del()
			
 
				+	{
			
 
				+		$post = $this->input->post(NULL, TRUE);
			
 
				+		if(isset($post['s']))  
			
 
				+		{
			
 
				+            $id_arr = $this->input->post('s');
			
 
				+            $id_arr =  explode(',',$id_arr);
			
 
				+            if(!$id_arr)
			
 
				+            {
			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;
			
 
				+            }
			
 
				+            //循环删除记录
			
 
				+            foreach ($id_arr as $v) 
			
 
				+		    {
			
 
				+                $this->studyclass->remove($v);
			
 
				+            }
			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));
			
 
				+		}
			
 
				+    }
			
 
				 }
			
--- a/core/CoreApp/controllers/Systembound.php
+++ b/core/CoreApp/controllers/Systembound.php
--- a/core/CoreApp/controllers/Systemdownload.php
+++ b/core/CoreApp/controllers/Systemdownload.php
--- a/core/CoreApp/controllers/Systemfout.php
+++ b/core/CoreApp/controllers/Systemfout.php
--- a/core/CoreApp/controllers/Systemprint.php
+++ b/core/CoreApp/controllers/Systemprint.php
--- a/core/CoreApp/controllers/Systemretreat.php
+++ b/core/CoreApp/controllers/Systemretreat.php
@@ -27,6 +27,7 @@ class Systemretreat extends Start_Controller {
 
				 		$this->load->_model('Model_user','user');

			
 
				 		$this->load->_model('Model_whlabel','whlabel');

			
 
				 		$this->load->_model('Model_specialstock','specialstock');

			
 
				+		$this->load->_model('Model_fullorderxw','fullorderxw');

			
 
				 		$this->load->helper('url');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
@@ -35,6 +36,10 @@ class Systemretreat extends Start_Controller {
 
				 		if($arg == 'out')

			
 
				         {

			
 
				              $this->_out();

			
 
				+        }

			
 
				+		else if($arg == 'excel')

			
 
				+        {

			
 
				+             $this->_excel();

			
 
				         }

			
 
				 		else

			
 
				 		{

			
@@ -76,7 +81,16 @@ class Systemretreat extends Start_Controller {
 
				 									$y = $this->fullordertt->get_number($order);

			
 
				 									if(!$y)

			
 
				 				        			{

			
 
				-										echo json_encode(array('msg'=>'无此数据','success'=>false));exit;

			
 
				+										$fullorder_name = 'fullorderxw';

			
 
				+										$y = $this->fullorderxw->get_waybill($order);

			
 
				+										if(!$y)

			
 
				+				    					{

			
 
				+											$y = $this->fullorderxw->get_number($order);

			
 
				+											if(!$y)

			
 
				+				        					{

			
 
				+												echo json_encode(array('msg'=>'无此数据','success'=>false));exit;

			
 
				+											}

			
 
				+										}

			
 
				 									}

			
 
				 								}

			
 
				 							}

			
@@ -101,7 +115,7 @@ class Systemretreat extends Start_Controller {
 
				 				{

			
 
				 					foreach ($wl as $v)

			
 
				 			    	{

			
 
				-						$this->whlabel->save(array('state'=>0,'zd'=>'','retreat'=>$time,'time'=>$time),$v['id']);//专属

			
 
				+						$this->whlabel->save(array('state'=>0,'rktype'=>5,'zd'=>'','retreat'=>$time,'time'=>$time),$v['id']);//专属

			
 
				 					}

			
 
				 				}

			
 
				 			}

			
@@ -112,7 +126,7 @@ class Systemretreat extends Start_Controller {
 
				 				{

			
 
				 					foreach ($wl as $v)

			
 
				 			    	{

			
 
				-						$this->specialstock->save(array('state'=>0,'zd'=>'','retreat'=>$time,'time'=>$time),$v['id']);

			
 
				+						$this->specialstock->save(array('state'=>0,'rktype'=>5,'zd'=>'','retreat'=>$time,'time'=>$time),$v['id']);

			
 
				 					}

			
 
				 				}

			
 
				 			}

			
@@ -297,6 +311,44 @@ class Systemretreat extends Start_Controller {
 
				 					$info_listtt[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['retreattime']).'</em>';

			
 
				 				}

			
 
				 				

			
 
				+            }

			
 
				+			$info_listxw = $this->fullorderxw->find_all($where,'id,shop,type,orderinfo,number,waybill,express,print,state,retreattime,shipremarks',$order_str,$start,$perpage);

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_listxw as $key=>$value) 

			
 
				+		    {

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_listxw[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['waybill'] == 0)

			
 
				+				{

			
 
				+					$info_listxw[$key]['waybill'] = "";

			
 
				+				}

			
 
				+				$express = $this->express->read($value['express']);

			
 
				+				$info_listxw[$key]['express'] = $express['servicename'];

			
 
				+				$warehouse = $this->warehouse->read($value['type']);

			
 
				+				$info_listxw[$key]['type'] = $warehouse['title'];

			
 
				+				$typeclass = $this->typeclass->read($value['state']);

			
 
				+				$info_listxw[$key]['state'] = $typeclass['spare'];

			
 
				+				if($value['print'] == 1)

			
 
				+				{

			
 
				+					$info_listxw[$key]['print'] = '不可打印';

			
 
				+				}

			
 
				+				else if($value['print'] == 2)

			
 
				+				{

			
 
				+					$info_listxw[$key]['print'] = '未打印';

			
 
				+				}

			
 
				+				else if($value['print'] == 3)

			
 
				+				{

			
 
				+					$info_listxw[$key]['print'] = '已打印';

			
 
				+				}

			
 
				+				if($value['retreattime'] == '0')

			
 
				+				{

			
 
				+					$info_listxw[$key]['retreattime'] = '<em class="t"></em>';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_listxw[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['retreattime']).'</em>';

			
 
				+				}

			
 
				+				

			
 
				             }

			
 
				 			$info_listsmt = $this->fullordersmt->find_all($where,'id,shop,type,orderinfo,number,waybill,express,print,state,retreattime,shipremarks',$order_str,$start,$perpage);

			
 
				 			 //格式化数据

			
@@ -339,10 +391,11 @@ class Systemretreat extends Start_Controller {
 
				             }

			
 
				 		    $total = $this->fullorder->find_count($where);

			
 
				 			$total += $this->fullordertt->find_count($where);

			
 
				+			$total += $this->fullorderxw->find_count($where);

			
 
				 			$total += $this->fullordersmt->find_count($where);

			
 
				 		    $pagenum = ceil($total/$perpage);

			
 
				 		    $over = $total-($start+$perpage);

			
 
				-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>(array_merge($info_list,$info_listtt,$info_listsmt)));//$info_list_smt

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>(array_merge($info_list,$info_listtt,$info_listxw,$info_listsmt)));//$info_list_smt

			
 
				 		    echo json_encode($rows);exit;

			
 
				 		}

			
 
				 		if(isset($_SESSION['api']))

			
@@ -354,4 +407,237 @@ class Systemretreat extends Start_Controller {
 
				 		}

			
 
				 		$this->_Template('systemretreat',$this->data);

			
 
				     }

			
 
				+	

			
 
				+	public function _excel()

			
 
				+	{

			
 
				+		$post = $this->input->get(NULL, TRUE);

			
 
				+		if(isset($_GET['excel']))  

			
 
				+		{

			
 
				+			if(isset($_SESSION['api']))

			
 
				+		{

			
 
				+			$user = $this->user->get_api($_SESSION['api']);

			
 
				+			$usp = $user;

			
 
				+		    $fgshop = "";$sid = "";$wid="";$wtype="";

			
 
				+		    $usersp = explode('|',trim($user['shop'],'|'));

			
 
				+			$userwh = explode('|',trim($user['warehouse'],'|'));

			
 
				+			foreach ($usersp as $value) 

			
 
				+		    {

			
 
				+				$fgshop .= " shop = ".$value." or";

			
 
				+				$sid .= " id = ".$value." or";

			
 
				+			}

			
 
				+			foreach ($userwh as $value) 

			
 
				+		    {

			
 
				+				$wid .= " id = ".$value." or";

			
 
				+				$wtype .= " type = ".$value." or";

			
 
				+			}

			
 
				+		}

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+			$timetk = $this->input->get('timetk',true);

			
 
				+			$timetj = $this->input->get('timetj',true);

			
 
				+			$shop = $this->input->get('shop',true);

			
 
				+			$source = $this->input->get('source',true);

			
 
				+			$orderinfo = $this->input->get('orderinfo',true);

			
 
				+			$number = $this->input->get('number',true);

			
 
				+			$waybill = $this->input->get('waybill',true);

			
 
				+			$express = $this->input->get('express',true);

			
 
				+			$type = $this->input->get('type',true);

			
 
				+			$lowe = $this->input->get('lowe',true);

			
 
				+			$sdd = $this->input->get('sid',true);

			
 
				+			$timetk = strtotime($timetk);

			
 
				+			$timetj = strtotime($timetj);

			
 
				+			$where = (isset($_SESSION['api']))?"library = 3 and (".rtrim($wtype,'or').")":"id= '0'";

			
 
				+			if($timetk && $timetj)

			
 
				+            {

			
 
				+                $where  .= " and retreattime > '$timetk' and retreattime < '$timetj'";

			
 
				+            }

			
 
				+			if($shop)

			
 
				+            {

			
 
				+                $where  .= " and shop = '$shop'";

			
 
				+            }

			
 
				+			if($orderinfo)

			
 
				+            {

			
 
				+                $where  .= " and orderinfo = '$orderinfo'";

			
 
				+            }

			
 
				+			if($number)

			
 
				+            {

			
 
				+                $where  .= " and number = '$number'";

			
 
				+            }

			
 
				+			if($waybill)

			
 
				+            {

			
 
				+                $where  .= " and waybill = '$waybill'";

			
 
				+            }

			
 
				+			if($express)

			
 
				+            {

			
 
				+				$where  .= " and express = '$express'";

			
 
				+            }

			
 
				+			if($orderinfo)

			
 
				+            {

			
 
				+                $where  .= " and orderinfo = '$orderinfo'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($lowe)

			
 
				+            {

			
 
				+                $where  .= " and shipremarks like '%$lowe%'";

			
 
				+            }

			
 
				+			$sidwhere = '';

			
 
				+			if($sdd)

			
 
				+            {

			
 
				+				$sd = "";

			
 
				+				$s = explode(',',trim($sdd,','));

			
 
				+				foreach ($s as $value) 

			
 
				+		    	{

			
 
				+					$sd .= " id = ".$value." or";

			
 
				+				}

			
 
				+                $sidwhere  = " and (".rtrim($sd,'or').")";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+			 $order_str = "retreattime desc";

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->fullorder->find_all($where.$sidwhere,'shop,type,orderinfo,number,waybill,express,state,librarytime,retreattime,shipremarks');

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_list[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['waybill'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['waybill'] = "";

			
 
				+				}

			
 
				+				$express = $this->express->read($value['express']);

			
 
				+				$info_list[$key]['express'] = $express['servicename'];

			
 
				+				$warehouse = $this->warehouse->read($value['type']);

			
 
				+				$info_list[$key]['type'] = $warehouse['title'];

			
 
				+				$typeclass = $this->typeclass->read($value['state']);

			
 
				+				$info_list[$key]['state'] = $typeclass['spare'];

			
 
				+				$info_list[$key]['librarytime'] = date('Y-m-d H:i',$value['librarytime']);

			
 
				+				if($value['retreattime'] == '0')

			
 
				+				{

			
 
				+					$info_list[$key]['retreattime'] = '<em class="t"></em>';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i',$value['retreattime']).'</em>';

			
 
				+				}

			
 
				+				$info_list[$key]['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$value['shipremarks']);

			
 
				+				

			
 
				+            }

			
 
				+			$info_listtt = $this->fullordertt->find_all($where.$sidwhere,'shop,type,orderinfo,number,waybill,express,state,librarytime,retreattime,shipremarks');

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_listtt as $key=>$value) 

			
 
				+		    {

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_listtt[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['waybill'] == 0)

			
 
				+				{

			
 
				+					$info_listtt[$key]['waybill'] = "";

			
 
				+				}

			
 
				+				$express = $this->express->read($value['express']);

			
 
				+				$info_listtt[$key]['express'] = $express['servicename'];

			
 
				+				$warehouse = $this->warehouse->read($value['type']);

			
 
				+				$info_listtt[$key]['type'] = $warehouse['title'];

			
 
				+				$typeclass = $this->typeclass->read($value['state']);

			
 
				+				$info_listtt[$key]['state'] = $typeclass['spare'];

			
 
				+				$info_listtt[$key]['librarytime'] = date('Y-m-d H:i',$value['librarytime']);

			
 
				+				if($value['retreattime'] == '0')

			
 
				+				{

			
 
				+					$info_listtt[$key]['retreattime'] = '<em class="t"></em>';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_listtt[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['retreattime']).'</em>';

			
 
				+				}

			
 
				+				

			
 
				+            }

			
 
				+			$info_listxw = $this->fullorderxw->find_all($where.$sidwhere,'shop,type,orderinfo,number,waybill,express,state,librarytime,retreattime,shipremarks');

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_listxw as $key=>$value) 

			
 
				+		    {

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_listxw[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['waybill'] == 0)

			
 
				+				{

			
 
				+					$info_listxw[$key]['waybill'] = "";

			
 
				+				}

			
 
				+				$express = $this->express->read($value['express']);

			
 
				+				$info_listxw[$key]['express'] = $express['servicename'];

			
 
				+				$warehouse = $this->warehouse->read($value['type']);

			
 
				+				$info_listxw[$key]['type'] = $warehouse['title'];

			
 
				+				$typeclass = $this->typeclass->read($value['state']);

			
 
				+				$info_listxw[$key]['state'] = $typeclass['spare'];

			
 
				+				$info_listxw[$key]['librarytime'] = date('Y-m-d H:i',$value['librarytime']);

			
 
				+				if($value['retreattime'] == '0')

			
 
				+				{

			
 
				+					$info_listxw[$key]['retreattime'] = '<em class="t"></em>';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_listxw[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['retreattime']).'</em>';

			
 
				+				}

			
 
				+				

			
 
				+            }

			
 
				+			$info_listsmt = $this->fullordersmt->find_all($where.$sidwhere,'shop,type,orderinfo,number,waybill,express,state,librarytime,retreattime,shipremarks');

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_listsmt as $key=>$value) 

			
 
				+		    {

			
 
				+				$shop = $this->shop->read($value['shop']);

			
 
				+				$info_listsmt[$key]['shop'] = $shop['shopname'];

			
 
				+				if($value['waybill'] == 0)

			
 
				+				{

			
 
				+					$info_listsmt[$key]['waybill'] = "";

			
 
				+				}

			
 
				+				$express = $this->express->read($value['express']);

			
 
				+				$info_listsmt[$key]['express'] = $express['servicename'];

			
 
				+				$warehouse = $this->warehouse->read($value['type']);

			
 
				+				$info_listsmt[$key]['type'] = $warehouse['title'];

			
 
				+				$typeclass = $this->typeclass->read($value['state']);

			
 
				+				$info_listsmt[$key]['state'] = $typeclass['spare'];

			
 
				+				$info_listsmt[$key]['librarytime'] = date('Y-m-d H:i',$value['librarytime']);

			
 
				+				if($value['retreattime'] == '0')

			
 
				+				{

			
 
				+					$info_listsmt[$key]['retreattime'] = '<em class="t"></em>';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_listsmt[$key]['retreattime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['retreattime']).'</em>';

			
 
				+				}

			
 
				+				$info_listsmt[$key]['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$value['shipremarks']);

			
 
				+				

			
 
				+            }

			
 
				+		    $rows = array_merge($info_list,$info_listtt,$info_listxw,$info_listsmt);//$info_list_smt

			
 
				+			   

			
 
				+				$title = '订单退库-'.date('Y-m-d H-i-s',time()); 

			
 
				+                $titlename = "<table border=1>

			
 
				+                <tr align='center'>

			
 
				+				<td>店铺名称</td>

			
 
				+                <td>发货仓库</td>

			
 
				+                <td>订单号</td>

			
 
				+                <td>编号</td>

			
 
				+                <td>运单号</td>

			
 
				+                <td>快递公司</td>

			
 
				+                <td>订单状态</td>

			
 
				+                <td>出库时间</td>

			
 
				+                <td>退库时间</td>

			
 
				+                <td>仓库品名</td>

			
 
				+                </tr>

			
 
				+                </table>"; 

			
 
				+                $tail = "\n";

			
 
				+            $filename = $title.".xls";

			
 
				+            $this->excel->get_fz2(array_merge($info_list,$info_listsmt,$info_listtt,$info_listxw),$titlename,$filename,$tail);

			
 
				+		}

			
 
				+			

			
 
				+	    }

			
 
				+	}

			
 
				 }
			
--- a/core/CoreApp/controllers/Trademark.php
+++ b/core/CoreApp/controllers/Trademark.php
@@ -0,0 +1,351 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class Trademark extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->_model('Model_trademark','trademark');

			
 
				+		$this->load->_model('Model_excel','excel');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'add')//添加

			
 
				+        {

			
 
				+             $this->_add();

			
 
				+        }

			
 
				+		else if($arg == 'edit')//修改

			
 
				+        {

			
 
				+             $this->_edit($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'del')//修改

			
 
				+        {

			
 
				+             $this->_del();

			
 
				+        }

			
 
				+		else if($arg == 'rows')//修改

			
 
				+        {

			
 
				+             $this->_rows();

			
 
				+        }

			
 
				+		else if($arg == 'code')

			
 
				+        {

			
 
				+             $this->_code($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'excel')

			
 
				+        {

			
 
				+             $this->_excel();

			
 
				+        }

			
 
				+		else if($arg == 'down')

			
 
				+        {

			
 
				+             $this->_down();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$name = $this->input->post('name',true);

			
 
				+			$type = $this->input->post('type',true);

			
 
				+			$class = $this->input->post('class',true);

			
 
				+			$owner = $this->input->post('owner',true);

			
 
				+			$agent = $this->input->post('agent',true);

			
 
				+			$number = $this->input->post('number',true);

			
 
				+			$xztime = $this->input->post('xztime',true);

			
 
				+			$timetk = $this->input->post('timetk',true);

			
 
				+			$timetj = $this->input->post('timetj',true);

			
 
				+			$timetk = strtotime($timetk);

			
 
				+			$timetj = strtotime($timetj);

			
 
				+			$where = "1=1 ";

			
 
				+            //数据排序

			
 
				+            $order_str = $xztime." desc";

			
 
				+			if($name)

			
 
				+            {

			
 
				+                $where  .= " and name like '%$name%'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($class)

			
 
				+            {

			
 
				+                $where  .= " and class like '%$class%'";

			
 
				+            }

			
 
				+			if($owner)

			
 
				+            {

			
 
				+                $where  .= " and owner like '%$owner%'";

			
 
				+            }

			
 
				+			if($agent)

			
 
				+            {

			
 
				+                $where  .= " and agent like '%$agent%'";

			
 
				+            }

			
 
				+			if($number)

			
 
				+            {

			
 
				+                $where  .= " and number like '%$number%'";

			
 
				+            }

			
 
				+			if($timetk && $timetj)

			
 
				+            {

			
 
				+                $where  .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";

			
 
				+            }

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->trademark->find_all($where,'id,type,name,number,class,owner,agent,djtime,sqtime,ggtime',$order_str,$start,$perpage);

			
 
				+			 //格式化数据

			
 
				+            foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				if($value['type'] == 1)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '国内商标';

			
 
				+				}

			
 
				+				else if($value['type'] == 2)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '美国商标';

			
 
				+				}

			
 
				+				else if($value['type'] == 3)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '国内专利';

			
 
				+				}

			
 
				+				else if($value['type'] == 4)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '美国专利';

			
 
				+				}

			
 
				+				else if($value['type'] == 5)

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '欧洲商标';

			
 
				+				}

			
 
				+				$info_list[$key]['djtime'] = ($value['djtime'] > 0)?date('Y-m-d H:i:s',$value['djtime']):'';

			
 
				+				$info_list[$key]['sqtime'] = ($value['sqtime'] > 0)?date('Y-m-d H:i:s',$value['sqtime']):'';

			
 
				+				$info_list[$key]['ggtime'] = ($value['ggtime'] > 0)?date('Y-m-d H:i:s',$value['ggtime']):'';

			
 
				+            }

			
 
				+		    $total = $this->trademark->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('trademark',$this->data);

			
 
				+	}

			
 
				+	//添加

			
 
				+	public function _add()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['name']))

			
 
				+		{

			
 
				+			if($this->trademark->insert($post))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$this->_Template('trademark_add',$this->data);

			
 
				+	}

			
 
				+	//修改

			
 
				+	public function _edit($arg_array)

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['id']))

			
 
				+		{

			
 
				+			$id = $this->input->post('id',true);

			
 
				+			if($this->trademark->save($post,$id))

			
 
				+        	{

			
 
				+         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				+       	 	}

			
 
				+       		else

			
 
				+        	{

			
 
				+           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				+        	}

			
 
				+		}

			
 
				+		$arg_array = $arg_array[0];

			
 
				+		$trademark = $this->trademark->read($arg_array);

			
 
				+		$this->data['trademark'] = $trademark;

			
 
				+		$this->_Template('trademark_edit',$this->data);

			
 
				+	}

			
 
				+	//删除

			
 
				+	public function _del()

			
 
				+	{

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['s']))  

			
 
				+		{

			
 
				+            $id_arr = $this->input->post('s');

			
 
				+            $id_arr =  explode(',',$id_arr);

			
 
				+            if(!$id_arr)

			
 
				+            {

			
 
				+                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				+            }

			
 
				+            //循环删除记录

			
 
				+            foreach ($id_arr as $v) 

			
 
				+		    {

			
 
				+                $this->trademark->remove($v);

			
 
				+            }

			
 
				+            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	public function _excel()

			
 
				+	{

			
 
				+		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				+		$config['upload_path'] = '.'.$dir ;

			
 
				+		$config['file_name'] = date('Ymd_His_',time()).rand(1000,9999);

			
 
				+        $config['allowed_types'] = 'xls|xlsx|csv';

			
 
				+        $config['max_size'] = 10240;

			
 
				+		$this->load->library('upload', $config);

			
 
				+		$this->upload->initialize($config);

			
 
				+        if ($this->upload->do_upload('userfile'))

			
 
				+        {

			
 
				+			$full_path = $dir.$this->upload->data('file_name');

			
 
				+			$fileName = '.' . $full_path;

			
 
				+            if (!file_exists($fileName)) 

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>"上传失败，请重试",'success'=>false));exit;

			
 
				+            }

			
 
				+			else

			
 
				+			{

			
 
				+				require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				+				$phpExcel = PHPExcel_IOFactory::load($fileName);// 载入当前文件

			
 
				+				$phpExcel->setActiveSheetIndex(0);// 设置为默认表

			
 
				+				$sheetCount = $phpExcel->getSheetCount();// 获取表格数量

			
 
				+				$row = $phpExcel->getActiveSheet()->getHighestRow();// 获取行数

			
 
				+				$column = $phpExcel->getActiveSheet()->getHighestColumn();// 获取列数

			
 
				+				++$column;//如果列数大于26行

			
 
				+				$list = array();

			
 
				+				for ($i = 2; $i <= $row; $i++) // 行数循环

			
 
				+				{

			
 
				+					$data = array();

			
 
				+                    for ($c = 'A'; $c != $column; $c++)  // 列数循环

			
 
				+	                {

			
 
				+						$data[] = $phpExcel->getActiveSheet()->getCell($c . $i)->getValue();

			
 
				+                    }

			
 
				+					$list[] = $data;

			
 
				+                }

			
 
				+			}

			
 
				+			$i = 0;$j = 0;$ed = array();$tytime = time();

			
 
				+		    foreach ($list as $key=>$value)

			
 
				+		    {

			
 
				+				$cf = $this->trademark->find_all("number = '".$value['3']."'");

			
 
				+				if(!isset($value['3'][0])) 

			
 
				+				{

			
 
				+					$post['name'] = $value['2'];

			
 
				+					if($value['1'] == '国内商标')

			
 
				+					{

			
 
				+						$post['value'] = 1;

			
 
				+					}

			
 
				+					else if($value['1'] == '美国商标')

			
 
				+					{

			
 
				+						$post['value'] = 2;

			
 
				+					}

			
 
				+					else if($value['1'] == '国内专利')

			
 
				+					{

			
 
				+						$post['value'] = 3;

			
 
				+					}

			
 
				+					else if($value['1'] == '美国专利')

			
 
				+					{

			
 
				+						$post['value'] = 4;

			
 
				+					}

			
 
				+					else if($value['1'] == '欧洲商标')

			
 
				+					{

			
 
				+						$post['value'] = 5;

			
 
				+					}

			
 
				+					$post['number'] = $value['3'];

			
 
				+					$post['class'] = $value['4'];

			
 
				+					$post['sqtime'] = $value['5'];

			
 
				+					$post['ggtime'] = $value['6'];

			
 
				+					$post['owner'] = $value['7'];

			
 
				+					$this->trademark->insert($post);	

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$ed[] = array($value['3'].'-有重复');

			
 
				+					$i++;

			
 
				+				}

			
 
				+				sleep(2);//停留2秒

			
 
				+			}

			
 
				+			if($i+$j > 0)

			
 
				+			{

			
 
				+				$time = date('Ymd',time());

			
 
				+				$title = '错误信息-'.$time;

			
 
				+        		$titlename = "<table border=1><tr><td>错误详情</td></tr></table>";

			
 
				+				$tail = "\n";

			
 
				+        		$filename = $title.".xls";

			
 
				+        		$ecl = $this->excel->get_fz3($ed,$titlename,$filename,$tail);

			
 
				+				$dir = '/data/excel/'.$time.'/';

			
 
				+				$file_name = 'error_'.$time.rand(1000,9999);

			
 
				+				if(!is_dir('.'.$dir))mkdir('.'.$dir,0777);

			
 
				+				$myfile = fopen(".".$dir.$file_name.".xls", "w") or die();

			
 
				+				fwrite($myfile,$ecl);

			
 
				+				fclose($myfile);

			
 
				+				$error = $dir.$file_name.'.xls';

			
 
				+				echo json_encode(array('msg'=>'添加成功，'.$i.'条异常，'.$j.'条失败','error'=>$error,'success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'添加成功!','error'=>1,'success'=>true));exit;

			
 
				+			}

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			echo json_encode(array('msg'=>'上传失败！','t'=>$this->upload->display_errors(),'success'=>false));exit;

			
 
				+		}

			
 
				+    }

			
 
				+	

			
 
				+	//下载excel模板

			
 
				+	public function _down()

			
 
				+	{

			
 
				+		if(isset($_GET['excela']))  

			
 
				+		{

			
 
				+			$title = "许昌龙熠美发饰品有限公司第一届雀王争霸赛"; 

			
 
				+            $titlename = "<table border=1>

			
 
				+            <tr><th colspan='8' align='left'><h3>许昌龙熠美发饰品有限公司第一届雀王争霸赛<h3></th></tr>

			
 
				+            <tr>

			
 
				+			<td>参加/不参加</td

			
 
				+            <td>选手昵称</td>

			
 
				+            <td>年龄</td>

			
 
				+            <td>喜好</td>

			
 
				+			<td>联系电话</td>

			
 
				+            <td>麻龄</td>

			
 
				+			<td>输赢</td>

			
 
				+            <td>牌后总结</td>

			
 
				+            </tr>

			
 
				+            </table>"; 

			
 
				+            $filename = $title.".xls"; 

			
 
				+			$tail = "\n"; 

			
 
				+            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);

			
 
				+			exit;

			
 
				+            $title = "导入模板"; 

			
 
				+            $titledata = array(array('序号','商标类型','商标名称','注册号','国际分类','申请日期','注册公告日期','申请人'),array('1','国内商标','AAA','1111111','18','2000-01-01','2000-01-01','许昌龙熠美发饰品有限公司'));

			
 
				+            $filename = $title.".xls";

			
 
				+            $this->get_excel($titledata,$filename);

			
 
				+	    }

			
 
				+	}

			
 
				+	

			
 
				+	public function get_excel($titledata,$filename)

			
 
				+	{

			
 
				+		require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				+		$objPHPExcel = new \PHPExcel();

			
 
				+        $objPHPExcel->setActiveSheetIndex(0);

			
 
				+

			
 
				+        $dataArray = $titledata;

			
 
				+        $objPHPExcel->getActiveSheet()->fromArray($dataArray, null, 'A1');

			
 
				+		header('Content-Type: application/vnd.ms-excel');

			
 
				+        header('Content-Disposition: attachment;filename='.$filename);

			
 
				+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');

			
 
				+        $objWriter->save('php://output');

			
 
				+        $objPHPExcel->disconnectWorksheets();

			
 
				+		

			
 
				+	}

			
 
				+}
			
--- a/core/CoreApp/controllers/Transfer.php
+++ b/core/CoreApp/controllers/Transfer.php
--- a/core/CoreApp/controllers/Typeclass.php
+++ b/core/CoreApp/controllers/Typeclass.php
@@ -6,6 +6,7 @@ class Typeclass extends Start_Controller {
 
				 		$this->load->_model('Model_typeclass','typeclass');

			
 
				 		$this->load->_model('Model_classid','classid');

			
 
				 		$this->load->_model('Model_excel','excel');

			
 
				+		$this->load->_model('Model_whlabel','whlabel');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -60,7 +61,7 @@ class Typeclass extends Start_Controller {
 
				 			$jm = $this->input->post('jm',true);

			
 
				 			$content = $this->input->post('content',true);

			
 
				 			$hq = $this->input->post('hq',true);

			
 
				-			$order_str = "sequence desc,title asc";

			
 
				+			$order_str = "sequence asc,title asc";

			
 
				 			if(isset($arg_array[1]))

			
 
				 			{

			
 
				 			    $where = "classid != '0' and classid != '1' and classid != '2' and classid != '3' and classid != '5' and classid != '11' and classid != '16' and classid != '17' and classid != '20' and classid != '21' and classid != '23' and classid != '24' and classid != '29' and classid != '30' and classid != '31' and classid != '32' and classid != '36'";

			
@@ -74,7 +75,7 @@ class Typeclass extends Start_Controller {
 
				 				$where  .= " and classid = '$classid'";

			
 
				 				if($classid != '999')

			
 
				 				{

			
 
				-				    $order_str = "sequence desc,title asc";

			
 
				+				    $order_str = "sequence asc,title asc";

			
 
				 				}

			
 
				 				else

			
 
				 				{

			
@@ -144,7 +145,7 @@ class Typeclass extends Start_Controller {
 
				 		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				 		    echo json_encode($rows);exit;

			
 
				 		}

			
 
				-		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '7' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				+		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				 		$class[] = array('id'=>'999','title'=>'只匹配品名系列');

			
 
				 		$this->data['class'] = $class;

			
 
				 		$this->_Template('typeclass',$this->data);

			
@@ -152,7 +153,7 @@ class Typeclass extends Start_Controller {
 
				 	

			
 
				 	public function _cx()

			
 
				 	{

			
 
				-		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '7' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				+		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				 		$class[] = array('id'=>'999','title'=>'只匹配品名系列');

			
 
				 		$this->data['class'] = $class;

			
 
				 		$this->_Template('typeclass_cx',$this->data);

			
@@ -193,13 +194,13 @@ class Typeclass extends Start_Controller {
 
				 			$post['zh'] = str_replace(array('（','）'),array('(',')'),$post['zh']);

			
 
				 			if($post['classid'] == 18 || $post['classid'] == 13 || $post['classid'] == 25 || $post['classid'] == 26)

			
 
				 			{

			
 
				-				$bm = $this->typeclass->find_count("classid = '".$post['classid']."'");

			
 
				+				$bm = $this->typeclass->find_all("classid = '".$post['classid']."'",'*','bm desc');

			
 
				 				$num = 100;

			
 
				 				if($post['classid'] == 18)

			
 
				 				{

			
 
				 					$num = 1000;

			
 
				 				}

			
 
				-				$post['bm'] = substr(strval($bm+1+$num),1,3);

			
 
				+				$post['bm'] = substr(strval($bm[0]['bm']+1+$num),1,3);

			
 
				 			}

			
 
				 			if($this->typeclass->insert($post))

			
 
				         	{

			
@@ -210,7 +211,7 @@ class Typeclass extends Start_Controller {
 
				            		echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				         	}

			
 
				 		}

			
 
				-		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '7' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				+		$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				 		$class[] = array('id'=>'999','title'=>'只匹配品名系列');

			
 
				 		$this->data['class'] = $class;

			
 
				 		$this->_Template('typeclass_add',$this->data);

			
@@ -261,7 +262,7 @@ class Typeclass extends Start_Controller {
 
				 		}

			
 
				 		$arg_array = $arg_array[0];

			
 
				 		$typeclass = $this->typeclass->read($arg_array);

			
 
				-	$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '7' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				+	$class = $this->classid->find_all("id != '0' and id != '1' and id != '2' and id != '3' and id != '5' and id != '11' and id != '16' and id != '17' and id != '20' and id != '21' and id != '23' and id != '24' and id != '29' and id != '30' and id != '31' and id != '32' and id != '4'",'*','ckpx asc');

			
 
				 		$class[] = array('id'=>'999','title'=>'只匹配品名系列');

			
 
				 		$this->data['class'] = $class;

			
 
				 		$this->data['typeclass'] = $typeclass;

			
@@ -271,7 +272,7 @@ class Typeclass extends Start_Controller {
 
				 	public function _del()

			
 
				 	{

			
 
				 		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['s']))  

			
 
				+		if(isset($post['s']))

			
 
				 		{

			
 
				             $id_arr = $this->input->post('s');

			
 
				             $id_arr =  explode(',',$id_arr);

			
@@ -282,6 +283,11 @@ class Typeclass extends Start_Controller {
 
				             //循环删除记录

			
 
				             foreach ($id_arr as $v) 

			
 
				 		    {

			
 
				+				$w = $this->whlabel->find_all("features like '%-".$v."-%'");

			
 
				+				if(isset($w[0]))

			
 
				+				{

			
 
				+					echo json_encode(array('msg'=>'进销存已使用，无法删除！','success'=>false));exit;

			
 
				+				}

			
 
				 				$d = $this->typeclass->read($v);

			
 
				 				if($d['bm'] != '')

			
 
				 				{

			
@@ -334,16 +340,16 @@ class Typeclass extends Start_Controller {
 
				 			$title = $this->input->get('title',true);

			
 
				 			$spare = $this->input->get('spare',true);

			
 
				 			$hq = $this->input->get('hq',true);

			
 
				-			$order_str = "classid asc,sequence desc,time desc";

			
 
				+			$order_str = "classid asc,sequence asc,time desc";

			
 
				             //数据排序

			
 
				-            $order_str = "classid asc,sequence desc";

			
 
				+            $order_str = "classid asc,sequence asc";

			
 
				             $where = "classid != '0' and classid != '1' and classid != '2' and classid != '3' and classid != '4' and classid != '5' and classid != '7' and classid != '11' and classid != '16' and classid != '17' and classid != '20' and classid != '21' and classid != '23' and classid != '24' and classid != '29' and classid != '30' and classid != '31' and classid != '32'";

			
 
				 			if($classid)

			
 
				             {

			
 
				 				$where  .= " and classid = '$classid'";

			
 
				 				if($classid != '999')

			
 
				 				{

			
 
				-				    $order_str = "sequence desc";

			
 
				+				    $order_str = "sequence asc";

			
 
				 				}

			
 
				 				else

			
 
				 				{

			
--- a/core/CoreApp/controllers/User.php
+++ b/core/CoreApp/controllers/User.php
--- a/core/CoreApp/controllers/Warehouse.php
+++ b/core/CoreApp/controllers/Warehouse.php
@@ -16,6 +16,8 @@ class Warehouse extends Start_Controller {
 
				 		$this->load->_model('Model_excel','excel');

			
 
				 		$this->load->_model('Model_transfer','transfer');

			
 
				 		$this->load->_model('Model_systemtransfer','systemtransfer');

			
 
				+		$this->load->_model('Model_whlabeltransport', 'whlabeltransport');

			
 
				+		$this->load->_model('Model_systemtransfer_cr', 'systemtransfer_cr');

			
 
				 	}

			
 
				 	//定义方法的调用规则 获取URI第二段值

			
 
				     public function _remap($arg,$arg_array)

			
@@ -397,7 +399,7 @@ class Warehouse extends Start_Controller {
 
				 				$typeclass[$v['id']] = $v['classid'];

			
 
				 			}

			
 
				 			$kxw = '';

			
 
				-			if($warehouse['zd'] == '0' || ($warehouse['zd'] == '1' && stripos($whlabel,$warehouse['hz'].'|') === false))

			
 
				+			if(1==1)//($warehouse['zd'] == '0' || ($warehouse['zd'] == '1' && stripos($whlabel,$warehouse['hz'].'|') === false))

			
 
				 			{

			
 
				 				$kxw = '可用现货仓：';$tdfh = '';$cs = array();

			
 
				 				$warehousedata = $this->warehouse->find_all("zd = '1' and id != '8'");

			
@@ -473,6 +475,7 @@ class Warehouse extends Start_Controller {
 
				 							    	}

			
 
				 								

			
 
				 							}

			
 
				+							/**

			
 
				 							if(stripos($cp,'-1181-') !== false)

			
 
				 							{

			
 
				 								$cc1 = explode('-',trim($cc[1],'-'));

			
@@ -496,7 +499,8 @@ class Warehouse extends Start_Controller {
 
				 							    	}

			
 
				 								

			
 
				 							}

			
 
				-							//HKK

			
 
				+							*/

			
 
				+							/** /HKK

			
 
				 							if(stripos($cp,'-2028-') !== false)

			
 
				 							{

			
 
				 								$cc1 = explode('-',trim($cc[1],'-'));

			
@@ -545,9 +549,8 @@ class Warehouse extends Start_Controller {
 
				 				                	{

			
 
				 				        	        	$hdtx .= $v['title'].' - HKK有货；';

			
 
				 							    	}

			
 
				-									$cs[] = $gpp;

			
 
				 							}

			
 
				-							

			
 
				+							**/

			
 
				 							//RTGWL

			
 
				 							if(stripos($cp,'-2076-') !== false)

			
 
				 							{

			
@@ -597,7 +600,6 @@ class Warehouse extends Start_Controller {
 
				 				                	{

			
 
				 				        	        	$hdtx .= $v['title'].' - RTGWL有货；';

			
 
				 							    	}

			
 
				-									$cs[] = $gpp;

			
 
				 							}

			
 
				 							

			
 
				 							// 4*7没货的，5*7如果有货，给提醒

			
@@ -690,6 +692,32 @@ class Warehouse extends Start_Controller {
 
				 							    	}

			
 
				 								

			
 
				 								

			
 
				+							}

			
 
				+							if(stripos($cp,'-73-') !== false) //200%   250%

			
 
				+							{

			
 
				+								$cc1 = explode('-',trim($cc[1],'-'));

			
 
				+								$newcp = '-';

			
 
				+								foreach ($cc1 as $kk=>$vv)

			
 
				+		   					    {

			
 
				+									if($kk == 1)

			
 
				+									{

			
 
				+                					    $newcp .= $vv.'-'.$cc[0].'-';

			
 
				+									}

			
 
				+									else

			
 
				+									{

			
 
				+										$newcp .= $vv.'-';

			
 
				+									}

			
 
				+            					}

			
 
				+								

			
 
				+							

			
 
				+									$gpp2 = str_replace('-73-','-74-',$newcp);

			
 
				+									$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp2' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用

			
 
				+									if($ccxh >= $num[1])

			
 
				+				                	{

			
 
				+				        	        	$hdtx .= $v['title'].' - 250%密度有货；';

			
 
				+							    	}

			
 
				+								

			
 
				+								

			
 
				 							}

			
 
				 							//HD相互提醒

			
 
				 							if(stripos($cp,'-146-') !== false || stripos($cp,'-331-') !== false) //13*4  HD13*4

			
@@ -913,6 +941,28 @@ class Warehouse extends Start_Controller {
 
				 								

			
 
				 							}

			
 
				 							//HD相互提醒结束

			
 
				+							$cc1 = explode('-',trim($cc[1],'-'));

			
 
				+								$newcp = '-';

			
 
				+								foreach ($cc1 as $kk=>$vv)

			
 
				+		   					    {

			
 
				+									if($kk == 1)

			
 
				+									{

			
 
				+                					    $newcp .= $vv.'-'.$cc[0].'-';

			
 
				+									}

			
 
				+									else

			
 
				+									{

			
 
				+										$newcp .= $vv.'-';

			
 
				+									}

			
 
				+            					}

			
 
				+							//在途库存

			
 
				+    							$transportlist = $this->whlabeltransport->find_all("features = '".$newcp."' and cz = 0 and warehouse = '".$v['id']."'");

			
 
				+								$transportMsg = "";

			
 
				+                                if(count($transportlist) > 0)

			
 
				+								{

			
 
				+									

			
 
				+                                    $transportItem = $transportlist[0];

			
 
				+                                    $transportMsg = "<br/>". $transportItem['sku'] . " 在途库存:  <b>" . $transportItem['num'] . "   </b>  预达时间: ".date("Y-m-d",$transportItem['stime']). "  <br/>  备注 :  " . $transportItem['text'];

			
 
				+                                }

			
 
				 				        }

			
 
				 						else

			
 
				 						{

			
@@ -948,16 +998,19 @@ class Warehouse extends Start_Controller {
 
				 					   {

			
 
				 						   $kxw .= $hdtx;

			
 
				 					   }

			
 
				+					   if (!empty($transportMsg)) {

			
 
				+							$kxw .= $transportMsg;

			
 
				+						}

			
 
				 				   }

			
 
				 				}

			
 
				 			}

			
 
				-			if($mgc ==  count($pp))

			
 
				+			if(isset($pp) && $mgc ==  count($pp))

			
 
				 			{

			
 
				 				$kxw .= '美国店；';

			
 
				 			}

			
 
				 			if($kxw == '可用现货仓：')

			
 
				 			{

			
 
				-				echo json_encode(array('msg'=>$kxw."无",'cs'=>$cs,'success'=>true));exit;

			
 
				+				echo json_encode(array('msg'=>$kxw.'无','cs'=>$cs,'success'=>true));exit;

			
 
				 			}

			
 
				 			else

			
 
				 			{

			
@@ -1072,6 +1125,13 @@ class Warehouse extends Start_Controller {
 
				 		    {

			
 
				                 $start = ($page - 1)*$perpage;

			
 
				             }

			
 
				+			$t = array();

			
 
				+			$transfer = $this->transfer->find_all();

			
 
				+			foreach ($transfer as $v)

			
 
				+		    {

			
 
				+				$t[$v['id']] = $v['title'];

			
 
				+				$ot[$v['id']] = ($v['orvertime']>0)?$v['orvertime']*24*3600:0;

			
 
				+			}

			
 
				             //取得信息列表

			
 
				             $info_list = $this->fullorder->find_all($where,'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);

			
 
				 			$info_listsmt = $this->fullordersmt->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);

			
@@ -1101,69 +1161,23 @@ class Warehouse extends Start_Controller {
 
				 				}

			
 
				 				$rows[$key]['orderinfo'] = "<h9 class='window' data-h='/warehouse/ordersee/".$value['id']."' data-t='订单号：".$value['orderinfo']."'><p>".$value['orderinfo']."</p></h9>";

			
 
				 				$rows[$key]['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$value['shipremarks']);

			
 
				-				$out = $this->systemtransfer->find_all("number = '".$value['number']."'");

			
 
				-				$outread = '';

			
 
				-				if($out)

			
 
				-				{

			
 
				-					foreach ($out as $val) 

			
 
				-		            {

			
 
				-						$list = '';

			
 
				-						$rk = explode('|',trim($val['rk'],'|'));

			
 
				-					    $rktime = explode('|',trim($val['rktime'],'|'));

			
 
				-					    $zw = array();

			
 
				-					    $t = $this->transfer->find_all("1=1");

			
 
				-					    foreach ($t as $v)

			
 
				-		   		        {

			
 
				-						    $zw[$v['id']] = $v['title'];

			
 
				-					    }

			
 
				-					    if($val['rk'] != '' && count($rk) > 0)

			
 
				-					    {

			
 
				-							for($i=0;$i<count($rk);$i++)

			
 
				-		       		        {

			
 
				-							    if(!isset($rktime[$i]))

			
 
				-							    {

			
 
				-									$list .= $zw[$cz[$i]];

			
 
				-							    }

			
 
				-							    else

			
 
				-							    {

			
 
				-					   		        $list .= $zw[$rk[$i]].' ：'.date('Y-m-d H:i',$rktime[$i]).'，';

			
 
				-							    }

			
 
				-							}

			
 
				-						}

			
 
				-						$outread .= '<p>'.$list.'</p>';

			
 
				-					}

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$systemwigsout = $this->systemwigsout->get_number($value['number']);

			
 
				-					$outread = '';

			
 
				-					if($systemwigsout)

			
 
				+				$out = '';

			
 
				+				$tf = $this->systemtransfer->find_all("number = '".$value['number']."'");

			
 
				+				foreach ($tf as $k=>$v) 

			
 
				+		        {

			
 
				+					if(count($tf) > 1)

			
 
				 					{

			
 
				-						$cz = explode('|',trim($systemwigsout['cz'],'|'));

			
 
				-						$cztime = explode('|',trim($systemwigsout['cztime'],'|'));

			
 
				-						$zw = array();

			
 
				-						$t = $this->transfer->find_all("1=1");

			
 
				-						foreach ($t as $v)

			
 
				-		    			{

			
 
				-							$zw[$v['id']] = $v['title'];

			
 
				-						}

			
 
				-						if($systemwigsout['cz'] != '' && count($cz) > 0)

			
 
				-						{

			
 
				-							for($i=0;$i<count($cz);$i++)

			
 
				-		       			 {

			
 
				-								if(!isset($cztime[$i]))

			
 
				-								{

			
 
				-									$outread .= $zw[$cz[$i]];

			
 
				-								}

			
 
				-								else

			
 
				-								{

			
 
				-					   			 $outread .= $zw[$cz[$i]].' ：'.date('Y-m-d H:i',$cztime[$i]).'，';

			
 
				-								}

			
 
				-							}

			
 
				-						}

			
 
				+						$out .= $k.'<br>';

			
 
				 					}

			
 
				+					$data = $this->systemtransfer_cr->find_all("fid = '".$v['id']."'");

			
 
				+				    $out = "订单打印 ：".date('Y-m-d H:i',$value['printtime']).'<br>';

			
 
				+				    foreach ($data as $k=>$v)

			
 
				+		            {

			
 
				+					    $type = ($v['type']==1)?'入库':'出库';

			
 
				+					    $out .= $t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']).'<br>';

			
 
				+				    }

			
 
				 				}

			
 
				-				$rows[$key]['outread'] = rtrim($outread,'，');

			
 
				+				$rows[$key]['outread'] = trim($out,'<br>');

			
 
				             }

			
 
				 			$dlz = $this->fullorder->find_count($where);

			
 
				 		    $smt = $this->fullordersmt->find_count($where);

			
@@ -1478,10 +1492,18 @@ class Warehouse extends Start_Controller {
 
				             {

			
 
				                 $where .= " and libraryconfirm = '$libraryconfirm'";

			
 
				             }

			
 
				+			$t = array();

			
 
				+			$transfer = $this->transfer->find_all();

			
 
				+			foreach ($transfer as $v)

			
 
				+		    {

			
 
				+				$t[$v['id']] = $v['title'];

			
 
				+				$ot[$v['id']] = ($v['orvertime']>0)?$v['orvertime']*24*3600:0;

			
 
				+			}

			
 
				             $order_str = ($print != 3)?"id desc":"printtime desc";

			
 
				 			$info_list = $this->fullorder->find_all($where.$id_is,'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);

			
 
				 			$info_listsmt = $this->fullordersmt->find_all($where.$id_smt." and mergeid != '1'",'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);

			
 
				-			$rows = array_merge($info_list,$info_listsmt);

			
 
				+			$info_listtt = $this->fullordertt->find_all($where.$id_smt." and mergeid != '1'",'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);

			
 
				+			$rows = array_merge($info_list,$info_listsmt,$info_listtt);

			
 
				             foreach ($rows as $key=>$value) 

			
 
				 		    {

			
 
				 				if($value['printtime'] > 0)

			
@@ -1513,34 +1535,23 @@ class Warehouse extends Start_Controller {
 
				 					$rows[$key]['libraryconfirm'] = '允许出库';

			
 
				 				}

			
 
				 				$rows[$key]['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$value['shipremarks']);

			
 
				-				$systemwigsout = $this->systemwigsout->get_number($value['number']);

			
 
				-				$wigsout = '';

			
 
				-				if($systemwigsout)

			
 
				-				{

			
 
				-					$cz = explode('|',trim($systemwigsout['cz'],'|'));

			
 
				-					$cztime = explode('|',trim($systemwigsout['cztime'],'|'));

			
 
				-					$zw = array();

			
 
				-			$t = $this->transfer->find_all("1=1");

			
 
				-			foreach ($t as $v)

			
 
				-		    {

			
 
				-				$zw[$v['id']] = $v['title'];

			
 
				-			}

			
 
				-					if($systemwigsout['cz'] != '' && count($cz) > 0)

			
 
				+				$out = '';

			
 
				+				$tf = $this->systemtransfer->find_all("number = '".$value['number']."'");

			
 
				+				foreach ($tf as $k=>$v) 

			
 
				+		        {

			
 
				+					if(count($tf) > 1)

			
 
				 					{

			
 
				-						for($i=0;$i<count($cz);$i++)

			
 
				-		        		{

			
 
				-							if(!isset($cztime[$i]))

			
 
				-							{

			
 
				-								$wigsout .= $zw[$cz[$i]].'->';

			
 
				-							}

			
 
				-							else

			
 
				-							{

			
 
				-					    		$wigsout .= $zw[$cz[$i]].' ：'.date('Y-m-d H:i',$cztime[$i]).'->';

			
 
				-							}

			
 
				-						}

			
 
				+						$out .= $k.'<br>';

			
 
				 					}

			
 
				+					$data = $this->systemtransfer_cr->find_all("fid = '".$v['id']."'");

			
 
				+				    $out = "订单打印 ：".date('Y-m-d H:i',$value['printtime']).'<br>';

			
 
				+				    foreach ($data as $k=>$v)

			
 
				+		            {

			
 
				+					    $type = ($v['type']==1)?'入库':'出库';

			
 
				+					    $out .= $t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']).'<br>';

			
 
				+				    }

			
 
				 				}

			
 
				-				$rows[$key]['systemwigsout'] = rtrim($wigsout,'->');

			
 
				+				$rows[$key]['systemwigsout'] = trim($out,'<br>');

			
 
				             }

			
 
				 			

			
 
				             	$title = date('Y-m-d',$timetk).'至'.date('Y-m-d',$timetj).'进销存详情'; 

			
--- a/core/CoreApp/controllers/Weight.php
+++ b/core/CoreApp/controllers/Weight.php
@@ -150,6 +150,7 @@ class Weight extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -174,6 +175,7 @@ class Weight extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			if($category == 1702)

			
 
				 			{

			
@@ -265,6 +267,7 @@ class Weight extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -289,6 +292,7 @@ class Weight extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			if($category == 1702)

			
 
				 			{

			
@@ -516,10 +520,14 @@ class Weight extends Start_Controller {
 
				         		}

			
 
				 				$features = '128'.implode("-",$ttpx);

			
 
				 			}

			
 
				-			else if(stripos($list,'-130-') !== false || stripos($list,'-133-') !== false)

			
 
				+			else if(stripos($list,'-133-') !== false)

			
 
				             {

			
 
				 				$features = $listarray[0].'-'.$listarray[5].'-'.(isset($listarray[4])?$listarray[4]:'');

			
 
				 			}

			
 
				+			else if(stripos($list,'-130-') !== false)

			
 
				+            {

			
 
				+				$features = $listarray[0].'-'.$listarray[4].'-'.$listarray[3];

			
 
				+			}

			
 
				 			$data = $this->weight->get_features($features);

			
 
				 			if($data)

			
 
				 			{

			
--- a/core/CoreApp/controllers/Whlabel.php
+++ b/core/CoreApp/controllers/Whlabel.php
--- a/core/CoreApp/controllers/Whlabel_bh.php
+++ b/core/CoreApp/controllers/Whlabel_bh.php
@@ -333,6 +333,7 @@ class Whlabel_bh extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -357,6 +358,7 @@ class Whlabel_bh extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			if($category == 1702)

			
 
				 			{

			
@@ -377,12 +379,12 @@ class Whlabel_bh extends Start_Controller {
 
				 						$bmpx[$typeclass[$v]['classid']] = $typeclass[$v]['bm'];

			
 
				 					}

			
 
				 				}

			
 
				-				if(isset($typeclass[$v]['title']))

			
 
				-				{

			
 
				-					$title .= $typeclass[$v]['title']." ";

			
 
				-				}

			
 
				 				if($v != 0)

			
 
				 				{

			
 
				+					if($k != 'size')

			
 
				+					{

			
 
				+			            $title .= $typeclass[$v]['title']." ";

			
 
				+					}

			
 
				 					$features .=$v.'-';

			
 
				 					$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];

			
 
				 					if(isset($pm[$typeclass[$v]['classid']]))

			
@@ -422,6 +424,11 @@ class Whlabel_bh extends Start_Controller {
 
				 			$pm = array_filter($pm);//去除空值

			
 
				 			$pm = implode(" ",$pm);

			
 
				 			$pm = preg_replace("/\r\n|\r|\n/",'',trim($pm,' '));

			
 
				+			if($list['size'])

			
 
				+			{

			
 
				+			    $typeclass = $this->typeclass->read($list['size']);

			
 
				+			    $title .= $typeclass['title'];

			
 
				+			}

			
 
				 			$title = trim($title,' ');

			
 
				 			

			
 
				 			$post['num'] = $this->input->post('num',true);

			
@@ -458,7 +465,7 @@ class Whlabel_bh extends Start_Controller {
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				echo json_encode(array('msg'=>'料号错误','cs'=>json_encode($lh),'success'=>false));exit;

			
 
				+				echo json_encode(array('msg'=>'料号错误','cs'=>$lh,'success'=>false));exit;

			
 
				 				

			
 
				 			}

			
 
				 			

			
@@ -478,6 +485,75 @@ class Whlabel_bh extends Start_Controller {
 
				 		$this->data['data'] = (isset($_GET['data']))?$_GET['data']:'';

			
 
				 		$this->_Template('whlabel_bh_add',$this->data);

			
 
				 	}

			
 
				+	

			
 
				+	

			
 
				+	public function get_cjlp($data)//创建料品

			
 
				+	{

			
 
				+		$list["0"]["Code"] = $data['jm'];//料号，SKU

			
 
				+		$list["0"]["Code1"] = '';

			
 
				+        $list["0"]["Name"] = $data['zh'];//产品名称

			
 
				+        $list["0"]["MainItemCategory"]["Code"] = $data['bm'];

			
 
				+        $list["0"]["Org"]["Code"] = 001;

			
 
				+        $list["0"]["OtherID"] = 1;

			
 
				+		$list["0"]["PurchaseInfo"]["BudgetControlType"] = -1;

			
 
				+        $list["0"]["PurchaseInfo"]["PriceSource"] = 2;

			
 
				+        $list["0"]["PurchaseInfo"]["InquireRule"] = -1;

			
 
				+        $list["0"]["PurchaseInfo"]["InquireFixedPeriod"] = 0;

			
 
				+        $list["0"]["PurchaseInfo"]["StatisticPeriod"] = -1;

			
 
				+        $list["0"]["PurchaseInfo"]["IsPUTradePathModify"] = true;

			
 
				+        $list["0"]["PurchaseInfo"]["IsPURtnTradePathModify"] = true;

			
 
				+        $list["0"]["InventoryUOM"]["Code"] = '条';

			
 
				+        $list["0"]["InventorySecondUOM"]["Code"] = '';

			
 
				+        $list["0"]["IsDualUOM"] = false;

			
 
				+        $list["0"]["InventoryInfo"]["InventoryPlanningMethod"] = 4;

			
 
				+        $list["0"]["InventoryInfo"]["InventoryPlanTime"] = -1;

			
 
				+        $list["0"]["InventoryInfo"]["TurnOverRate"] = 1;

			
 
				+        $list["0"]["InventoryInfo"]["ReserveMode"] = -1;

			
 
				+        $list["0"]["InventoryInfo"]["SupplyMethod"] = -1;

			
 
				+        $list["0"]["DescFlexField"]["PrivateDescSeg1"] = 01;

			
 
				+        $list["0"]["DescFlexField"]["PubDescSeg5"] = 01;

			
 
				+        $list["0"]["Description"] = $data['title'];

			
 
				+        $list["0"]["ItemForm"] = 2001;

			
 
				+        $list["0"]["ItemFormAttribute"] = 10;

			
 
				+        $list["0"]["IsInventoryEnable"] = true;

			
 
				+        $list["0"]["IsPurchaseEnable"] = true;

			
 
				+        $list["0"]["IsSalesEnable"] = true;

			
 
				+        $list["0"]["IsBuildEnable"] = true;

			
 
				+        $list["0"]["IsOutsideOperationEnable"] = true;

			
 
				+        $list["0"]["IsMRPEnable"] = true;

			
 
				+        $list["0"]["IsBOMEnable"] = true;

			
 
				+        $list["0"]["IsCostCalByGrade"] = false;

			
 
				+        $list["0"]["IsCostCalByPotency"] = false;

			
 
				+        $list["0"]["IsGradeControl"] = false;

			
 
				+        $list["0"]["StandardGrade"] = -1;

			
 
				+        $list["0"]["StartGrade"] = -1;

			
 
				+        $list["0"]["EndGrade"] = -1;

			
 
				+        $list["0"]["IsPotencyControl"] = false;

			
 
				+        $list["0"]["StandardPotency"] = -1;

			
 
				+        $list["0"]["StartPotency"] = -1;

			
 
				+        $list["0"]["EndPotency"] = -1;

			
 
				+		$asd = $list;

			
 
				+		$list = json_encode($list);

			
 
				+		$token = $this->setting->get_yytoken_130();

			
 
				+		$url = 'http://172.31.105.167/U9C/webapi/ItemMaster/Create';

			
 
				+		$header[] = "Content-Type: application/json";

			
 
				+        $header[] = "Token: ".$token;

			
 
				+        $ch = curl_init();

			
 
				+        curl_setopt($ch, CURLOPT_URL, $url);

			
 
				+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

			
 
				+        curl_setopt($ch, CURLOPT_HTTPHEADER, $header);

			
 
				+		curl_setopt($ch, CURLINFO_HEADER_OUT, TRUE);

			
 
				+		curl_setopt($ch, CURLOPT_POST, 1);

			
 
				+        curl_setopt($ch, CURLOPT_POSTFIELDS, $list);

			
 
				+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

			
 
				+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);

			
 
				+        $res = curl_exec($ch);

			
 
				+		$res = json_decode($res,true);

			
 
				+

			
 
				+		return $asd;

			
 
				+	}

			
 
				+	

			
 
				+	

			
 
				 	//修改产品

			
 
				 	public function _edit($arg_array)

			
 
				 	{

			
@@ -539,6 +615,7 @@ class Whlabel_bh extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -563,6 +640,7 @@ class Whlabel_bh extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			if($category == 1702)

			
 
				 			{

			
@@ -583,12 +661,12 @@ class Whlabel_bh extends Start_Controller {
 
				 						$bmpx[$typeclass[$v]['classid']] = $typeclass[$v]['bm'];

			
 
				 					}

			
 
				 				}

			
 
				-				if(isset($typeclass[$v]['title']))

			
 
				-				{

			
 
				-					$title .= $typeclass[$v]['title']." ";

			
 
				-				}

			
 
				 				if($v != 0)

			
 
				 				{

			
 
				+					if($k != 'size')

			
 
				+					{

			
 
				+			            $title .= $typeclass[$v]['title']." ";

			
 
				+					}

			
 
				 					$features .=$v.'-';

			
 
				 					$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];

			
 
				 					if(isset($pm[$typeclass[$v]['classid']]))

			
@@ -628,6 +706,11 @@ class Whlabel_bh extends Start_Controller {
 
				 			$pm = array_filter($pm);//去除空值

			
 
				 			$pm = implode(" ",$pm);

			
 
				 			$pm = preg_replace("/\r\n|\r|\n/",'',trim($pm,' '));

			
 
				+			if($list['size'])

			
 
				+			{

			
 
				+			    $typeclass = $this->typeclass->read($list['size']);

			
 
				+			    $title .= $typeclass['title'];

			
 
				+			}

			
 
				 			$title = trim($title,' ');

			
 
				 			

			
 
				 			$post['num'] = $this->input->post('num',true);

			
@@ -697,7 +780,7 @@ class Whlabel_bh extends Start_Controller {
 
				 				echo json_encode(array('msg'=>'料号错误','cs'=>json_encode($lh),'success'=>false));exit;

			
 
				 				

			
 
				 			}

			
 
				-			echo json_encode(array('msg'=>'操作成功！'.$lh['Data'][0]['m_isSucess'],'id'=>$id,'typetext'=>'传输料号','text'=>'','num'=>0,'cs'=>$lh,'success'=>true));

			
 
				+			echo json_encode(array('msg'=>'操作成功！'.$lh['Data'][0]['m_isSucess'],'id'=>$id,'typetext'=>'传输料号','text'=>'','num'=>0,'cs'=>$lh,'bm'=>$w['bm'],'success'=>true));

			
 
				 			/** 投产

			
 
				 			

			
 
				 			

			
@@ -996,6 +1079,7 @@ class Whlabel_bh extends Start_Controller {
 
				 				$list['lacecolor'] = $this->input->post('lacecolor',true);

			
 
				 				$list['lacetypes'] = $this->input->post('lacetypes',true);

			
 
				 				$list['wigother'] = $this->input->post('wigother',true);

			
 
				+				$list['wigother2'] = $this->input->post('wigother2',true);

			
 
				 			}

			
 
				 			if($category == 129)

			
 
				 			{

			
@@ -1020,6 +1104,7 @@ class Whlabel_bh extends Start_Controller {
 
				 			if($category == 130 || $category == 133 || $category == 1702)

			
 
				 			{

			
 
				 				$list['items'] = $this->input->post('items',true);

			
 
				+				$list['weight'] = $this->input->post('weight',true);

			
 
				 			}

			
 
				 			if($category == 1702)

			
 
				 			{

			
--- a/core/CoreApp/controllers/Whlabelstockup.php
+++ b/core/CoreApp/controllers/Whlabelstockup.php
@@ -0,0 +1,620 @@
 
				+<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				+class whlabelstockup extends Start_Controller {

			
 
				+	public function __construct(){

			
 
				+		parent::__construct();

			
 
				+		$this->load->library('session');

			
 
				+		$this->load->_model('Model_whlabel_stockup','whlabel_stockup');

			
 
				+		$this->load->_model('Model_whlabel','whlabel');

			
 
				+		$this->load->_model('Model_whlabeltransport','whlabeltransport');

			
 
				+		$this->load->_model('Model_classid','classid');

			
 
				+		$this->load->_model('Model_whlabel_qh','whlabel_qh');

			
 
				+		$this->load->_model('Model_typeclass','typeclass');

			
 
				+		$this->load->_model('Model_whlabel_type','whlabel_type');

			
 
				+		$this->load->_model('Model_whlabel_bh','whlabel_bh');

			
 
				+		$this->load->_model('Model_shop','shop');

			
 
				+		$this->load->_model('Model_purchase','purchase');

			
 
				+		$this->load->_model('Model_apiyy','apiyy');

			
 
				+		$this->load->_model('Model_excel','excel');

			
 
				+		$this->load->_model('Model_whlabel_bh_transfer','whlabel_bh_transfer');

			
 
				+	}

			
 
				+	//定义方法的调用规则 获取URI第二段值

			
 
				+    public function _remap($arg,$arg_array)

			
 
				+    {

			
 
				+		if($arg == 'count')

			
 
				+        {

			
 
				+             $this->_count();

			
 
				+        }

			
 
				+		else if($arg == 'xd')

			
 
				+        {

			
 
				+             $this->_xd($arg_array);

			
 
				+        }

			
 
				+		else if($arg == 'excel')

			
 
				+        {

			
 
				+             $this->_excel();

			
 
				+        }

			
 
				+		else

			
 
				+		{

			
 
				+			 $this->_index();

			
 
				+		}

			
 
				+    }

			
 
				+

			
 
				+	//管理

			
 
				+	public function _index()

			
 
				+	{

			
 
				+		$wt = array();

			
 
				+		$whlabel_type = $this->whlabel_type->find_all();

			
 
				+		foreach ($whlabel_type as $v) 

			
 
				+		{

			
 
				+			$wt[$v['id']] = $v['title'];

			
 
				+		}

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['page']))  

			
 
				+		{

			
 
				+		    $page = $this->input->post('page',true);

			
 
				+		    $perpage = $this->input->post('perpage',true);

			
 
				+			$sku = $this->input->post('sku',true);

			
 
				+			$jm = $this->input->post('jm',true);

			
 
				+			$text = $this->input->post('text',true);

			
 
				+			$type = $this->input->post('type',true);

			
 
				+			$repair = $this->input->post('repair',true);

			
 
				+			$stockup = $this->input->post('stockup',true);

			
 
				+			$outbound = $this->input->post('outbound',true);

			
 
				+			$lacecolor = $this->input->post('lacecolor',true);

			
 
				+			$category = $this->input->post('category',true);

			
 
				+			$size = $this->input->post('size',true);

			
 
				+			$grade = $this->input->post('grade',true);

			
 
				+			$color = $this->input->post('color',true);

			
 
				+			$lowe = $this->input->post('lowe',true);

			
 
				+			$lacetype = $this->input->post('lacetype',true);

			
 
				+			$haircap = $this->input->post('haircap',true);

			
 
				+			$density = $this->input->post('density',true);

			
 
				+			$where = "1=1";

			
 
				+			if($lacecolor)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lacecolor-%'";

			
 
				+            }

			
 
				+			if($lacetype)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lacetype-%'";

			
 
				+            }

			
 
				+			if($category)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$category-%'";

			
 
				+            }

			
 
				+			if($size)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$size-%'";

			
 
				+            }

			
 
				+			if($grade)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$grade-%'";

			
 
				+            }

			
 
				+			if($color)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$color-%'";

			
 
				+            }

			
 
				+			if($lowe)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lowe-%'";

			
 
				+            }

			
 
				+			if($haircap)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$haircap-%'";

			
 
				+            }

			
 
				+			if($density)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$density-%'";

			
 
				+            }

			
 
				+			if($sku)

			
 
				+            {

			
 
				+                $where  .= " and sku like '%$sku%'";

			
 
				+            }

			
 
				+			if($jm)

			
 
				+            {

			
 
				+                $where  .= " and jm = '$jm'";

			
 
				+            }

			
 
				+			if($text)

			
 
				+            {

			
 
				+                $where  .= " and text = '$text'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($repair != '')

			
 
				+            {

			
 
				+                $where  .= " and repair = '$repair'";

			
 
				+            }

			
 
				+			if($stockup != '')

			
 
				+            {

			
 
				+                $where  .= " and stockup = '$stockup'";

			
 
				+            }

			
 
				+			if($outbound != '')

			
 
				+            {

			
 
				+                $where  .= " and outbound = '$outbound'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "repair desc";//备货预警从大到小

			
 
				+            if(empty($page))

			
 
				+		    {

			
 
				+                $start = 0;

			
 
				+		    	$perpage = 1;

			
 
				+            }

			
 
				+		    else

			
 
				+		    {

			
 
				+                $start = ($page - 1)*$perpage;

			
 
				+            }

			
 
				+            //取得信息列表

			
 
				+            $info_list = $this->whlabel_stockup->find_all($where,'id,sku,jm,us,uszt,cs,xc,type,st,seven,thirty,availableday,lackday,zd,repair,stockup,outbound,bhnum',$order_str,$start,$perpage);

			
 
				+			foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				$data = $this->whlabel_stockup->read($value['id']);

			
 
				+				 $bh = $this->whlabel_bh->find_all("sku = '".$data['bhsku']."' and features = '".$data['features']."' and time > '".(time()-7*24*3600)."'");

			
 
				+				$info_list[$key]['sku'] = '<p>'.$value['sku'].'</p>';

			
 
				+				foreach ($bh as $v) 

			
 
				+		        {

			
 
				+					$printnum = $this->whlabel_bh_transfer->get_number($v['number']);

			
 
				+					if(isset($printnum['ctime11']) && $printnum['ctime11'] > 0)

			
 
				+					{

			
 
				+						continue;

			
 
				+					}

			
 
				+					$info_list[$key]['sku'] .= '<p style="color: #2084db;">'.date('Y-m-d',$v['time']).' 备货数量：'.$v['bhnum'].' 未入库</p>';

			
 
				+					

			
 
				+				}

			
 
				+				if($value['repair'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['repair'] = '/';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['repair'] = '补货';

			
 
				+				}

			
 
				+				if($value['stockup'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['stockup'] = '/';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['stockup'] = '备货';

			
 
				+				}

			
 
				+				if($value['outbound'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['outbound'] = '正常';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['outbound'] = '异常';

			
 
				+				}

			
 
				+				if(isset($wt[$value['type']]))

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = $wt[$value['type']];

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '未设置';

			
 
				+				}

			
 
				+				$info_list[$key]['cs'] = $value['us']+$value['uszt'];

			
 
				+				$info_list[$key]['bhnum'] = '<p><input value="'.$value['bhnum'].'" name="xd" type="text" style="width:80%;margin:0 10%;padding:5px 0;border: 1px #ccc solid;font-size: 13px;text-align: center;color: #333;border-radius: 5px;"></p><p><b id="xf'.$key.'" class="xd">下单</b></p>';

			
 
				+		    }

			
 
				+		    $total = $this->whlabel_stockup->find_count($where);

			
 
				+		    $pagenum = ceil($total/$perpage);

			
 
				+		    $over = $total-($start+$perpage);

			
 
				+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				+		    echo json_encode($rows);exit;

			
 
				+		}

			
 
				+		$this->_Template('whlabelstockup',$this->data);

			
 
				+	}

			
 
				+

			
 
				+	public function _count()

			
 
				+	{

			
 
				+		$c = array();

			
 
				+		$time = time();

			
 
				+		$typeclass = array();

			
 
				+		$tc = $this->typeclass->find_all();

			
 
				+		foreach ($tc as $v)

			
 
				+		{

			
 
				+			$typeclass[$v['id']] = $v;

			
 
				+		}

			
 
				+		$classid = $this->classid->sku();

			
 
				+		$info_list = $this->whlabel->find_pc('warehouse=5','sku,purchase,features','*','id asc');

			
 
				+		$this->db->truncate('whlabel_stockup');

			
 
				+		$this->db->trans_begin();

			
 
				+		$asd = 0;

			
 
				+		foreach ($info_list as $key=>$value) 

			
 
				+		{

			
 
				+			$features = str_replace(array('-163-','-164-','-165-','-166-'),'-',$value['features']);

			
 
				+			$features = explode('-',trim($features,'-'));

			
 
				+			$pm = $classid;

			
 
				+			$jm = $classid;

			
 
				+			$bhsku = array();

			
 
				+			$bmpx = array(13=>'',16=>'',18=>'',25=>'',26=>'',41=>'');

			
 
				+			foreach($features as $k=>$v)

			
 
				+			{

			
 
				+				if(isset($typeclass[$v]) && isset($bmpx[$typeclass[$v]['classid']]))

			
 
				+				{

			
 
				+					if($typeclass[$v]['bm'] != '')

			
 
				+					{

			
 
				+						$bmpx[$typeclass[$v]['classid']] = $typeclass[$v]['bm'];

			
 
				+					}

			
 
				+				}

			
 
				+				if($v != 0)

			
 
				+				{

			
 
				+					if($k != 'size')

			
 
				+					{

			
 
				+			            $title .= $typeclass[$v]['title']." ";

			
 
				+					}

			
 
				+					$bhsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];

			
 
				+					if(!isset($typeclass[$v]))

			
 
				+					{

			
 
				+						continue;

			
 
				+					}

			
 
				+					if(isset($pm[$typeclass[$v]['classid']]))

			
 
				+					{

			
 
				+						if(stripos($typeclass[$v]['zh'],'|') !== false)

			
 
				+						{

			
 
				+							$tz = explode('|',$typeclass[$v]['zh']);

			
 
				+							$pm[$typeclass[$v]['classid']] = $tz[0];

			
 
				+						}

			
 
				+						else

			
 
				+						{

			
 
				+							$pm[$typeclass[$v]['classid']] = $typeclass[$v]['zh'];

			
 
				+						}

			
 
				+					}

			
 
				+					if(isset($jm[$typeclass[$v]['classid']]))

			
 
				+					{

			
 
				+						$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];

			
 
				+							

			
 
				+					}

			
 
				+			    }

			
 
				+			}

			
 
				+			$jm = array_filter($jm);

			
 
				+			$zh = implode(" ",$pm);

			
 
				+			$zh = str_replace('自然色 ','',trim($zh,' '));

			
 
				+			$zh = str_replace(array('        ','       ','      ','     ','    ','   ','  '),' ',$zh);

			
 
				+			$zh = preg_replace("/\r\n|\r|\n/",'',$zh);//中文

			
 
				+			$bhsku = array_filter($bhsku);//去除空值

			
 
				+			$post['bhsku'] = implode("-",$bhsku);

			
 
				+			$post['bm'] = '03'.implode("",$bmpx);

			
 
				+			

			
 
				+			$post['features'] = $value['features'];

			
 
				+			$post['title'] = $value['title'];

			
 
				+			$post['sku'] = $value['sku'];

			
 
				+			$post['jm'] = implode("-",$jm);//简码

			
 
				+			$post['zh'] = $zh;

			
 
				+

			
 
				+			$post['us'] = $this->whlabel->find_count('state = 0 and warehouse = 5 and sku = "'.$value['sku'].'" and features = "'.$value['features'].'"');//美仓库存

			
 
				+			$post['xc'] = $this->whlabel->find_count('state = 0 and warehouse = 13 and features = "'.$value['features'].'"');//许昌库存

			
 
				+			$qh = $this->whlabel_qh->get_data($value['features'],date('Ym',$time));

			
 
				+			if(isset($qh['num']))

			
 
				+			{

			
 
				+				if($post['us']+$post['xc'] < 1 && $qh['gxtime'] < date('Ymd',$time))

			
 
				+				{

			
 
				+					$this->whlabel_qh->save(array("num"=>$qh['num']+1,"gxtime"=>date('Ymd',$time)),$qh['id']);

			
 
				+					$qh['num'] += 1;

			
 
				+				}

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				$this->whlabel_qh->insert(array("sku"=>$value['sku'],"features"=>$value['features'],"num"=>0,"gtime"=>date('Ym',$time),"gxtime"=>date('Ymd',$time)));

			
 
				+				$qh['num'] = 0;

			
 
				+			}

			
 
				+			$zt = $this->whlabeltransport->find_all('sku = "'.$value['sku'].'" and warehouse = 5 and features = "'.$value['features'].'" and cz = "0"');

			
 
				+			$post['uszt'] = array_sum(array_column($zt,'num'));//在途库存

			
 
				+			$post['type'] = $value['type'];//等级类型

			
 
				+			//$post['text'] = $value['text'];//备注

			
 
				+			$post['seven'] = $this->whlabel->find_count('sku = "'.$value['sku'].'" and features = "'.$value['features'].'" and outk > "'.($time-7*24*3600).'" and outk < "'.$time.'"');//7天出库

			
 
				+			$post['st'] = $this->whlabel->find_count('sku = "'.$value['sku'].'" and features = "'.$value['features'].'" and outk > "'.($time-14*24*3600).'" and outk < "'.($time-7*24*3600).'"');//前7天出库

			
 
				+			$post['thirty'] = $this->whlabel->find_count('sku = "'.$value['sku'].'" and features = "'.$value['features'].'" and outk > "'.($time-30*24*3600).'" and outk < "'.$time.'"');//30天出库

			
 
				+			$post['zd'] = $this->whlabel->find_count('sku = "'.$value['sku'].'" and state = 0 and zd != "" and features = "'.$value['features'].'"');//占单数量

			
 
				+			if($post['thirty'] > 0 && 30-$qh['num'] > 0)

			
 
				+			{

			
 
				+				$post['availableday'] = sprintf("%01.1f",($post['uszt']+$post['us']-$post['zd'])/($post['thirty']/(30-$qh['num'])));//预计可用天数

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				$post['availableday'] = sprintf("%01.1f",($post['uszt']-$post['zd']));

			
 
				+			}

			
 
				+			$post['lackday'] = $qh['num'];//本月缺货天数

			
 
				+			$post['repair'] = '0';//是否需要补货

			
 
				+			if($value['type'] > 0 && $value['type'] < 5 && $post['availableday'] < 40)

			
 
				+			{

			
 
				+				$post['repair'] = '1';//补货

			
 
				+			}

			
 
				+			$post['stockup'] = '0';

			
 
				+			if(($post['uszt']+$post['xc']) < $post['thirty'])

			
 
				+			{

			
 
				+				$post['stockup'] = '1';//备货

			
 
				+			}

			
 
				+			$post['outbound'] = '0';//正常

			
 
				+			if($post['seven'] > 0)

			
 
				+			{

			
 
				+				if($post['seven'] >= $post['seven']*2)

			
 
				+				{

			
 
				+					$post['outbound'] = '1';//异常

			
 
				+				}

			
 
				+			}

			
 
				+			$bhnum = $post['thirty']/30*40-($post['uszt']+$post['us']-$post['zd']);//  30天出库/30天*40天-（在途+美仓-占单）

			
 
				+			if($bhnum > 0)

			
 
				+			{

			
 
				+				$post['bhnum'] = $bhnum;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+			    $post['bhnum'] = 0;

			
 
				+			}

			
 
				+			$asd++;

			
 
				+			$this->whlabel_stockup->insert($post);

			
 
				+		}

			
 
				+		if ($this->db->trans_status() === FALSE)

			
 
				+		{

			
 
				+    		$this->db->trans_rollback();

			
 
				+		}

			
 
				+		else

			
 
				+		{

			
 
				+    		$this->db->trans_commit();

			
 
				+		}

			
 
				+		echo $asd;

			
 
				+	}

			
 
				+	

			
 
				+	public function _xd($arg_array)

			
 
				+	{

			
 
				+		$tc = $this->typeclass->find_all();

			
 
				+		$typeclass = array();

			
 
				+		foreach ($tc as $v)

			
 
				+		{

			
 
				+			$tcjm[$v['id']] = array($v['jm'],$v['classid']);

			
 
				+			$typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm'],'bqsku'=>$v['bqsku']);

			
 
				+		}

			
 
				+		$post = $this->input->post(NULL, TRUE);

			
 
				+		if(isset($post['bhid']))

			
 
				+		{

			
 
				+			$id = $this->input->post('bhid',true);

			
 
				+			$data = $this->whlabel_stockup->read($id);

			
 
				+			$jm = $data['jm'];

			
 
				+			$sku = $data['bhsku'];

			
 
				+			$pm = $data['zh'];

			
 
				+			$title = $data['title'];

			
 
				+			$post['bm'] =  $data['bm'];

			
 
				+			$post['features'] = $data['features'];

			
 
				+			

			
 
				+			$post['num'] = $this->input->post('num',true);

			
 
				+			$ztime = $this->input->post('ztime',true);

			
 
				+			$post['ztime'] = strtotime($ztime);

			
 
				+			$post['jm'] = $jm;

			
 
				+			$post['sku'] = $sku;

			
 
				+			$post['pm'] = $pm;

			
 
				+			$post['title'] = $title;

			
 
				+			if($ztime)

			
 
				+			{

			
 
				+			    $post['ztime'] = strtotime($ztime);

			
 
				+			}

			
 
				+			$time = time();

			
 
				+			$post['time'] = $time;//操作时间

			
 
				+			$post['printnum'] = $time;

			
 
				+			$post['type'] = 0;

			
 
				+			$post['number'] = date('YmdHis',time()).rand(100,999);

			
 
				+			//传输料号开始

			
 
				+			$lc = 0;

			
 
				+			$lh = $this->apiyy->get_cjlp(array('jm'=>$post['jm'],'title'=>$post['title'],'zh'=>$post['pm'],'bm'=>$post['bm']));

			
 
				+			if(isset($lh['Data'][0]))

			
 
				+			{

			
 
				+				if($lh['Data'][0]['m_isSucess'] != 1)

			
 
				+				{

			
 
				+					if($lh['Data'][0]['m_errorMsg'] != '料号 已存在，请重新输入！')

			
 
				+					{

			
 
				+						echo json_encode(array('msg'=>$lh['Data'][0]['m_errorMsg'],'bm'=>$post['bm'],'jm'=>$post['jm'],'success'=>false));exit;

			
 
				+					}

			
 
				+				}

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'料号错误','cs'=>json_encode($lh),'success'=>false));exit;

			
 
				+				

			
 
				+			}

			
 
				+			if($this->whlabel_bh->insert($post))

			
 
				+			{

			
 
				+			    echo json_encode(array('msg'=>'添加成功','success'=>true));exit;

			
 
				+			}

			
 
				+			else

			
 
				+			{

			
 
				+				echo json_encode(array('msg'=>'添加失败，请重试','success'=>false));exit;

			
 
				+			}

			
 
				+		}

			
 
				+		$w = $this->shop->find_all("yyid != ''");

			
 
				+		$this->data['yyck'] = $w;

			
 
				+		$whlabelstockup = $this->whlabel_stockup->read($arg_array[0]);

			
 
				+		$this->data['whlabelstockup'] = $whlabelstockup ;

			
 
				+		$this->data['num'] = $arg_array[1];

			
 
				+		$purchase = $this->purchase->find_all("yyid != ''");

			
 
				+		$this->data['purchase'] = $purchase;

			
 
				+		$this->_Template('whlabelstockup_xd',$this->data);

			
 
				+	}

			
 
				+	

			
 
				+	

			
 
				+		public function _excel()

			
 
				+    {

			
 
				+		$user = $this->user->get_api($_SESSION['api']);

			
 
				+		if($user)

			
 
				+		{

			
 
				+		    $fgshop = "";$sid = "";

			
 
				+		    $user = explode('|',trim($user['shop'],'|'));

			
 
				+			foreach ($user as $value) 

			
 
				+		    {

			
 
				+				$fgshop .= " shop = ".$value." or";

			
 
				+				$sid .= " id = ".$value." or";

			
 
				+			}

			
 
				+		}

			
 
				+		$post = $this->input->get(NULL, TRUE);

			
 
				+		if(isset($post['a']))  

			
 
				+		{

			
 
				+			$sku = $this->input->get('sku',true);

			
 
				+			$jm = $this->input->get('jm',true);

			
 
				+			$text = $this->input->get('text',true);

			
 
				+			$type = $this->input->get('type',true);

			
 
				+			$repair = $this->input->get('repair',true);

			
 
				+			$stockup = $this->input->get('stockup',true);

			
 
				+			$outbound = $this->input->get('outbound',true);

			
 
				+			$lacecolor = $this->input->get('lacecolor',true);

			
 
				+			$category = $this->input->get('category',true);

			
 
				+			$size = $this->input->get('size',true);

			
 
				+			$grade = $this->input->get('grade',true);

			
 
				+			$color = $this->input->get('color',true);

			
 
				+			$lowe = $this->input->get('lowe',true);

			
 
				+			$lacetype = $this->input->get('lacetype',true);

			
 
				+			$haircap = $this->input->get('haircap',true);

			
 
				+			$density = $this->input->get('density',true);

			
 
				+			$where = "1=1";

			
 
				+			if($lacecolor)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lacecolor-%'";

			
 
				+            }

			
 
				+			if($lacetype)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lacetype-%'";

			
 
				+            }

			
 
				+			if($category)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$category-%'";

			
 
				+            }

			
 
				+			if($size)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$size-%'";

			
 
				+            }

			
 
				+			if($grade)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$grade-%'";

			
 
				+            }

			
 
				+			if($color)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$color-%'";

			
 
				+            }

			
 
				+			if($lowe)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$lowe-%'";

			
 
				+            }

			
 
				+			if($haircap)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$haircap-%'";

			
 
				+            }

			
 
				+			if($density)

			
 
				+            {

			
 
				+                $where  .= " and features like '%-$density-%'";

			
 
				+            }

			
 
				+			if($sku)

			
 
				+            {

			
 
				+                $where  .= " and sku = '$sku'";

			
 
				+            }

			
 
				+			if($jm)

			
 
				+            {

			
 
				+                $where  .= " and jm = '$jm'";

			
 
				+            }

			
 
				+			if($text)

			
 
				+            {

			
 
				+                $where  .= " and text = '$text'";

			
 
				+            }

			
 
				+			if($type)

			
 
				+            {

			
 
				+                $where  .= " and type = '$type'";

			
 
				+            }

			
 
				+			if($repair != '')

			
 
				+            {

			
 
				+                $where  .= " and repair = '$repair'";

			
 
				+            }

			
 
				+			if($stockup != '')

			
 
				+            {

			
 
				+                $where  .= " and stockup = '$stockup'";

			
 
				+            }

			
 
				+			if($outbound != '')

			
 
				+            {

			
 
				+                $where  .= " and outbound = '$outbound'";

			
 
				+            }

			
 
				+            //数据排序

			
 
				+            $order_str = "repair desc";//备货预警从大到小

			
 
				+			

			
 
				+			$dowid = $this->input->get('a');

			
 
				+			$wid = "";

			
 
				+			if($dowid != "")

			
 
				+			{

			
 
				+				$id_arr =  explode(',',rtrim($dowid,','));

			
 
				+				$wid  .= " id = 0 or";

			
 
				+				foreach ($id_arr as $v) 

			
 
				+		        {

			
 
				+                    $wid  .= " id = '$v' or";

			
 
				+                }

			
 
				+				$wid = " and (".rtrim($wid,'or').")";

			
 
				+			}

			
 
				+			

			
 
				+

			
 
				+			 $info_list = $this->whlabel_stockup->find_all($where.$wid,'id,sku,jm,us,uszt,cs,xc,type,st,seven,thirty,availableday,lackday,zd,repair,stockup,outbound,bhnum',$order_str);

			
 
				+			foreach ($info_list as $key=>$value) 

			
 
				+		    {

			
 
				+				$data = $this->whlabel_stockup->read($value['id']);

			
 
				+				 $bh = $this->whlabel_bh->find_all("sku = '".$data['bhsku']."' and features = '".$data['features']."' and time > '".(time()-7*24*3600)."'");

			
 
				+				$info_list[$key]['sku'] = '<p>'.$value['sku'].'</p>';

			
 
				+				foreach ($bh as $v) 

			
 
				+		        {

			
 
				+					$info_list[$key]['sku'] .= '<p style="color: #2084db;">'.date('Y-m-d',$v['time']).' 备货数量：'.$v['bhnum'].'</p>';

			
 
				+				}

			
 
				+				if($value['repair'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['repair'] = '/';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['repair'] = '补货';

			
 
				+				}

			
 
				+				if($value['stockup'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['stockup'] = '/';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['stockup'] = '备货';

			
 
				+				}

			
 
				+				if($value['outbound'] == 0)

			
 
				+				{

			
 
				+					$info_list[$key]['outbound'] = '正常';

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['outbound'] = '异常';

			
 
				+				}

			
 
				+				if(isset($wt[$value['type']]))

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = $wt[$value['type']];

			
 
				+				}

			
 
				+				else

			
 
				+				{

			
 
				+					$info_list[$key]['type'] = '未设置';

			
 
				+				}

			
 
				+				$info_list[$key]['cs'] = $value['us']+$value['uszt'];

			
 
				+				unset($info_list[$key]['id']);

			
 
				+		    }

			
 
				+		}

			
 
				+			$title = '预警及备货'.date('Y-m-d H:i',time()); 

			
 
				+            $titlename = "<table border=1>

			
 
				+            <tr>

			
 
				+         <td>SKU</td>

			
 
				+<td>用友料号</td>

			
 
				+<td>美仓库存</td>

			
 
				+<td>在途</td>

			
 
				+<td>美仓库存+在途</td>

			
 
				+<td>许昌库存</td>

			
 
				+<td>等级</td>

			
 
				+<td>前周出库</td>

			
 
				+<td>近7天出库</td>

			
 
				+<td>近30天出库</td>

			
 
				+<td>预计可用天数</td>

			
 
				+<td>本月缺货</td>

			
 
				+<td>占单数量</td>

			
 
				+<td>补货预警</td>

			
 
				+<td>备货提醒</td>

			
 
				+<td>出库异常</td>

			
 
				+<td>需要备货</td>

			
 
				+  </tr>

			
 
				+            </table>"; 

			
 
				+            $filename = $title.".xls"; 

			
 
				+			$tail = "\n";

			
 
				+            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);

			
 
				+	}

			
 
				+}
			
--- a/core/CoreApp/controllers/Whlabeltransport.php
+++ b/core/CoreApp/controllers/Whlabeltransport.php
@@ -320,6 +320,7 @@ class Whlabeltransport extends Start_Controller {
 
				 			    {

			
 
				 					$label['label'] = time().rand(100,999).$i;//产品标签 辨别各个产品，暂不使用

			
 
				 					$label['cs'] = $id;//前期增加这个是在途库存添加的数据

			
 
				+					$label['rktype'] = 1;

			
 
				 				    $this->whlabel->insert($label);

			
 
				 			    }

			
 
				 				$this->whlabeltransport->save(array('time'=>$time,'cz'=>1),$data['id']);

			
@@ -593,6 +594,7 @@ class Whlabeltransport extends Start_Controller {
 
				 			        {

			
 
				 					    $label['label'] = time().rand(100,999).$i;//产品标签 辨别各个产品，暂不使用

			
 
				 					    $label['cs'] = 1;//前期增加这个是在途库存添加的数据

			
 
				+						$label['rktype'] = 1;

			
 
				 				        $this->whlabel->insert($label);

			
 
				 			        }

			
 
				 				    $this->whlabeltransport->save(array('time'=>$time,'cz'=>1),$data['id']);

			
--- a/core/CoreApp/controllers/printcode.php
+++ b/core/CoreApp/controllers/printcode.php
@@ -1,374 +0,0 @@
 
				-<?php defined('BASEPATH') OR exit('No direct script access allowed');

			
 
				-header("Access-Control-Allow-Origin: *");

			
 
				-class Printcode extends Start_Controller {

			
 
				-	public function __construct(){

			
 
				-		parent::__construct();

			
 
				-		$this->load->_model('Model_print_code','print_code');

			
 
				-		$this->load->_model('Model_excel','excel');

			
 
				-	}

			
 
				-	//定义方法的调用规则 获取URI第二段值

			
 
				-    public function _remap($arg,$arg_array)

			
 
				-    {

			
 
				-		if($arg == 'addexcel')

			
 
				-        {

			
 
				-             $this->_addexcel();

			
 
				-        }

			
 
				-		else if($arg == 'print')

			
 
				-        {

			
 
				-             $this->_print();

			
 
				-        }

			
 
				-		else if($arg == 'see')

			
 
				-        {

			
 
				-             $this->_see();

			
 
				-        }

			
 
				-		else if($arg == 'add')

			
 
				-        {

			
 
				-             $this->_add();

			
 
				-        }

			
 
				-		else if($arg == 'edit')

			
 
				-        {

			
 
				-             $this->_edit($arg_array);

			
 
				-        }

			
 
				-		else if($arg == 'del')

			
 
				-        {

			
 
				-             $this->_del();

			
 
				-        }

			
 
				-		else

			
 
				-		{

			
 
				-			 $this->_index();

			
 
				-		}

			
 
				-    }

			
 
				-	

			
 
				-	public function _see()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['page']))  

			
 
				-		{

			
 
				-		    $page = $this->input->post('page',true);

			
 
				-		    $perpage = $this->input->post('perpage',true);

			
 
				-			$timetk = $this->input->post('timetk',true);

			
 
				-			$timetj = $this->input->post('timetj',true);

			
 
				-			$number = $this->input->post('number',true);

			
 
				-			$label = $this->input->post('label',true);

			
 
				-			$print = $this->input->post('print',true);

			
 
				-			$xztime = $this->input->post('xztime',true);

			
 
				-			$timetk = strtotime($timetk);

			
 
				-			$timetj = strtotime($timetj);

			
 
				-			$where = "1=1";

			
 
				-			if($number)

			
 
				-            {

			
 
				-                $where  .= " and number = '$number'";

			
 
				-            }

			
 
				-			if($label)

			
 
				-            {

			
 
				-				$where  .= " and label = '$label'";

			
 
				-            }

			
 
				-			if($print != '')

			
 
				-            {

			
 
				-                $where  .= " and print = '$print'";

			
 
				-            }

			
 
				-			if($timetk && $timetj)

			
 
				-            {

			
 
				-                $where  .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";

			
 
				-            }

			
 
				-            //数据排序

			
 
				-            $order_str = $xztime." desc";

			
 
				-            if(empty($page))

			
 
				-		    {

			
 
				-                $start = 0;

			
 
				-		    	$perpage = 1;

			
 
				-            }

			
 
				-		    else

			
 
				-		    {

			
 
				-                $start = ($page - 1)*$perpage;

			
 
				-            }

			
 
				-			$info_list = $this->printcode->find_all($where,'id,title,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				-            foreach ($info_list as $key=>$value) 

			
 
				-		    {

			
 
				-				if($value['time'] != 0)

			
 
				-				{

			
 
				-				    $info_list[$key]['time'] = date('Y-m-d H:i',$value['time']);

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$info_list[$key]['time'] = '';

			
 
				-				}

			
 
				-				if($value['addtime'] != 0)

			
 
				-				{

			
 
				-				    $info_list[$key]['addtime'] = date('Y-m-d H:i',$value['addtime']);

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$info_list[$key]['addtime'] = '';

			
 
				-				}

			
 
				-				$info_list[$key]['cz'] = "<span class='amazonbarprint' data-id='".$value['id']."' data-num='".$value['num']."'>打印</span>";

			
 
				-            }

			
 
				-			$total = $this->printcode->find_count($where);

			
 
				-		    $pagenum = ceil($total/$perpage);

			
 
				-		    $over = $total-($start+$perpage);

			
 
				-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				-		    echo json_encode($rows);exit;

			
 
				-		}

			
 
				-		$this->_Template('printcode_see',$this->data);

			
 
				-	}

			
 
				-	

			
 
				-	public function _index()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['page']))  

			
 
				-		{

			
 
				-		    $page = $this->input->post('page',true);

			
 
				-		    $perpage = $this->input->post('perpage',true);

			
 
				-			$timetk = $this->input->post('timetk',true);

			
 
				-			$timetj = $this->input->post('timetj',true);

			
 
				-			$number = $this->input->post('number',true);

			
 
				-			$label = $this->input->post('label',true);

			
 
				-			$print = $this->input->post('print',true);

			
 
				-			$xztime = $this->input->post('xztime',true);

			
 
				-			$timetk = strtotime($timetk);

			
 
				-			$timetj = strtotime($timetj);

			
 
				-			$where = "1=1";

			
 
				-			if($number)

			
 
				-            {

			
 
				-                $where  .= " and number = '$number'";

			
 
				-            }

			
 
				-			if($label)

			
 
				-            {

			
 
				-				$where  .= " and label = '$label'";

			
 
				-            }

			
 
				-			if($print != '')

			
 
				-            {

			
 
				-                $where  .= " and print = '$print'";

			
 
				-            }

			
 
				-			if($timetk && $timetj)

			
 
				-            {

			
 
				-                $where  .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";

			
 
				-            }

			
 
				-            //数据排序

			
 
				-            $order_str = $xztime." desc";

			
 
				-            if(empty($page))

			
 
				-		    {

			
 
				-                $start = 0;

			
 
				-		    	$perpage = 1;

			
 
				-            }

			
 
				-		    else

			
 
				-		    {

			
 
				-                $start = ($page - 1)*$perpage;

			
 
				-            }

			
 
				-			$info_list = $this->printcode->find_all($where,'id,title,number,label,label2,num,time,addtime',$order_str,$start,$perpage);

			
 
				-            foreach ($info_list as $key=>$value) 

			
 
				-		    {

			
 
				-				if($value['time'] != 0)

			
 
				-				{

			
 
				-				    $info_list[$key]['time'] = date('Y-m-d H:i',$value['time']);

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$info_list[$key]['time'] = '';

			
 
				-				}

			
 
				-				if($value['addtime'] != 0)

			
 
				-				{

			
 
				-				    $info_list[$key]['addtime'] = date('Y-m-d H:i',$value['addtime']);

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$info_list[$key]['addtime'] = '';

			
 
				-				}

			
 
				-            }

			
 
				-			$total = $this->printcode->find_count($where);

			
 
				-		    $pagenum = ceil($total/$perpage);

			
 
				-		    $over = $total-($start+$perpage);

			
 
				-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));

			
 
				-		    echo json_encode($rows);exit;

			
 
				-		}

			
 
				-		$this->_Template('printcode',$this->data);

			
 
				-	}

			
 
				-	

			
 
				-	public function _add()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['num']))

			
 
				-		{

			
 
				-		    $post['num'] = $this->input->post('num');

			
 
				-			if(!is_numeric($post['num']))

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>'数量必须是数字！','success'=>false));exit;

			
 
				-			}

			
 
				-			if($this->printcode->insert($post))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$this->_Template('printcode_add',$this->data);

			
 
				-	}

			
 
				-	

			
 
				-	

			
 
				-	public function _edit($arg_array)

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['id']))

			
 
				-		{

			
 
				-			$id = $this->input->post('id',true);

			
 
				-			$data = $this->printcode->read($id);

			
 
				-			if($data['time'] != 0)

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>'此单已打印，无法修改！','success'=>false));exit;

			
 
				-			}

			
 
				-			if($this->printcode->save($post,$id))

			
 
				-        	{

			
 
				-         		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{

			
 
				-           		echo json_encode(array('msg'=>'修改失败，请重试','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-		$arg_array = $arg_array[0];

			
 
				-		$printcode = $this->printcode->read($arg_array);

			
 
				-		$this->data['printcode'] = $printcode;

			
 
				-		$this->_Template('printcode_edit',$this->data);

			
 
				-	}

			
 
				-	

			
 
				-	//删除

			
 
				-	public function _del()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['s']))  

			
 
				-		{

			
 
				-            $id_arr = $this->input->post('s');

			
 
				-            $id_arr =  explode(',',$id_arr);

			
 
				-            if(!$id_arr)

			
 
				-            {

			
 
				-                echo json_encode(array('msg'=>'参数错误！','success'=>false));exit;

			
 
				-            }

			
 
				-            //循环删除记录

			
 
				-            foreach ($id_arr as $v) 

			
 
				-		    {

			
 
				-				$data = $this->printcode->read($v);

			
 
				-				if($data['time'] != 0)

			
 
				-				{

			
 
				-					echo json_encode(array('msg'=>$data['title'].'<br>已打印，无法删除！','success'=>false));exit;

			
 
				-				}

			
 
				-                $this->printcode->remove($v);

			
 
				-            }

			
 
				-            echo json_encode(array('del'=>$id_arr,'msg'=>'删除记录成功！','success'=>true));

			
 
				-		}

			
 
				-    }

			
 
				-	

			
 
				-	public function _print()

			
 
				-	{

			
 
				-		$post = $this->input->post(NULL, TRUE);

			
 
				-		if(isset($post['s']))  

			
 
				-		{

			
 
				-			$v = $this->input->post('s');

			
 
				-			$va = explode(',',rtrim($v,','));

			
 
				-			$n = $this->input->post('n');

			
 
				-			$sl = $this->input->post('sl');

			
 
				-			$text = array();$text['data'] = array();$time = time();

			
 
				-			$data = $this->printcode->read($va[$n]);

			
 
				-			$rows = array('number'=>$data['number'],'label'=>$data['label'],'label2'=>$data['label2'],'num'=>$sl,'data'=>$v,'n'=>$n-1);

			
 
				-			if($this->printcode->save(array('print'=>1,'time'=>$time),$data['id']))

			
 
				-        	{

			
 
				-         		echo json_encode(array('rows'=>($rows),'success'=>true));exit;

			
 
				-       	 	}

			
 
				-       		else

			
 
				-        	{	

			
 
				-           		echo json_encode(array('msg'=>'数据写入异常，请重新打印！','success'=>false));exit;

			
 
				-        	}

			
 
				-		}

			
 
				-	}

			
 
				-	

			
 
				-	public function _addexcel()

			
 
				-	{

			
 
				-		$dir = '/data/excel/'.date('Ymd',time()).'/';

			
 
				-		$config['upload_path'] = '.'.$dir ;

			
 
				-		$config['file_name'] = date('Ymd_His_',time()).rand(1000,9999);

			
 
				-        $config['allowed_types'] = 'xls|xlsx|csv';

			
 
				-        $config['max_size'] = 10240;

			
 
				-		$this->load->library('upload', $config);

			
 
				-		$this->upload->initialize($config);

			
 
				-        if ($this->upload->do_upload('userfile'))

			
 
				-        {

			
 
				-			$full_path = $dir.$this->upload->data('file_name');

			
 
				-			$fileName = '.' . $full_path;

			
 
				-            if (!file_exists($fileName)) 

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>"上传失败，请重试",'success'=>false));exit;

			
 
				-            }

			
 
				-			else

			
 
				-			{

			
 
				-				libxml_use_internal_errors(true);

			
 
				-				require_once "./data/excel/PHPExcel/IOFactory.php";

			
 
				-				$phpExcel = PHPExcel_IOFactory::load($fileName);// 载入当前文件

			
 
				-				$phpExcel->setActiveSheetIndex(0);// 设置为默认表

			
 
				-				$sheetCount = $phpExcel->getSheetCount();// 获取表格数量

			
 
				-				$row = $phpExcel->getActiveSheet()->getHighestRow();// 获取行数

			
 
				-				$column = $phpExcel->getActiveSheet()->getHighestColumn();// 获取列数

			
 
				-				++$column;//如果列数大于26行

			
 
				-				$list = array();

			
 
				-				for ($i = 3; $i <= $row; $i++) // 行数循环

			
 
				-				{

			
 
				-					$data = array();

			
 
				-                    for ($c = 'A'; $c != $column; $c++)  // 列数循环

			
 
				-	                {

			
 
				-						$data[] = $phpExcel->getActiveSheet()->getCell($c . $i)->getValue();

			
 
				-                    }

			
 
				-					$list[] = $data;

			
 
				-                }

			
 
				-			}

			
 
				-			$i = 0;$j = 0;$ed = array();$time = time();

			
 
				-		    foreach ($list as $key=>$value)

			
 
				-		    {

			
 
				-				$time = time();

			
 
				-				if($value['0'] == "")

			
 
				-				{

			
 
				-					continue;

			
 
				-				}

			
 
				-				$post['title'] =  $value['0'];

			
 
				-				$post['number'] =  $value['1'];

			
 
				-				$post['label'] =  $value['2'];

			
 
				-				$post['label2'] =  $value['3'];

			
 
				-				$post['num'] =  $value['4'];

			
 
				-				$post['addtime'] =  $time;

			
 
				-				if(!is_numeric($post['num']))

			
 
				-				{

			
 
				-					$ed[] = array($key.' 行，非数字！');

			
 
				-					$j++;

			
 
				-					continue;

			
 
				-				}

			
 
				-				if($post['num'] < 1)

			
 
				-				{

			
 
				-					$ed[] = array($key.' 行，数量错误！');

			
 
				-					$j++;

			
 
				-					continue;

			
 
				-				}

			
 
				-				$this->printcode->insert($post);

			
 
				-			}

			
 
				-			if($j > 0)

			
 
				-			{

			
 
				-				$tt = date('Ymd',time());

			
 
				-				$title = '库存导入错误信息-'.$tt;

			
 
				-        		$titlename = "<table border=1><tr><td>错误详情</td></tr></table>";

			
 
				-				$tail = "\n";

			
 
				-        		$filename = $title.".xls";

			
 
				-        		$ecl = $this->excel->get_fz3($ed,$titlename,$filename,$tail);

			
 
				-				$dir = '/data/excel/'.$time.'/';

			
 
				-				$file_name = 'error_'.$time.rand(1000,9999);

			
 
				-				if(!is_dir('.'.$dir))mkdir('.'.$dir,0777);

			
 
				-				$myfile = fopen(".".$dir.$file_name.".xls", "w") or die();

			
 
				-				fwrite($myfile,$ecl);

			
 
				-				fclose($myfile);

			
 
				-				$error = $dir.$file_name.'.xls';

			
 
				-				echo json_encode(array('msg'=>'导入成功，'.$j.'条异常，','error'=>$error,'success'=>true));exit;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				echo json_encode(array('msg'=>'导入成功!','error'=>1,'success'=>true));exit;

			
 
				-			}

			
 
				-		}

			
 
				-	}

			
 
				-}
			
--- a/core/CoreApp/controllers_whsmw3.tar.gz
+++ b/core/CoreApp/controllers_whsmw3.tar.gz
--- a/core/CoreApp/core/Lin_Controller.php
+++ b/core/CoreApp/core/Lin_Controller.php
--- a/core/CoreApp/libraries/Common.php
+++ b/core/CoreApp/libraries/Common.php
@@ -83,6 +83,14 @@ $this->ci = &get_instance();
 
				 		$where .= " and aecode != 'Others'";

			
 
				 	}

			
 
				     $result = $this->ci->express->find_all($where,'*',$order,0,$num);

			
 
				+    return $result;

			
 
				+	}

			
 
				+	/*翔文快递*/

			
 
				+    function _xwexpress($num=100,$order=NULL)

			
 
				+    {

			
 
				+	$this->ci->load->_model('Model_express','express');

			
 
				+    $where = "off != '1' and servicename like '%翔文%'"; //and ((id > 42 and id < 50) or id = 55 or id = 61 or id = 65)";

			
 
				+    $result = $this->ci->express->find_all($where,'*',$order,0,$num);

			
 
				     return $result;

			
 
				 	}

			
 
				 	/*供应商*/

			
@@ -151,6 +159,14 @@ $this->ci = &get_instance();
 
				 	$this->ci->load->_model('Modelwhlabel_type','whlabel_type');

			
 
				     $where = "1 = 1";

			
 
				     $result = $this->ci->whlabel_type->find_all($where,'*',$order,0,$num);

			
 
				+    return $result;

			
 
				+	}

			
 
				+	/*公司名称*/

			
 
				+    function _whlabel_company($num=100,$order=NULL)

			
 
				+    {

			
 
				+	$this->ci->load->_model('Model_company','company');

			
 
				+    $where = "1 = 1";

			
 
				+    $result = $this->ci->company->find_all($where,'*',$order,0,$num);

			
 
				     return $result;

			
 
				 	}

			
 
				 }

			
@@ -193,13 +209,18 @@ function express($num=20,$ae=1,$order='idsort desc'){
 
				 	$com = &get_common();

			
 
				 	return $com->_express($num,$ae,$order);

			
 
				 }

			
 
				+/*翔文快递*/

			
 
				+function xwexpress($num=20,$order='idsort desc'){

			
 
				+	$com = &get_common();

			
 
				+	return $com->_xwexpress($num,$order);

			
 
				+}

			
 
				 /*供应商*/

			
 
				 function purchase($num=20,$order='id asc'){

			
 
				 	$com = &get_common();

			
 
				 	return $com->_purchase($num,$order);

			
 
				 }

			
 
				 /*国家*/

			
 
				-function country($num=500,$order='ename asc'){

			
 
				+function country($num=500,$order='name asc'){

			
 
				 	$com = &get_common();

			
 
				 	return $com->_country($num,$order);

			
 
				 }

			
@@ -233,6 +254,11 @@ function whlabel_type($num=500,$order='id asc'){
 
				 	$com = &get_common();

			
 
				 	return $com->_whlabel_type($num,$order);

			
 
				 }

			
 
				+/*公司*/

			
 
				+function company($num=500,$order='id asc'){

			
 
				+	$com = &get_common();

			
 
				+	return $com->_whlabel_company($num,$order);

			
 
				+}

			
 
				 /*载入编辑器*/

			
 
				 function load_editor($id='content',$top = '0px',$height='300px',$content='<p><br></p>')

			
 
				 {

			
@@ -252,8 +278,8 @@ return
 
				     <div id='".$id."' style='min-height:$height;'></div>

			
 
				 	</div>

			
 
				 <textarea name='Editorcontent' class='none'>$content</textarea>

			
 
				-<link href='".base_url()."/style/Editor/Editor.css' rel='stylesheet' type='text/css' />

			
 
				-<script charset='utf-8' src='".base_url()."/style/Editor/Editor.js'></script>

			
 
				+<link href='/style/Editor/Editor.css' rel='stylesheet' type='text/css' />

			
 
				+<script charset='utf-8' src='/style/Editor/Editor.js'></script>

			
 
				 <script>

			
 
				 const { createEditor, createToolbar } = window.wangEditor

			
 
				 

			
--- a/core/CoreApp/models/Model_17track.php
+++ b/core/CoreApp/models/Model_17track.php
@@ -5,23 +5,7 @@ function __construct(){
 
				 }

			
 
				 	public function get_logistics($v) //17track.net

			
 
				 	{

			
 
				-		if(!isset($v['servicename']))

			
 
				-		{

			
 
				-			$v['servicename'] = 1;

			
 
				-		}

			
 
				-		if($v['servicename'] == 'DHL')

			
 
				-		{

			
 
				-			$data = '[{"number":"'.$v['waybill'].'","carrier":"100001"}]'; 

			
 
				-		}

			
 
				-		else if($v['servicename'] == 'UPS')

			
 
				-		{

			
 
				-			$data = '[{"number":"'.$v['waybill'].'","carrier":"100002"}]'; 

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$data = '[{"number":"'.$v['waybill'].'","auto_detection":"true"}]'; //运输商key查询https://res.17track.net/asset/carrier/info/carrier.all.json

			
 
				-		}

			
 
				-		$url = 'https://api.17track.net/track/v1/register';

			
 
				+		$url = 'https://api.17track.net/track/v2.2/register';

			
 
				 		$header[] = "17token:0811AC1711EAABB7D764D04B824F8C2D";

			
 
				         $header[] = "Content-Type:application/json";

			
 
				 		$ch = curl_init();

			
@@ -29,13 +13,18 @@ function __construct(){
 
				         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

			
 
				         curl_setopt($ch, CURLOPT_HTTPHEADER, $header);

			
 
				 		curl_setopt($ch, CURLOPT_POST, 1);

			
 
				-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);

			
 
				+        curl_setopt($ch, CURLOPT_POSTFIELDS, $v);

			
 
				         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

			
 
				         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);

			
 
				+		curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,2);

			
 
				         $res = curl_exec($ch);

			
 
				         curl_close($ch);

			
 
				 		$res = json_decode($res,true);

			
 
				-		if(isset($res['data']['accepted']['0']['origin']))

			
 
				+		if(isset($res['data']['accepted']['0']['origin']))//成功

			
 
				+		{

			
 
				+			$list = array('exstate'=>0,'content'=>'','f'=>1,'data'=>'','webhookregister'=>1);

			
 
				+		}

			
 
				+		else if(isset($res['data']['rejected']['0']['error']['code']) && $res['data']['rejected']['0']['error']['code'] == '-18019901')//重复注册

			
 
				 		{

			
 
				 			$list = array('exstate'=>0,'content'=>'','f'=>1,'data'=>'','webhookregister'=>1);

			
 
				 		}

			
@@ -43,5 +32,6 @@ function __construct(){
 
				 		{

			
 
				 			$list = array('content'=>$res['data']['rejected']['0']['error']['message'],'f'=>0);

			
 
				 		}

			
 
				+		return $list;

			
 
				 	}

			
 
				 }  //end class
			
--- a/core/CoreApp/models/Model_afspaypal.php
+++ b/core/CoreApp/models/Model_afspaypal.php
@@ -0,0 +1,15 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_afspaypal extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'afspaypal';

			
 
				+    $this->load_table('afspaypal');

			
 
				+}

			
 
				+	/** 通过名称查找 */

			
 
				+	public function get_number($number)

			
 
				+	{

			
 
				+		return  $this->find("number = '$number'");	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_api.php
+++ b/core/CoreApp/models/Model_api.php
--- a/core/CoreApp/models/Model_apitt.php
+++ b/core/CoreApp/models/Model_apitt.php
@@ -1,379 +1,455 @@
 
				-<?php

			
 
				-class Model_apitt extends Lin_Model {

			
 
				-function __construct(){

			
 
				-		parent::__construct();

			
 
				-}

			
 
				-	public function get_list($shop,$from,$to,$order_status,$cuy,$num,$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku)//获取订单列表

			
 
				-	{

			
 
				-		$url = 'https://open-api.tiktokglobalshop.com';

			
 
				-		$link = '/order/202309/orders/search';

			
 
				-		$time = time();

			
 
				-		$post['create_time_ge'] = $from;

			
 
				-		$post['create_time_lt'] = $to;

			
 
				-		$post['order_status'] = $order_status;

			
 
				-		$queryParams['page_size'] = 100;

			
 
				-		$queryParams['sort_order'] = 'ASC';

			
 
				-		$queryParams['sort_field'] = 'create_time';

			
 
				-		$queryParams['shop_cipher'] =$shop['shop_cipher'];

			
 
				-		$queryParams['shop_id'] =$shop['codeid'];

			
 
				-		$queryParams['app_key'] =$shop['app_key'];

			
 
				-		$queryParams['shop_cipher'] =$shop['shop_cipher'];

			
 
				-		$queryParams['timestamp'] =$time;

			
 
				-		$link .= '?'.http_build_query($queryParams);

			
 
				-		$sign = $this->sign($link,$shop['app_secret'],$post);

			
 
				-		$url .= $link.'&sign='.$sign;

			
 
				-		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);

			
 
				-		$res = $this->su_curl($post,$url,$headers);

			
 
				-		$res = json_decode($res,true);

			
 
				-		$list = array();$page_token = '';$arr = array();

			
 
				-		if(isset($res['data']['orders']))

			
 
				-		{

			
 
				-			if($res['data']['total_count'] > 100)

			
 
				-			{

			
 
				-				$n = ceil($res['data']['total_count']/100);

			
 
				-				for($i=0;$i<$n;$i++)

			
 
				-				{

			
 
				-					$net_date = $this->get_next_list($shop,$from,$to,$order_status,$page_token);

			
 
				-					$page_token = $net_date[1];

			
 
				-					foreach ($net_date['0'] as $val) 

			
 
				-		        	{

			
 
				-						$d = $this->fullordertt->get_orderinfo($val['id']);

			
 
				-				    	if(!$d)

			
 
				-				    	{

			
 
				-							$list[] = $val['id'];

			
 
				-						}

			
 
				-					}

			
 
				-				}

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-			    foreach ($res['data']['orders'] as $val) 

			
 
				-		        {

			
 
				-				    $d = $this->fullordertt->get_orderinfo($val['id']);

			
 
				-				    if(!$d)

			
 
				-				    {

			
 
				-					    $list[] = $val['id'];

			
 
				-				    }

			
 
				-			    }

			
 
				-			}

			
 
				-			$cs = array();

			
 
				-			if(count($list) > 50)

			
 
				-			{

			
 
				-				$n = ceil(count($list)/50);$x = 0;

			
 
				-				for($i=0;$i<$n;$i++)

			
 
				-				{

			
 
				-					$k = ($i<1)?0:$i*50;

			
 
				-					$data = array_slice($list,$k,50);

			
 
				-					$d = $this->get_data($data,$shop);

			
 
				-					$cs[] = $d;

			
 
				-					if(isset($d['data']))

			
 
				-		            {

			
 
				-					    foreach ($d['data']['orders'] as $val) 

			
 
				-		                {

			
 
				-						    $arr[$x] = $val;

			
 
				-							$x++;

			
 
				-					    }

			
 
				-					}

			
 
				-				}

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				$d = $this->get_data($list,$shop);

			
 
				-				if(isset($d['data']))

			
 
				-		        {

			
 
				-					 foreach ($d['data']['orders'] as $val) 

			
 
				-		             {

			
 
				-						 $arr[] = $val;

			
 
				-					 }

			
 
				-				}

			
 
				-			}

			
 
				-		}

			
 
				-		$read = array();

			
 
				-		$gnum = array();

			
 
				-		foreach ($arr as $val) 

			
 
				-		{

			
 
				-			$create_time = substr($val['create_time'],0,10)-$sjc;

			
 
				-			if(isset($gnum[date('ymd',$create_time)]))

			
 
				-			{

			
 
				-				$gnum[date('ymd',$create_time)] += 1;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				$num = $this->fullordertt->find_count('gtime = "'.date('Ymd',$create_time).'" and shop = "'.$shop['id'].'"');

			
 
				-				$gnum[date('ymd',$create_time)] = $num+1;

			
 
				-			}

			
 
				-			$read[] = $this->get_read($val,$time,$shop,$cuy,$gnum[date('ymd',$create_time)],$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku);

			
 
				-		}

			
 
				-		return array($read,$list);

			
 
				-	}

			
 
				-	

			
 
				-	public function get_next_list($shop,$from,$to,$order_status,$page_token='')//获取订单列表

			
 
				-	{

			
 
				-		$url = 'https://open-api.tiktokglobalshop.com';

			
 
				-		$link = '/order/202309/orders/search';

			
 
				-		$time = time();

			
 
				-		$post['create_time_ge'] = $from;

			
 
				-		$post['create_time_lt'] = $to;

			
 
				-		$post['order_status'] = $order_status;

			
 
				-		$queryParams['page_size'] = 100;

			
 
				-		$queryParams['sort_order'] = 'ASC';

			
 
				-		$queryParams['sort_field'] = 'create_time';

			
 
				-		$queryParams['shop_cipher'] =$shop['shop_cipher'];

			
 
				-		$queryParams['shop_id'] =$shop['codeid'];

			
 
				-		$queryParams['app_key'] =$shop['app_key'];

			
 
				-		$queryParams['shop_cipher'] =$shop['shop_cipher'];

			
 
				-		$queryParams['timestamp'] =$time;

			
 
				-		if($page_token)

			
 
				-		{

			
 
				-		    $queryParams['page_token'] = $page_token;

			
 
				-		}

			
 
				-		$link .= '?'.http_build_query($queryParams);

			
 
				-		$sign = $this->sign($link,$shop['app_secret'],$post);

			
 
				-		$url .= $link.'&sign='.$sign;

			
 
				-		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);

			
 
				-		$res = $this->su_curl($post,$url,$headers);

			
 
				-		$res = json_decode($res,true);

			
 
				-		if(isset($res['data']['orders']))

			
 
				-		{

			
 
				-			return array($res['data']['orders'],$res['data']['next_page_token']);

			
 
				-		}

			
 
				-	}

			
 
				-	

			
 
				-	public function get_data($list,$shop)

			
 
				-	{

			
 
				-		$url = 'https://open-api.tiktokglobalshop.com';

			
 
				-		$link = '/order/202309/orders';

			
 
				-		$time = time();

			
 
				-		$ids = implode(",",$list);

			
 
				-		$link .= '?shop_cipher='.$shop['shop_cipher'].'&app_key='.$shop['app_key'].'&timestamp='.$time.'&ids='.$ids;

			
 
				-		$sign = $this->sign($link,$shop['app_secret'],'');

			
 
				-		$url .= $link.'&sign='.$sign;

			
 
				-		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);

			
 
				-		$res = $this->su_curl('',$url,$headers,$date_type='json',$timeout=300,$httptype="GET");

			
 
				-		$res = json_decode($res,true);

			
 
				-		return $res;

			
 
				-	}

			
 
				-	

			
 
				-	public function get_read($data,$time,$shop,$cuy,$num,$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku)

			
 
				-	{

			
 
				-		$purl = 'https://shop.tiktok.com/view/product/';

			
 
				-		$link = '';$product = '';$sku = '';$quantity = '';

			
 
				-		$lpsq = array();

			
 
				-		foreach ($data['line_items'] as $v) 

			
 
				-		{

			
 
				-			if(isset($lpsq[$v['seller_sku']]))

			
 
				-			{

			
 
				-				$lpsq[$v['seller_sku']]['quantity'] += 1;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				$lpsq[$v['seller_sku']] = array('link'=>$purl.$v['product_id'],'product'=>$v['product_name'],'sku'=>$v['seller_sku'],'quantity'=>1);

			
 
				-			}

			
 
				-		}

			
 
				-		foreach ($lpsq as $v) 

			
 
				-		{

			
 
				-			$link .= $v['link'].',';

			
 
				-			$product .= $v['product'].',';

			
 
				-			$sku .= $v['sku'].',';

			
 
				-			$quantity .= $v['quantity'].';';

			
 
				-		}

			
 
				-		if($data['status'] == 'DELIVERED' || $data['status'] == 'IN_TRANSIT' || $data['status'] == 'COMPLETED')

			
 
				-		{

			
 
				-			$s = 216;

			
 
				-		}

			
 
				-		else if($data['status'] == 'AWAITING_SHIPMENT')

			
 
				-		{

			
 
				-			$s = 207;

			
 
				-		}

			
 
				-		else if($data['status'] == 'CANCELLED')

			
 
				-		{

			
 
				-			$s = 217;

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$s = 283;

			
 
				-		}

			
 
				-		if(isset($zjsku[$shop['id']]))//判断是否找到店铺SKU

			
 
				-		{

			
 
				-			$sku = rtrim($sku,',').','.$zjsku[$shop['id']];

			
 
				-		}

			
 
				-		$post['user_id'] = $data['user_id'];

			
 
				-		$post['state'] = $s;

			
 
				-		$post['shop'] = $shop['id'];//店铺ID

			
 
				-		$post['user'] = $shop['shopuser'];//店铺负责人

			
 
				-		$post['product'] = rtrim($product,',');//产品名称

			
 
				-		$post['link'] = rtrim($link,',');//产品链接

			
 
				-		$post['issku'] = rtrim($sku,',');

			
 
				-		$post['quantity'] = rtrim($quantity,';');

			
 
				-		$post['clientremarks'] = $data['buyer_message'];//客户备注

			
 
				-		$post['paypal'] = '';//交易号

			
 
				-		$post['guarantee'] = '';//卖家保障

			
 
				-		$post['parameter'] = '';//属性

			
 
				-		$post['shippingmethod'] = $data['delivery_option_name'].' '.$data['payment']['shipping_fee'];//用户选择快递方式及运费金额

			
 
				-		$post['source'] = 2;//订单类型

			
 
				-		$post['type'] = 1;//发货仓库

			
 
				-		$post['capital'] = 3;//资金支付状况，全部付款

			
 
				-		$post['number'] = $shop['shortname'].'-'.substr(date('ymd',substr($data['create_time'],0,10)-$sjc),1).'-'.(substr(strval($num+1000),1,3));//编号

			
 
				-		$post['orderinfo'] = $data['id'];//订单号

			
 
				-		$post['insurance'] = 0;//运输保险费用

			
 
				-		$address = $data['recipient_address']['address_detail'];

			
 
				-		$post['baddress'] = $address.','.$data['recipient_address']['district_info'][3]['address_name'].','.$data['recipient_address']['district_info'][1]['address_name'].','.$data['recipient_address']['postal_code'].','.$data['recipient_address']['region_code'].','.$data['recipient_address']['phone_number'];

			
 
				-		$post['saddress'] = $address.','.$data['recipient_address']['district_info'][3]['address_name'].','.$data['recipient_address']['district_info'][1]['address_name'].','.$data['recipient_address']['postal_code'].','.$data['recipient_address']['region_code'].','.$data['recipient_address']['phone_number'];

			
 
				-		$post['country'] = $cuy[$data['recipient_address']['region_code']];//此国家的ID

			
 
				-		$post['al'] = $data['recipient_address']['region_code'];//联邦名称

			
 
				-		$post['bname'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//名称

			
 
				-		$post['sname'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//名称

			
 
				-		$post['client'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//公司名称

			
 
				-		$post['name'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//收件人名称

			
 
				-		$post['phone'] = preg_replace('/\D/s','',$data['recipient_address']['phone_number']);//收件人电话

			
 
				-		$post['email'] = preg_replace('/( |　| |\s)+/','',$data['buyer_email']);//客户邮箱

			
 
				-		$post['zipcode'] = $data['recipient_address']['postal_code'];//收件人邮编

			
 
				-		$post['province'] = $data['recipient_address']['district_info'][1]['address_name'];//收件人省份

			
 
				-		$post['city'] = $data['recipient_address']['district_info'][3]['address_name'];//收件人城市

			
 
				-		$post['address'] = $address;//收件人地址

			
 
				-		$post['shouldmoney'] = $data['payment']['total_amount'];//应收金额

			
 
				-		$post['skje'] = $post['shouldmoney'];//收款金额

			
 
				-		$post['ismoney'] = $data['payment']['currency'].$post['shouldmoney'];//支付币种金额

			
 
				-		$yga = $post['shouldmoney'];//金额

			
 
				-		$post['cf'] = ($data['shipping_type']=='SELLER')?0:1;//是否仓发TIKTOK平台仓发 SELLER商家发,ERP中1平台仓发，0商家发

			
 
				-		$seller_note = isset($data['seller_note'])?preg_replace('/[^0-9]/','',$data['seller_note']):0;

			
 
				-		$post['budget'] = ($seller_note>0)?($seller_note/100):0;//预估到账金额

			
 
				-		/**

			
 
				-		if(isset($data['pay']) && $yga > 0)

			
 
				-		{

			
 
				-			$post['pay'] = $pay[$data['pay']]['id'];

			
 
				-			$ygc = $pay[$data['pay']]['estimaterate'];//预估到账公式

			
 
				-			$post['estimaterate'] = $pay[$data['pay']]['estimaterate'];

			
 
				-			$ifbudget = eval("return $yga*1.$ygc;");

			
 
				-			if($ifbudget > 0)

			
 
				-			{

			
 
				-			    $post['budget'] = eval("return $yga*1.$ygc;");//预估到帐金额

			
 
				-			}

			
 
				-		}

			
 
				-		else if($yga > 0)

			
 
				-		{

			
 
				-			$post['pay'] = 0;

			
 
				-			$ygb = $shop['estimaterate'];//店铺默认到账公式

			
 
				-			$post['estimaterate'] = $shop['estimaterate'];

			
 
				-			$ifbudget = eval("return $yga*1.$ygb;");

			
 
				-			if($ifbudget > 0)

			
 
				-			{

			
 
				-			    $post['budget'] = eval("return $yga*1.$ygb;");//预估到帐金额

			
 
				-			}

			
 
				-		}

			
 
				-		**/

			
 
				-		$post['overtime'] = $data['shipping_due_time']-$sjc;//超时时间

			
 
				-		$post['buytime'] = substr($data['paid_time'],0,10)-$sjc;//格式化付款时间

			
 
				-		$post['dtime'] = substr($data['create_time'],0,10)-$sjc;//订单时间

			
 
				-		$post['gtime'] = date('Ymd',substr($data['create_time'],0,10)-$sjc);//格式化订单时间

			
 
				-		$post['currencytitle'] = $data['payment']['currency'];//结算币种名称

			
 
				-		$post['currency'] = $typeclass[$data['payment']['currency']];//钱币ID

			
 
				-		$post['time'] = time();//同步时间

			
 
				-		$post['hl'] = '6.4';//汇率

			
 
				-		if(isset($data['delivery_option_name']))

			
 
				-		{

			
 
				-			$post['express'] = (isset($ex[$data['delivery_option_name']]))?$ex[$data['delivery_option_name']]['id']:0;//快递方式

			
 
				-		}

			
 
				-		if(isset($data['line_items'][0]['tracking_number']))

			
 
				-		{

			
 
				-			$post['waybill'] = $data['line_items'][0]['tracking_number'];

			
 
				-		}

			
 
				-		$matching = $this->api->matching($post['quantity'],$post['issku'],$dtc,$money,$int,$dtctitle);

			
 
				-		$post['shipremarks'] = $matching['title'];

			
 
				-		$post['cost'] = $matching['cost'];

			
 
				-		$post['purchase'] = $matching['purchase'];

			
 
				-		$post['fpdata'] = $matching['product'];

			
 
				-		$post['whlabel'] = $matching['whlabel'];

			
 
				-		$post['slpx'] = $matching['wcslpx'];

			
 
				-		return $post;

			
 
				-	}

			
 
				-	

			
 
				-	public function sign($url,$appSecret,$body='') 

			
 
				-	{

			
 
				-		// 解析URL获取查询参数

			
 
				-		$queryParams = array();

			
 
				-		parse_str(parse_url($url, PHP_URL_QUERY), $queryParams);

			
 
				-		// 排除'sign'和'access_token'

			
 
				-		unset($queryParams['sign'], $queryParams['access_token']);

			
 
				-		// 按字典顺序排序查询参数

			
 
				-		ksort($queryParams);

			
 
				-		// 拼接参数为{key}{value}格式

			
 
				-		$input = '';

			
 
				-		foreach ($queryParams as $key => $value)

			
 
				-		{

			
 
				-    		$input .= $key . $value;

			
 
				-		}

			
 
				-		// 追加请求路径

			
 
				-		$path = parse_url($url, PHP_URL_PATH);

			
 
				-		$input = $path . $input;

			
 
				-		if ($body) 

			
 
				-		{

			
 
				-			$input .= json_encode($body);

			
 
				-	    }

			
 
				-		// 使用app_secret包裹生成的字符串

			
 
				-		$input = $appSecret . $input . $appSecret;

			
 
				-		// 生成签名

			
 
				-		$sign = hash_hmac('sha256', $input,$appSecret);

			
 
				-        return $sign;

			
 
				-	}

			
 
				-	

			
 
				-	public function su_curl($data,$url,$header=array(),$date_type='json',$timeout=300,$httptype="POST",$userpwd='')

			
 
				-    {

			
 
				-    

			
 
				-        if ($date_type == 'http_build_query')

			
 
				-		{

			
 
				-            $data = http_build_query($data);

			
 
				-        }

			
 
				-		else if ($date_type == 'json')

			
 
				-		{

			
 
				-            $data = json_encode($data);

			
 
				-        }

			
 
				-        $ch = curl_init();

			
 
				-        curl_setopt($ch, CURLOPT_URL, $url);

			
 
				-        curl_setopt($ch, CURLOPT_POSTFIELDS,$data);

			
 
				-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

			
 
				-        curl_setopt($ch, CURLOPT_HEADER, false);

			
 
				-        switch ($httptype)

			
 
				-		{

			
 
				-            case "GET":

			
 
				-            curl_setopt($ch, CURLOPT_HTTPGET, true);

			
 
				-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");

			
 
				-            break;

			
 
				-			

			
 
				-            case "POST":

			
 
				-            curl_setopt($ch, CURLOPT_POST, true);

			
 
				-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");

			
 
				-            break;

			
 
				-			

			
 
				-            case "PUT":

			
 
				-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");

			
 
				-            break;

			
 
				-			

			
 
				-            case "DELETE":

			
 
				-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");

			
 
				-            break;

			
 
				-        }

			
 
				-        $isSecure = strpos($url, "https://");

			
 
				-        if ($isSecure === 0)

			
 
				-		{

			
 
				-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

			
 
				-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);

			
 
				-        }

			
 
				-        if(!empty($header))

			
 
				-		{

			
 
				-            curl_setopt($ch, CURLOPT_SSLVERSION , 6); //NEW ADDITION

			
 
				-            curl_setopt($ch,CURLOPT_HTTPHEADER,$header);

			
 
				-        }

			
 
				-

			
 
				-        if(!empty($userpwd))

			
 
				-		{

			
 
				-            curl_setopt($ch,CURLOPT_USERPWD,$userpwd);

			
 
				-        }

			
 
				-        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

			
 
				-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);

			
 
				-        $result = curl_exec($ch);

			
 
				-        curl_close($ch);

			
 
				-        return $result;

			
 
				-	}

			
 
				-

			
 
				+<?php
			
 
				+class Model_apitt extends Lin_Model {
			
 
				+function __construct(){
			
 
				+		parent::__construct();
			
 
				+		$this->load->_model("Model_logic_ding","logic_ding");
			
 
				+}
			
 
				+	public function get_list($shop,$from,$to,$order_status,$cuy,$num,$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku)//获取订单列表
			
 
				+	{
			
 
				+		$url = 'https://open-api.tiktokglobalshop.com';
			
 
				+		$link = '/order/202309/orders/search';
			
 
				+		$time = time();
			
 
				+		$post['create_time_ge'] = $from;
			
 
				+		$post['create_time_lt'] = $to;
			
 
				+		$post['order_status'] = $order_status;
			
 
				+		$queryParams['page_size'] = 100;
			
 
				+		$queryParams['sort_order'] = 'ASC';
			
 
				+		$queryParams['sort_field'] = 'create_time';
			
 
				+		$queryParams['shop_cipher'] =$shop['shop_cipher'];
			
 
				+		$queryParams['shop_id'] =$shop['codeid'];
			
 
				+		$queryParams['app_key'] =$shop['app_key'];
			
 
				+		$queryParams['shop_cipher'] =$shop['shop_cipher'];
			
 
				+		$queryParams['timestamp'] =$time;
			
 
				+		$link .= '?'.http_build_query($queryParams);
			
 
				+		$sign = $this->sign($link,$shop['app_secret'],$post);
			
 
				+		$url .= $link.'&sign='.$sign;
			
 
				+		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);
			
 
				+		$res = $this->su_curl($post,$url,$headers);
			
 
				+		//$this->logic_ding->sendToDing($shop['shopname']."测试获取TT订单".$res);
			
 
				+		$res = json_decode($res,true);
			
 
				+		$list = array();$page_token = '';$arr = array();
			
 
				+		if(isset($res['data']['orders']))
			
 
				+		{
			
 
				+			foreach ($res['data']['orders'] as $val) 
			
 
				+		    {
			
 
				+				 $d = $this->fullordertt->get_orderinfo($val['id']);
			
 
				+				 if(!$d)
			
 
				+				 {
			
 
				+					 $list[] = $val['id'];
			
 
				+				 }
			
 
				+			}
			
 
				+			if($res['data']['total_count'] > 100)
			
 
				+			{
			
 
				+				$page_token = $res['data']['next_page_token'];
			
 
				+				$synum = $res['data']['total_count']-100;
			
 
				+				if($synum > 100)
			
 
				+				{
			
 
				+					$synum = ceil($synum/100);
			
 
				+				}
			
 
				+				else
			
 
				+				{
			
 
				+					$synum = 1;
			
 
				+				}
			
 
				+				for($i=0;$i<$synum;$i++)
			
 
				+				{
			
 
				+					if($page_token)
			
 
				+					{
			
 
				+					    $net_date = $this->get_next_list($shop,$from,$to,$order_status,$page_token);
			
 
				+					    $page_token = $net_date[1];
			
 
				+					    foreach ($net_date['0'] as $val) 
			
 
				+		        	    {
			
 
				+						    $d = $this->fullordertt->get_orderinfo($val['id']);
			
 
				+				    	    if(!$d)
			
 
				+				    	    {
			
 
				+							    $list[] = $val['id'];
			
 
				+						    }
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+			$cs = array();
			
 
				+			if(count($list) > 50)
			
 
				+			{
			
 
				+				$n = ceil(count($list)/50);$x = 0;
			
 
				+				for($i=0;$i<$n;$i++)
			
 
				+				{
			
 
				+					$k = ($i<1)?0:$i*50;
			
 
				+					$data = array_slice($list,$k,50);
			
 
				+					$d = $this->get_data($data,$shop);
			
 
				+					$cs[] = $d;
			
 
				+					if(isset($d['data']))
			
 
				+		            {
			
 
				+					    foreach ($d['data']['orders'] as $val) 
			
 
				+		                {
			
 
				+						    $arr[$x] = $val;
			
 
				+							$x++;
			
 
				+					    }
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				$d = $this->get_data($list,$shop);
			
 
				+				if(isset($d['data']))
			
 
				+		        {
			
 
				+					 foreach ($d['data']['orders'] as $val) 
			
 
				+		             {
			
 
				+						 $arr[] = $val;
			
 
				+					 }
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+		$read = array();
			
 
				+		$gnum = array();
			
 
				+		foreach ($arr as $val) 
			
 
				+		{
			
 
				+			$create_time = substr($val['create_time'],0,10)-$sjc;
			
 
				+			if(isset($gnum[date('ymd',$create_time)]))
			
 
				+			{
			
 
				+				$gnum[date('ymd',$create_time)] += 1;
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				//$num = $this->fullordertt->find_count('gtime = "'.date('Ymd',$create_time).'" and shop = "'.$shop['id'].'"');
			
 
				+				//避免number 冲突的问题
			
 
				+    			$info = $this->fullordertt->find('gtime = "'.date('Ymd',$create_time).'" and shop = "'.$shop['id'].'"',"*","id desc");
			
 
				+				if(empty($info)){
			
 
				+					$num = 0;
			
 
				+				}else{
			
 
				+					$tmp_number_arr = explode("-",$info['number']);
			
 
				+					$num = array_pop($tmp_number_arr);
			
 
				+					$num = $num*1;
			
 
				+				}
			
 
				+				$gnum[date('ymd',$create_time)] = $num+1;
			
 
				+			}
			
 
				+			$read[] = $this->get_read($val,$time,$shop,$cuy,$gnum[date('ymd',$create_time)],$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku);
			
 
				+		}
			
 
				+		return array($read,$list);
			
 
				+	}
			
 
				+	
			
 
				+	public function get_next_list($shop,$from,$to,$order_status,$page_token='')//获取订单列表
			
 
				+	{
			
 
				+		$url = 'https://open-api.tiktokglobalshop.com';
			
 
				+		$link = '/order/202309/orders/search';
			
 
				+		$time = time();
			
 
				+		$post['create_time_ge'] = $from;
			
 
				+		$post['create_time_lt'] = $to;
			
 
				+		$post['order_status'] = $order_status;
			
 
				+		$queryParams['page_size'] = 100;
			
 
				+		$queryParams['sort_order'] = 'ASC';
			
 
				+		$queryParams['sort_field'] = 'create_time';
			
 
				+		$queryParams['shop_cipher'] =$shop['shop_cipher'];
			
 
				+		$queryParams['shop_id'] =$shop['codeid'];
			
 
				+		$queryParams['app_key'] =$shop['app_key'];
			
 
				+		$queryParams['timestamp'] =$time;
			
 
				+		if($page_token)
			
 
				+		{
			
 
				+		    $queryParams['page_token'] = $page_token;
			
 
				+		}
			
 
				+		$link .= '?'.http_build_query($queryParams);
			
 
				+		$sign = $this->sign($link,$shop['app_secret'],$post);
			
 
				+		$url .= $link.'&sign='.$sign;
			
 
				+		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);
			
 
				+		$res = $this->su_curl($post,$url,$headers);
			
 
				+		$res = json_decode($res,true);
			
 
				+		$orders = array();
			
 
				+		if(isset($res['data']['orders']))
			
 
				+		{
			
 
				+			$orders = $res['data']['orders'];
			
 
				+		}
			
 
				+		return array($orders,$res['data']['next_page_token']);
			
 
				+	}
			
 
				+	
			
 
				+	public function get_data($list,$shop)
			
 
				+	{
			
 
				+		$url = 'https://open-api.tiktokglobalshop.com';
			
 
				+		$link = '/order/202309/orders';
			
 
				+		$time = time();
			
 
				+		$ids = implode(",",$list);
			
 
				+		$link .= '?shop_cipher='.$shop['shop_cipher'].'&app_key='.$shop['app_key'].'&timestamp='.$time.'&ids='.$ids;
			
 
				+		$sign = $this->sign($link,$shop['app_secret'],'');
			
 
				+		$url .= $link.'&sign='.$sign;
			
 
				+		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);
			
 
				+		$res = $this->su_curl('',$url,$headers,$date_type='json',$timeout=300,$httptype="GET");
			
 
				+		$res = json_decode($res,true);
			
 
				+		return $res;
			
 
				+	}
			
 
				+	
			
 
				+	
			
 
				+	public function get_je($d,$shop)//预估到账金额
			
 
				+	{
			
 
				+		$url = 'https://open-api.tiktokglobalshop.com';
			
 
				+		$link = '/finance/202309/orders/'.$d['orderinfo'].'/statement_transactions';
			
 
				+		$time = time();
			
 
				+		$link .= '?shop_cipher='.$shop['shop_cipher'].'&app_key='.$shop['app_key'].'&timestamp='.$time;
			
 
				+		$sign = $this->sign($link,$shop['app_secret'],'');
			
 
				+		$url .= $link.'&sign='.$sign;
			
 
				+		$headers = array('Content-Type: application/json','x-tts-access-token:'.$shop['token']);
			
 
				+		$res = $this->su_curl('',$url,$headers,$date_type='json',$timeout=300,$httptype="GET");
			
 
				+		$res = json_decode($res,true);
			
 
				+		return $res;
			
 
				+	}
			
 
				+	
			
 
				+	public function get_read($data,$time,$shop,$cuy,$num,$dtc,$money,$int,$dtctitle,$pay,$typeclass,$ex,$sjc,$zjsku)
			
 
				+	{
			
 
				+		$purl = 'https://shop.tiktok.com/view/product/';
			
 
				+		$link = '';$product = '';$sku = '';$quantity = '';$price = "";$row_total ="";
			
 
				+		$lpsq = array();
			
 
				+		foreach ($data['line_items'] as $v) 
			
 
				+		{
			
 
				+			if(isset($lpsq[$v['seller_sku']]))
			
 
				+			{
			
 
				+				$lpsq[$v['seller_sku']]['quantity'] += 1;
			
 
				+				$tmp_row_total = $v['sale_price'] ;
			
 
				+				foreach($v['item_tax'] as $kk => $vv){
			
 
				+				    if(isset($vv['tax_amount'])){
			
 
				+				         $tmp_row_total  = 	$tmp_row_total*1 + $vv['tax_amount']*1;
			
 
				+				    }
			
 
				+				   
			
 
				+				}
			
 
				+				$lpsq[$v['seller_sku']]['row_total'] = $lpsq[$v['seller_sku']]['row_total']*1 + $tmp_row_total*1;
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				//$lpsq[$v['seller_sku']] = array('link'=>$purl.$v['product_id'],'product'=>$v['product_name'],'sku'=>$v['seller_sku'],'quantity'=>1);
			
 
				+				$tmp_row_total = $v['sale_price'] ;
			
 
				+				foreach($v['item_tax'] as $kk => $vv){
			
 
				+				    if(isset($vv['tax_amount'])){
			
 
				+				         $tmp_row_total  = 	$tmp_row_total*1 + $vv['tax_amount']*1;
			
 
				+				    }
			
 
				+				   
			
 
				+				}
			
 
				+				$lpsq[$v['seller_sku']] = array('link'=>$purl.$v['product_id'],'product'=>$v['product_name'],'sku'=>$v['seller_sku'],'quantity'=>1,'price'=>$v['original_price'],"row_total"=>$tmp_row_total);
			
 
				+			}
			
 
				+		}
			
 
				+//  		$this->logic_ding->sendToDing($shop['shopname']."测试获取TT订单".json_encode($data));
			
 
				+//  		$this->logic_ding->sendToDing($shop['shopname']."测试获取TT订单数据转化".json_encode($lpsq));
			
 
				+		foreach ($lpsq as $v) 
			
 
				+		{
			
 
				+			$link .= $v['link'].',';
			
 
				+			$product .= $v['product'].',';
			
 
				+			$sku .= $v['sku'].',';
			
 
				+			$quantity .= $v['quantity'].';';
			
 
				+			$price .= $v['price'].',';
			
 
				+			$row_total .= $v['row_total'].',';
			
 
				+		}
			
 
				+	
			
 
				+		if($data['status'] == 'DELIVERED' || $data['status'] == 'IN_TRANSIT' || $data['status'] == 'COMPLETED')
			
 
				+		{
			
 
				+			$s = 216;
			
 
				+		}
			
 
				+		else if($data['status'] == 'AWAITING_SHIPMENT')
			
 
				+		{
			
 
				+			$s = 207;
			
 
				+		}
			
 
				+		else if($data['status'] == 'CANCELLED')
			
 
				+		{
			
 
				+			$s = 217;
			
 
				+		}
			
 
				+		else
			
 
				+		{
			
 
				+			$s = 283;
			
 
				+		}
			
 
				+		if(isset($zjsku[$shop['id']]))//判断是否找到店铺SKU
			
 
				+		{
			
 
				+			$sku = rtrim($sku,',').','.$zjsku[$shop['id']];
			
 
				+		}
			
 
				+		$post['user_id'] = $data['user_id'];
			
 
				+		$post['state'] = $s;
			
 
				+		$post['shop'] = $shop['id'];//店铺ID
			
 
				+		$post['user'] = $shop['shopuser'];//店铺负责人
			
 
				+		$post['product'] = rtrim($product,',');//产品名称
			
 
				+		$post['link'] = rtrim($link,',');//产品链接
			
 
				+		$post['issku'] = rtrim($sku,',');
			
 
				+		$post['quantity'] = rtrim($quantity,';');
			
 
				+		$post['clientremarks'] = $data['buyer_message'];//客户备注
			
 
				+		$post['paypal'] = '';//交易号
			
 
				+		$post['guarantee'] = '';//卖家保障
			
 
				+		$post['parameter'] = '';//属性
			
 
				+		$post['shippingmethod'] = $data['delivery_option_name'].' '.$data['payment']['shipping_fee'];//用户选择快递方式及运费金额
			
 
				+		$post['source'] = 2;//订单类型
			
 
				+		$post['type'] = 1;//发货仓库
			
 
				+		$post['capital'] = 3;//资金支付状况，全部付款
			
 
				+		$numbernew = $shop['shortname'].'-'.substr(date('ymd',substr($data['create_time'],0,10)-$sjc),1);
			
 
				+		$numberwb = (substr(strval($num+1000),1,3));
			
 
				+		if($numbernew == 'TT-QQS-40807')
			
 
				+		{
			
 
				+			$numberwb = $numberwb+7;
			
 
				+		}
			
 
				+	    //过完今天就删除
			
 
				+	    $tmp_time = date("Y-m-d");
			
 
				+	    if($tmp_time == '20250114'){
			
 
				+	       $numberwb = $numberwb+7;
			
 
				+	    }
			
 
				+		$post['number'] = $shop['shortname'].'-'.substr(date('ymd',substr($data['create_time'],0,10)-$sjc),1).'-'.$numberwb;//编号
			
 
				+		if($post['number'] =='TT-WK-50113-038'){
			
 
				+		    $post['number'] = 'TT-WK-50113-034';
			
 
				+		}
			
 
				+		$post['orderinfo'] = $data['id'];//订单号
			
 
				+		$post['insurance'] = 0;//运输保险费用
			
 
				+		$address = $data['recipient_address']['address_detail'];
			
 
				+		$post['baddress'] = $address.','.$data['recipient_address']['district_info'][3]['address_name'].','.$data['recipient_address']['district_info'][1]['address_name'].','.$data['recipient_address']['postal_code'].','.$data['recipient_address']['region_code'].','.$data['recipient_address']['phone_number'];
			
 
				+		$post['saddress'] = $address.','.$data['recipient_address']['district_info'][3]['address_name'].','.$data['recipient_address']['district_info'][1]['address_name'].','.$data['recipient_address']['postal_code'].','.$data['recipient_address']['region_code'].','.$data['recipient_address']['phone_number'];
			
 
				+		$post['country'] = $cuy[$data['recipient_address']['region_code']];//此国家的ID
			
 
				+		$post['al'] = $data['recipient_address']['region_code'];//联邦名称
			
 
				+		$post['bname'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//名称
			
 
				+		$post['sname'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//名称
			
 
				+		$post['client'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//公司名称
			
 
				+		$post['name'] = preg_replace('/( |　| |\s)/',' ',$data['recipient_address']['name']);//收件人名称
			
 
				+		$post['phone'] = preg_replace('/\D/s','',$data['recipient_address']['phone_number']);//收件人电话
			
 
				+		$post['email'] = preg_replace('/( |　| |\s)+/','',$data['buyer_email']);//客户邮箱
			
 
				+		$post['zipcode'] = $data['recipient_address']['postal_code'];//收件人邮编
			
 
				+		$post['province'] = $data['recipient_address']['district_info'][1]['address_name'];//收件人省份
			
 
				+		$post['city'] = $data['recipient_address']['district_info'][3]['address_name'];//收件人城市
			
 
				+		$post['address'] = $address;//收件人地址
			
 
				+		$post['shouldmoney'] = $data['payment']['total_amount'];//应收金额
			
 
				+		$post['skje'] = $post['shouldmoney'];//收款金额
			
 
				+		$post['ismoney'] = $data['payment']['currency'].$post['shouldmoney'];//支付币种金额
			
 
				+		$yga = $post['shouldmoney'];//金额
			
 
				+		$post['cf'] = ($data['shipping_type']=='SELLER')?0:1;//是否仓发TIKTOK平台仓发 SELLER商家发,ERP中1平台仓发，0商家发
			
 
				+		$post['budget'] = 0;//预估到账金额
			
 
				+		/**
			
 
				+		if(isset($data['pay']) && $yga > 0)
			
 
				+		{
			
 
				+			$post['pay'] = $pay[$data['pay']]['id'];
			
 
				+			$ygc = $pay[$data['pay']]['estimaterate'];//预估到账公式
			
 
				+			$post['estimaterate'] = $pay[$data['pay']]['estimaterate'];
			
 
				+			$ifbudget = eval("return $yga*1.$ygc;");
			
 
				+			if($ifbudget > 0)
			
 
				+			{
			
 
				+			    $post['budget'] = eval("return $yga*1.$ygc;");//预估到帐金额
			
 
				+			}
			
 
				+		}
			
 
				+		else if($yga > 0)
			
 
				+		{
			
 
				+			$post['pay'] = 0;
			
 
				+			$ygb = $shop['estimaterate'];//店铺默认到账公式
			
 
				+			$post['estimaterate'] = $shop['estimaterate'];
			
 
				+			$ifbudget = eval("return $yga*1.$ygb;");
			
 
				+			if($ifbudget > 0)
			
 
				+			{
			
 
				+			    $post['budget'] = eval("return $yga*1.$ygb;");//预估到帐金额
			
 
				+			}
			
 
				+		}
			
 
				+		**/
			
 
				+		$post['overtime'] = $data['shipping_due_time']-$sjc;//超时时间
			
 
				+		$post['buytime'] = substr($data['paid_time'],0,10)-$sjc;//格式化付款时间
			
 
				+		$post['dtime'] = substr($data['create_time'],0,10)-$sjc;//订单时间
			
 
				+		$post['gtime'] = date('Ymd',substr($data['create_time'],0,10)-$sjc);//格式化订单时间
			
 
				+		$post['currencytitle'] = $data['payment']['currency'];//结算币种名称
			
 
				+		$post['currency'] = $typeclass[$data['payment']['currency']];//钱币ID
			
 
				+		$post['time'] = time();//同步时间
			
 
				+		$post['hl'] = '6.4';//汇率
			
 
				+		$post['delivery_option_id'] = $data['delivery_option_id'];
			
 
				+		if(isset($data['delivery_option_name']))
			
 
				+		{
			
 
				+			$post['express'] = (isset($ex[$data['delivery_option_name']]))?$ex[$data['delivery_option_name']]['id']:0;//快递方式
			
 
				+		}
			
 
				+		if(isset($data['line_items'][0]['tracking_number']))
			
 
				+		{
			
 
				+			$post['waybill'] = $data['line_items'][0]['tracking_number'];
			
 
				+		}
			
 
				+		
			
 
				+ 		//$this->logic_ding->sendToDing("测试获取TT订单编码".$post['number']);
			
 
				+		$matching = $this->api->matching($post['quantity'],$post['issku'],$dtc,$money,$int,$dtctitle,$shop,[
			
 
				+		        'price'=>trim($price,','),
			
 
				+			    'row_total'=>trim($row_total,','),
			
 
				+		    ]);
			
 
				+		$post['shipremarks'] = $matching['title'];
			
 
				+		$post['cost'] = $matching['cost'];
			
 
				+		$post['purchase'] = $matching['purchase'];
			
 
				+		$post['fpdata'] = $matching['product'];
			
 
				+		$post['whlabel'] = $matching['whlabel'];
			
 
				+		$post['slpx'] = $matching['wcslpx'];
			
 
				+		return $post;
			
 
				+	}
			
 
				+	
			
 
				+	public function sign($url,$appSecret,$body='') 
			
 
				+	{
			
 
				+		// 解析URL获取查询参数
			
 
				+		$queryParams = array();
			
 
				+		parse_str(parse_url($url, PHP_URL_QUERY), $queryParams);
			
 
				+		// 排除'sign'和'access_token'
			
 
				+		unset($queryParams['sign'], $queryParams['access_token']);
			
 
				+		// 按字典顺序排序查询参数
			
 
				+		ksort($queryParams);
			
 
				+		// 拼接参数为{key}{value}格式
			
 
				+		$input = '';
			
 
				+		foreach ($queryParams as $key => $value)
			
 
				+		{
			
 
				+    		$input .= $key . $value;
			
 
				+		}
			
 
				+		// 追加请求路径
			
 
				+		$path = parse_url($url, PHP_URL_PATH);
			
 
				+		$input = $path . $input;
			
 
				+		if ($body) 
			
 
				+		{
			
 
				+			$input .= json_encode($body);
			
 
				+	    }
			
 
				+		// 使用app_secret包裹生成的字符串
			
 
				+		$input = $appSecret . $input . $appSecret;
			
 
				+		// 生成签名
			
 
				+		$sign = hash_hmac('sha256', $input,$appSecret);
			
 
				+        return $sign;
			
 
				+	}
			
 
				+	
			
 
				+	public function su_curl($data,$url,$header=array(),$date_type='json',$timeout=300,$httptype="POST",$userpwd='')
			
 
				+    {
			
 
				+    
			
 
				+        if ($date_type == 'http_build_query')
			
 
				+		{
			
 
				+            $data = http_build_query($data);
			
 
				+        }
			
 
				+		else if ($date_type == 'json')
			
 
				+		{
			
 
				+            $data = json_encode($data);
			
 
				+        }
			
 
				+        $ch = curl_init();
			
 
				+        curl_setopt($ch, CURLOPT_URL, $url);
			
 
				+        curl_setopt($ch, CURLOPT_POSTFIELDS,$data);
			
 
				+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
			
 
				+        curl_setopt($ch, CURLOPT_HEADER, false);
			
 
				+        switch ($httptype)
			
 
				+		{
			
 
				+            case "GET":
			
 
				+            curl_setopt($ch, CURLOPT_HTTPGET, true);
			
 
				+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
			
 
				+            break;
			
 
				+			
			
 
				+            case "POST":
			
 
				+            curl_setopt($ch, CURLOPT_POST, true);
			
 
				+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
			
 
				+            break;
			
 
				+			
			
 
				+            case "PUT":
			
 
				+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
			
 
				+            break;
			
 
				+			
			
 
				+            case "DELETE":
			
 
				+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
			
 
				+            break;
			
 
				+        }
			
 
				+        $isSecure = strpos($url, "https://");
			
 
				+        if ($isSecure === 0)
			
 
				+		{
			
 
				+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
			
 
				+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
			
 
				+        }
			
 
				+        if(!empty($header))
			
 
				+		{
			
 
				+            curl_setopt($ch, CURLOPT_SSLVERSION , 6); //NEW ADDITION
			
 
				+            curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
			
 
				+        }
			
 
				+
			
 
				+        if(!empty($userpwd))
			
 
				+		{
			
 
				+            curl_setopt($ch,CURLOPT_USERPWD,$userpwd);
			
 
				+        }
			
 
				+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
			
 
				+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
			
 
				+        $result = curl_exec($ch);
			
 
				+        curl_close($ch);
			
 
				+        return $result;
			
 
				+	}
			
 
				+
			
 
				 }  //end class
			
--- a/core/CoreApp/models/Model_apixw.php
+++ b/core/CoreApp/models/Model_apixw.php
--- a/core/CoreApp/models/Model_apiyy.php
+++ b/core/CoreApp/models/Model_apiyy.php
@@ -203,7 +203,12 @@ class Model_apiyy extends Lin_Model
 
				 	

			
 
				 	public function get_cg($data)//无源采购

			
 
				 	{

			
 
				-		$list["0"]["BusinessDate"] = date("Y-m-d H:i:s",time());

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				+		$list["0"]["BusinessDate"] = date("Y-m-d H:i:s",$time);

			
 
				 		$list["0"]["DocumentType"] = "PO01";

			
 
				         $list["0"]["POLineDTOList"][0]["ItemInfo"]['m_code'] = $data['sku'];//料号

			
 
				 		$list["0"]["POLineDTOList"][0]["SupplierConfirmQtyTU"] = $data['ts'];//数量

			
@@ -242,7 +247,12 @@ class Model_apiyy extends Lin_Model
 
				 	//https://openapi.yyu9c.com/doc.html#/U9C%20OPENAPI/Receivement/Receivement_CreateRcvBySrcPO

			
 
				 	public function get_bzsh($data)//标准收货

			
 
				 	{

			
 
				-		$list["0"]["potorcvDTOS"][0]["BusinessDate"] = date("Y-m-d H:i:s",time());

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				+		$list["0"]["potorcvDTOS"][0]["BusinessDate"] = date("Y-m-d H:i:s",$time);

			
 
				 		$list["0"]["potorcvDTOS"][0]["Amount1"] = $data['ts'];//收货数量

			
 
				 		$list["0"]["potorcvDTOS"][0]["Amount2"] = 0;//收货数量

			
 
				 		$list["0"]["potorcvDTOS"][0]["PONo"] = $data['od'];//订单号

			
@@ -288,6 +298,11 @@ class Model_apiyy extends Lin_Model
 
				 	

			
 
				 	public function get_sc($data)//生产订单

			
 
				 	{

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				 		$list["0"]["OtherID"] = '';

			
 
				         $list["0"]["Org"]['Code'] = "120";

			
 
				         $list["0"]["ItemMaster"]["Code"] = $data['sku'];

			
@@ -299,8 +314,8 @@ class Model_apiyy extends Lin_Model
 
				 		$list["0"]["RoutingEffeDate"] = '';

			
 
				 		$list["0"]["ProductQty"] = $data['ts'];

			
 
				         $list["0"]["ProductUOM"]["Code"] = '条';

			
 
				-        $list["0"]["StartDate"] = date('Y-m-d',time());

			
 
				-		$list["0"]["CompleteDate"] = date('Y-m-d',$data['time']);

			
 
				+        $list["0"]["StartDate"] = date('Y-m-d',$time);

			
 
				+		$list["0"]["CompleteDate"] = date('Y-m-d',$time);//$data['time']

			
 
				         $list["0"]["MOSourceDocType"] = 0;

			
 
				         $list["0"]["OwnerOrg"]["Code"] = "120";

			
 
				         $list["0"]["SCVWh"]["Code"] = $data['drck'];

			
@@ -431,6 +446,11 @@ class Model_apiyy extends Lin_Model
 
				 	

			
 
				 	public function get_cprk($data)//产品入库

			
 
				 	{

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				 		$list["0"]["DocNo"] = '';

			
 
				         $list["0"]["CompleteList"]["0"]["MOKey"]["OtherID"] = '';

			
 
				         $list["0"]["CompleteList"]["0"]["MOKey"]["ID"] = 0;

			
@@ -475,7 +495,7 @@ class Model_apiyy extends Lin_Model
 
				         $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["SourceDoc"]["SrcDocID"] = $data['rkid'];

			
 
				         $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["SourceDoc"]["SrcDocLineID"] = 0;

			
 
				         $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["SourceDoc"]["SrcDocType"] = '';

			
 
				-        $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["DocDate"] = date("Y-m-d",time());

			
 
				+        $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["DocDate"] = date("Y-m-d",$time);

			
 
				         //$list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["ActualRcvTime"] = date("Y-m-d",time());

			
 
				         $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["RcvOrg"]["Code"] = 120;

			
 
				         $list["0"]["CompleteList"]["0"]["SourceRcvRptLine"]["RcvRptDocDTO"]["Org"]["Code"] = 120;

			
@@ -521,7 +541,7 @@ class Model_apiyy extends Lin_Model
 
				 		$list["0"]["DescFlexField"]["PubDescSeg4"] = $data['number'];

			
 
				 		$list["0"]["DescFlexField"]["PubDescSeg5"] = $data['shipremarks'];

			
 
				         $list["0"]["DocType"]["Code"] = 0;

			
 
				-        $list["0"]["BusinessDate"] = date("Y-m-d H:i:s",time());

			
 
				+        $list["0"]["BusinessDate"] = date("Y-m-d H:i:s",$time);

			
 
				         $list["0"]["OtherID"] = '';

			
 
				         $list["0"]["Direction"] = 0;

			
 
				         $list["0"]["IsOffLine"] = 1;

			
@@ -549,9 +569,14 @@ class Model_apiyy extends Lin_Model
 
				 	

			
 
				 	public function get_dc($data)//调出

			
 
				 	{

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				 		$list["0"]["OtherID"] = $data['number'];

			
 
				         $list["0"]["TransOutDocType_Code"] = 'TransOut001';

			
 
				-        $list["0"]["BusinessDate"] = date('Y-m-d',time());

			
 
				+        $list["0"]["BusinessDate"] = date('Y-m-d',$time);

			
 
				         $list["0"]["TransferDirection"] = 0;

			
 
				         //$list["0"]["DescFlexField"] = (object)array();

			
 
				 		//$list["0"]["DescFlexField"]["PubDescSeg2"] = $data['kh'];

			
@@ -628,9 +653,14 @@ class Model_apiyy extends Lin_Model
 
				 	

			
 
				 	public function get_cpdc($data)//成品仓调出到其它外贸仓

			
 
				 	{

			
 
				+		$time = time();

			
 
				+		if($time > 1717171200 && $time < 1717257599)

			
 
				+		{

			
 
				+			$time = time()-24*3600;

			
 
				+		}

			
 
				 		$list["0"]["OtherID"] = $data['number'];

			
 
				         $list["0"]["TransOutDocType_Code"] = 'TransOut002';

			
 
				-        $list["0"]["BusinessDate"] = date('Y-m-d',time());

			
 
				+        $list["0"]["BusinessDate"] = date('Y-m-d',$time);

			
 
				         $list["0"]["TransferDirection"] = 0;

			
 
				         $list["0"]["DescFlexField"] = (object)array();

			
 
				         $list["0"]["TransOutLines"][0]['ItemInfo']['ItemCode'] = $data['jm'];

			
@@ -758,7 +788,7 @@ class Model_apiyy extends Lin_Model
 
				 			$list["0"]["SOLineDTOList"][$i]['PubDescSeg4'] = '0.00';

			
 
				 			$list["0"]["SOLineDTOList"][$i]['PriceList'] = '';

			
 
				 			$list["0"]["SOLineDTOList"][$i]['TaxMoneyTC'] = 0;

			
 
				-			$list["0"]["SOLineDTOList"][$i]['TotalMoneyTC'] = $data['budget'];

			
 
				+			//$list["0"]["SOLineDTOList"][$i]['TotalMoneyTC'] = $data['budget'];

			
 
				 			$list["0"]["SOLineDTOList"][$i]['TaxSchedule'] = 'YZ05';

			
 
				 			$list["0"]["SOLineDTOList"][$i]['DescFlexField']['PubDescSeg3'] = '';

			
 
				 			$list["0"]["SOLineDTOList"][$i]['OrderByQtyTU'] = $data['lh'][$i]['ts'];//条数

			
--- a/core/CoreApp/models/Model_awlgx.php
+++ b/core/CoreApp/models/Model_awlgx.php
@@ -7,4 +7,8 @@ class Model_Awlgx extends Lin_Model
 
				 	$this->table = 'awlgx';

			
 
				     $this->load_table('awlgx');

			
 
				 }

			
 
				+   public function get_number($number)

			
 
				+	{

			
 
				+		return  $this->find("number = '$number'");	

			
 
				+	}

			
 
				 }  //end class
			
--- a/core/CoreApp/models/Model_ck.php
+++ b/core/CoreApp/models/Model_ck.php
@@ -1,483 +1,483 @@
 
				-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				-class Model_ck extends Lin_Model 

			
 
				-{

			
 
				-	function __construct(){

			
 
				-	parent::__construct();

			
 
				-	$this->load_table('setting');

			
 
				-}

			
 
				-	public function get_kcyz($state,$warehouse,$shop,$number,$whlabel,$fpdata)//库存验证

			
 
				-	{

			
 
				-		$save = array();$x=0;

			
 
				-		$pp = explode('|',trim($number,'|'));

			
 
				-		if($warehouse['zd'] == 1 && $warehouse['bdck'] != '')

			
 
				-		{

			
 
				-			$n = 'get_'.$warehouse['bdck'];

			
 
				-		    $y = $this->$n($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=1);

			
 
				-		    return $y;

			
 
				-		}

			
 
				-	}

			
 
				-	

			
 
				-	public function get_kc($state,$warehouse,$shop,$number,$whlabel,$fpdata)//库存操作开始

			
 
				-	{

			
 
				-		if(!preg_match('/[0-9]/',$whlabel))

			
 
				-		{

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加产品信息！','success'=>false)));exit;

			
 
				-		}

			
 
				-		$wl = $this->specialstock->find_all("zd = '$number'");

			
 
				-		if($wl)

			
 
				-		{

			
 
				-			foreach ($wl as $v)

			
 
				-			{

			
 
				-				$this->specialstock->save(array('zd'=>''),$v['id']);//专属

			
 
				-			}

			
 
				-		}

			
 
				-		if(($state != '207' && $state != '209') || $warehouse['zd'] == 0)//待发货状态

			
 
				-		{

			
 
				-		    $wlw = $this->whlabel->find_all("zd = '$number'");

			
 
				-		    if($wlw)

			
 
				-		    {

			
 
				-			    foreach ($wlw as $v)

			
 
				-			    {

			
 
				-				    $this->whlabel->save(array('zd'=>''),$v['id']);//专属

			
 
				-			    }

			
 
				-		    }

			
 
				-		}

			
 
				-			$fhw = '|';$j = 0;

			
 
				-			$fd = explode(';',trim($fpdata,';'));

			
 
				-			$wcfpd = '';

			
 
				-			$pp = explode('|',trim($whlabel,'|'));

			
 
				-			if($warehouse['bdck'] == 'specialstock' && ($state == '207' || $state == '209'))//特殊仓含特殊产品的不处理whlabel和fpdata 但需要状态符合

			
 
				-			{

			
 
				-		    	foreach ($pp as $v)

			
 
				-		    	{

			
 
				-					if(stripos($v,$warehouse['hz']) === false)

			
 
				-					{

			
 
				-			        	$num = explode('-',$v);

			
 
				-			        	$fhw .= $num[0].'-'.$num[1].'-0|';

			
 
				-			        	$cffpt = explode('|',trim($fd[$j],'|'));

			
 
				-			        	$cffpt[9] = 0;

			
 
				-			        	$wcfpd .= implode("|",$cffpt).';';

			
 
				-					}

			
 
				-					else

			
 
				-					{

			
 
				-						$fhw .= $v.'|';

			
 
				-						$wcfpd .= $fd[$j].';';

			
 
				-					}

			
 
				-					$j++;

			
 
				-		    	}

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-		    	foreach ($pp as $v)

			
 
				-		    	{

			
 
				-					$num = explode('-',$v);

			
 
				-					if(isset($num[2]) && $num[2] == 'DNOTO')//选择不占单的

			
 
				-					{

			
 
				-						$fhw .= $v.'|';

			
 
				-			    		$wcfpd .= $fd[$j].';';

			
 
				-					}

			
 
				-					else

			
 
				-					{

			
 
				-			    	    $fhw .= $num[0].'-'.$num[1].'-0|';

			
 
				-			    	    $cffpt = explode('|',trim($fd[$j],'|'));

			
 
				-			    	    $cffpt[9] = 0;

			
 
				-			    	    $wcfpd .= implode("|",$cffpt).';';

			
 
				-					}

			
 
				-			    	$j++;

			
 
				-		    	}

			
 
				-			}

			
 
				-			$whlabel = $fhw;

			
 
				-			$fpdata = $wcfpd;

			
 
				-			if($warehouse['zd'] == 1 && $warehouse['bdck'] != '')

			
 
				-			{

			
 
				-				$n = 'get_'.$warehouse['bdck'];

			
 
				-				$z = $this->$n($state,$warehouse,$shop,$number,$whlabel,$fpdata);

			
 
				-				return $z;exit;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;

			
 
				-			}

			
 
				-	}

			
 
				-

			
 
				-	

			
 
				-	public function get_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=0)

			
 
				-	{

			
 
				-		//smt:edit-bcbz-readonly-customersmt_medit,dlz:edit-readonly-customer_medit

			
 
				-		if(!$whlabel || $whlabel == '|')

			
 
				-		{

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加产品信息！','success'=>false)));exit;

			
 
				-		}

			
 
				-		//先预先判断开始，否则清除数据后造成库存错误

			
 
				-		if($state == '207' || $state == '209')//待发货状态

			
 
				-		{

			
 
				-			$pp = explode('|',trim($whlabel,'|'));

			
 
				-			$cxsl = array();//产品数组化提供下面查询

			
 
				-			foreach ($pp as $key=>$va)

			
 
				-			{

			
 
				-				$w = explode('-',$va);

			
 
				-				if(!isset($w[2]))

			
 
				-				{

			
 
				-					$w[2] = 0;

			
 
				-				}

			
 
				-				$cxsl[$key] = $w;

			
 
				-			}

			
 
				-			$x = 0;$save = array();

			
 
				-			foreach ($pp as $key=>$va)

			
 
				-			{

			
 
				-				$num = explode('-',$va);

			
 
				-				if(!isset($num[2]) || isset($num[2]) && $num[2] != "DNOTO")

			
 
				-				{

			
 
				-				    foreach ($cxsl as $k=>$v)

			
 
				-				    {

			
 
				-					    if($v[0] == $num[0] && $num[2] != "DNOTO" && $key != $k)

			
 
				-					    {

			
 
				-							$num[1] += $v[1];//如果有相同产品并且未禁止占单，那么合并占单数量

			
 
				-					    }

			
 
				-					}

			
 
				-				}

			
 
				-				$wh = $this->whlabel->find_count("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and (shop IS NULL or shop = '')");//通用

			
 
				-				$shopwh = $this->whlabel->find_count("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and shop like '%,".$shop.",%'");//专属

			
 
				-				$x++;

			
 
				-				if($wh+$shopwh < $num[1] || (isset($num[2]) && $num[2] == "DNOTO" && $warehouse['zdms'] == 2))

			
 
				-				{

			
 
				-					$save[] = $x-1;continue;//提前先加X不然出错，所以要减1

			
 
				-				}

			
 
				-			}

			
 
				-			if(isset($save[0]) && $warehouse['zdms'] == 2)

			
 
				-            {

			
 
				-				return array('t'=>1,'m'=>json_encode(array('t'=>2,'msg'=>"红色商品名库存不够扣减或不允许占单",'error'=>$save,'hq'=>"state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and (shop IS NULL or shop = '')",'success'=>false)));exit;

			
 
				-            }

			
 
				-			if($yz == 0)

			
 
				-			{

			
 
				-				$z = $this->get_whlabel_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata);

			
 
				-				return $z;

			
 
				-			}

			
 
				-		}

			
 
				-		else//订单状态不符合

			
 
				-		{

			
 
				-			return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;

			
 
				-		}

			
 
				-	}

			
 
				-	public function get_whlabel_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata)

			
 
				-	{

			
 
				-		$fhw = '|';

			
 
				-		$fpdata = explode(';',trim($fpdata,';'));

			
 
				-		$wcfpd = '';

			
 
				-		$wlw = $this->whlabel->find_all("zd = '".$number."'");

			
 
				-		if($state == '207' || $state == '209')

			
 
				-		{

			
 
				-			$x = 0;

			
 
				-			$pp = explode('|',trim($whlabel,'|'));

			
 
				-			$wzdid = '';$szdid = '';$wfcid = array();

			
 
				-			foreach ($pp as $va)

			
 
				-			{

			
 
				-				$fhid = '';$DNOTO = 0;

			
 
				-				$num = explode('-',$va);

			
 
				-				if(isset($num[2]) && $num[2] == "DNOTO")

			
 
				-				{

			
 
				-					$DNOTO = 1;

			
 
				-				}

			
 
				-				$whlabel = $this->whlabel->find_all("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '".$number."' or zd = '') and (shop IS NULL or shop = '')");//通用

			
 
				-				$shopwhlabel = $this->whlabel->find_all("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '".$number."' or zd = '') and shop like '%,".$shop.",%'");//专属

			
 
				-				if(count($shopwhlabel) > 0 && $DNOTO < 1)//如果有专属库存

			
 
				-				{

			
 
				-					if(count($shopwhlabel) >= $num[1])

			
 
				-					{

			
 
				-						for($i=0;$i<$num[1];$i++)

			
 
				-			            {

			
 
				-							$fhid .= $shopwhlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-							//$this->whlabel->save(array('zd'=>$number),$shopwhlabel[$i]['id']);//专属 ~符号这里改验货也需要改

			
 
				-							$wzdid .= 'id != '.$shopwhlabel[$i]['id'].' and ';

			
 
				-							$wfcid[] = $shopwhlabel[$i]['id'];

			
 
				-						}

			
 
				-					}

			
 
				-					else

			
 
				-					{

			
 
				-						for($i=0;$i<count($shopwhlabel);$i++)

			
 
				-			            {

			
 
				-							$fhid .= $shopwhlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-							//$this->whlabel->save(array('zd'=>$number),$shopwhlabel[$i]['id']);//扣减专属

			
 
				-							$wzdid .= 'id != '.$shopwhlabel[$i]['id'].' and ';

			
 
				-							$wfcid[] = $shopwhlabel[$i]['id'];

			
 
				-						}

			
 
				-						for($i=0;$i<$num[1]-count($shopwhlabel);$i++)

			
 
				-			            {

			
 
				-							if(isset($whlabel[$i]))

			
 
				-							{

			
 
				-							    $fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-							    //$this->whlabel->save(array('zd'=>$number),$whlabel[$i]['id']);//扣减通用

			
 
				-							    $wzdid .= 'id != '.$whlabel[$i]['id'].' and ';

			
 
				-							    $wfcid[] = $whlabel[$i]['id'];

			
 
				-							}

			
 
				-						}

			
 
				-					}

			
 
				-					$fhw .= $num[0].'-'.$num[1].'-'.rtrim($fhid,'~')."|";

			
 
				-					$cffpt = explode('|',trim($fpdata[$x],'|'));

			
 
				-					$cffpt[9] = rtrim($fhid,'~');

			
 
				-					$wcfpd .= implode("|",$cffpt).';';

			
 
				-				}

			
 
				-				else if(count($whlabel) >= $num[1] && $DNOTO < 1)

			
 
				-				{

			
 
				-					for($i=0;$i<$num[1];$i++)

			
 
				-			        {

			
 
				-						$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-						//$this->whlabel->save(array('zd'=>$number),$whlabel[$i]['id']);//通用

			
 
				-						$wzdid .= 'id != '.$whlabel[$i]['id'].' and ';

			
 
				-						$wfcid[] = $whlabel[$i]['id'];

			
 
				-					}

			
 
				-					$fhw .= $num[0].'-'.$num[1].'-'.rtrim($fhid,'~')."|";

			
 
				-					$cffpt = explode('|',trim($fpdata[$x],'|'));

			
 
				-					$cffpt[9] = rtrim($fhid,'~');

			
 
				-					$wcfpd .= implode("|",$cffpt).';';

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$fhw .= $va."|";

			
 
				-					$wcfpd .= $fpdata[$x].';';

			
 
				-				}

			
 
				-				$x++;

			
 
				-			}

			
 
				-		}

			
 
				-		$this->db->trans_begin();

			
 
				-		if(isset($wlw[0]))

			
 
				-		{

			
 
				-			foreach ($wlw as $v)

			
 
				-			{

			
 
				-				$this->whlabel->save(array('zd'=>''),$v['id']);//专属

			
 
				-			}

			
 
				-		}

			
 
				-		if($wzdid != '')

			
 
				-		{

			
 
				-			foreach ($wfcid as $v)

			
 
				-			{

			
 
				-				$this->whlabel->save(array('zd'=>$number),$v);

			
 
				-			}

			
 
				-		}

			
 
				-		if ($this->db->trans_status() === FALSE)

			
 
				-        {

			
 
				-			$this->db->trans_rollback();

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$this->db->trans_commit();

			
 
				-			return array('t'=>0,'whlabel'=>$fhw,'fpdata'=>$wcfpd);

			
 
				-		}

			
 
				-	}

			
 
				-	

			
 
				-	

			
 
				-	public function get_specialstock($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=0)

			
 
				-	{

			
 
				-		if(!$whlabel || $whlabel == '|' || stripos($whlabel,$warehouse['hz']) === false)

			
 
				-		{

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加特殊产品信息！','success'=>false)));exit;

			
 
				-		}

			
 
				-		//先预先判断开始，否则清除数据后造成库存错误

			
 
				-		if($state == '207' || $state == '209')//待发货状态

			
 
				-		{

			
 
				-			$pp = explode('|',trim($whlabel,'|'));

			
 
				-			$x = 0;$save = array();

			
 
				-			foreach ($pp as $va)

			
 
				-			{

			
 
				-				$x++;

			
 
				-				$num = explode('-',$va);

			
 
				-				if(stripos($va,$warehouse['hz']) !== false)

			
 
				-				{

			
 
				-					$wh = $this->specialstock->find_count("state = '0' and number = '$num[0]' and (zd = '$number' or zd = '')");//通用

			
 
				-				    if($wh < $num[1])

			
 
				-				    {

			
 
				-						$save[] = $x-1;continue;//提前先加X不然出错，所以要减1

			
 
				-				    }

			
 
				-				}

			
 
				-			}

			
 
				-			if(isset($save[0]))

			
 
				-            {

			
 
				-				return array('t'=>1,'m'=>json_encode(array('t'=>2,'msg'=>"红色商品名库存不够扣减或不允许占单",'error'=>$save,'success'=>false)));exit;

			
 
				-            }

			
 
				-			if($yz == 0)

			
 
				-			{

			
 
				-				$z = $this->get_specialstock_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata);

			
 
				-				return $z;

			
 
				-			}

			
 
				-		}

			
 
				-		else//订单状态不符合

			
 
				-		{

			
 
				-			return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;

			
 
				-		}

			
 
				-	}

			
 
				-	public function get_specialstock_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata)

			
 
				-	{

			
 
				-		$fpdata = explode(';',trim($fpdata,';'));

			
 
				-		$wcfpd = '';

			
 
				-		$this->db->trans_begin();

			
 
				-		$wl = $this->whlabel->find_all("zd = '".$number."'");

			
 
				-		if($wl)

			
 
				-			{

			
 
				-				foreach ($wl as $v)

			
 
				-				{

			
 
				-					$this->whlabel->save(array('zd'=>''),$v['id']);//专属

			
 
				-				}

			
 
				-			}

			
 
				-		if($state == '207' || $state == '209')

			
 
				-		{

			
 
				-			$fhw = array();$x = 0;$wzdid = '';

			
 
				-			$pp = explode('|',trim($whlabel,'|'));

			
 
				-			foreach ($pp as $va)

			
 
				-			{

			
 
				-				$num = explode('-',$va);

			
 
				-				if(stripos($va,$warehouse['hz']) !== false)

			
 
				-				{

			
 
				-					$fhid = '';

			
 
				-					$num = explode('-',$va);

			
 
				-				    $whlabel = $this->specialstock->find_all("state = '0' and number = '$num[0]' and zd = ''");//通用

			
 
				-					$fgzid = explode('~',trim($num[2],'~'));

			
 
				-					foreach ($fgzid as $vid)

			
 
				-					{

			
 
				-					    $xzkc = $this->specialstock->read(rtrim($vid,$warehouse['hz']));//选择的这个库存

			
 
				-					    if($xzkc['zd'] != '')

			
 
				-					    {

			
 
				-						    return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'所选库存已被占单！请重新打开选择页面','success'=>false)));exit;

			
 
				-					    }

			
 
				-					}

			
 
				-					for($i=0;$i<$num[1];$i++)

			
 
				-			        {

			
 
				-						$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-					    $this->specialstock->save(array('zd'=>$number,'zdlist'=>date('Y-m-d H:i:s',time())),$whlabel[$i]['id']);//通用

			
 
				-						$wzdid .= 'id != '.$whlabel[$i]['id'].' and ';

			
 
				-				    }

			
 
				-					$fhw[] = $num[0].'-'.$num[1].'-'.rtrim($fhid,'~');

			
 
				-					$cffpt = explode('|',trim($fpdata[$x],'|'));

			
 
				-					$cffpt[9] = rtrim($fhid,'~');

			
 
				-					$wcfpd .= implode("|",$cffpt).';';

			
 
				-				}

			
 
				-				else

			
 
				-				{

			
 
				-					$fhw[] = $va;

			
 
				-					$wcfpd .= $fpdata[$x].';';

			
 
				-				}

			
 
				-				$x++;

			
 
				-			}

			
 
				-			$fhw = '|'.implode("|",$fhw).'|';

			
 
				-		}

			
 
				-		if ($this->db->trans_status() === TRUE)

			
 
				-        {

			
 
				-			$this->db->trans_commit();

			
 
				-			return array('t'=>0,'whlabel'=>$fhw,'fpdata'=>$wcfpd);exit;

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$this->db->trans_rollback();

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));exit;

			
 
				-		}

			
 
				-	}

			
 
				-	

			
 
				-	//预先判断仓开始

			
 
				-	public function get_yx_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata)//通用仓

			
 
				-	{

			
 
				-		$z = $this->get_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata);

			
 
				-		return $z;

			
 
				-

			
 
				-	}

			
 
				-	public function get_yx_specialstock($state,$warehouse,$shop,$number,$whlabel,$fpdata)//特殊仓

			
 
				-	{

			
 
				-		$pp = explode('|',trim($whlabel,'|'));

			
 
				-		$fpdata = explode(';',trim($fpdata,';'));

			
 
				-		$wcfpd = '';$fhw = array();

			
 
				-		$x = 0;$save = array();

			
 
				-		$kytskc = array();

			
 
				-		foreach ($pp as $k=>$va)

			
 
				-		{

			
 
				-			$num = explode('-',$va);

			
 
				-			$wh = $this->specialstock->find_count("state = '0' and number = '$num[0]' and zd = ''");

			
 
				-			if(!isset($num[1]))

			
 
				-			{

			
 
				-				$num[1] = 1;

			
 
				-			}

			
 
				-			if($wh >= $num[1])

			
 
				-			{

			
 
				-				$kytskc[] = $num[0].'-'.$num[1].'-z';//有可占用的

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				$kytskc[] = $num[0].'-'.$num[1].'-0';

			
 
				-			}

			
 
				-		}

			
 
				-		$y = 0;

			
 
				-		$this->db->trans_begin();

			
 
				-		foreach ($kytskc as $va)

			
 
				-		{

			
 
				-			$num = explode('-',$va);

			
 
				-			if(stripos($va,$warehouse['hz']) !== false)

			
 
				-			{

			
 
				-				$whlabel = $this->specialstock->find_all("state = '0' and number = '$num[0]' and zd = ''");//通用

			
 
				-				$fhid = '';

			
 
				-				for($i=0;$i<$num[1];$i++)

			
 
				-			    {

			
 
				-					$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';

			
 
				-					$this->specialstock->save(array('zd'=>$number,'zdlist'=>date('Y-m-d H:i:s',time())),$whlabel[$i]['id']);//通用

			
 
				-				}

			
 
				-				$fhw[] = $num[0].'-'.$num[1].'-'.rtrim($fhid,'~');

			
 
				-				$cffpt = explode('|',trim($fpdata[$x],'|'));

			
 
				-				$cffpt[9] = rtrim($fhid,'~');

			
 
				-				$wcfpd .= implode("|",$cffpt).';';

			
 
				-				$y++;

			
 
				-			}

			
 
				-			else

			
 
				-			{

			
 
				-				$fhw[] = $num[0].'-'.$num[1].'-0';

			
 
				-				$wcfpd .= $fpdata[$x].';';

			
 
				-			}

			
 
				-			$x++;

			
 
				-		}

			
 
				-		if($this->db->trans_status() === TRUE)

			
 
				-        {

			
 
				-			$this->db->trans_commit();

			
 
				-			return array('t'=>0,'whlabel'=>"|".implode("|",$fhw)."|",'fpdata'=>$wcfpd);exit;

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$this->db->trans_rollback();

			
 
				-			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));exit;

			
 
				-		}

			
 
				-	}

			
 
				-	//预先判断仓结束

			
 
				-	

			
 
				-	public function get_fl($hz,$whlabel,$fpdata)//特殊仓

			
 
				-	{

			
 
				-		$sfxh = 0;

			
 
				-		if($hz != '')

			
 
				-		{

			
 
				-			$num = explode('|',trim($whlabel,'|'));

			
 
				-		    $bh = substr_count($whlabel,$hz);

			
 
				-		    if($bh == count($num))

			
 
				-		    {

			
 
				-			    $sfxh = 1;//有现货

			
 
				-		    }

			
 
				-		}

			
 
				-		$f = explode(';',trim($fpdata,';'));

			
 
				-		//$fl = substr_count($fpdata,'Bob');//暂时不用这个，防止产品出现大小写不一致

			
 
				-		$i = 0;

			
 
				-		foreach ($f as $v) 

			
 
				-		{

			
 
				-			if(stripos($fpdata,'bob') !== false && (stripos($v,'bob') !== false || stripos($v,'wig') === false))

			
 
				-			{

			
 
				-				$i++;

			
 
				-			}

			
 
				-		}

			
 
				-		if(count($f) == $i)

			
 
				-		{

			
 
				-			$type = $this->typeclass->get_type('37','BOBTYPE');

			
 
				-		}

			
 
				-		else if(stripos($fpdata,'wig') !== false)

			
 
				-		{

			
 
				-			$type = $this->typeclass->get_type('37','WIGTYPE');

			
 
				-		}

			
 
				-		else

			
 
				-		{

			
 
				-			$type = $this->typeclass->get_type('37','OTHERTYPE');

			
 
				-		}

			
 
				-		$ckfl = $type['id'];

			
 
				-		return array('sfxh'=>$sfxh,'ckfl'=>$ckfl);

			
 
				-	}

			
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 
			
 
				+class Model_ck extends Lin_Model 
			
 
				+{
			
 
				+	function __construct(){
			
 
				+	parent::__construct();
			
 
				+	$this->load_table('setting');
			
 
				+}
			
 
				+	public function get_kcyz($state,$warehouse,$shop,$number,$whlabel,$fpdata)//库存验证
			
 
				+	{
			
 
				+		$save = array();$x=0;
			
 
				+		$pp = explode('|',trim($number,'|'));
			
 
				+		if($warehouse['zd'] == 1 && $warehouse['bdck'] != '')
			
 
				+		{
			
 
				+			$n = 'get_'.$warehouse['bdck'];
			
 
				+		    $y = $this->$n($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=1);
			
 
				+		    return $y;
			
 
				+		}
			
 
				+	}
			
 
				+	
			
 
				+	public function get_kc($state,$warehouse,$shop,$number,$whlabel,$fpdata)//库存操作开始
			
 
				+	{
			
 
				+		if(!preg_match('/[0-9]/',$whlabel))
			
 
				+		{
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加产品信息！','success'=>false)));exit;
			
 
				+		}
			
 
				+		$wl = $this->specialstock->find_all("zd = '$number'");
			
 
				+		if($wl)
			
 
				+		{
			
 
				+			foreach ($wl as $v)
			
 
				+			{
			
 
				+				$this->specialstock->save(array('zd'=>''),$v['id']);//专属
			
 
				+			}
			
 
				+		}
			
 
				+		if(($state != '207' && $state != '209') || $warehouse['zd'] == 0)//待发货状态
			
 
				+		{
			
 
				+		    $wlw = $this->whlabel->find_all("zd = '$number'");
			
 
				+		    if($wlw)
			
 
				+		    {
			
 
				+			    foreach ($wlw as $v)
			
 
				+			    {
			
 
				+				    $this->whlabel->save(array('zd'=>''),$v['id']);//专属
			
 
				+			    }
			
 
				+		    }
			
 
				+		}
			
 
				+			$fhw = '|';$j = 0;
			
 
				+			$fd = explode(';',trim($fpdata,';'));
			
 
				+			$wcfpd = '';
			
 
				+			$pp = explode('|',trim($whlabel,'|'));
			
 
				+			if($warehouse['bdck'] == 'specialstock' && ($state == '207' || $state == '209'))//特殊仓含特殊产品的不处理whlabel和fpdata 但需要状态符合
			
 
				+			{
			
 
				+		    	foreach ($pp as $v)
			
 
				+		    	{
			
 
				+					if(stripos($v,$warehouse['hz']) === false)
			
 
				+					{
			
 
				+			        	$num = explode('-',$v);
			
 
				+			        	$fhw .= $num[0].'-'.$num[1].'-0|';
			
 
				+			        	$cffpt = explode('|',trim($fd[$j],'|'));
			
 
				+			        	$cffpt[9] = 0;
			
 
				+			        	$wcfpd .= implode("|",$cffpt).';';
			
 
				+					}
			
 
				+					else
			
 
				+					{
			
 
				+						$fhw .= $v.'|';
			
 
				+						$wcfpd .= $fd[$j].';';
			
 
				+					}
			
 
				+					$j++;
			
 
				+		    	}
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+		    	foreach ($pp as $v)
			
 
				+		    	{
			
 
				+					$num = explode('-',$v);
			
 
				+					if(isset($num[2]) && $num[2] == 'DNOTO')//选择不占单的
			
 
				+					{
			
 
				+						$fhw .= $v.'|';
			
 
				+			    		$wcfpd .= $fd[$j].';';
			
 
				+					}
			
 
				+					else
			
 
				+					{
			
 
				+			    	    $fhw .= $num[0].'-'.$num[1].'-0|';
			
 
				+			    	    $cffpt = explode('|',trim($fd[$j],'|'));
			
 
				+			    	    $cffpt[9] = 0;
			
 
				+			    	    $wcfpd .= implode("|",$cffpt).';';
			
 
				+					}
			
 
				+			    	$j++;
			
 
				+		    	}
			
 
				+			}
			
 
				+			$whlabel = $fhw;
			
 
				+			$fpdata = $wcfpd;
			
 
				+			if($warehouse['zd'] == 1 && $warehouse['bdck'] != '')
			
 
				+			{
			
 
				+				$n = 'get_'.$warehouse['bdck'];
			
 
				+				$z = $this->$n($state,$warehouse,$shop,$number,$whlabel,$fpdata);
			
 
				+				return $z;exit;
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;
			
 
				+			}
			
 
				+	}
			
 
				+
			
 
				+	
			
 
				+	public function get_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=0)
			
 
				+	{
			
 
				+		//smt:edit-bcbz-readonly-customersmt_medit,dlz:edit-readonly-customer_medit
			
 
				+		if(!$whlabel || $whlabel == '|')
			
 
				+		{
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加产品信息！','success'=>false)));exit;
			
 
				+		}
			
 
				+		//先预先判断开始，否则清除数据后造成库存错误
			
 
				+		if($state == '207' || $state == '209')//待发货状态
			
 
				+		{
			
 
				+			$pp = explode('|',trim($whlabel,'|'));
			
 
				+			$cxsl = array();//产品数组化提供下面查询
			
 
				+			foreach ($pp as $key=>$va)
			
 
				+			{
			
 
				+				$w = explode('-',$va);
			
 
				+				if(!isset($w[2]))
			
 
				+				{
			
 
				+					$w[2] = 0;
			
 
				+				}
			
 
				+				$cxsl[$key] = $w;
			
 
				+			}
			
 
				+			$x = 0;$save = array();
			
 
				+			foreach ($pp as $key=>$va)
			
 
				+			{
			
 
				+				$num = explode('-',$va);
			
 
				+				if(!isset($num[2]) || isset($num[2]) && $num[2] != "DNOTO")
			
 
				+				{
			
 
				+				    foreach ($cxsl as $k=>$v)
			
 
				+				    {
			
 
				+					    if($v[0] == $num[0] && $num[2] != "DNOTO" && $key != $k)
			
 
				+					    {
			
 
				+							$num[1] += $v[1];//如果有相同产品并且未禁止占单，那么合并占单数量
			
 
				+					    }
			
 
				+					}
			
 
				+				}
			
 
				+				$wh = $this->whlabel->find_count("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and (shop IS NULL or shop = '')");//通用
			
 
				+				$shopwh = $this->whlabel->find_count("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and shop like '%,".$shop.",%'");//专属
			
 
				+				$x++;
			
 
				+				if($wh+$shopwh < $num[1] || (isset($num[2]) && $num[2] == "DNOTO" && $warehouse['zdms'] == 2))
			
 
				+				{
			
 
				+					$save[] = $x-1;continue;//提前先加X不然出错，所以要减1
			
 
				+				}
			
 
				+			}
			
 
				+			if(isset($save[0]) && $warehouse['zdms'] == 2)
			
 
				+            {
			
 
				+				return array('t'=>1,'m'=>json_encode(array('t'=>2,'msg'=>"红色商品名库存不够扣减或不允许占单",'error'=>$save,'hq'=>"state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '$number' or zd = '') and (shop IS NULL or shop = '')",'success'=>false)));exit;
			
 
				+            }
			
 
				+			if($yz == 0)
			
 
				+			{
			
 
				+				$z = $this->get_whlabel_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata);
			
 
				+				return $z;
			
 
				+			}
			
 
				+		}
			
 
				+		else//订单状态不符合
			
 
				+		{
			
 
				+			return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;
			
 
				+		}
			
 
				+	}
			
 
				+	public function get_whlabel_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata)
			
 
				+	{
			
 
				+		$fhw = '|';
			
 
				+		$fpdata = explode(';',trim($fpdata,';'));
			
 
				+		$wcfpd = '';
			
 
				+		$wlw = $this->whlabel->find_all("zd = '".$number."'");
			
 
				+		if($state == '207' || $state == '209')
			
 
				+		{
			
 
				+			$x = 0;
			
 
				+			$pp = explode('|',trim($whlabel,'|'));
			
 
				+			$wzdid = '';$szdid = '';$wfcid = array();
			
 
				+			foreach ($pp as $va)
			
 
				+			{
			
 
				+				$fhid = '';$DNOTO = 0;
			
 
				+				$num = explode('-',$va);
			
 
				+				if(isset($num[2]) && $num[2] == "DNOTO")
			
 
				+				{
			
 
				+					$DNOTO = 1;
			
 
				+				}
			
 
				+				$whlabel = $this->whlabel->find_all("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '".$number."' or zd = '') and (shop IS NULL or shop = '')");//通用
			
 
				+				$shopwhlabel = $this->whlabel->find_all("state = '0' and number = '$num[0]' and warehouse = '".$warehouse['id']."' and (zd = '".$number."' or zd = '') and shop like '%,".$shop.",%'");//专属
			
 
				+				if(count($shopwhlabel) > 0 && $DNOTO < 1)//如果有专属库存
			
 
				+				{
			
 
				+					if(count($shopwhlabel) >= $num[1])
			
 
				+					{
			
 
				+						for($i=0;$i<$num[1];$i++)
			
 
				+			            {
			
 
				+							$fhid .= $shopwhlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+							//$this->whlabel->save(array('zd'=>$number),$shopwhlabel[$i]['id']);//专属 ~符号这里改验货也需要改
			
 
				+							$wzdid .= 'id != '.$shopwhlabel[$i]['id'].' and ';
			
 
				+							$wfcid[] = $shopwhlabel[$i]['id'];
			
 
				+						}
			
 
				+					}
			
 
				+					else
			
 
				+					{
			
 
				+						for($i=0;$i<count($shopwhlabel);$i++)
			
 
				+			            {
			
 
				+							$fhid .= $shopwhlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+							//$this->whlabel->save(array('zd'=>$number),$shopwhlabel[$i]['id']);//扣减专属
			
 
				+							$wzdid .= 'id != '.$shopwhlabel[$i]['id'].' and ';
			
 
				+							$wfcid[] = $shopwhlabel[$i]['id'];
			
 
				+						}
			
 
				+						for($i=0;$i<$num[1]-count($shopwhlabel);$i++)
			
 
				+			            {
			
 
				+							if(isset($whlabel[$i]))
			
 
				+							{
			
 
				+							    $fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+							    //$this->whlabel->save(array('zd'=>$number),$whlabel[$i]['id']);//扣减通用
			
 
				+							    $wzdid .= 'id != '.$whlabel[$i]['id'].' and ';
			
 
				+							    $wfcid[] = $whlabel[$i]['id'];
			
 
				+							}
			
 
				+						}
			
 
				+					}
			
 
				+					$fhw .= $num[0].'-'.$num[1].'-'.rtrim($fhid,'~')."|";
			
 
				+					$cffpt = explode('|',trim($fpdata[$x],'|'));
			
 
				+					$cffpt[9] = rtrim($fhid,'~');
			
 
				+					$wcfpd .= implode("|",$cffpt).';';
			
 
				+				}
			
 
				+				else if(count($whlabel) >= $num[1] && $DNOTO < 1)
			
 
				+				{
			
 
				+					for($i=0;$i<$num[1];$i++)
			
 
				+			        {
			
 
				+						$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+						//$this->whlabel->save(array('zd'=>$number),$whlabel[$i]['id']);//通用
			
 
				+						$wzdid .= 'id != '.$whlabel[$i]['id'].' and ';
			
 
				+						$wfcid[] = $whlabel[$i]['id'];
			
 
				+					}
			
 
				+					$fhw .= $num[0].'-'.$num[1].'-'.rtrim($fhid,'~')."|";
			
 
				+					$cffpt = explode('|',trim($fpdata[$x],'|'));
			
 
				+					$cffpt[9] = rtrim($fhid,'~');
			
 
				+					$wcfpd .= implode("|",$cffpt).';';
			
 
				+				}
			
 
				+				else
			
 
				+				{
			
 
				+					$fhw .= $va."|";
			
 
				+					$wcfpd .= $fpdata[$x].';';
			
 
				+				}
			
 
				+				$x++;
			
 
				+			}
			
 
				+		}
			
 
				+		$this->db->trans_begin();
			
 
				+		if(isset($wlw[0]))
			
 
				+		{
			
 
				+			foreach ($wlw as $v)
			
 
				+			{
			
 
				+				$this->whlabel->save(array('zd'=>''),$v['id']);//专属
			
 
				+			}
			
 
				+		}
			
 
				+		if($wzdid != '')
			
 
				+		{
			
 
				+			foreach ($wfcid as $v)
			
 
				+			{
			
 
				+				$this->whlabel->save(array('zd'=>$number),$v);
			
 
				+			}
			
 
				+		}
			
 
				+		if ($this->db->trans_status() === FALSE)
			
 
				+        {
			
 
				+			$this->db->trans_rollback();
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));
			
 
				+		}
			
 
				+		else
			
 
				+		{
			
 
				+			$this->db->trans_commit();
			
 
				+			return array('t'=>0,'whlabel'=>$fhw,'fpdata'=>$wcfpd);
			
 
				+		}
			
 
				+	}
			
 
				+	
			
 
				+	
			
 
				+	public function get_specialstock($state,$warehouse,$shop,$number,$whlabel,$fpdata,$yz=0)
			
 
				+	{
			
 
				+		if(!$whlabel || $whlabel == '|' || stripos($whlabel,$warehouse['hz']) === false)
			
 
				+		{
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'请先添加特殊产品信息！','success'=>false)));exit;
			
 
				+		}
			
 
				+		//先预先判断开始，否则清除数据后造成库存错误
			
 
				+		if($state == '207' || $state == '209')//待发货状态
			
 
				+		{
			
 
				+			$pp = explode('|',trim($whlabel,'|'));
			
 
				+			$x = 0;$save = array();
			
 
				+			foreach ($pp as $va)
			
 
				+			{
			
 
				+				$x++;
			
 
				+				$num = explode('-',$va);
			
 
				+				if(stripos($va,$warehouse['hz']) !== false)
			
 
				+				{
			
 
				+					$wh = $this->specialstock->find_count("state = '0' and number = '$num[0]' and (zd = '$number' or zd = '')");//通用
			
 
				+				    if($wh < $num[1])
			
 
				+				    {
			
 
				+						$save[] = $x-1;continue;//提前先加X不然出错，所以要减1
			
 
				+				    }
			
 
				+				}
			
 
				+			}
			
 
				+			if(isset($save[0]))
			
 
				+            {
			
 
				+				return array('t'=>1,'m'=>json_encode(array('t'=>2,'msg'=>"红色商品名库存不够扣减或不允许占单",'error'=>$save,'success'=>false)));exit;
			
 
				+            }
			
 
				+			if($yz == 0)
			
 
				+			{
			
 
				+				$z = $this->get_specialstock_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata);
			
 
				+				return $z;
			
 
				+			}
			
 
				+		}
			
 
				+		else//订单状态不符合
			
 
				+		{
			
 
				+			return array('t'=>0,'whlabel'=>$whlabel,'fpdata'=>$fpdata);exit;
			
 
				+		}
			
 
				+	}
			
 
				+	public function get_specialstock_zd($state,$warehouse,$shop,$number,$whlabel,$fpdata)
			
 
				+	{
			
 
				+		$fpdata = explode(';',trim($fpdata,';'));
			
 
				+		$wcfpd = '';
			
 
				+		$this->db->trans_begin();
			
 
				+		$wl = $this->whlabel->find_all("zd = '".$number."'");
			
 
				+		if($wl)
			
 
				+			{
			
 
				+				foreach ($wl as $v)
			
 
				+				{
			
 
				+					$this->whlabel->save(array('zd'=>''),$v['id']);//专属
			
 
				+				}
			
 
				+			}
			
 
				+		if($state == '207' || $state == '209')
			
 
				+		{
			
 
				+			$fhw = array();$x = 0;$wzdid = '';
			
 
				+			$pp = explode('|',trim($whlabel,'|'));
			
 
				+			foreach ($pp as $va)
			
 
				+			{
			
 
				+				$num = explode('-',$va);
			
 
				+				if(stripos($va,$warehouse['hz']) !== false)
			
 
				+				{
			
 
				+					$fhid = '';
			
 
				+					$num = explode('-',$va);
			
 
				+				    $whlabel = $this->specialstock->find_all("state = '0' and number = '$num[0]' and zd = ''");//通用
			
 
				+					$fgzid = explode('~',trim($num[2],'~'));
			
 
				+					foreach ($fgzid as $vid)
			
 
				+					{
			
 
				+					    $xzkc = $this->specialstock->read(rtrim($vid,$warehouse['hz']));//选择的这个库存
			
 
				+					    if($xzkc['zd'] != '')
			
 
				+					    {
			
 
				+						    return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'所选库存已被占单！请重新打开选择页面','success'=>false)));exit;
			
 
				+					    }
			
 
				+					}
			
 
				+					for($i=0;$i<$num[1];$i++)
			
 
				+			        {
			
 
				+						$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+					    $this->specialstock->save(array('zd'=>$number,'zdlist'=>date('Y-m-d H:i:s',time())),$whlabel[$i]['id']);//通用
			
 
				+						$wzdid .= 'id != '.$whlabel[$i]['id'].' and ';
			
 
				+				    }
			
 
				+					$fhw[] = $num[0].'-'.$num[1].'-'.rtrim($fhid,'~');
			
 
				+					$cffpt = explode('|',trim($fpdata[$x],'|'));
			
 
				+					$cffpt[9] = rtrim($fhid,'~');
			
 
				+					$wcfpd .= implode("|",$cffpt).';';
			
 
				+				}
			
 
				+				else
			
 
				+				{
			
 
				+					$fhw[] = $va;
			
 
				+					$wcfpd .= $fpdata[$x].';';
			
 
				+				}
			
 
				+				$x++;
			
 
				+			}
			
 
				+			$fhw = '|'.implode("|",$fhw).'|';
			
 
				+		}
			
 
				+		if ($this->db->trans_status() === TRUE)
			
 
				+        {
			
 
				+			$this->db->trans_commit();
			
 
				+			return array('t'=>0,'whlabel'=>$fhw,'fpdata'=>$wcfpd);exit;
			
 
				+		}
			
 
				+		else
			
 
				+		{
			
 
				+			$this->db->trans_rollback();
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));exit;
			
 
				+		}
			
 
				+	}
			
 
				+	
			
 
				+	//预先判断仓开始
			
 
				+	public function get_yx_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata)//通用仓
			
 
				+	{
			
 
				+		$z = $this->get_whlabel($state,$warehouse,$shop,$number,$whlabel,$fpdata);
			
 
				+		return $z;
			
 
				+
			
 
				+	}
			
 
				+	public function get_yx_specialstock($state,$warehouse,$shop,$number,$whlabel,$fpdata)//特殊仓
			
 
				+	{
			
 
				+		$pp = explode('|',trim($whlabel,'|'));
			
 
				+		$fpdata = explode(';',trim($fpdata,';'));
			
 
				+		$wcfpd = '';$fhw = array();
			
 
				+		$x = 0;$save = array();
			
 
				+		$kytskc = array();
			
 
				+		foreach ($pp as $k=>$va)
			
 
				+		{
			
 
				+			$num = explode('-',$va);
			
 
				+			$wh = $this->specialstock->find_count("state = '0' and number = '$num[0]' and zd = ''");
			
 
				+			if(!isset($num[1]))
			
 
				+			{
			
 
				+				$num[1] = 1;
			
 
				+			}
			
 
				+			if($wh >= $num[1])
			
 
				+			{
			
 
				+				$kytskc[] = $num[0].'-'.$num[1].'-z';//有可占用的
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				$kytskc[] = $num[0].'-'.$num[1].'-0';
			
 
				+			}
			
 
				+		}
			
 
				+		$y = 0;
			
 
				+		$this->db->trans_begin();
			
 
				+		foreach ($kytskc as $va)
			
 
				+		{
			
 
				+			$num = explode('-',$va);
			
 
				+			if(stripos($va,$warehouse['hz']) !== false)
			
 
				+			{
			
 
				+				$whlabel = $this->specialstock->find_all("state = '0' and number = '$num[0]' and zd = ''");//通用
			
 
				+				$fhid = '';
			
 
				+				for($i=0;$i<$num[1];$i++)
			
 
				+			    {
			
 
				+					$fhid .= $whlabel[$i]['id'].$warehouse['hz'].'~';
			
 
				+					$this->specialstock->save(array('zd'=>$number,'zdlist'=>date('Y-m-d H:i:s',time())),$whlabel[$i]['id']);//通用
			
 
				+				}
			
 
				+				$fhw[] = $num[0].'-'.$num[1].'-'.rtrim($fhid,'~');
			
 
				+				$cffpt = explode('|',trim($fpdata[$x],'|'));
			
 
				+				$cffpt[9] = rtrim($fhid,'~');
			
 
				+				$wcfpd .= implode("|",$cffpt).';';
			
 
				+				$y++;
			
 
				+			}
			
 
				+			else
			
 
				+			{
			
 
				+				$fhw[] = $num[0].'-'.$num[1].'-0';
			
 
				+				$wcfpd .= $fpdata[$x].';';
			
 
				+			}
			
 
				+			$x++;
			
 
				+		}
			
 
				+		if($this->db->trans_status() === TRUE)
			
 
				+        {
			
 
				+			$this->db->trans_commit();
			
 
				+			return array('t'=>0,'whlabel'=>"|".implode("|",$fhw)."|",'fpdata'=>$wcfpd);exit;
			
 
				+		}
			
 
				+		else
			
 
				+		{
			
 
				+			$this->db->trans_rollback();
			
 
				+			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','success'=>false)));exit;
			
 
				+		}
			
 
				+	}
			
 
				+	//预先判断仓结束
			
 
				+	
			
 
				+	public function get_fl($hz,$whlabel,$fpdata)//特殊仓
			
 
				+	{
			
 
				+		$sfxh = 0;
			
 
				+		if($hz != '')
			
 
				+		{
			
 
				+			$num = explode('|',trim($whlabel,'|'));
			
 
				+		    $bh = substr_count($whlabel,$hz);
			
 
				+		    if($bh == count($num))
			
 
				+		    {
			
 
				+			    $sfxh = 1;//有现货
			
 
				+		    }
			
 
				+		}
			
 
				+		$f = explode(';',trim($fpdata,';'));
			
 
				+		//$fl = substr_count($fpdata,'Bob');//暂时不用这个，防止产品出现大小写不一致
			
 
				+		$i = 0;
			
 
				+		foreach ($f as $v) 
			
 
				+		{
			
 
				+			if(stripos($fpdata,'bob') !== false && (stripos($v,'bob') !== false || stripos($v,'wig') === false))
			
 
				+			{
			
 
				+				$i++;
			
 
				+			}
			
 
				+		}
			
 
				+		if(count($f) == $i)
			
 
				+		{
			
 
				+			$type = $this->typeclass->get_type('37','BOBTYPE');
			
 
				+		}
			
 
				+		else if(stripos($fpdata,'wig') !== false)
			
 
				+		{
			
 
				+			$type = $this->typeclass->get_type('37','WIGTYPE');
			
 
				+		}
			
 
				+		else
			
 
				+		{
			
 
				+			$type = $this->typeclass->get_type('37','OTHERTYPE');
			
 
				+		}
			
 
				+		$ckfl = $type['id'];
			
 
				+		return array('sfxh'=>$sfxh,'ckfl'=>$ckfl);
			
 
				+	}
			
 
				 }  //end class
			
--- a/core/CoreApp/models/Model_classid.php
+++ b/core/CoreApp/models/Model_classid.php
@@ -28,7 +28,7 @@ class Model_classid extends Lin_Model
 
				 				$sku['dc'] = '';

			
 
				 				$sku['c'] = '';

			
 
				 			}

			
 
				-			else if($v['id'] == 39)

			
 
				+			else if($v['id'] == 7)

			
 
				 			{

			
 
				 				$sku[999] = '';

			
 
				 				$sku[9999] = '';

			
--- a/core/CoreApp/models/Model_cne.php
+++ b/core/CoreApp/models/Model_cne.php
--- a/core/CoreApp/models/Model_company.php
+++ b/core/CoreApp/models/Model_company.php
@@ -0,0 +1,10 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_Company extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'company';

			
 
				+    $this->load_table('company');

			
 
				+}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_container.php
+++ b/core/CoreApp/models/Model_container.php
@@ -0,0 +1,15 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_container extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'container';

			
 
				+    $this->load_table('container');

			
 
				+}

			
 
				+	/** 通过名称查找 */

			
 
				+	public function get_name($name)

			
 
				+	{

			
 
				+		return  $this->find("name = '$name'");	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_devicemaster.php
+++ b/core/CoreApp/models/Model_devicemaster.php
@@ -0,0 +1,11 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 
			
 
				+class Model_devicemaster extends Lin_Model 
			
 
				+{
			
 
				+	function __construct(){
			
 
				+        parent::__construct();
			
 
				+        $this->load->database();
			
 
				+        $this->table = 'devicemaste';
			
 
				+        $this->load_table('devicemaster');
			
 
				+    }
			
 
				+	
			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_dhl.php
+++ b/core/CoreApp/models/Model_dhl.php
@@ -2,9 +2,13 @@
 
				 class Model_Dhl extends Lin_Model {

			
 
				 function __construct(){

			
 
				 		parent::__construct();

			
 
				+		$this->load->database();

			
 
				+		$this->table = 'dhl';

			
 
				+    	$this->load_table('dhl');

			
 
				 }

			
 
				     public function get_data($data)

			
 
				 	{

			
 
				+		$nd = $data;

			
 
				 		if($data['pay'] == 1)

			
 
				 		{

			
 
				 			$data['pay'] == 'PayPal';

			
@@ -330,8 +334,13 @@ function __construct(){
 
				 		$values = json_decode($res,true);

			
 
				 		

			
 
				 		**/

			
 
				-		

			
 
				-		

			
 
				+		//发送C类

			
 
				+		//$this->get_data_c($nd);

			
 
				+		$cx = $this->find("number = '".$nd['number']."'");

			
 
				+		if(!$cx && $nd['printcode'] != "DHLUSA")

			
 
				+		{

			
 
				+		    $this->insert(array("number"=>$nd['number'],'time'=>time()));

			
 
				+		}

			
 
				 		return $values;

			
 
				 	}

			
 
				 	

			
@@ -850,7 +859,7 @@ function __construct(){
 
				 			'Content-Type: application/json'

			
 
				         );

			
 
				 		$ch = curl_init();

			
 
				-		$url = 'https://webhub.cndhl.com/dps/dps-auth-server/api/gateway-token/generate';

			
 
				+		$url = 'https://dps-api.cndhl.com/dps-auth-server/api/gateway-token/generate';//正式   测试 https://webhub.cndhl.com/dps/dps-auth-server/api/gateway-token/generate

			
 
				 		curl_setopt($ch,CURLOPT_URL,$url);

			
 
				 		curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);

			
 
				 		curl_setopt($ch, CURLOPT_HTTPHEADER, $token_header);

			
@@ -864,15 +873,13 @@ function __construct(){
 
				 		$data = json_encode($post);

			
 
				         curl_setopt($ch, CURLOPT_POSTFIELDS,$data);

			
 
				 		$res = curl_exec($ch);

			
 
				-		curl_close($ch);

			
 
				 		$resp = json_decode($res,true);

			
 
				 		$token = $resp['result']['token'];

			
 
				 		return $token;

			
 
				 	}

			
 
				 	

			
 
				-	public function get_data_c($arg_array)//C类

			
 
				+	public function get_data_c($data,$id)//C类

			
 
				 	{

			
 
				-		$data = $this->fullorder->get_number($arg_array[0]);

			
 
				 		$token = $this->_token();

			
 
				 		$file_header = array(

			
 
				             'x-request-id: 605062090',

			
@@ -880,7 +887,7 @@ function __construct(){
 
				 			'Content-Type: application/json'

			
 
				         );

			
 
				 		$ch = curl_init();

			
 
				-		$url = 'https://webhub.cndhl.com/dps/dps-declaration-api/api/declare/submit-declare';

			
 
				+		$url = 'https://dps-api.cndhl.com/dps-declaration-api/api/declare/submit-declare';

			
 
				 		curl_setopt($ch,CURLOPT_URL,$url);

			
 
				 		curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);

			
 
				 		curl_setopt($ch, CURLOPT_HTTPHEADER, $file_header);

			
@@ -889,7 +896,7 @@ function __construct(){
 
				 		curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,600);

			
 
				         //设置post数据

			
 
				 		

			
 
				-		

			
 
				+		$list = $data;

			
 
				 		$post = array();

			
 
				 		$post['decMessage']['decHead']['iEFlag']="E";

			
 
				 		$post['decMessage']['decHead']['tradeName']="许昌龙盈实业集团有限公司";

			
@@ -935,22 +942,23 @@ function __construct(){
 
				 		$res = curl_exec($ch);

			
 
				 		curl_close($ch);

			
 
				 		$resp = json_decode($res,true);

			
 
				-		

			
 
				+		$j = '';

			
 
				 		if(isset($resp['result']))

			
 
				 		{

			
 
				 			if($resp['result'] == 'OK')

			
 
				 			{

			
 
				-				return 1;

			
 
				+				$j =  1;

			
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				return 2;

			
 
				+				$j =  2;

			
 
				 			}

			
 
				 		}

			
 
				 		else

			
 
				 		{

			
 
				-			return 2;

			
 
				+			$j =  2;

			
 
				 		}

			
 
				+		$this->save(array('type'=>$j),$id);

			
 
				 	}

			
 
				 	

			
 
				 	public function get_data_9610($data)//9610

			
@@ -963,7 +971,7 @@ function __construct(){
 
				 			'Content-Type: application/json'

			
 
				         );

			
 
				 		$ch = curl_init();

			
 
				-		$url = 'https://webhub.cndhl.com/dps/dps-declaration-api/api/cross-border/submit-declare';

			
 
				+		$url = 'https://dps-api.cndhl.com/dps-declaration-api/api/cross-border/submit-declare';

			
 
				 		curl_setopt($ch,CURLOPT_URL,$url);

			
 
				 		curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);

			
 
				 		curl_setopt($ch, CURLOPT_HTTPHEADER, $file_header);

			
@@ -977,7 +985,7 @@ function __construct(){
 
				 		

			
 
				 		$post['baseInfo']['logisticsNo']=$data['waybill'];//运单号

			
 
				 		$post['baseInfo']['iEFlag']="E";//进出口类型

			
 
				-		$post['baseInfo']['ebpName']=$data['shop'];//电商平台名称

			
 
				+		$post['baseInfo']['ebpName']=$data['shoptype'];//电商平台名称

			
 
				 		$post['baseInfo']['ebpUsCode']="91411023MA45JCKTXL";//电商平台统一社会信用代码

			
 
				 		$post['baseInfo']['ebpCode']="4110961543";//电商平台海关注册编码

			
 
				         $post['baseInfo']['ebcName']="许昌龙盈实业集团有限公司";//发货人

			
@@ -989,32 +997,31 @@ function __construct(){
 
				 		$post['baseInfo']['version']="1.0";//报文版本号

			
 
				 		$post['baseInfo']['requestTime']=date('Y-m-d H:i:s',time());//报文请求时间

			
 
				 		

			
 
				-		$post['declareInfo']['orderNo']=$data['number'];//订单编号

			
 
				-		$post['declareInfo']['statisticsFlag']="A";//申报业务类型A-简化申报，B-汇总申报，只能填写大写A或者B。

			
 
				+		$post['declareInfo']['orderNo']=$data['orderinfo'];//订单编号

			
 
				+		$post['declareInfo']['statisticsFlag']="B";//申报业务类型A-简化申报，B-汇总申报，只能填写大写A或者B。

			
 
				 		$post['declareInfo']['tradeMode']="9610";//贸易方式

			
 
				-		$post['declareInfo']['grossWeight']=rtrim($data['weight'],'kg')*1000;//毛重

			
 
				+		$post['declareInfo']['grossWeight']=sprintf("%.2f",rtrim($data['weight'],'kg'));//毛重

			
 
				 		$post['declareInfo']['wrapType']="22";//包装种类

			
 
				-		$post['declareInfo']['netWeight']=sprintf("%.2f",$data['jweight']);//净重

			
 
				+		$post['declareInfo']['netWeight']=sprintf("%.2f",$data['jweight']/1000);//净重

			
 
				 		$post['declareInfo']['freight']="20";//运费

			
 
				 		$post['declareInfo']['fcurrency']="USD";//运费币制

			
 
				 		$post['declareInfo']['insuredFee']=$data['bx'];//保费总价

			
 
				 		$post['declareInfo']['icurrency']="USD";//保费币制

			
 
				         

			
 
				-        $post['goodsInfoList'][0]['gnum']=$num;//客户需要 从1开始递增

			
 
				+        $post['goodsInfoList'][0]['gnum']=1;//客户需要 从1开始递增

			
 
				 		$post['goodsInfoList'][0]['itemNo']= "无";//企业自定义货号

			
 
				 		$post['goodsInfoList'][0]['gname']=$data['zwpm'];//商品名称

			
 
				 		$post['goodsInfoList'][0]['gcode']=$data['hgbm'];//商品编码

			
 
				 		$post['goodsInfoList'][0]['gmodel']="0|0|假发|人发";//规格型号

			
 
				 		$post['goodsInfoList'][0]['barCode']="无";//商品条形码

			
 
				-		$post['goodsInfoList'][0]['qty1']=$data['zjs'];//第一法定数量

			
 
				+		$post['goodsInfoList'][0]['qty1']=$post['declareInfo']['netWeight'];//第一法定数量

			
 
				 		$post['goodsInfoList'][0]['unit1']="035";//第一法定计量单位

			
 
				 		$post['goodsInfoList'][0]['qty']=$data['ts'];//申报数量

			
 
				 		$post['goodsInfoList'][0]['unit']="015";//申报计量单位

			
 
				 		$post['goodsInfoList'][0]['price']=$data['dtsbjz'];//单价

			
 
				 		$post['goodsInfoList'][0]['totalPrice']=$data['zsbjz'];//总价

			
 
				 		$post['goodsInfoList'][0]['currency']="USD";//币制

			
 
				-		

			
 
				-		

			
 
				+

			
 
				 		$data = json_encode($post);

			
 
				 		//echo $data;exit;

			
 
				         curl_setopt($ch, CURLOPT_POSTFIELDS,$data);

			
--- a/core/CoreApp/models/Model_email.php
+++ b/core/CoreApp/models/Model_email.php
@@ -0,0 +1,15 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_email extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'email';

			
 
				+    $this->load_table('email');

			
 
				+}

			
 
				+	/** 通过名称查找 */

			
 
				+	public function get_uid($uid)

			
 
				+	{

			
 
				+		return  $this->find("uid = '$uid'");	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_excel.php
+++ b/core/CoreApp/models/Model_excel.php
@@ -225,7 +225,10 @@ function __construct(){
 
				 				}

			
 
				 				else if($ke != 'fpdata' && $ke != 'hl' && $ke != 'currencytitle' || $ke == 'orderinfo')

			
 
				 				{

			
 
				-						 $str .= "<td align='left' style='vnd.ms-excel.numberformat:@'>".trim($va,' ')."\t"."</td>"; //.$tj.$va.

			
 
				+					if(is_string($va))

			
 
				+					{

			
 
				+					    $str .= "<td align='left' style='vnd.ms-excel.numberformat:@'>".trim($va,' ')."\t"."</td>"; //.$tj.$va.

			
 
				+					}

			
 
				 				}

			
 
				 		    }

			
 
				 			$str .= "</tr>\n";

			
--- a/core/CoreApp/models/Model_fedex.php
+++ b/core/CoreApp/models/Model_fedex.php
--- a/core/CoreApp/models/Model_fedex_ficp.php
+++ b/core/CoreApp/models/Model_fedex_ficp.php
--- a/core/CoreApp/models/Model_fullorder_dbs_1hrgfepo0s19h_20241029184728.php
+++ b/core/CoreApp/models/Model_fullorder_dbs_1hrgfepo0s19h_20241029184728.php
@@ -0,0 +1,40 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_fullorder_dbs_1hrgfepo0s19h_20241029184728 extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'fullorder_dbs_1hrgfepo0s19h_20241029184728';

			
 
				+    $this->load_table('fullorder_dbs_1hrgfepo0s19h_20241029184728');

			
 
				+}

			
 
				+	/** 通过API查找 */

			
 
				+	public function get_api($api)

			
 
				+	{

			
 
				+		return  $this->find("api = '$api'");	

			
 
				+	}

			
 
				+	public function get_number($number)

			
 
				+	{

			
 
				+		return  $this->find("number = '$number'");	

			
 
				+	}

			
 
				+	public function get_orderinfo($orderinfo)

			
 
				+	{

			
 
				+		return  $this->find("orderinfo = '$orderinfo'");	

			
 
				+	}

			
 
				+	public function get_waybill($waybill)

			
 
				+	{

			
 
				+		return  $this->find("waybill = '$waybill'");	

			
 
				+	}

			
 
				+	public function get_rpaypal($rpaypal)

			
 
				+	{

			
 
				+		return  $this->find("rpaypal = '$rpaypal'");	

			
 
				+	}

			
 
				+	public function get_paypal($paypal)

			
 
				+	{

			
 
				+		return  $this->find("paypal = '$paypal'");	

			
 
				+	}

			
 
				+	public function get_time($time)

			
 
				+	{

			
 
				+		$dt = 3600;

			
 
				+		return  date('Y-m-d H:i:s',$time+$dt);	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_fullorderhb.php
+++ b/core/CoreApp/models/Model_fullorderhb.php
@@ -0,0 +1,32 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_fullorderhb extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'fullorderhb';

			
 
				+    $this->load_table('fullorderhb');

			
 
				+}

			
 
				+	/** 通过API查找 */

			
 
				+	public function get_api($api)

			
 
				+	{

			
 
				+		return  $this->find("api = '$api'");	

			
 
				+	}

			
 
				+	public function get_number($number)

			
 
				+	{

			
 
				+		return  $this->find("number = '$number'");	

			
 
				+	}

			
 
				+	public function get_orderinfo($orderinfo)

			
 
				+	{

			
 
				+		return  $this->find("orderinfo = '$orderinfo'");	

			
 
				+	}

			
 
				+	public function get_waybill($waybill)

			
 
				+	{

			
 
				+		return  $this->find("waybill = '$waybill'");	

			
 
				+	}

			
 
				+	public function get_time($time)

			
 
				+	{

			
 
				+		$dt = 3600;

			
 
				+		return  date('Y-m-d H:i:s',$time+$dt);	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_fullorderpaypal.php
+++ b/core/CoreApp/models/Model_fullorderpaypal.php
@@ -0,0 +1,19 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_fullorderpaypal extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'fullorderpaypal';

			
 
				+    $this->load_table('fullorderpaypal');

			
 
				+}

			
 
				+	/** 通过API查找 */

			
 
				+	public function get_orderinfo($orderinfo)

			
 
				+	{

			
 
				+		return  $this->find("orderinfo = '$orderinfo'");	

			
 
				+	}

			
 
				+	public function get_waybill($waybill)

			
 
				+	{

			
 
				+		return  $this->find("waybill = '$waybill'");	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_fullordertthb.php
+++ b/core/CoreApp/models/Model_fullordertthb.php
@@ -0,0 +1,32 @@
 
				+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 

			
 
				+class Model_fullordertthb extends Lin_Model 

			
 
				+{

			
 
				+	function __construct(){

			
 
				+	parent::__construct();

			
 
				+	$this->load->database();

			
 
				+	$this->table = 'fullordertthb';

			
 
				+    $this->load_table('fullordertthb');

			
 
				+}

			
 
				+	/** 通过API查找 */

			
 
				+	public function get_api($api)

			
 
				+	{

			
 
				+		return  $this->find("api = '$api'");	

			
 
				+	}

			
 
				+	public function get_number($number)

			
 
				+	{

			
 
				+		return  $this->find("number = '$number'");	

			
 
				+	}

			
 
				+	public function get_orderinfo($orderinfo)

			
 
				+	{

			
 
				+		return  $this->find("orderinfo = '$orderinfo'");	

			
 
				+	}

			
 
				+	public function get_waybill($waybill)

			
 
				+	{

			
 
				+		return  $this->find("waybill = '$waybill'");	

			
 
				+	}

			
 
				+	public function get_time($time)

			
 
				+	{

			
 
				+		$dt = 3600;

			
 
				+		return  date('Y-m-d H:i:s',$time+$dt);	

			
 
				+	}

			
 
				+}  //end class
			
--- a/core/CoreApp/models/Model_hualei.php
+++ b/core/CoreApp/models/Model_hualei.php
@@ -74,7 +74,8 @@ function __construct(){
 
				 		'consignee_telephone' => $data['phone'],//收货人电话 必填

			
 
				 		'country' => $data['lb'],//收货人国家二字码

			
 
				 		'shipper_taxno' => $data['ioss'],

			
 
				-		'shipper_taxnocountry' => 'CN',

			
 
				+		'shipper_taxnotype'=>'IOSS',

			
 
				+		'shipper_taxnocountry' => 'NL',

			
 
				 		'customer_id' => $customer_id,

			
 
				 		'customer_userid' => $customer_userid,

			
 
				 		'orderInvoiceParam' => Array(

			
@@ -141,7 +142,6 @@ function __construct(){
 
				 		//'order_insurance'=>'',//保险金额

			
 
				 		);

			
 
				 		}

			
 
				-

			
 
				 		$result = $this->curlRequest('http://123.207.33.169:8082/createOrderApi.htm',$link.json_encode($count));

			
 
				 		$resultData = json_decode($result['result'], true);

			
 
				 		if($resultData['ack'] == 'true')

			
--- a/core/CoreApp/models/Model_hualeixw.php
+++ b/core/CoreApp/models/Model_hualeixw.php
@@ -18,6 +18,18 @@ function __construct(){
 
				 			$link = 'getTrackingNumber=2&param=';

			
 
				 			$ys = 1;//延时获取运单

			
 
				 		}

			
 
				+		else if($data['printcode'] == "HUALEIXW-DHL")

			
 
				+		{

			
 
				+			$product_id = 7141;

			
 
				+			$link = 'param=';

			
 
				+			$ys = 0;//非延时获取运单

			
 
				+		}

			
 
				+		else if($data['printcode'] == "HUALEIXW-ARAMEX")

			
 
				+		{

			
 
				+			$product_id = 3361;

			
 
				+			$link = 'param=';

			
 
				+			$ys = 0;//非延时获取运单

			
 
				+		}

			
 
				 		else if($data['printcode'] == "HUALEIXW-GES-GB-A")

			
 
				 		{

			
 
				 			//$product_id = 4461;

			
@@ -27,7 +39,7 @@ function __construct(){
 
				 		}

			
 
				 		else if ($data['printcode'] == "HUALEIXW-GES-EU9610")

			
 
				 		{

			
 
				-			$product_id = 7301;

			
 
				+			$product_id = 4301;//7301;

			
 
				 			$link = 'getTrackingNumber=2&param=';

			
 
				 			$ys = 1;

			
 
				 		}

			
--- a/core/CoreApp/models/Model_logic_crm.php
+++ b/core/CoreApp/models/Model_logic_crm.php
@@ -0,0 +1,215 @@
 
				+<?php
			
 
				+/**
			
 
				+ * 对接crm接口
			
 
				+ */
			
 
				+class Model_logic_crm extends Lin_Model {
			
 
				+    function __construct(){
			
 
				+            parent::__construct();
			
 
				+            $this->load->_model('Model_express','express');
			
 
				+            $this->load->_model("Model_logic_ding","logic_ding");
			
 
				+    }
			
 
				+    public function panduan($order_info,$type,$express_info){
			
 
				+        if(empty($order_info)){
			
 
				+            return ;
			
 
				+        }
			
 
				+        if(!is_array($order_info)){
			
 
				+            return ;
			
 
				+        }
			
 
				+        //目前只有 4 店铺才处理
			
 
				+        if(!in_array($order_info['shop'],[4])){
			
 
				+            return ;
			
 
				+        }
			
 
				+        $express_info = $this->express->read($order_info['express']);
			
 
				+        if($type == 1){
			
 
				+            return ;
			
 
				+            return $this->orderCreated($order_info,$express_info);
			
 
				+        }
			
 
				+        if($type == 2){
			
 
				+            return $this->sendOutWarehouse($order_info,$express_info);
			
 
				+        }
			
 
				+        if($type == 3){
			
 
				+            return $this->orderPredelivery($order_info,$express_info);
			
 
				+        }
			
 
				+        if($type == 4){
			
 
				+            return $this->orderDelivery($order_info,$express_info);
			
 
				+        }
			
 
				+    }
			
 
				+    //处理转化接口需要的数据
			
 
				+    protected function transferData($order_info,$express_info){
			
 
				+        $len = strlen((string)$order_info['shop']);
			
 
				+        //var_dump($order_info['orderinfo']);
			
 
				+        $increment_id = substr($order_info['orderinfo'],$len);
			
 
				+        //var_dump($increment_id);
			
 
				+        $item_list = [
			
 
				+            // [
			
 
				+            //     "title"=>"",
			
 
				+            //     "sku"=>"",
			
 
				+            //     "qty"=>0,
			
 
				+            // ]
			
 
				+        ];
			
 
				+        $sku_list = explode(",",$order_info['issku']);
			
 
				+        $product_list = explode(",",$order_info['product']);
			
 
				+        $qty_list = explode(";",$order_info['quantity']);
			
 
				+        try{
			
 
				+             foreach($sku_list as $key => $value){
			
 
				+                $item_list[] = [
			
 
				+                    "name"=>$product_list[$key],
			
 
				+                    "sku"=>$value,
			
 
				+                    "qty"=>isset($qty_list[$key])?$qty_list[$key]:1,
			
 
				+                ];
			
 
				+            }
			
 
				+
			
 
				+            
			
 
				+        }catch(Exception $e){
			
 
				+           //防止品名和数量对不上  直接放弃不发了
			
 
				+           return [];
			
 
				+        }
			
 
				+        // foreach($sku_list as $key => $value){
			
 
				+        //     $item_list[] = [
			
 
				+        //         "name"=>$product_list[$key],
			
 
				+        //         "sku"=>$value,
			
 
				+        //         "qty"=>isset($qty_list[$key])?$qty_list[$key]:1,
			
 
				+        //     ];
			
 
				+        // }
			
 
				+
			
 
				+        $address = "";
			
 
				+        if(!empty($order_info['street'])){
			
 
				+            $address .= $order_info['street'];
			
 
				+        }
			
 
				+        if(!empty($order_info['address'])){
			
 
				+            $address .= $order_info['address'];
			
 
				+        }
			
 
				+        if(!empty($order_info['address2'])){
			
 
				+            $address .= $order_info['address2'];
			
 
				+        }
			
 
				+        $info = [
			
 
				+            "website_id"=>(int)$order_info['shop'],
			
 
				+            "orderinfo"=>[
			
 
				+                "increment_id"=>$increment_id,
			
 
				+                "store_id"=>$order_info['shop'],
			
 
				+                "customer_id"=>0,
			
 
				+                "customer_name"=>$order_info['client'],
			
 
				+                "customer_email"=>$order_info['email'],
			
 
				+                "customer_phone"=>$order_info['phone'],
			
 
				+                "grand_total" =>$order_info['shouldmoney'],
			
 
				+                "country"=>$order_info['al'],
			
 
				+                "product_items"=>$item_list,
			
 
				+                "created_at"=>$order_info['dtime'],//建议只精确到天 不要时分秒
			
 
				+                "updated_at"=>0,//发货时间
			
 
				+                "address"=>[
			
 
				+                    "street"=> $address,
			
 
				+                    "city"=> $order_info['city'],
			
 
				+                    "province"=> $order_info['province'],
			
 
				+                    "zip"=> $order_info['zipcode'],
			
 
				+                    "country"=> $order_info['al'],
			
 
				+                    "phone"=> $order_info['phone'],
			
 
				+                ]
			
 
				+            ]
			
 
				+           
			
 
				+
			
 
				+        ];
			
 
				+
			
 
				+        return $info;
			
 
				+    }
			
 
				+    //订单创建
			
 
				+    protected function orderCreated($order_info,$express_info = []){
			
 
				+        $info = $this->transferData($order_info,$express_info);
			
 
				+        if(empty($info)){
			
 
				+          return ;  
			
 
				+        }
			
 
				+        $info['updated_at'] = $order_info['time'];
			
 
				+        $info["act"]  = "order_created";
			
 
				+        $info["status"]='pending';//订单进行中
			
 
				+        $this->sendOrderNotice(json_encode($info));
			
 
				+    }
			
 
				+    //向crm发送订单出货通知
			
 
				+    /**
			
 
				+     * @param $order_info 订单信息
			
 
				+     * @param $express_info 快递公司信息
			
 
				+     */
			
 
				+    protected function sendOutWarehouse($order_info,$express_info =[]){
			
 
				+        $info = $this->transferData($order_info,$express_info);
			
 
				+        if(empty($info)){
			
 
				+          return ;  
			
 
				+        }
			
 
				+        $info['updated_at'] = time();
			
 
				+        $info["act"]  = "order_shipped";
			
 
				+        $info["status"]='processing';//订单进行中
			
 
				+        $info['orderinfo']['tracking_number'] = $order_info['waybill'];
			
 
				+        $info['orderinfo']['carrier'] = $express_info['iscode'];
			
 
				+        $info['orderinfo']['tracking_url'] = $express_info['url'];
			
 
				+        $this->sendOrderNotice(json_encode($info));
			
 
				+    }   
			
 
				+    //订单预计送达时间
			
 
				+    protected function orderPredelivery($order_info,$express_info =[]){
			
 
				+        $info = $this->transferData($order_info,$express_info);
			
 
				+        if(empty($info)){
			
 
				+          return ;  
			
 
				+        }
			
 
				+        $info['updated_at'] = time();
			
 
				+        $info["act"]  = "order_predelivery";
			
 
				+        $info["status"]='processing';//订单进行中
			
 
				+        $info['orderinfo']['tracking_number'] = $order_info['waybill'];
			
 
				+        $info['orderinfo']['carrier'] = $express_info['iscode'];
			
 
				+        $info['orderinfo']['tracking_url'] = $express_info['url'];
			
 
				+        $this->sendOrderNotice(json_encode($info));
			
 
				+    }
			
 
				+    //向crm 发送订单收获通知
			
 
				+    protected function orderDelivery($order_info,$express_info =[]){
			
 
				+        $info = $this->transferData($order_info,$express_info);
			
 
				+        if(empty($info)){
			
 
				+          return ;  
			
 
				+        }
			
 
				+        $info['updated_at'] = time();
			
 
				+        $info["act"]  = "order_delivery";
			
 
				+        $info["status"]='processing';//订单进行中
			
 
				+        $info['orderinfo']['tracking_number'] = $order_info['waybill'];
			
 
				+        $info['orderinfo']['carrier'] = $express_info['iscode'];
			
 
				+        $info['orderinfo']['tracking_url'] = $express_info['url'];
			
 
				+        $this->sendOrderNotice(json_encode($info));
			
 
				+    }
			
 
				+    //向crm发送订单通知
			
 
				+    protected function sendOrderNotice($params){
			
 
				+        
			
 
				+      
			
 
				+      
			
 
				+         $all_url = "http://crm.hnwmzp.cn/sqs";
			
 
				+    
			
 
				+         $ch = curl_init($all_url);
			
 
				+         // 设置cURL选项 
			
 
				+         $options = array(
			
 
				+             CURLOPT_SSL_VERIFYPEER=>false,
			
 
				+             CURLOPT_SSL_VERIFYHOST=>false,
			
 
				+             CURLOPT_RETURNTRANSFER => true,   
			
 
				+             CURLOPT_POST => true,             
			
 
				+             CURLOPT_POSTFIELDS => $params,  
			
 
				+             CURLOPT_HTTPHEADER => [
			
 
				+                 'lytoken'=>'lytec',
			
 
				+                 'Content-Type: application/json'
			
 
				+             ],
			
 
				+         );
			
 
				+         // 应用这些选项到cURL会话
			
 
				+         curl_setopt_array($ch, $options);
			
 
				+ 
			
 
				+         // 执行cURL会话并获取响应
			
 
				+         $response = curl_exec($ch);
			
 
				+        
			
 
				+        //var_dump( $response );
			
 
				+           // 检查是否有错误发生
			
 
				+        if ($response === false) {
			
 
				+            $error = curl_error($ch);
			
 
				+            curl_close($ch);
			
 
				+            return [
			
 
				+                "code"=> -1,
			
 
				+                "msg"=> $error
			
 
				+            ];
			
 
				+        }
			
 
				+
			
 
				+        // 关闭cURL会话
			
 
				+        curl_close($ch);
			
 
				+
			
 
				+        // 输出响应内容
			
 
				+        return json_decode($response,true);
			
 
				+    }
			
 
				+}
			
 
				+
			
--- a/core/CoreApp/models/Model_logic_ding.php
+++ b/core/CoreApp/models/Model_logic_ding.php
		`@@ -0,0 +1 @@`
		`+open_basedir=/www/wwwroot/1.wepolicy.cn/:/tmp/`
		`@@ -0,0 +1 @@`
		`+py2ZZAKT7_C_KvqBkZIBSYMLXRbGRE6kTjdNlU5rGHQ.g08JR1D1oqzUu8uSRzemtcHIMHh-NIa29o3LoMj77Ps`
		`@@ -0,0 +1 @@`
		`+2024071400000018ybebeaaecw7wbk1n7ixwvehv725iffj96uzoqtk57jo7lumc`