Browse Source

下单统计新增

zhuyiyi 2 months ago
parent
commit
69f97517c4
2 changed files with 6 additions and 3 deletions
  1. 5 1
      SiteCore/Handler/sync.order.cs
  2. 1 2
      Web/EOrder/js/p_order.js

+ 5 - 1
SiteCore/Handler/sync.order.cs

@@ -65,7 +65,7 @@ namespace SiteCore.Handler
 
             DataStruct dStruct = GetPostStruct();
 
-            //string a = SecurityHelper.DecryptSymmetric("iG5fU/YBNxc=");
+            //string a = SecurityHelper.DecryptSymmetric("BnK3+504SQ8=");
             //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\新建文件夹\\tj21hf.psd");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
@@ -12888,6 +12888,10 @@ namespace SiteCore.Handler
                     {
                         map["dayDev"]++;
                     }
+                    if (DateTime.Compare(FinishPlaceTime, six) < 0 && (supplierId == 126))
+                    {
+                        map["dayDev"]++;
+                    }
 
                 }
                 //帆布---52|条幅---27

+ 1 - 2
Web/EOrder/js/p_order.js

@@ -318,12 +318,11 @@ function memoFn(eid) {
     var rec = grid.getSelected();
     var mm = rec.seller_memo;
     if (mm != "") mm = mm.replace(/&lt;br&gt;/g, "\n");
-    $("#txtMemo").val(mm).attr("readonly", true);
+    $("#txtMemo").val(mm)
     $("#txtQnMemo").val("").show();
 
     if (rec.IsSample > 0 || rec.ctid.indexOf("N_") > -1 || rec.seller_memo.indexOf("现货") > -1 || rec.seller_memo.indexOf("礼物") > -1) {
         $("#txtQnMemo").hide();
-        $("#txtMemo").attr("readonly", false);
     }
 
     mini.get("memo_win").show();