提交数据

core/CoreApp/models/Model_logic_goods_replace.php

@@ -36,6 +36,11 @@ class Model_logic_goods_replace extends Lin_Model {
                 "msg"=>"没有检测到商品信息"
             ];
         }
+        $shipmarks = [];
+        //getOneU9bmHasGift($sku,$classid,$typeclass)
+        $classid = $this->logic_u9tools->getClass();
+        $class_list = $typeclass = $this->logic_u9tools->getTypeClass();
+        
         $fpdata_date = explode(";",trim($fpdata,";"));
         $fpdata_final_arr = [];
         //先查询是否占单了  如果占单了 那么就 不处理  如果不存在那么就处理
@@ -48,12 +53,33 @@ 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'];
+                        }
+                      
+    
+                    }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 = [
                     //     'sku2'=> $sku_str ,
                     // ];
                     // $goods_info = $this->logic_u9tools->getU9bm($sku_list,'sku2');
                     $replace_sku_str = $this->replaceSku($detail_arr[0]);
+                    
+                   
+
                     $l_sku_arr = explode("-",trim($replace_sku_str,'-'));
                     $sku_sort_arr = $this->logic_zhlp->transferSku($l_sku_arr);
                     if(empty($sku_sort_arr)){
@@ -66,10 +92,15 @@ class Model_logic_goods_replace extends Lin_Model {
                     if($res['code'] != 1){
                         return $res ;
                     }
-                   
+                    
                     $final_sortsku_arr = $res['data'];
-                  
-                    $class_list = $this->logic_u9tools->getTypeClass();
+
+                    $rr = $this->logic_u9tools->getOneU9bmHasGift("-".implode("-",$final_sortsku_arr)."-",$classid,$typeclass);
+                    if(isset($rr['zh'])){
+                        $shipmarks[] = $rr['zh'];
+                    }
+                   
+                   
                     $en_title = "";
                     foreach($final_sortsku_arr as $k => $v){
                         if(isset($class_list[$v])){
@@ -77,6 +108,7 @@ class Model_logic_goods_replace extends Lin_Model {
                         }
                     }
                     $en_title = trim($en_title);
+            
                     $cc = $final_sortsku_arr[14];
                     unset($final_sortsku_arr[14]);
                     $final_sku_str = $cc.",-".implode('-',$final_sortsku_arr)."-";
@@ -86,6 +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'];
+                    }
+                  
+
+                }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;
            }
           
@@ -94,7 +143,8 @@ class Model_logic_goods_replace extends Lin_Model {
         return [
             'code'=>1,
             "msg"=>"ok",
-            'data'=>(implode(";",$fpdata_final_arr).";")
+            'data'=>(implode(";",$fpdata_final_arr).";"),
+            'shipmarks'=>implode(";",$shipmarks)
        ];
     }
 

template/erp/fullorder_edit.html

@@ -29,7 +29,7 @@
 <a href="javascript:void(0);" class="expxg">修 改</a>
 <a href="javascript:void(0);" class="expsc">删 除</a>
 
-<!-- <a href="javascript:void(0);" class="ly_mcth">美仓替换</a> -->
+<a href="javascript:void(0);" class="ly_mcth">美仓替换</a>
 
 <!-- {if $thfpdata != ''}
 <a href="javascript:void(0);" class="ckthfpdata">查看替换内容</a>
@@ -1280,6 +1280,6 @@ $("#is_jiaji_id").on('change',function(){
 });
 
 </script>
-<script src="{$theme}js/fullorder-addedit.js?v=20250919"></script>
+<script src="{$theme}js/fullorder-addedit.js?v=20250918"></script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>
 {Template footer}

template/erp/js/fullorder-addedit.js

@@ -1913,7 +1913,7 @@ $(".ly_mcth").on('click',function(){
 		fpdata:obj.fpadta,
 	},function(res){
 		if(res.code == 1){
-			doLymcth(res.data)
+			doLymcth(res.data,res.shipmarks)
 		}else{
 			layx.confirm('提示',res.msg,null,{
 				buttons:[
@@ -2016,7 +2016,7 @@ function getTrabltr(){
 	};
 }
 //执行上边的返回结果拼接 以及界面操作
-function doLymcth(fpdata){
+function doLymcth(fpdata,shipmarks){
 	let table_tr = "";
 	let good_list = fpdata.split(";");
 	let detail_str = "";
@@ -2025,12 +2025,14 @@ function doLymcth(fpdata){
 	for(var i in good_list){
 		tmp_str = "";
 		if(good_list[i].length > 0){
-			let detail_arr = good_list[i].split("|");
+			detail_arr = good_list[i].split("|");
 			tmp_str += "<tr data-list='"+detail_arr[0]+"'><td>"+detail_arr[1]+"</td><td>"+detail_arr[2]+"</td><td class='none'>"+detail_arr[3]+"</td><td class='none'>"+detail_arr[4]+"</td><td class='none'>"+detail_arr[5]+"</td><td class='none'>"+detail_arr[6]+"</td><td class='none'>"+detail_arr[7]+"</td><td class='none'>"+detail_arr[8]+"</td><td class='none'>"+detail_arr[9]+"</td><td class='none val9'>0</td><td></td><td><font class='jzzd'>禁止占单</font></td></tr>";
 		}
 		table_tr += tmp_str;
 	}
 	$(".datatext ").html(table_tr);
+	$("textarea[name='shipremarks']").text(shipmarks);
+
 	checkKcyz()
 	custom();
 }