推送接发其它的相关信息

core/CoreApp/controllers/Specialstock.php

@@ -1603,6 +1603,9 @@ class Specialstock extends Start_Controller {
 			{
 				$list['syhairther'] = $this->input->post('syhairther',true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			foreach($list as $k=>$v)
 			{
 				if($v != 0)
@@ -1740,6 +1743,9 @@ class Specialstock extends Start_Controller {
 			{
 				$list['syhairther'] = $this->input->post('syhairther',true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			foreach($list as $k=>$v)
 			{
 				if($v != 0)

core/CoreApp/controllers/Transfer.php

@@ -333,6 +333,10 @@ class Transfer extends Start_Controller {
 			{
 				$list['syhairther'] = $this->input->post('syhairther',true);
 			}
+
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 				foreach($list as $k=>$v)
 				{
 					if($v != 0)

core/CoreApp/controllers/Typeclass.php

@@ -221,6 +221,7 @@ class Typeclass extends Start_Controller {
 			}else{
 				$post['is_check'] = 0;
 			}
+			$post['ysdj'] = $post['ysdj']? $post['ysdj']*1 : 0;
 			if($this->typeclass->insert($post))
         	{
          		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
@@ -293,6 +294,7 @@ class Typeclass extends Start_Controller {
 			}else{
 				$post['is_check'] = 0;
 			}
+			$post['ysdj'] = $post['ysdj']? $post['ysdj']*1 : 0;
 			if($this->typeclass->save($post,$id))
         	{
          		echo json_encode(array('msg'=>'修改成功','success'=>true));exit;

core/CoreApp/controllers/Whlabel.php

@@ -1894,6 +1894,9 @@ class Whlabel extends Start_Controller
 				$list['items'] = $this->input->post('items', true);
 				$list['weight'] = $this->input->post('weight', true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			if ($category == 1702) {
 				$list['syhairther'] = $this->input->post('syhairther', true);
 			}
@@ -2117,6 +2120,9 @@ class Whlabel extends Start_Controller
 				$list['items'] = $this->input->post('items', true);
 				$list['weight'] = $this->input->post('weight', true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			if ($category == 1702) {
 				$list['syhairther'] = $this->input->post('syhairther', true);
 			}
@@ -5837,6 +5843,9 @@ class Whlabel extends Start_Controller
 				if ($category == 1702) {
 					$list['syhairther'] = $this->input->post('syhairther', true);
 				}
+				if($category == 130){
+					$list['jfother'] = $this->input->post('jfother', true);
+				}
 				foreach ($list as $k => $v) {
 					if ($v != 0) {
 						$num .= $v;

core/CoreApp/controllers/Whlabel_bh.php

@@ -574,6 +574,9 @@ class Whlabel_bh extends Start_Controller {
 			{
 				$list['syhairther'] = $this->input->post('syhairther',true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			$classid = $this->classid->sku();
 			$pm = $classid;
 		    $jm = $classid;
@@ -858,6 +861,9 @@ class Whlabel_bh extends Start_Controller {
 			{
 				$list['syhairther'] = $this->input->post('syhairther',true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
 			$classid = $this->classid->sku();
 			$pm = $classid;
 		    $jm = $classid;

core/CoreApp/controllers/Whlabelbarcode.php

@@ -212,6 +212,10 @@ class Whlabelbarcode extends Start_Controller {
 			{
 				$list['pieceweight'] = $this->input->post('pieceweight',true);
 			}
+			if($category == 130){
+				$list['jfother'] = $this->input->post('jfother', true);
+			}
+
 			foreach($list as $k=>$v)
 			{
 				if($v != 0)

core/CoreApp/controllers/Whlabelfz.php

@@ -780,6 +780,9 @@ class Whlabelfz extends Start_Controller
 			$list['items'] = empty($post['items'])?'':$post['items'];
 			$list['weight'] = empty($post['weight'])?'':$post['weight'];
 		}
+		if ($category == 130 ) {
+			$list['jfother'] = empty($post['jfother'])?'':$post['jfother'];
+		}
 		if ($category == 1702) {
 			$list['syhairther'] = empty($post['syhairther'])?'':$post['syhairther'];
 		}

core/CoreApp/models/Model_api.php

@@ -1461,7 +1461,7 @@ function __construct(){
 			$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=>'',44=>'',39=>'',50=>'',51=>'');//头套
-			$cpcp = array(16=>130,13=>80,14=>'',33=>'',8=>57,15=>'',38=>'',7=>'');//卡子发,7=>33重量
+			$cpcp = array(16=>130,13=>80,14=>'',33=>'',8=>57,15=>'',38=>'',7=>'',52=>'');//卡子发,7=>33重量
 			$cpgi = array(16=>131,34=>'');//礼物
 			//$cpac = array(16=>133,35=>'',7=>'');//配件
 

core/CoreApp/models/Model_logic_u9tools.php

@@ -391,6 +391,9 @@ class Model_logic_u9tools extends Lin_Model {
                 $list['weight'] = $sku_list[7]['id'];//重 量
             }
         }
+        if($cate == 130){
+            $list['jfother'] = $sku_list[52]['id'];
+        }
         if($cate == 1702)
         {
             if(isset($sku_list[48])){

core/CoreApp/models/Model_logic_zhlp.php

@@ -279,6 +279,7 @@ class Model_logic_zhlp extends Lin_Model {
                 "lowe"=>empty($arr['lowe'])?0:$arr['lowe'],
                 "items"=>empty($arr['items'])?0:$arr['items'],
                 "weight"=>empty($arr['weight'])?0:$arr['weight'],
+                'jfother'=>(empty($arr['jfother'])?0:$arr['jfother']),
                 "size"=>empty($arr['size'])?0:$arr['size'],
             ];
         }elseif($type == 3){
@@ -291,6 +292,7 @@ class Model_logic_zhlp extends Lin_Model {
                 "lowe"=>empty($arr[15])?0:$arr[15],//曲 度
                 "items"=>empty($arr[38])?0:$arr[38],//单片片数
                 "weight"=>empty($arr[7])?0:$arr[7],//重量
+                "jfother"=>(empty($arr[52])?0:$arr[52]),//接发其它
                 "size"=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }else{
@@ -303,6 +305,7 @@ class Model_logic_zhlp extends Lin_Model {
                 15=>empty($arr[15])?0:$arr[15],//曲 度
                 38=>empty($arr[38])?0:$arr[38],//单片片数
                 7=>empty($arr[7])?0:$arr[7],//重量
+                52=>empty($arr[52])?0:$arr[52],//接发其它
                 14=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }

template/erp/choice.html

@@ -430,6 +430,15 @@
 							{/loop}
 						</select>
 					</li>
+					<li class="3 none">
+						<em>接发其它：</em>
+						<select name="jfother" class="select">
+							<option value="">未选择</option>
+							{loop typeclass(52) as $val}
+							<option value="{$val['id']}">{$val['title']}</option>
+							{/loop}
+						</select>
+					</li>
 				</div>
 				<div class="datalist">
 					<li class="length none4">

template/erp/specialstock_enteradd.html

@@ -422,6 +422,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist">
 <li class="length none4">

template/erp/specialstock_enteredit.html

@@ -420,6 +420,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist postgift">
 <li>

template/erp/transfer_print.html

@@ -412,6 +412,16 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
+
 </div>
 <div class="datalist">
 <li class="length none4">

template/erp/whlabel_bh_add.html

@@ -414,6 +414,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 </div>
 <div class="datalist">

template/erp/whlabel_bh_edit.html

@@ -420,6 +420,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist">
 <li>

template/erp/whlabel_enteradd.html

@@ -422,6 +422,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist">
 <li class="length none4">

template/erp/whlabel_enteredit.html

@@ -422,6 +422,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist">
 <li>

template/erp/whlabel_print.html

@@ -430,6 +430,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 </div>
 <div class="datalist">
 <li class="length none4">

template/erp/whlabelbarcode_add.html

@@ -201,6 +201,15 @@
 {/loop}
 </select>
 </li>
+<li class="3 none">
+	<em>接发其它：</em>
+	<select name="jfother" class="select">
+		<option value="">未选择</option>
+		{loop typeclass(52) as $val}
+		<option value="{$val['id']}">{$val['title']}</option>
+		{/loop}
+	</select>
+</li>
 
 </div>
 <div class="datalist">