修改备注信息不替换

core/CoreApp/models/Model_logic_goods_replace.php

@@ -38,7 +38,7 @@ class Model_logic_goods_replace extends Lin_Model {
         }
         $shipmarks = [];
         //getOneU9bmHasGift($sku,$classid,$typeclass)
-        $classid = $this->logic_u9tools->getClass();
+        //$classid = $this->logic_u9tools->getClass();
         $class_list = $typeclass = $this->logic_u9tools->getTypeClass();
         
         $fpdata_date = explode(";",trim($fpdata,";"));
@@ -53,23 +53,23 @@ class Model_logic_goods_replace extends Lin_Model {
                 $ret_list = $this->whlabel->find_all(" state = 0 and zd = '".$number."' and features = '".$sku_str."' ");
                 if(count($ret_list) > 0){
                     $fpdata_final_arr[] = $v;
-                    if(strpos($v,",")!== false){
-                        $detail_arr = explode("|",trim($v,"|"));
-                        $ll_tmp_arr = explode(",",$detail_arr[0]);
-                        $tmp_sku = "-".$ll_tmp_arr[0].$ll_tmp_arr[1]."-";
-                        $rr = $this->logic_u9tools->getOneU9bmHasGift( $tmp_sku,$classid,$typeclass);
-                        if(isset($rr['zh'])){
-                            $shipmarks[] = $rr['zh'];
-                        }
+                    // if(strpos($v,",")!== false){
+                    //     $detail_arr = explode("|",trim($v,"|"));
+                    //     $ll_tmp_arr = explode(",",$detail_arr[0]);
+                    //     $tmp_sku = "-".$ll_tmp_arr[0].$ll_tmp_arr[1]."-";
+                    //     $rr = $this->logic_u9tools->getOneU9bmHasGift( $tmp_sku,$classid,$typeclass);
+                    //     if(isset($rr['zh'])){
+                    //         $shipmarks[] = $rr['zh'];
+                    //     }
                       
     
-                    }else{
-                        $detail_arr = explode("|",trim($v,"|"));
-                        $rr = $this->logic_u9tools->getOneU9bmHasGift( $detail_arr[0],$classid,$typeclass);
-                        if(isset($rr['zh'])){
-                            $shipmarks[] = $rr['zh'];
-                        }
-                    }
+                    // }else{
+                    //     $detail_arr = explode("|",trim($v,"|"));
+                    //     $rr = $this->logic_u9tools->getOneU9bmHasGift( $detail_arr[0],$classid,$typeclass);
+                    //     if(isset($rr['zh'])){
+                    //         $shipmarks[] = $rr['zh'];
+                    //     }
+                    // }
                 }else{
 
                     // $sku_list = [
@@ -95,10 +95,10 @@ class Model_logic_goods_replace extends Lin_Model {
                     
                     $final_sortsku_arr = $res['data'];
 
-                    $rr = $this->logic_u9tools->getOneU9bmHasGift("-".implode("-",$final_sortsku_arr)."-",$classid,$typeclass);
-                    if(isset($rr['zh'])){
-                        $shipmarks[] = $rr['zh'];
-                    }
+                    // $rr = $this->logic_u9tools->getOneU9bmHasGift("-".implode("-",$final_sortsku_arr)."-",$classid,$typeclass);
+                    // if(isset($rr['zh'])){
+                    //     $shipmarks[] = $rr['zh'];
+                    // }
                    
                    
                     $en_title = "";
@@ -118,23 +118,23 @@ class Model_logic_goods_replace extends Lin_Model {
                     $fpdata_final_arr[] = $v;
                 }
            }else{
-                if(strpos($v,",")!== false){
-                    $detail_arr = explode("|",trim($v,"|"));
-                    $ll_tmp_arr = explode(",",$detail_arr[0]);
-                    $tmp_sku = "-".$ll_tmp_arr[0].$ll_tmp_arr[1]."-";
-                    $rr = $this->logic_u9tools->getOneU9bmHasGift( $tmp_sku,$classid,$typeclass);
-                    if(isset($rr['zh'])){
-                        $shipmarks[] = $rr['zh'];
-                    }
+                // if(strpos($v,",")!== false){
+                //     $detail_arr = explode("|",trim($v,"|"));
+                //     $ll_tmp_arr = explode(",",$detail_arr[0]);
+                //     $tmp_sku = "-".$ll_tmp_arr[0].$ll_tmp_arr[1]."-";
+                //     $rr = $this->logic_u9tools->getOneU9bmHasGift( $tmp_sku,$classid,$typeclass);
+                //     if(isset($rr['zh'])){
+                //         $shipmarks[] = $rr['zh'];
+                //     }
                   
 
-                }else{
-                    $detail_arr = explode("|",trim($v,"|"));
-                    $rr = $this->logic_u9tools->getOneU9bmHasGift( $detail_arr[0],$classid,$typeclass);
-                    if(isset($rr['zh'])){
-                        $shipmarks[] = $rr['zh'];
-                    }
-                }
+                // }else{
+                //     $detail_arr = explode("|",trim($v,"|"));
+                //     $rr = $this->logic_u9tools->getOneU9bmHasGift( $detail_arr[0],$classid,$typeclass);
+                //     if(isset($rr['zh'])){
+                //         $shipmarks[] = $rr['zh'];
+                //     }
+                // }
                 $fpdata_final_arr[] = $v;
            }
           
@@ -144,7 +144,7 @@ class Model_logic_goods_replace extends Lin_Model {
             'code'=>1,
             "msg"=>"ok",
             'data'=>(implode(";",$fpdata_final_arr).";"),
-            'shipmarks'=>implode(";",$shipmarks)
+            //'shipmarks'=>implode(";",$shipmarks)
        ];
     }
 

template/erp/js/fullorder-addedit.js

@@ -1914,7 +1914,7 @@ $(".ly_mcth").on('click',function(){
 	},function(res){
 		layx.destroy('loadId');
 		if(res.code == 1){
-			doLymcth(res.data,res.shipmarks)
+			doLymcth(res.data)
 		}else{
 			layx.confirm('提示',res.msg,null,{
 				buttons:[
@@ -2017,7 +2017,7 @@ function getTrabltr(){
 	};
 }
 //执行上边的返回结果拼接 以及界面操作
-function doLymcth(fpdata,shipmarks){
+function doLymcth(fpdata){
 	let table_tr = "";
 	let good_list = fpdata.split(";");
 	let detail_str = "";
@@ -2032,8 +2032,7 @@ function doLymcth(fpdata,shipmarks){
 		table_tr += tmp_str;
 	}
 	$(".datatext ").html(table_tr);
-	$("textarea[name='shipremarks']").text(shipmarks);
-
+	
 	$("select[name=warehouse]").val(5)
 	checkKcyz()
 	custom();