昨晚修复订单sku排序和入库排序不一致的问题

core/CoreApp/models/Model_usps.php

@@ -677,7 +677,7 @@ function __construct(){
         $xml .= "<RecipientBCC></RecipientBCC>";
         //$xml .= "<PostalMarking>CUBIC</PostalMarking>";
         $xml .= "</ExternalReturnLabelRequest>";
-		
+		$this->logic_ding->sendToDing("usps老接口退后". $xml);
 		$ch = curl_init();
 		$url = 'https://returns.usps.com/services/GetLabel?externalReturnLabelRequest='.$xml;
        //$url = 'https://returns.usps.com/Services/ExternalCreateReturnLabel.svc/ExternalCreateReturnLabel?externalReturnLabelRequest='.$xml;

template/erp/fullorder_edit.html

@@ -1072,6 +1072,6 @@ function addShouhu(that){
 	location.href=url
 }
 </script>
-<script src="{$theme}js/fullorder-addedit.js?v=2024031"></script>
+<script src="{$theme}js/fullorder-addedit.js?v=20240314567"></script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>
 {Template footer}

template/erp/js/fullorder-addedit.js

@@ -765,7 +765,8 @@ $("#currency").change(function(){
 	        {
 			    if(i == 2)
 			    {
-					if(data[i] == 2090)
+					//if(data[i] == 2090)
+					if ((data[i] == 2090) || (data[i] == 1620)) 
 					{
 						zrflx++;
 						t = t +data[i];
@@ -866,7 +867,8 @@ $("#currency").change(function(){
 	        {
 			    if(i == 2)
 			    {
-					if(data[i] == 2090)
+					//if(data[i] == 2090)
+					if ((data[i] == 2090) || (data[i] == 1620)) 
 					{
 						zrflx++;
 						t = t +data[i];
@@ -1093,7 +1095,8 @@ $("select[name='warehouse']").change(function() {
 	        {
 			    if(i == 2)
 			    {
-					if(data[i] == 2090)
+					//if(data[i] == 2090)
+					if ((data[i] == 2090) || (data[i] == 1620)) 
 					{
 						zrflx++;
 						t = t +data[i];
@@ -1393,6 +1396,7 @@ $.ajax({
 	        }
 		w = w + t + '-' + $(this).find("td:eq(1)").text() + '-' + $(this).find("td:eq(9)").text() + '|';
         });
+        //alert(w)
 		 var yzdata = {
         warehouse: czw,
 		shop: $("input[name=shop]").val(),
@@ -1597,7 +1601,8 @@ $(".clearreturnedit2").html("<em>允许发货：</em><b>允许出库</b>");
 	        {
 			    if(i == 2)
 			    {
-					if(data[i] == 2090)
+					//if(data[i] == 2090)
+					if ((data[i] == 2090) || (data[i] == 1620)) 
 					{
 						zrflx++;
 						t = t +data[i];