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

1

Browse Source
DS7_JingHan^2
hanxuntao 2 years ago
parent 032f5474df
commit e442076097
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

7
DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
Unescape Escape View File

@ -82,7 +82,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE "); strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE ");
strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2"); strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2");
strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION,SOURCE_OP"); strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION,SOURCE_OP,BSTYPE2");
strSql.Append(" from OP_APPLY "); strSql.Append(" from OP_APPLY ");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_APPLY.BSNO) "); strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_APPLY.BSNO) ");
@ -161,7 +161,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE "); strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE ");
strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE"); strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE");
strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION"); strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION,BSTYPE2");
strSql.Append(" from OP_APPLY "); strSql.Append(" from OP_APPLY ");
if (!string.IsNullOrEmpty(strCondition)) if (!string.IsNullOrEmpty(strCondition))
@ -221,7 +221,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE "); strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE ");
strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2"); strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2");
strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION,SOURCE_OP"); strSql.Append(",EXPORT_CREDIT_CODE,SHIP_CREDIT_CODE,isnull(ENTRY_VERSION,'0') ENTRY_VERSION,SOURCE_OP,BSTYPE2");
strSql.Append(" from OP_APPLY "); strSql.Append(" from OP_APPLY ");
if (!string.IsNullOrEmpty(condition)) if (!string.IsNullOrEmpty(condition))
@ -424,6 +424,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
data.SHIP_CREDIT_CODE = Convert.ToString(reader["SHIP_CREDIT_CODE"]);// data.SHIP_CREDIT_CODE = Convert.ToString(reader["SHIP_CREDIT_CODE"]);//
data.ENTRY_VERSION = Convert.ToString(reader["ENTRY_VERSION"]);// data.ENTRY_VERSION = Convert.ToString(reader["ENTRY_VERSION"]);//
data.SOURCE_OP = Convert.ToString(reader["SOURCE_OP"]);// data.SOURCE_OP = Convert.ToString(reader["SOURCE_OP"]);//
data.BSTYPE2 = Convert.ToString(reader["BSTYPE2"]);//
#endregion #endregion
headList.Add(data); headList.Add(data);
} }

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriEdit.js
Unescape Escape View File

@ -1061,7 +1061,7 @@ Ext.extend(Shipping.MsOpAiriEdit, Ext.Panel, {
items: [this.comboxPORTDISCHARGEID, { items: [this.comboxPORTDISCHARGEID, {
name: 'PORTDISCHARGE' name: 'PORTDISCHARGE'
}, { }, {
fieldLabel: '进口日期', fieldLabel: '入库日期',
format: 'Y-m-d', format: 'Y-m-d',
flex: 1, flex: 1,
xtype: 'datefield', xtype: 'datefield',

4
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
Unescape Escape View File

@ -992,7 +992,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
this.formBill.getForm().findField('PREPARDAT').setValue(portload); this.formBill.getForm().findField('PREPARDAT').setValue(portload);
this.formBill.getForm().findField('PAYABLEAT').setValue(''); this.formBill.getForm().findField('PAYABLEAT').setValue('');
} else if (combo.value == "FREIGHT COLLECT") { } else if (combo.value == "FREIGHT COLLECT") {
var DESTINATION = this.formEdit.getForm().findField('DESTINATION').getValue(); var DESTINATION = this.formBill.getForm().findField('DESTINATION').getValue();
this.formBill.getForm().findField('PAYABLEAT').setValue(DESTINATION); this.formBill.getForm().findField('PAYABLEAT').setValue(DESTINATION);
this.formBill.getForm().findField('PREPARDAT').setValue(''); this.formBill.getForm().findField('PREPARDAT').setValue('');
@ -4395,7 +4395,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
this.formHead.getForm().findField('MDESCRIPTION').setValue(this.formMBL.getForm().findField('MDESCRIPTION').getValue()); this.formHead.getForm().findField('MDESCRIPTION').setValue(this.formMBL.getForm().findField('MDESCRIPTION').getValue());
this.formHead.getForm().findField('MCONSIGNEE').setValue(this.formMBL.getForm().findField('MCONSIGNEE').getValue()); this.formHead.getForm().findField('MCONSIGNEE').setValue(this.formMBL.getForm().findField('MCONSIGNEE').getValue());
this.formHead.getForm().findField('MNOTIFYPARTY').setValue(this.formMBL.getForm().findField('MNOTIFYPARTY').getValue()); this.formHead.getForm().findField('MNOTIFYPARTY').setValue(this.formMBL.getForm().findField('MNOTIFYPARTY').getValue());
this.formHead.getForm().findField('MBLFRT').setValue(this.formMBL.getForm().findField('MBLFRT').getValue()); //this.formHead.getForm().findField('MBLFRT').setValue(this.formMBL.getForm().findField('MBLFRT').getValue());
// //
var jsonBody = ConvertRecordsToJsonAll(bodydatas); var jsonBody = ConvertRecordsToJsonAll(bodydatas);
this.formHead.getForm().findField('BSNO').setDisabled(false); this.formHead.getForm().findField('BSNO').setDisabled(false);

Write Preview
Loading…
Cancel
Save