'20220803空运出口销售订舱未完成'

临时发布20240103
ddlucky 2 years ago
parent dc1f652fc0
commit ebf95caf1c

@ -1 +1 @@
546fadbd59cfe6f07b28834e5b7752e3de7a4de4
678037f85c586ea56c9d27c1569e6c8026b148c7

File diff suppressed because it is too large Load Diff

@ -178,7 +178,7 @@ namespace DSWeb.MvcShipping.Controllers
headData.BSDATE = DateTime.Now;
headData.ORSTATUS ="9";
headData.ORSTATUSREF = "录入状态";
headData.DbOperationType = DbOperationType.DbotIns;
headData.DbOperationType = DbOperationType.DbotIns;
}
else if (opstatus == "edit")
{

File diff suppressed because it is too large Load Diff

@ -75,8 +75,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
strSql.Append("BLFRT,OTFRT,HBLBLFRT,HBLOTFRT,MARKS,[DESCRIPTION],GOODSNAME,PKGS,KINDPKGS,UNIT,");
strSql.Append("KGS,CBM,CURR,CUSTVALUE,CUSTOMVALUE,CLASS,FEEKGS,PRICE,TTLFREIGHT,OTFEE,HANDINGINFO,ACCOUNTINFO,");
strSql.Append("INPUTBY,OP,CUSTSERVICE,SALE,AIRLINES,TRANSAIRLINES,FORWARDER,CUSTOMSER,TRUCKER,INVNO,FRCUSTSERVICE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,ORDERNO,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,ORDERTYPE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,");
strSql.Append("OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX");
@ -161,14 +161,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
}
strSql.Append(@") as num , ");
strSql.Append(" B.BSNO,MASTERNO,ORDERTYPE,ORDTYPE,ORDERNO,BSSTATUS,FEESTATUS,BSDATE,ACCDATE,MBLNO,HBLNO,CUSTNO,TRANSNO,CUSTOMERNAME,BLTYPE,SHIPPERID,");
strSql.Append(" B.BSNO,MASTERNO,ORDERTYPE,ORDTYPE,ORDERNO,BSSTATUS,FEESTATUS,BSDATE,ACCDATE,MBLNO,HBLNO,CUSTNO,TRANSNO,CUSTOMERNAME,SHIPPERID,");
strSql.Append("CONSIGNEEID,NOTIFYPARTYID,SHIPPER,CONSIGNEE,NOTIFYPARTY,AGENTID,AGENT,VESSEL,ETD,ETA,");
strSql.Append("PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,TRANSPORTID,TRANSPORT,TRANSPORT2ID,TRANSPORT2,TRANSPORT3ID,TRANSPORT3,BLTYPE,ISSUETYPE,");
strSql.Append("BLFRT,OTFRT,HBLBLFRT,HBLOTFRT,MARKS,[DESCRIPTION],GOODSNAME,PKGS,KINDPKGS,UNIT,");
strSql.Append("KGS,CBM,CURR,CUSTVALUE,CUSTOMVALUE,CLASS,FEEKGS,PRICE,TTLFREIGHT,OTFEE,HANDINGINFO,ACCOUNTINFO,");
strSql.Append("INPUTBY,OP,CUSTSERVICE,SALE,AIRLINES,TRANSAIRLINES,FORWARDER,CUSTOMSER,TRUCKER,INVNO,FRCUSTSERVICE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,ORDERNO,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,ORDERTYPE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,");
strSql.Append("OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX");
@ -233,8 +233,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
strSql.Append("BLFRT,OTFRT,HBLBLFRT,HBLOTFRT,MARKS,[DESCRIPTION],GOODSNAME,PKGS,KINDPKGS,UNIT,");
strSql.Append("KGS,CBM,CURR,CUSTVALUE,CUSTOMVALUE,CLASS,FEEKGS,PRICE,TTLFREIGHT,OTFEE,HANDINGINFO,ACCOUNTINFO,");
strSql.Append("INPUTBY,OP,CUSTSERVICE,SALE,AIRLINES,TRANSAIRLINES,FORWARDER,CUSTOMSER,TRUCKER,INVNO,FRCUSTSERVICE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,ORDERNO,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,ORDERTYPE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,");
strSql.Append("OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX");
strSql.Append(",OTFEE1,OTFEE1AMOUNT,OTFEE2,OTFEE2AMOUNT,OTFEE3,OTFEE3AMOUNT,OTFEE4,OTFEE4AMOUNT,OTFEE5,OTFEE5AMOUNT");
@ -274,8 +274,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
strSql.Append("BLFRT,OTFRT,HBLBLFRT,HBLOTFRT,MARKS,[DESCRIPTION],GOODSNAME,PKGS,KINDPKGS,UNIT,");
strSql.Append("KGS,CBM,CURR,CUSTVALUE,CUSTOMVALUE,CLASS,FEEKGS,PRICE,TTLFREIGHT,OTFEE,HANDINGINFO,ACCOUNTINFO,");
strSql.Append("INPUTBY,OP,CUSTSERVICE,SALE,AIRLINES,TRANSAIRLINES,FORWARDER,CUSTOMSER,TRUCKER,INVNO,FRCUSTSERVICE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,ORDERNO,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,ORDERTYPE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,");
strSql.Append("OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX");
strSql.Append(",OTFEE1,OTFEE1AMOUNT,OTFEE2,OTFEE2AMOUNT,OTFEE3,OTFEE3AMOUNT,OTFEE4,OTFEE4AMOUNT,OTFEE5,OTFEE5AMOUNT");
@ -326,7 +326,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
strSql.Append("BLFRT,OTFRT,HBLBLFRT,HBLOTFRT,MARKS,[DESCRIPTION],GOODSNAME,PKGS,KINDPKGS,UNIT,");
strSql.Append("KGS,CBM,CURR,CUSTVALUE,CUSTOMVALUE,CLASS,FEEKGS,PRICE,TTLFREIGHT,OTFEE,HANDINGINFO,ACCOUNTINFO,");
strSql.Append("INPUTBY,OP,CUSTSERVICE,SALE,AIRLINES,TRANSAIRLINES,FORWARDER,CUSTOMSER,TRUCKER,INVNO,FRCUSTSERVICE,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,ORDERNO,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("CARGOID,BSSOURCE,BSSOURCEDETAIL,INSURANCEER,INSURANCENO,INAMOUT,");
strSql.Append("ISVOU,VOUNO,REMARK,CORPID,SALEDEPT,CREATETIME,STLNAME,STLDATE,ORDERTYPE,");
strSql.Append("OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX");

@ -57,18 +57,6 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
set { _custno = value; }
}
private string _ORDNO = "";
/// <summary>
/// 订单号
/// </summary>
[ModelDB]
public string ORDNO
{
get { return _ORDNO; }
set { _ORDNO = value; }
}
private string _ORSTATUS = "";
/// <summary>
/// 订单状态
@ -84,7 +72,6 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
/// <summary>
/// 订单状态ref
/// </summary>
[ModelDB]
public string ORSTATUSREF
{
get { return _ORSTATUSREF; }
@ -911,7 +898,7 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
private string _orderno = "";
/// <summary>
/// 订舱编
/// 订
/// </summary>
[ModelDB]
public string ORDERNO
@ -1740,6 +1727,39 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
set { _iscancel = value; }
}
private DateTime? _SUBMITDATE = null;
/// <summary>
/// 提交审核日期
/// </summary>
[ModelDB]
public DateTime? SUBMITDATE
{
get { return _SUBMITDATE; }
set { _SUBMITDATE = value; }
}
private DateTime? _AUDITDATE = null;
/// <summary>
/// 审核通过日期
/// </summary>
[ModelDB]
public DateTime? AUDITDATE
{
get { return _AUDITDATE; }
set { _AUDITDATE = value; }
}
private DateTime? _CONFIRMDATE = null;
/// <summary>
/// 确认订舱日期
/// </summary>
[ModelDB]
public DateTime? CONFIRMDATE
{
get { return _CONFIRMDATE; }
set { _CONFIRMDATE = value; }
}
#endregion
public MsAireOrder()

@ -62,7 +62,10 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>
<%--<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js"></script>--%>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js"></script>
<%--<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js"></script> --%>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/OrderFeeGrid.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/AireAmendFee.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillEdit.js"></script>

@ -18,7 +18,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
sortdire: '',
id: "MainAirePanel",
initUIComponents: function () {
this.formname = "formMsOpAireIndex"; //页面名称
this.formname = "formMsAireOrderIndex"; //页面名称
//定义数据集
this.storePLList = Ext.create('Ext.data.Store', {
model: 'MsOpAireModel'
@ -40,7 +40,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
remoteSort: true,
proxy: {
type: 'ajax',
url: '/MvcShipping/MsOpAire/GetDataList',
url: '/MvcShipping/MsAireOrder/GetDataList',
reader: {
id: 'BSNO',
root: 'data',
@ -134,13 +134,13 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
sortable: true,
id: '',
dataIndex: 'ORDERNO',
header: '订舱编号',
header: '订号',
width: 120
}, {
sortable: true,
id: '',
dataIndex: 'ORDERTYPE',
header: '订方式',
header: '订方式',
width: 120
},
{
@ -190,39 +190,41 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
return "";
}
}
},
{
sortable: true,
id: '',
dataIndex: 'DRFEESTATUS',
header: '应收费用',
align: 'center',
width: 60,
renderer: function (value, meta) {
if (value == '审核通过') {
meta.tdCls = 'feestatus_pass';
} else if (value == '录入状态') {
} else if (value == '提交审核') {
meta.tdCls = 'feestatus_refer';
} else if (value == '部分结算') {
meta.tdCls = 'feestatus_refer';
} else if (value == '结算完毕') {
meta.tdCls = 'feestatus_settle';
} else if (value == '未录入') {
} else if (value == '部分结算') {
meta.tdCls = 'feestatus_settle';
} else if (value == '部分审核') {
meta.tdCls = 'feestatus_pass';
} else if (value == '部分提交') {
meta.tdCls = 'feestatus_refer';
} else if (value == '驳回提交') {
meta.tdCls = 'feestatus_nopass';
}
return value;
}
},
,
//{
// sortable: true,
// id: '',
// dataIndex: 'DRFEESTATUS',
// header: '应收费用',
// align: 'center',
// width: 60,
// renderer: function (value, meta) {
// if (value == '审核通过') {
// meta.tdCls = 'feestatus_pass';
// } else if (value == '录入状态') {
// } else if (value == '提交审核') {
// meta.tdCls = 'feestatus_refer';
// } else if (value == '部分结算') {
// meta.tdCls = 'feestatus_refer';
// } else if (value == '结算完毕') {
// meta.tdCls = 'feestatus_settle';
// } else if (value == '未录入') {
// } else if (value == '部分结算') {
// meta.tdCls = 'feestatus_settle';
// } else if (value == '部分审核') {
// meta.tdCls = 'feestatus_pass';
// } else if (value == '部分提交') {
// meta.tdCls = 'feestatus_refer';
// } else if (value == '驳回提交') {
// meta.tdCls = 'feestatus_nopass';
// }
// return value;
// }
//},
{
sortable: true,
id: '',
@ -724,7 +726,38 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
dataIndex: 'REMARK',
header: '备注', //,
width: 120
}];
}
, {
dataIndex: 'ORSTATUS',
header: 'ORSTATUS', //,
hidden:true,
width: 120
}, {
dataIndex: 'ORSTATUSREF',
header: '订单状态', //,
width: 120
}, {
dataIndex: 'AUDITOPERATOR',
header: '审核人', //,
width: 120
}, {
dataIndex: 'AUDITOPERATOR2',
header: '确认订舱人', //,
width: 120
}, {
dataIndex: 'SUBMITDATE',
header: '提交时间', //,
width: 120
}, {
dataIndex: 'AUDITDATE',
header: '审核时间', //,
width: 120
}, {
dataIndex: 'CONFIRMDATE',
header: '确认订舱时间', //,
width: 120
}];
this.girdcolums = this.initgirdcolums;
@ -778,7 +811,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
this.gridList.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.SelectedRecord = record;
this.OprationStatus = 'edit';
DsOpenEditWin('/MvcShipping/MsOpAire/Edit', record.data.BSNO);
DsOpenEditWin('/MvcShipping/MsAireOrder/Edit', record.data.BSNO);
}, this);
this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) {
@ -933,7 +966,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
iconCls: "btnadd",
handler: function (button, event) {
this.OprationStatus = 'add';
DsOpenEditWin('/MvcShipping/MsOpAire/Edit');
DsOpenEditWin('/MvcShipping/MsAireOrder/Edit');
},
scope: this
}, {
@ -1694,7 +1727,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
Ext.Msg.wait('正在删除数据...');
Ext.Ajax.request({
waitMsg: '正在删除数据...',
url: '/MvcShipping/MsOpAire/Delete',
url: '/MvcShipping/MsAireOrder/Delete',
params: {
data: Ext.JSON.encode(record.data)
},

@ -178,7 +178,17 @@
{ name: 'SERVICE8', type: 'string' },
{ name: 'SERVICE9', type: 'string' },
{ name: 'SERVICE10', type: 'string' },
{ name: 'BillFeeStatus', type: 'string' }
{ name: 'BillFeeStatus', type: 'string' },
{ name: 'ORSTATUS', type: 'string' },
{ name: 'ORSTATUSREF', type: 'string' },
{ name: 'AUDITOPERATOR', type: 'string' },
{ name: 'AUDITOPERATOR2', type: 'string' },
{ name: 'SUBMITDATE', type: 'string' },
{ name: 'AUDITDATE', type: 'string' },
{ name: 'CONFIRMDATE', type: 'string' },
{ name: 'SERVICECONTRACTNO', type: 'string' }
]
});

@ -454,7 +454,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
{
sortable: true,
id: '',
dataIndex: 'ETD',
dataIndex: 'ETD2',
header: Zi.LAN.ETD_BOCHUAN, //'开船日期',
width: 80,
filter: {

@ -1618,9 +1618,9 @@
<Content Include="Areas\MvcShipping\Viewsjs\MsFeeTemplate\FeeTemplatePLAdd.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\Edit.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\Index.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsOpAireEdit.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsOpAireEditView.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsOpAireIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsAireOrderEdit.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsAireOrderEditView.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsAireOrder\MsAireOrderIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpReceipt\ReceiptDocIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSeae\FeeIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSeae\MsOpSeaeFeeIndex.js" />
@ -7554,6 +7554,7 @@
<Compile Include="Areas\MvcShipping\DAL\MsContainerSetCtn\MsContainerSetCtnDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsContainerSet\MsContainerSetDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsCrmClient\MsCrmClientDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsOpAire\MsAireOrderDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsOpSocCtn\MsOpSocCtnDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsOpSeaePre\MsOpSeaePreDAL.cs" />
<Compile Include="Areas\MvcShipping\DAL\MsRptCwBaoXiao\MsRptCwBaoXiaoDAL.cs" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save