lvhao 1 день назад
Родитель
Сommit
d985ba15d3

+ 2 - 0
core/CoreApp/controllers/Specialstock.php

@@ -1573,6 +1573,7 @@ class Specialstock extends Start_Controller {
 				$list['wigother'] = $this->input->post('wigother',true);
 				$list['wigother1'] = $this->input->post('wigother1',true);
 				$list['wigother2'] = $this->input->post('wigother2',true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if($category == 129)
 			{
@@ -1713,6 +1714,7 @@ class Specialstock extends Start_Controller {
 				$list['wigother'] = $this->input->post('wigother',true);
 				$list['wigother1'] = $this->input->post('wigother1',true);
 				$list['wigother2'] = $this->input->post('wigother2',true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if($category == 129)
 			{

+ 1 - 0
core/CoreApp/controllers/Transfer.php

@@ -307,6 +307,7 @@ class Transfer extends Start_Controller {
 				$list['wigother'] = $this->input->post('wigother',true);
 				$list['wigother1'] = $this->input->post('wigother1',true);
 				$list['wigother2'] = $this->input->post('wigother2',true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if($category == 129)
 			{

+ 4 - 0
core/CoreApp/controllers/Whlabel.php

@@ -1887,6 +1887,7 @@ class Whlabel extends Start_Controller
 				$list['wigother'] = $this->input->post('wigother', true);
 				$list['wigother1'] = $this->input->post('wigother1', true);
 				$list['wigother2'] = $this->input->post('wigother2', true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if ($category == 129) {
 				$list['wide'] = $this->input->post('wide', true);
@@ -2113,6 +2114,7 @@ class Whlabel extends Start_Controller
 				$list['wigother'] = $this->input->post('wigother', true);
 				$list['wigother1'] = $this->input->post('wigother1', true);
 				$list['wigother2'] = $this->input->post('wigother2', true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if ($category == 129) {
 				$list['wide'] = $this->input->post('wide', true);
@@ -5833,6 +5835,7 @@ class Whlabel extends Start_Controller
 					$list['wigother'] = $this->input->post('wigother', true);
 					$list['wigother1'] = $this->input->post('wigother1', true);
 					$list['wigother2'] = $this->input->post('wigother2', true);
+					$list['product_related'] = $this->input->post('product_related', true);
 				}
 				if ($category == 129) {
 					$list['wide'] = $this->input->post('wide', true);
@@ -6068,6 +6071,7 @@ class Whlabel extends Start_Controller
 					$list['wigother'] = $this->input->post('wigother', true);
 					$list['wigother1'] = $this->input->post('wigother1', true);
 					$list['wigother2'] = $this->input->post('wigother2', true);
+					$list['product_related'] = $this->input->post('product_related', true);
 				}
 				if ($category == 129) {
 					$list['wide'] = $this->input->post('wide', true);

+ 1 - 0
core/CoreApp/controllers/Whlabel_bh.php

@@ -547,6 +547,7 @@ class Whlabel_bh extends Start_Controller {
 				$list['wigother'] = $this->input->post('wigother',true);
 				$list['wigother1'] = $this->input->post('wigother1',true);
 				$list['wigother2'] = $this->input->post('wigother2',true);
+				$list['product_related'] = $this->input->post('product_related', true);
 			}
 			if($category == 129)
 			{

+ 3 - 0
core/CoreApp/models/Model_logic_u9tools.php

@@ -346,6 +346,9 @@ class Model_logic_u9tools extends Lin_Model {
             if(isset($sku_list[51])){
                 $list['wigother2'] = $sku_list[51]['id'];//头套其它2
             }
+            if(isset($sku_list[53])){
+                $list['product_related'] = $sku_list[53]['id'];//头套其它2
+            }
         }
         //现在没有129这个分类了
         // if($category == 129)

+ 4 - 0
core/CoreApp/models/Model_logic_zhlp.php

@@ -227,6 +227,7 @@ class Model_logic_zhlp extends Lin_Model {
                 "wigother"=>empty($arr['wigother'])?0:$arr['wigother'],
                 "wigother1"=>empty($arr['wigother1'])?0:$arr['wigother1'],
                 "wigother2"=>empty($arr['wigother2'])?0:$arr['wigother2'],
+                "product_related"=>empty($arr['product_related'])?0:$arr['product_related'],
                 "size"=>empty($arr['size'])?0:$arr['size'],
             ];
         }elseif($type == 3){
@@ -245,6 +246,7 @@ class Model_logic_zhlp extends Lin_Model {
                 "wigother"=>empty($arr[39])?0:$arr[39],//分缝及刘海
                 "wigother1"=>empty($arr[50])?0:$arr[50],//头套其它1
                 "wigother2"=>empty($arr[51])?0:$arr[51],//头套其它2
+                "product_related"=>empty($arr[53])?0:$arr[53],//生产方式/配比
                 "size"=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }else{
@@ -263,6 +265,7 @@ class Model_logic_zhlp extends Lin_Model {
                 39=>empty($arr[39])?0:$arr[39],//分缝及刘海
                 50=>empty($arr[50])?0:$arr[50],//头套其它1
                 51=>empty($arr[51])?0:$arr[51],//头套其它2
+                53=>empty($arr[53])?0:$arr[53],//生产方式/配比
                 14=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }
@@ -498,6 +501,7 @@ class Model_logic_zhlp extends Lin_Model {
 			$list['wigother'] = empty($post['wigother'])?'':$post['wigother'];
 			$list['wigother1'] = empty($post['wigother1'])?'':$post['wigother1'];
 			$list['wigother2'] = empty($post['wigother2'])?'':$post['wigother2'];
+            $list['product_related'] = empty($post['product_related'])?'':$post['product_related'];
 		}
 		if ($category == 129) {
 			$list['wide'] = empty($post['wide'])?'':$post['wide'];

+ 9 - 0
template/erp/choice.html

@@ -380,6 +380,15 @@
 							{/loop}
 						</select>
 					</li>
+					<li class="2 none">
+						<em>生产方式/配比:</em>
+						<select name="product_related" class="select">
+							<option value="">未选择</option>
+							{loop typeclassyc(53) as $val}
+							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+							{/loop}
+						</select>
+					</li>
 
 					<li class="6 none">
 						<em>头套类型:</em>

+ 9 - 0
template/erp/specialstock_enteradd.html

@@ -372,6 +372,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 
 <li class="6 none">
 <em>头套类型:</em>

+ 9 - 0
template/erp/specialstock_enteredit.html

@@ -371,6 +371,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 <li class="6 none">
 <em>头套类型:</em>
 <select name="synthetictype" class="select">

+ 9 - 0
template/erp/transfer_print.html

@@ -362,6 +362,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 
 <li class="6 none">
 <em>头套类型:</em>

+ 9 - 0
template/erp/whlabel_bh_add.html

@@ -364,6 +364,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 
 <li class="6 none">
 <em>头套类型:</em>

+ 10 - 0
template/erp/whlabel_enteradd.html

@@ -373,6 +373,16 @@
 </select>
 </li>
 
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
+
 <li class="6 none">
 <em>头套类型:</em>
 <select name="synthetictype" class="select">

+ 10 - 0
template/erp/whlabel_enteredit.html

@@ -373,6 +373,16 @@
 </select>
 </li>
 
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
+
 <li class="6 none">
 <em>头套类型:</em>
 <select name="synthetictype" class="select">

+ 9 - 0
template/erp/whlabel_print.html

@@ -380,6 +380,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 
 <li class="6 none">
 <em>头套类型:</em>

+ 9 - 0
template/erp/whlabel_usaprint.html

@@ -375,6 +375,15 @@
 {/loop}
 </select>
 </li>
+<li class="2 none">
+<em>生产方式/配比:</em>
+<select name="product_related" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(53) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 
 <li class="6 none">
 <em>头套类型:</em>