7777

TradeManageNew/DD_OrderServiceNew.asmx.cs

@@ -30510,7 +30510,11 @@ namespace TradeManageNew
             Model.State = 1;
             Model.CreateTime = DateTime.Now;
             Model.CreateUserId= Convert.ToInt32(Session["UserId"]);
-            return DataNew.Save_TemuShopGoodActive(Model);
+
+            int a= DataNew.Save_TemuShopGoodActive(Model);
+            string info = Session["Name"]+ "添加了temu活动，详情请去temu活动页面查看";
+            DataNew.SaveIOpenMess(1, info);
+            return a;
         }
         #endregion
         #region 删除

TradeManageNew/DataNew.cs

@@ -31457,11 +31457,11 @@ where c.SKU1=@SKU";
             string tsql = @"
 if @id>0
 begin
-Update [HT_CustomFee] set [customname]=@customname,[htdate]=@htdate,[htcode]=@htcode,[yjprice]=@yjprice,[rmbprice]=@rmbprice,[usdprice]=@usdprice,[njprice]=@njprice,[hyprice]=@hyprice,[hlrate]=@hlrate,[llrate]=@llrate,[totalrmbprice]=@totalrmbprice,[totalusdprice]=@totalusdprice,[yfprice]=@yfprice,[lxprice]=@lxprice,[inname]=@inname,[indate]=@indate,[state]=@state,jxdate=@jxdate,feetype=@feetype,hyrmbprice=@hyrmbprice,njrmbprice=@njrmbprice,yjrate=@yjrate,yjrmbprice=@yjrmbprice where id=@id
+Update [HT_CustomFee] set [customname]=@customname,[htdate]=@htdate,[htcode]=@htcode,[yjprice]=@yjprice,[rmbprice]=@rmbprice,[usdprice]=@usdprice,[njprice]=@njprice,[hyprice]=@hyprice,[hlrate]=@hlrate,[llrate]=@llrate,[totalrmbprice]=@totalrmbprice,[totalusdprice]=@totalusdprice,[yfprice]=@yfprice,[lxprice]=@lxprice,[inname]=@inname,[indate]=@indate,[state]=@state,jxdate=@jxdate,feetype=@feetype,hyrmbprice=@hyrmbprice,njrmbprice=@njrmbprice,yjrate=@yjrate,yjrmbprice=@yjrmbprice,otherrmbprice=@otherrmbprice,otherprice=@otherprice where id=@id
 end
 else
 begin
-INSERT INTO [HT_CustomFee]([customname],[htdate],[htcode],[yjprice],[rmbprice],[usdprice],[njprice],[hyprice],[hlrate],[llrate],[totalrmbprice],[totalusdprice],[yfprice],[lxprice],[inname],[indate],[state],jxdate,feetype,yjrate,njrmbprice,hyrmbprice,yjrmbprice)values(@customname,@htdate,@htcode,@yjprice,@rmbprice,@usdprice,@njprice,@hyprice,@hlrate,@llrate,@totalrmbprice,@totalusdprice,@yfprice,@lxprice,@inname,@indate,@state,@jxdate,@feetype,@yjrate,@njrmbprice,@hyrmbprice,@yjrmbprice)
+INSERT INTO [HT_CustomFee]([customname],[htdate],[htcode],[yjprice],[rmbprice],[usdprice],[njprice],[hyprice],[hlrate],[llrate],[totalrmbprice],[totalusdprice],[yfprice],[lxprice],[inname],[indate],[state],jxdate,feetype,yjrate,njrmbprice,hyrmbprice,yjrmbprice,otherrmbprice,otherprice)values(@customname,@htdate,@htcode,@yjprice,@rmbprice,@usdprice,@njprice,@hyprice,@hlrate,@llrate,@totalrmbprice,@totalusdprice,@yfprice,@lxprice,@inname,@indate,@state,@jxdate,@feetype,@yjrate,@njrmbprice,@hyrmbprice,@yjrmbprice,@otherrmbprice,@otherprice)
 set @id=SCOPE_IDENTITY()
 end
 select @id";
@@ -31490,6 +31490,8 @@ select @id";
             db.AddInParameter(cmd, "@njrmbprice", DbType.Decimal, Model.njrmbprice);
             db.AddInParameter(cmd, "@hyrmbprice", DbType.Decimal, Model.hyrmbprice);
             db.AddInParameter(cmd, "@yjrmbprice", DbType.Decimal, Model.yjrmbprice);
+            db.AddInParameter(cmd, "@otherprice", DbType.Decimal, Model.otherprice);
+            db.AddInParameter(cmd, "@otherrmbprice", DbType.Decimal, Model.otherrmbprice);
             db.AddInParameter(cmd, "@state", DbType.Int32, Model.state);
             int a = Convert.ToInt32(db.ExecuteScalar(cmd));
             return a;
@@ -31544,7 +31546,7 @@ select @id";
         public static List<HT_CustomFee> GetListCustomFee(string where, int PageIndex, int PageSize, string Sort, out int RowCount)
         {
             QueryService2 ser = new QueryService2();
-            ser.Tsql = "select id=cast(a.id as int),a.customname,a.htdate,a.htcode,a.yjprice,a.rmbprice,a.usdprice,a.njprice,a.hyprice,a.hlrate,a.llrate,a.totalrmbprice,a.totalusdprice,yfprice=isnull(a.yfprice,0),a.lxprice,a.inname,a.indate,a.state,a.jxdate,a.feetype,zfprice=case when a.feetype=1 then a.rmbprice else a.usdprice end,a.yjrate,a.njrmbprice,a.hyrmbprice,a.yjrmbprice,days=DATEDIFF(day,jxdate,getdate()),a.predate,days2=case when predate is not null then DATEDIFF(day,predate,getdate()) else -1 end from HT_CustomFee a";
+            ser.Tsql = "select id=cast(a.id as int),a.customname,a.htdate,a.htcode,a.yjprice,a.rmbprice,a.usdprice,a.njprice,a.hyprice,a.hlrate,a.llrate,a.totalrmbprice,a.totalusdprice,yfprice=isnull(a.yfprice,0),a.lxprice,a.inname,a.indate,a.state,a.jxdate,a.feetype,zfprice=case when a.feetype=1 then a.rmbprice else a.usdprice end,a.yjrate,a.njrmbprice,a.hyrmbprice,a.yjrmbprice,days=DATEDIFF(day,jxdate,getdate()),a.predate,days2=case when predate is not null then DATEDIFF(day,predate,getdate()) else -1 end,a.otherprice,a.otherrmbprice from HT_CustomFee a";
             ser.Tsql += " " + ser.Filter(where);
             ser.PageIndex = PageIndex;
             ser.PageSize = PageSize;

TradeManageNew/HT_CustomList.aspx

@@ -110,8 +110,11 @@
                         num2 = Model.njprice;
                         $("#a_hyprice").html("美金$" + Model.hyprice);
                         num3 = Model.hyprice;
+                        $("#a_otherprice").html("美金$" + Model.otherprice);
+                        num5 = Model.otherprice;
                         $("#txtnjprice").val(Model.njrmbprice);
                         $("#txthyprice").val(Model.hyrmbprice);
+                        $("#txtotherprice").val(Model.otherrmbprice);
                     }
                     if (Model.feetype == 2) {
                         $("#a_zhprice").html("人民币$" + Model.rmbprice);
@@ -120,8 +123,11 @@
                         num2 = Model.njrmbprice;
                         $("#a_hyprice").html("人民币$" + Model.hyrmbprice);
                         num3 = Model.hyrmbprice;
+                        $("#a_otherprice").html("人民币$" + Model.otherrmbprice);
+                        num5 = Model.otherrmbprice;
                         $("#txtnjprice").val(Model.njprice);
                         $("#txthyprice").val(Model.hyprice);
+                        $("#txtotherprice").val(Model.otherprice);
                     }
                     ShowFancybox("MainTable");
                 }
@@ -166,20 +172,24 @@
         var num = 0;
         var num2 = 0;
         var num3 = 0;
+        var num5= 0;
         function zhprice() {
            // txthlrate listfeetype txtzfprice a_zhprice
-            $("#txthlrate,#txtzfprice,#txtnjprice,#txthyprice").keyup(function () {
+            $("#txthlrate,#txtzfprice,#txtnjprice,#txthyprice,#txtotherprice").keyup(function () {
                 num = 0;
                 $("#a_zhprice").html("");
                 num2 = 0;
                 $("#a_njprice").html("");
                 num3 = 0;
                 $("#a_hyprice").html("");
+                num5 = 0;
+                $("#a_otherprice").html("");
                 var hl = parseFloat($("#txthlrate").val());
                 var bz = $("#listfeetype").val();
                 var zf = parseFloat($("#txtzfprice").val());
                 var nj = parseFloat($("#txtnjprice").val());
                 var hy = parseFloat($("#txthyprice").val());
+                var qt = parseFloat($("#txtotherprice").val());
                 if (hl > 0 && zf > 0 && bz == 1) {
 
                     num = parseFloat(zf / hl);
@@ -224,6 +234,20 @@
                     $("#a_hyprice").html("人民币￥" + num3);
 
                 }
+                if (hl > 0 && qt > 0 && bz == 1) {
+
+                    num5 = parseFloat(qt / hl);
+                    num5 = num5.toFixed(2);
+                    $("#a_otherprice").html("美金$" + num5);
+                }
+
+                if (hl > 0 && qt > 0 && bz == 2) {
+
+                    num5 = parseFloat(qt * hl);
+                    num5 = num5.toFixed(2);
+                    $("#a_otherprice").html("人民币￥" + num5);
+
+                }
 
                 
             });
@@ -237,6 +261,7 @@
                 var zf = parseFloat($("#txtzfprice").val());
                 var nj = parseFloat($("#txtnjprice").val());
                 var hy = parseFloat($("#txthyprice").val());
+                var qt = parseFloat($("#txtotherprice").val());
                 if (hl > 0 && zf > 0 && bz == 1) {
 
                      num = parseFloat(zf / hl);
@@ -280,6 +305,20 @@
                     $("#a_hyprice").html("人民币￥" + num3);
 
                 }
+                if (hl > 0 && qt > 0 && bz == 1) {
+
+                    num5 = parseFloat(qt / hl);
+                    num5 = num5.toFixed(2);
+                    $("#a_otherprice").html("美金$" + num5);
+                }
+
+                if (hl > 0 && qt > 0 && bz == 2) {
+
+                    num5 = parseFloat(qt * hl);
+                    num5 = num5.toFixed(2);
+                    $("#a_otherprice").html("人民币￥" + num5);
+
+                }
             });
         }
 
@@ -375,7 +414,7 @@
             Array.add(datagrid1.Columns, col);
 
             col = new nblf.ui.DataGridColumn();
-            col.HeaderText = "金额";
+            col.HeaderText = "货值";
             col.CellTemplate ="<span>${Bind usdprice}【￥{Bind rmbprice}】</span>";
             Array.add(datagrid1.Columns, col);
             col = new nblf.ui.DataGridColumn();
@@ -384,7 +423,7 @@
             Array.add(datagrid1.Columns, col);
 
             col = new nblf.ui.DataGridColumn();
-            col.HeaderText = "内际金额";
+            col.HeaderText = "内陆费用";
             col.CellTemplate ="<span>${Bind njprice}【￥{Bind njrmbprice}】</span>";
             Array.add(datagrid1.Columns, col);
 
@@ -392,6 +431,10 @@
             col.HeaderText = "海运费";
             col.CellTemplate ="<span>${Bind hyprice}【￥{Bind hyrmbprice}】</span>";
             Array.add(datagrid1.Columns, col);
+            col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "其他费用";
+            col.CellTemplate = "<span>${Bind otherprice}【￥{Bind otherrmbprice}】</span>";
+            Array.add(datagrid1.Columns, col);
 
             col = new nblf.ui.DataGridColumn();
             col.HeaderText = "汇率";
@@ -625,14 +668,18 @@
                 Model.njprice = num2;
                 Model.hyrmbprice = $("#txthyprice").val();
                 Model.hyprice = num3;
+                Model.otherrmbprice = $("#txtotherprice").val();
+                Model.otherprice = num5;
             }
             else if (Model.feetype == 2) {
                 Model.usdprice = $("#txtzfprice").val();
                 Model.rmbprice = num;
                 Model.njprice = $("#txtnjprice").val();
                 Model.njrmbprice = num2;
-                Model.rmbprice = $("#txthyprice").val();
+                Model.hyprice = $("#txthyprice").val();
                 Model.hyrmbprice = num3;
+                Model.otherprice = $("#txtotherprice").val();
+                Model.otherrmbprice = num5;
             }
 
             WindowLoadModel.Show();
@@ -805,20 +852,22 @@
         <td><select id='listfeetype' style="width: 99%;" columnname="feetype" columndesc="结算币种" columnrequired="false">
             <option value="1">人民币</option>
              <option value="2">美金</option>
-            </select></td><td class="f1" ><font color="red">*</font>金额</td>
-        <td><input id='txtzfprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="zfprice" columndesc="金额" columnrequired="true" /><a id="a_zhprice" style="color:red"></a></td>
+            </select></td><td class="f1" ><font color="red">*</font>货值</td>
+        <td><input id='txtzfprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="zfprice" columndesc="货值" columnrequired="true" /><a id="a_zhprice" style="color:red"></a></td>
     </tr>
     <tr>
         
     </tr>
     <tr>
-        <td class="f1" ><font color="red">*</font>内际金额</td>
-        <td><input id='txtnjprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="njprice" columndesc="内际金额" columnrequired="true"  value="0" /><a id="a_njprice" style="color:red"></a></td>  <td class="f1" ><font color="red">*</font>海运费</td>
+        <td class="f1" ><font color="red">*</font>内陆费用</td>
+        <td><input id='txtnjprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="njprice" columndesc="内陆费用" columnrequired="true"  value="0" /><a id="a_njprice" style="color:red"></a></td>  <td class="f1" ><font color="red">*</font>海运费</td>
         <td><input id='txthyprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="hyprice" columndesc="海运费" columnrequired="true"  value="0"/><a id="a_hyprice" style="color:red"></a></td>
     </tr>
    
     <tr>
-       
+        <td class="f1" >其他费用</td>
+        <td><input id='txtotherprice' type='text' style='width: 50%' precision="2" min="0" max="99999" columnname="njprice" columndesc="其他费用" columnrequired="true"  value="0" /><a id="a_otherprice" style="color:red"></a></td>  <td class="f1" ></td>
+        <td></td>
     </tr>
   
    

TradeManageNew/HuoWuServiceNew.asmx.cs

@@ -7807,6 +7807,8 @@ namespace TradeManageNew
                 }
                 rmodel.Code = 1;
                 rmodel.Message = "";
+                string info = Session["Name"] + "导入了temu活动，详情请去temu活动页面查看";
+                DataNew.SaveIOpenMess(1, info);
                 return rmodel;
             }
             catch (Exception ex)

TradeManageNew/ModelNew.cs

@@ -11478,6 +11478,8 @@ namespace TradeManageNew
         /// 海运费
         /// </summary>
         public Decimal? hyprice { get; set; }
+        public Decimal? otherprice { get; set; }
+        public Decimal? otherrmbprice { get; set; }
         /// <summary>
         /// 汇率
         /// </summary>