内贸空运 部分修改

DS7Zhanhao
ddlucky 2 years ago
parent b449e631a9
commit b6a8571918

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

@ -296,6 +296,11 @@ namespace DSWeb.MvcShipping.Controllers
if (isPost)
{
//增加一个判断 如无揽货人sale则报警不保存
var modb = new ModelObjectRepository();
DBResult result = modb.Save(headData,
ModelObjectConvert<MsOpAirn_Cargomb>.ToModelObjectList(CargobodyList),
@ -465,9 +470,6 @@ namespace DSWeb.MvcShipping.Controllers
}
}

@ -73,6 +73,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpAirnDAL
strSql.Append(" ,c.PRICE price,ISVOID ");
strSql.Append(" ,(select isnull(ISAGENTCN,0) from info_client where shortname=B.AIRLINES) ISAGENTCN ");
strSql.Append(" ,(select CODENAME from info_client where shortname=B.AIRLINES) AIRLINESCODE ");
strSql.Append(" ,(select name from company where gid=CORPID) CORPREF ");
strSql.Append(" from OP_AIRN B ");
//sql主分单过滤条件已在where中体现无需再join中嵌套case 2018年1月27日10:44:14
@ -155,6 +156,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpAirnDAL
strSql.Append(" ,c.PRICE price,ISVOID ");
strSql.Append(" ,(select isnull(ISAGENTCN,0) from info_client where shortname=B.AIRLINES) ISAGENTCN ");
strSql.Append(" ,(select CODENAME from info_client where shortname=B.AIRLINES) AIRLINESCODE ");
strSql.Append(" ,(select name from company where gid=CORPID) CORPREF ");
strSql.Append(" from OP_AIRN B ");
strSql.Append(" left join OP_AIRN_CARGO C on c.bsno =( CASE b.BLTYPE when '国内分单' then B.bsno else (select top 1 bsno from OP_AIRN where HBLNO=b.HBLNO and BLTYPE='国内分单') end) ");
strSql.Append(" left join Import_cargoName icn on icn.gid=c.CARGOGID ");
@ -205,6 +207,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpAirnDAL
strSql.Append(" ,c.PRICE price,ISVOID ");
strSql.Append(" ,(select isnull(ISAGENTCN,0) from info_client where shortname=B.AIRLINES) ISAGENTCN ");
strSql.Append(" ,(select CODENAME from info_client where shortname=B.AIRLINES) AIRLINESCODE ");
strSql.Append(" ,(select name from company where gid=CORPID) CORPREF ");
strSql.Append(" from OP_AIRN B ");
strSql.Append(" left join OP_AIRN_CARGO C on c.bsno =( CASE b.BLTYPE when '国内分单' then B.bsno else (select top 1 bsno from OP_AIRN where HBLNO=b.HBLNO and BLTYPE='国内分单') end) ");
strSql.Append(" left join Import_cargoName icn on icn.gid=c.CARGOGID ");
@ -260,6 +263,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpAirnDAL
strSql.Append(" ,c.PRICE price ,ISVOID,HDEMO");
strSql.Append(" ,(select isnull(ISAGENTCN,0) from info_client where shortname=B.AIRLINES) ISAGENTCN ");
strSql.Append(" ,(select CODENAME from info_client where shortname=B.AIRLINES) AIRLINESCODE,HDEMO ");
strSql.Append(" ,(select name from company where gid=CORPID) CORPREF ");
strSql.Append(" ,(select name from company where gid=CORPID) CORPREF ");
strSql.Append(" from OP_AIRN B ");
strSql.Append(" left join OP_AIRN_CARGO C on c.bsno =( CASE b.BLTYPE when '国内分单' then B.bsno else (select top 1 bsno from OP_AIRN where HBLNO=b.HBLNO and BLTYPE='国内分单') end) ");
strSql.Append(" left join Import_cargoName icn on icn.gid=c.CARGOGID ");
@ -499,6 +505,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpAirnDAL
data.ISVOID = Convert.ToDecimal(reader["ISVOID"]);
data.HDEMO = Convert.ToString(reader["HDEMO"]);
data.CORPREF = Convert.ToString(reader["CORPREF"]);
#endregion
headList.Add(data);
}

@ -236,9 +236,16 @@ namespace DSWeb.MvcShipping.Models.MsOpAirn
{
get{ return _corpid; }
set{ _corpid = value; }
}
private string _saledept = "";
}
private string _CORPREF = "";
public string CORPREF
{
get { return _CORPREF; }
set { _CORPREF = value; }
}
private string _saledept = "";
/// <summary>
/// 所属部门
/// </summary>

@ -963,6 +963,12 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
proxy: { url: modurl }//{ url: '/MvcShipping/MsChFee/GetFeeTypeRefListNew' }
});
this.PubStore_OpCode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.UserRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefList' }
});
this.PubStore_OpCode.load();
////var StoreStatusTask = { //Ext的定时器每隔30秒刷新store。
//// run: function () {
@ -1180,6 +1186,10 @@ Ext.extend(Shipping.MainForm, Ext.Panel, {
result = this.PubStore_CODE_FEE;
}
if (STORENAME == "OpCode") {
result = this.PubStore_OpCode;
}
return result;
//if ((result != "") && (result.getCount() == 0) ) {

@ -19,6 +19,9 @@ Ext.extend(Shipping.MsOpSeaeFenEdit, Ext.Panel, {
//this.bodyDel = [];
this.itemindex = 1;
parentWin = window.parent.opener;
mainWin = getMainForm(parentWin);
//#region 信息加载
//权限范围
this.storeDefValue = Ext.create('Ext.data.Store', {
@ -59,7 +62,8 @@ Ext.extend(Shipping.MsOpSeaeFenEdit, Ext.Panel, {
model: 'DsShipping.ux.UserRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetUserRefList' }
});
this.storeOpCode.load();
//this.storeOpCode.load();
this.storeOpCode.loadData(mainWin.GetPubStore("OpCode").data.items);
//客服
this.comboxCUSTSERVICE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '客服',

@ -313,6 +313,17 @@ Ext.extend(Shipping.MsOpAirnFenIndex, Ext.Panel, {
dataIndex: 'VOUNO',
header: '凭证号',
width: 60
}, {
sortable: true,
dataIndex: 'SALEDEPT',
header: '所属部门',
width: 120
}, {
sortable: true,
hidden:true,
dataIndex: 'CORPREF',
header: '所属公司',
width: 120
}];
//定义Grid

@ -19,6 +19,10 @@ Ext.extend(Shipping.MsOpAirnIndex, Ext.Panel, {
initUIComponents: function () {
this.formname = "formMsOpAirnIndex"; //页面名称
parentWin = window.parent;
mainWin = getMainForm(parentWin);
//定义数据集
this.storePLList = Ext.create('Ext.data.Store', {
model: 'MsOpAirnModel'
@ -674,6 +678,17 @@ Ext.extend(Shipping.MsOpAirnIndex, Ext.Panel, {
dataIndex: 'STLDATE',
header: '结算日期',
width: 120
}, {
sortable: true,
dataIndex: 'SALEDEPT',
header: '所属部门',
width: 120
}, {
sortable: true,
hidden: true,
dataIndex: 'CORPREF',
header: '所属公司',
width: 120
}];

@ -17,6 +17,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
isfen: false,
HBLNO: "",
BSNO: "",
cansave:false,
initUIComponents: function () {
this.serialNo = 0;
@ -25,6 +26,9 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
this.initloaddata = 0;
this.CargoDel = [];
this.formname = "OpAirnMainEdit"; //页面名称
//#region 信息加载
this.storeDefValue = Ext.create('Ext.data.Store', {
model: 'DsShipping.ux.OpDefValue',
@ -70,6 +74,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
model: 'DsShipping.ux.UserRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefList' }
});
//客服
this.comboxCUSTSERVICE = Ext.create('DsExt.ux.RefTableCombox', {
@ -492,7 +497,8 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
this.storeDept.load();
this.comboxDept = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '所属部门',
hidden: true,
//hidden: true,
readOnly: true,
store: this.storeDept,
forceSelection: true,
name: 'SALEDEPT',
@ -755,7 +761,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCustCode, this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, this.comboxDept]
items: [this.comboxCustCode, this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL]
}, {
xtype: 'container',
layout: 'hbox',
@ -806,7 +812,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxSALE, this.comboxCUSTSERVICE, {xtype:"hiddenfield",flex:3}]
items: [this.comboxSALE, this.comboxCUSTSERVICE, this.comboxDept, {xtype:"hiddenfield",flex:2}]
}
, this.myCheckboxService, {
xtype: 'container',
@ -2854,13 +2860,14 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
// parentWin = window.parent.opener._this;
parentWin = window.parent.opener._thisfenlist;
if (parentWin == NaN || parentWin == null) {
parentWin = window.parent.opener._this;
} else {
this.isfen = true;
}
this.InitData();
this.formCargo.on('edit', function (editor, e, eOpts) {
@ -2942,6 +2949,23 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
this._Head = ret[5];
this._Edit = ret[6];
mainWin = {};
if (this.parenttype == "OP_AIRN_Edit" ) {
//parentWin = window.parent.opener._this;
parentWin2 = window.parent.opener.opener;
mainWin = getMainForm(parentWin2);
} else {
parentWin2 = window.parent.opener;
mainWin = getMainForm(parentWin2);
}
this.storeOpCode.loadData(mainWin.GetPubStore("OpCode").data.items);
/*
if (parenttype == "OP_AIRN_Edit") {
this.formHead.getForm().findField('HBLNO').setValue(ret[3]);
@ -3121,7 +3145,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
if (data.ISVOID == "1") {
this.setSaveBtnStatus(false);
}
this.cansave = true;
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
@ -3147,7 +3171,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
LoadInitData: function () {
this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} });
this.storeOpCode.load();
//this.storeOpCode.load();
this.storeAIRLINES.load({ params: { condition: "ISAIRLINES='1'" }
,
callback: function (r, options, success) {
@ -3173,6 +3197,9 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
},
//#region 保存
Save: function (type, print) {
if (!this.cansave) return;
var _this = this;
var basicForm = this.formEdit.getForm();
var basicForm2 = this.formHead.getForm();

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

@ -96,7 +96,7 @@
<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" />
-->
<!-- 本地仓储库 dsbzk admin 123456
<add name="DongShengDB" connectionString="Server=127.0.0.1;Database=DSWMS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=127.0.0.1;Database=DSWMS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
@ -411,14 +411,14 @@
<add name="DongShengDB" connectionString="Server=47.104.148.25,12356;Database=ShippingWeb_QDWTSJ;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.104.148.25,12356;Database=ShippingWeb_QDWTSJ;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!--原机场顺达 瑞京 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220601.
<!--原机场顺达 瑞京 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220601. -->
<add name="DongShengDB" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 瑞京 原机场顺达 测试库 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220331. -->
<!-- 瑞京 原机场顺达 测试库 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220331.
<add name="DongShengDB" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL_20220428;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL_20220428;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!--锦亿鹏鸿 ShippingWeb_QDJYPH qdjyph admin 123456
<add name="DongShengDB" connectionString="Server=47.104.203.39;Database=ShippingWeb_QDJYPH;User ID=sa;Password=2018QDds0411;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.104.203.39;Database=ShippingWeb_QDJYPH;User ID=sa;Password=2018QDds0411;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -96,7 +96,7 @@
<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" />
-->
<!-- 本地仓储库 dsbzk admin 123456
<add name="DongShengDB" connectionString="Server=127.0.0.1;Database=DSWMS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=127.0.0.1;Database=DSWMS;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
@ -411,14 +411,14 @@
<add name="DongShengDB" connectionString="Server=47.104.148.25,12356;Database=ShippingWeb_QDWTSJ;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.104.148.25,12356;Database=ShippingWeb_QDWTSJ;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!--原机场顺达 瑞京 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220601.
<!--原机场顺达 瑞京 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220601. -->
<add name="DongShengDB" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 瑞京 原机场顺达 测试库 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220331. -->
<!-- 瑞京 原机场顺达 测试库 http://47.105.53.126:8081/login.aspx QDRJ admin Ateam220331.
<add name="DongShengDB" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL_20220428;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.105.53.126,12356;Database=ShippingWeb_RJGYL_20220428;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!--锦亿鹏鸿 ShippingWeb_QDJYPH qdjyph admin 123456
<add name="DongShengDB" connectionString="Server=47.104.203.39;Database=ShippingWeb_QDJYPH;User ID=sa;Password=2018QDds0411;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=47.104.203.39;Database=ShippingWeb_QDJYPH;User ID=sa;Password=2018QDds0411;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

Binary file not shown.

Binary file not shown.

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

@ -578,7 +578,7 @@ from (
where s.group_idx = 1*/
var sqlQuery = " select 编号 MFNO,case when isnull(分提单号,'')<>'' then 分提单号 else 主提单号 end MBLNO,case when isnull(分提单号,'')<>'' then 0 else 1 end ISMAIN from t_op_seae_edi ";
sqlQuery += string.Format(" where EDI类型='CN' and {0}>='{1}' and {2}<'{3}' and isnull(申报状态,'')='' order by 录入日期 desc", queryfield, startdate, queryfield, enddate);
sqlQuery += string.Format(" where isnull(分提单号,'')='' and EDI类型='CN' and {0}>='{1}' and {2}<'{3}' and isnull(申报状态,'')='' order by 录入日期 desc", queryfield, startdate, queryfield, enddate);
//sqlQuery += " and not exists (select 1 from op_seae_edi_status where mfno=op_seae_edi.mfno and statustext= '装载放行' ) and dbo.getblno(mfno) not in(select mblno from wlxx_mblno) order by " + queryfield;

Loading…
Cancel
Save