lvhao преди 2 месеца
родител
ревизия
f8c52eb499
променени са 2 файла, в които са добавени 20 реда и са изтрити 2 реда
  1. 19 1
      core/CoreApp/controllers/Commodity.php
  2. 1 1
      template/erp/commodity.html

+ 19 - 1
core/CoreApp/controllers/Commodity.php

@@ -707,6 +707,24 @@ class Commodity extends Start_Controller {
 			foreach($tcall as $v){
 				$dtctitle[$v['id']] = $v['title'];
 			}
+
+			$dtc = [];
+			foreach ($tcall 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']);
+				}
+			}
             foreach ($info_list as $key=>$v) 
 		    {
 				$shopname = isset($shop_list[$v['shop']])?$shop_list[$v['shop']]:'';
@@ -714,7 +732,7 @@ class Commodity extends Start_Controller {
 				$tmp_list = [];
 				foreach($skulist as $skv){
 					$tmp_sku = str_replace('--','-',$skv['sku']);
-					$u9_info = $this->logic_order->skuTransferFeatures($tmp_sku,$typeclass,$dtctitle,$classid);
+					$u9_info = $this->logic_order->skuTransferFeatures($tmp_sku,$typeclass,$dtc,$dtctitle,$classid);
 					echo "<pre>";
 					var_dump($tmp_sku);
 					var_dump($u9_info);

+ 1 - 1
template/erp/commodity.html

@@ -29,7 +29,7 @@
 </ul>
 <div class="control">
 <a href="javascript:void(0);" class="commodity">同步产品</a>
-<!-- <a href="javascript:void(0);" class="excel_daochu">excel导出产品</a> -->
+<a href="javascript:void(0);" class="excel_daochu">excel导出产品</a>
 </div>
 <table class="datatitle data" border="0" style="border-collapse:collapse;">
 <tr>