乐企他用url地址改为单独的sysparam设置。

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -7653,7 +7653,7 @@ namespace DSWeb.Areas.CommMng.DAL
             {
                 var cdc = new CommonDataContext();
                 T_ALL_DA T_ALL_DA = new T_ALL_DA();
-                var DJYURL = MsSysParamSetDAL.GetData("PARAMNAME='DJYAPIURL'");
+                var DJYURL = MsSysParamSetDAL.GetData("PARAMNAME='LQTYAPIURL'");
 
                 var headers = new NameValueCollection();
 
@@ -7725,7 +7725,7 @@ namespace DSWeb.Areas.CommMng.DAL
                     result.OK("同步完成", rtn);
                 }
                 else {
-                    MsSysParamSetDAL.SaveSysParamValue("DJYAPIURL", "大简云接口服务地址", "http://60.209.125.238:35100");
+                    MsSysParamSetDAL.SaveSysParamValue("LQTYAPIURL", "乐企他用接口服务地址", "http://47.105.115.105:26650");
                 }
             }
             catch(Exception e)

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js

@@ -853,9 +853,6 @@ Zi.LAN.DPKGTYPE = "包装等级";
 Zi.LAN.DGOODNAME = "技术品名";
 Zi.LAN.ISMP = "污染物";
 Zi.LAN.ImportHaiGuanJia = "海管家舱单模板";
-<<<<<<< HEAD
-Zi.LAN.CDSTATUS = "舱单";
-=======
 
 
 Zi.LAN.DJYDC = "大简云订舱";

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_COSCO.js

@@ -1520,7 +1520,7 @@ Ext.extend(Shipping.formDjyOrder_COSCO, Ext.Panel, {
                 } else {
                     Ext.Msg.show({
                         title: '提示',
-                        msg: "请在【系统配置-参数设置-大简云订舱_账号密码设置】中增加船公司[" + CARRIER + "]的账号与密码",
+                        msg: "请在【系统配置-参数设置-大简云订舱_账号密码设置】中增加船公司[" + _this.carrier + "]的账号与密码",
                         icon: Ext.MessageBox.ERROR,
                         buttons: Ext.Msg.OK
                     });
@@ -1564,7 +1564,7 @@ Ext.extend(Shipping.formDjyOrder_COSCO, Ext.Panel, {
                 } else {
                     Ext.Msg.show({
                         title: '提示',
-                        msg: "请在【系统配置-参数设置-大简云订舱_合约号设置】中增加船公司[" + CARRIER + "]的合约号",
+                        msg: "请在【系统配置-参数设置-大简云订舱_合约号设置】中增加船公司[" + _this.carrier + "]的合约号",
                         icon: Ext.MessageBox.ERROR,
                         buttons: Ext.Msg.OK
                     });

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_EMC.js

@@ -1825,7 +1825,7 @@ Ext.extend(Shipping.formDjyOrder_EMC, Ext.Panel, {
                 } else {
                     Ext.Msg.show({
                         title: '提示',
-                        msg: "请在【系统配置-参数设置-大简云订舱_账号密码设置】中增加船公司[" + CARRIER + "]的账号与密码",
+                        msg: "请在【系统配置-参数设置-大简云订舱_账号密码设置】中增加船公司[" + _this.carrier + "]的账号与密码",
                         icon: Ext.MessageBox.ERROR,
                         buttons: Ext.Msg.OK
                     });
@@ -1869,7 +1869,7 @@ Ext.extend(Shipping.formDjyOrder_EMC, Ext.Panel, {
                 } else {
                     Ext.Msg.show({
                         title: '提示',
-                        msg: "请在【系统配置-参数设置-大简云订舱_合约号设置】中增加船公司[" + CARRIER + "]的合约号",
+                        msg: "请在【系统配置-参数设置-大简云订舱_合约号设置】中增加船公司[" + _this.carrier + "]的合约号",
                         icon: Ext.MessageBox.ERROR,
                         buttons: Ext.Msg.OK
                     });