dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

20230724

Browse Source
QDHHYT
dengyu 1 year ago
parent cfa9c323c8
commit 0a21f24d02
10 changed files with 1652 additions and 166 deletions
Show Stats Download Patch File Download Diff File

1
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -1506,4 +1506,5 @@ namespace DSWeb.Common.DB
#endregion
}
}

2
DSWeb.Common/DB/CommonDataContext.cs
Unescape Escape View File

@ -58,6 +58,8 @@ namespace DSWeb.Common.DB
public DbSet<Receipt_Doc_md> Receipt_Doc { get; set; }
public class InvMailInfo
{
public string MBLNO { get; set; }

8
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -3551,7 +3551,7 @@ namespace DSWeb.MvcShipping.Controllers
error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", "");
}
else if (type == "EVERGREENEDI") {
else if (type == "EVERGREEN") {
error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill);
}
@ -3579,7 +3579,7 @@ namespace DSWeb.MvcShipping.Controllers
else
filename = MsOpSeaeEdiPortDAL.CreateEdiYMSI(headEdiList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype);
} else if (type == "EVERGREENEDI")
} else if (type == "EVERGREEN")
{
if (filetype == "B")
filename = MsOpSeaeEdiPortDAL.CreateEdiEVERGREEN(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill,filetype);
@ -3681,7 +3681,7 @@ namespace DSWeb.MvcShipping.Controllers
error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", "");
}
else if (type == "EVERGREENEDI")
else if (type == "EVERGREEN")
{
error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill);
@ -3704,7 +3704,7 @@ namespace DSWeb.MvcShipping.Controllers
filename = MsOpSeaeEdiPortDAL.CreateEdiYMSI(headEdiList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype);
}
else if (type == "EVERGREENEDI")
else if (type == "EVERGREEN")
{
if (filetype == "B")
filename = MsOpSeaeEdiPortDAL.CreateEdiEVERGREEN(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype);

5
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -2051,7 +2051,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var wordcheckResult = BasicDataRefDAL.是否有非字母数字标点(fieldstr);
if (wordcheckResult.Success)
{
isPost = false;
//isPost = false;
errorstr += $"{fieldName} 包含文本：【{wordcheckResult.Message}】;";
}
}
@ -2266,6 +2266,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
string uname =username;
sdal.SaveStatusTree(BSNO, uname == null ? "" : uname);
result.Data = BSNO;
if (!string.IsNullOrWhiteSpace(errorstr)) {
result.setMessage(errorstr);
}
return result;
}
else

1748
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
View File

File diff suppressed because it is too large Load Diff

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js
Unescape Escape View File

@ -1720,7 +1720,7 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, {
// scope: this
//});
//this.onRefreshSumClick(_this.sqlcontext);
this.getPageData(sqlcontext);
this.getPageData(this.sqlcontext);
this.storeList.on('beforeload', function (store) {

28
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -167,7 +167,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
//this.storeOpCode4.loadData(astoreOpCode.data.items);
this.storeOpCode5.loadData(astoreOpCode.data.items);
this.storeOpCode6.loadData(astoreOpCode.data.items);
this.storeOpCode7.loadData(astoreOpCode.data.items);
}
/*
@ -208,7 +208,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
},
this);
//海外操作
//订舱中心
this.storeOpCode6.on('beforeload',
function (store) {
var sql = " u.GID IN (SELECT USERID FROM user_userattribute WHERE ATTRIBUTEID='31AC11C1-D005-46EC-A0EE-05BC211AE1B7' and VALUE='true' ) ";
@ -228,6 +228,15 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
},
this);
//海外操作
this.storeOpCode7.on('beforeload',
function (store) {
var sql = " u.GID IN (SELECT USERID FROM user_userattribute WHERE ATTRIBUTEID='31AC11C1-D005-46EC-A0EE-05BC211AE1B7' and VALUE='true' ) ";
Ext.apply(store.proxy.extraParams, {
condition: sql
});
},
this);
//客服
@ -291,8 +300,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
});
this.comboxOP_OVERSEA = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.OP_OVERSEA, //'操 作',
store: this.storeOpCode6,
fieldLabel: Zi.LAN.OP_OVERSEA, //'海外操作',
store: this.storeOpCode7,
forceSelection: true,
queryMode: 'remote',
minChars: 0,
@ -13925,7 +13934,9 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
_this.onSendINTTR(FILETYPE.FILETYPE, FILEROLE.FILEROLE, IsBill, CARRIER.CARRIER, IsNADFW, Ext.getCmp('tbNADFWID').getValue().toString(), Ext.getCmp('tbNADFW').getValue().toString());
}
if (jsonresult.Message != "数据保存成功") {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
@ -14189,8 +14200,9 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
}
}
this.tabSeaepanel.doLayout();
if (jsonresult.Message != "数据保存成功") {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
@ -16461,7 +16473,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
CodeAndName: data.OP_OVERSEA
});
this.storeOpCode6.add(recordCustCode);
this.storeOpCode7.add(recordCustCode);
}
var BLTYPE = this.formHead.getForm().findField('BLTYPE').getValue();

11
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -13601,7 +13601,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要修改的业务!
return;
} else {
var _this = this;
Ext.MessageBox.confirm(Zi.LAN.TiShi, '确定要批量修改【' + records.length + '】条数据吗？', function (btn) {
if (btn == 'yes') {
@ -13617,7 +13617,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
//var rangeUser = [op, inputby, doc, orderop, custservice]
//canedit = DsStoreExistsList(_this.StoreOpRange, 'OPID', rangeUser)
var mrecords = DsStoreQueryBy(this.StoreOpRange, 'OPID', op);
var mrecords = DsStoreQueryBy(_this.StoreOpRange, 'OPID', op);
if (mrecords.getCount() > 0) {
rec.data.SHIPPER = '';
@ -13627,7 +13627,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
rec.data.DESCRIPTION = '';
bodyAddDatas.push(rec);
} else {
var recordins = DsStoreQueryBy(this.StoreOpRange, 'OPID', inputby);
var recordins = DsStoreQueryBy(_this.StoreOpRange, 'OPID', inputby);
if (recordins.getCount() > 0) {
rec.data.SHIPPER = '';
rec.data.CONSIGNEE = '';
@ -13646,9 +13646,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
}
var data = this.formModify.getForm().getValues();
var data = _this.formModify.getForm().getValues();
_this = this;
if (bodyAddDatas.length == 0) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoXiuGaiDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
@ -13686,7 +13685,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
},
scope: this
scope: _this
});
}
}

8
DSWeb/Web.config
Unescape Escape View File

@ -96,14 +96,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 环海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 888666
<!-- 环海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 888666 -->
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 666888 -->
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=20230604;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=20230604;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 锦海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

5
HcDBUtility/Comm/DBResult.cs
Unescape Escape View File

@ -56,6 +56,11 @@ namespace HcUtility.Comm
if (data != null) this.Data = data;
return this;
}
public DBResult setMessage( string _message)
{
message += _message + ";";
return this;
}
public DBResult OK()
{

Write Preview
Loading…
Cancel
Save