diff --git a/DSWeb/Areas/Account/Models/Chfee_do/Chfee_do.cs b/DSWeb/Areas/Account/Models/Chfee_do/Chfee_do.cs
index b5eded17..f1326e06 100644
--- a/DSWeb/Areas/Account/Models/Chfee_do/Chfee_do.cs
+++ b/DSWeb/Areas/Account/Models/Chfee_do/Chfee_do.cs
@@ -218,6 +218,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_do
public string SETTLETYPEREF { get; set; }
public string CREATEUSER { get; set; }
+
+ public string BILLSTATUSREF { get; set; }
#endregion
}
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
index 1c061d8b..0825b8a8 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js
@@ -540,7 +540,7 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
this.onSubmitAuditClick();
},
scope: this
- }, '-', {
+ }, {
id: 'btnSubmitAuditBack',
text: '撤销提交',
tooltip: '撤销提交',
@@ -548,6 +548,22 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
this.onSubmitAuditBackClick();
},
scope: this
+ }, '-', {
+ text: '审核通过', //审核通过
+ iconCls: "btnadd",
+ id: 'btnAuditPass',
+ handler: function (button, event) {
+ this.onAuditPassClick();
+ },
+ scope: this
+ }, {
+ text: '驳回提交', //审核通过
+ iconCls: "btndelete",
+ id: 'btnAuditBack',
+ handler: function (button, event) {
+ this.onAuditBackClick();
+ },
+ scope: this
}
]
}); //end 按钮Toolbar
@@ -2011,7 +2027,77 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
//#endregion 明细表
+ //#region 驳回理由
+
+ this.formAuditBack = Ext.widget('form', {
+ frame: true,
+ region: 'center',
+ title: "驳回原因",
+ bodyPadding: 5,
+ fieldDefaults: {
+ margins: '2 2 2 2',
+ labelAlign: 'right',
+ flex: 1,
+ labelWidth: 90,
+ msgTarget: 'qtip'
+ },
+
+ items: [{
+ xtype: 'textareafield',
+ grow: true,
+ fieldLabel: '',
+ labelSeparator: '',
+ labelWidth: 0,
+ height: 100,
+ name: 'ORREASON',
+ anchor: '100%'
+ }
+
+ ]//end root items
+ });
+ me = this;
+ this.winAuditBackShow = Ext.create('Ext.window.Window', {
+ title: "驳回收费申请",
+ width: 450,
+ //height : 120,
+ //plain : true,
+ iconCls: "addicon",
+ resizable: false,
+ // 是否可以拖动
+ // draggable:false,
+ collapsible: true, // 允许缩放条
+ closeAction: 'close',
+ closable: true,
+ modal: 'true',
+ buttonAlign: "center",
+ bodyStyle: "padding:0 0 0 0",
+ items: [this.formAuditBack],
+ buttons: [{
+ text: "确认驳回",
+ minWidth: 70,
+ handler: function () {
+
+ var form = me.formAuditBack.getForm();
+ var ORREASON = form.findField('ORREASON').getRawValue();
+ if (ORREASON == '' || ORREASON == null || ORREASON == undefined) {
+ Ext.Msg.show({ title: '提示', msg: '驳回原因为必填!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ return;
+ };
+ me.reason = ORREASON;
+ me.onAuditBack(ORREASON);
+
+ me.winAuditBackShow.close();
+ }
+ }, {
+ text: "关闭",
+ minWidth: 70,
+ handler: function () {
+ me.winAuditBackShow.close();
+ }
+ }]
+ });
+ //#endregion
//#region 布局
//控件布局
@@ -2240,6 +2326,28 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
if (this.opStatus == 'edit')
condition = " BILLNO='" + this.editRecord.get('BILLNO') + "'";
+ Ext.getCmp('btnAuditPass').hide();
+ Ext.getCmp('btnAuditBack').hide();
+ Ext.Ajax.request({
+ waitMsg: '',
+ url: '/MvcShipping/MsBaseInfo/GetUserModuleEnable',
+ params: {
+ modulename: "modRevcAppAudit"
+ },
+ callback: function (options, success, response) {
+ if (success) {
+ var result = Ext.JSON.decode(response.responseText);
+ if (result.Success) {
+ Ext.getCmp('btnAuditPass').show();
+ Ext.getCmp('btnAuditBack').show();
+ }
+ } else {
+
+ }
+ },
+ scope: this
+ });
+
this.LoadData(this.opStatus, condition);
this.LoadMustBe();
@@ -3850,7 +3958,7 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
}
if ((bsStatus != 1) && (bsStatus != 6)) {
- this.setSaveBtnStatus(false);
+ _this.setSaveBtnStatus(false);
} else {
_this.setSaveBtnStatus(canedit);
}
@@ -4000,7 +4108,9 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
sum = sum.toFixed(2);
Ext.getCmp("zongshu").setText(" 选中金额:" + sum);
- }, onAddFileClick: function () {
+ }
+
+ , onAddFileClick: function () {
if (BillState != '未提交' && BillState != '审核驳回') {//未提交
Ext.MessageBox.alert(Zi.LAN.Prompt, Zi.LAN.noallowxiugai); //提示', '当前状态不允许修改附件列表
return;
@@ -4013,7 +4123,9 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
winAccess.BillNo = BillNo;
winAccess.FileBillType = "收费申请";
winAccess.show();
- }, onDelFileClick: function () {
+ }
+
+ , onDelFileClick: function () {
if (BillState != '未提交' && BillState != '审核驳回') {//未提交
Ext.MessageBox.alert(Zi.LAN.Prompt, Zi.LAN.noallowxiugai); //提示', '当前状态不允许修改附件列表！
return;
@@ -4058,6 +4170,164 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, {
}
}, this);
}
+
+ , onAuditPassClick: function () {
+
+ var BILLNO = this.formEdit.getForm().findField('BILLNO').getValue();
+
+ var BILLSTATUS = this.formEdit.getForm().findField('BILLSTATUS').getValue();
+
+ if (BILLNO == '*') {
+ Ext.Msg.show({ title: '提示', msg: '请先保存收费申请，然后才能审核!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ return;
+ };
+
+ var basicForm = this.formEdit.getForm();
+
+ if (!basicForm.isValid()) {
+ return;
+ }
+
+ var bodyAddDatas = [];
+
+ this.formEdit.getForm().findField('BILLSTATUS').setDisabled(false);
+ this.formEdit.getForm().findField('APPLICANT').setDisabled(false);
+ this.formEdit.getForm().findField('COMPANYID').setDisabled(false);
+ var data = basicForm.getValues();
+ this.formEdit.getForm().findField('BILLSTATUS').setDisabled(true);
+ this.formEdit.getForm().findField('APPLICANT').setDisabled(true);
+ this.formEdit.getForm().findField('COMPANYID').setDisabled(true);
+
+ if ((BILLSTATUS == '6' || BILLSTATUS == '2')) {
+ var rec = {};
+ rec.data = data;
+ bodyAddDatas.push(rec);
+
+ } else {
+ Ext.Msg.show({ title: '提示', msg: '只有提交审核和驳回审核的才能审核！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ return;
+ };
+
+ var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
+
+ _this = this;
+
+ Ext.MessageBox.confirm('提示', '确认要审核吗？', function (btn) {
+ if (btn == 'yes') {
+ Ext.Msg.wait('正在审核...');
+ Ext.Ajax.request({
+ waitMsg: '正在审核...',
+ url: '/Account/Chfee_recvapplication/AuditList',
+ params: {
+ data: jsonbodyAddDatas
+ },
+ callback: function (options, success, response) {
+ if (success) {
+ var jsonresult = Ext.JSON.decode(response.responseText);
+ if (jsonresult.Success) {
+ condition = " BILLNO='" + BILLNO + "'";
+ _this.LoadData('edit', condition);
+
+ Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ }
+ else {
+ Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+ }
+ }
+ },
+ failure: function (response, options) {
+ Ext.Msg.show({ title: '错误', msg: '服务器响应出错！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ },
+ success: function (response, options) {
+ },
+ scope: this
+ }); //end Ext.Ajax.request
+ }
+ }, this);
+
+ },
+
+ onAuditBackClick: function () {
+
+ this.winAuditBackShow.show();
+
+ },
+
+ onAuditBack: function (ORREASON) {
+
+ var BILLNO = this.formEdit.getForm().findField('BILLNO').getValue();
+
+ var BILLSTATUS = this.formEdit.getForm().findField('BILLSTATUS').getValue();
+
+
+ if (BILLNO == '*') {
+ Ext.Msg.show({ title: '提示', msg: '请先保存收费申请，然后才能审核!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ return;
+ };
+
+ var basicForm = this.formEdit.getForm();
+
+ if (!basicForm.isValid()) {
+ return;
+ }
+
+ var bodyAddDatas = [];
+
+ this.formEdit.getForm().findField('BILLSTATUS').setDisabled(false);
+ this.formEdit.getForm().findField('APPLICANT').setDisabled(false);
+ this.formEdit.getForm().findField('COMPANYID').setDisabled(false);
+ var data = basicForm.getValues();
+ this.formEdit.getForm().findField('BILLSTATUS').setDisabled(true);
+ this.formEdit.getForm().findField('APPLICANT').setDisabled(true);
+ this.formEdit.getForm().findField('COMPANYID').setDisabled(true);
+
+ if ((BILLSTATUS == '0' || BILLSTATUS == '2')) {
+ var rec = {};
+ rec.data = data;
+ bodyAddDatas.push(rec);
+
+ } else {
+ Ext.Msg.show({ title: '提示', msg: '只有提交审核或审核通过的才能驳回！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ return;
+ };
+
+
+
+ var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
+
+ _this = this;
+
+
+ Ext.Msg.wait('正在驳回审核...');
+ Ext.Ajax.request({
+ waitMsg: '正在驳回审核...',
+ url: '/Account/Chfee_recvapplication/AuditBackList',
+ params: {
+ data: jsonbodyAddDatas,
+ ORREASON: ORREASON
+ },
+ callback: function (options, success, response) {
+ if (success) {
+ var jsonresult = Ext.JSON.decode(response.responseText);
+ if (jsonresult.Success) {
+ condition = " BILLNO='" + BILLNO + "'";
+ _this.LoadData('edit', condition);
+ _this.winAuditBackShow.close();
+ Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ }
+ else {
+ Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+ }
+ }
+ },
+ failure: function (response, options) {
+ Ext.Msg.show({ title: '错误', msg: '服务器响应出错！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+ },
+ success: function (response, options) {
+ },
+ scope: this
+ }); //end Ext.Ajax.request
+ }
});
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationEdit.js
index 5bec681d..bce82160 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationEdit.js
@@ -308,7 +308,7 @@ Ext.extend(Shipping.MsChRecvapplicationEdit, Ext.Panel, {
this.onSubmitAuditClick();
},
scope: this
- }, '-', {
+ }, {
id: 'btnSubmitAuditBack',
text: '撤销提交',
tooltip: '撤销提交',
@@ -316,6 +316,22 @@ Ext.extend(Shipping.MsChRecvapplicationEdit, Ext.Panel, {
this.onSubmitAuditBackClick();
},
scope: this
+ }, '-', {
+ text: '审核通过', //审核通过
+ iconCls: "btnadd",
+ id: 'btnAuditPass',
+ handler: function (button, event) {
+ this.onAuditPassClick();
+ },
+ scope: this
+ }, {
+ text: '驳回提交', //审核通过
+ iconCls: "btndelete",
+ id: 'btnAuditBack',
+ handler: function (button, event) {
+ this.onAuditBackClick();
+ },
+ scope: this
}
]
}); //end 按钮Toolbar
@@ -1303,6 +1319,28 @@ Ext.extend(Shipping.MsChRecvapplicationEdit, Ext.Panel, {
this.editRecord = ret[2];
}
+ Ext.getCmp('btnAuditPass').hide();
+ Ext.getCmp('btnAuditBack').hide();
+ Ext.Ajax.request({
+ waitMsg: '',
+ url: '/MvcShipping/MsBaseInfo/GetUserModuleEnable',
+ params: {
+ modulename: "modRevcAppAudit"
+ },
+ callback: function (options, success, response) {
+ if (success) {
+ var result = Ext.JSON.decode(response.responseText);
+ if (result.Success) {
+ Ext.getCmp('btnAuditPass').show();
+ Ext.getCmp('btnAuditBack').show();
+ }
+ } else {
+
+ }
+ },
+ scope: this
+ });
+
if (this.opStatus == 'edit')
condition = " BILLNO='" + this.editRecord.get('BILLNO') + "'";
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationIndex.js
index ab44f848..1050073c 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationIndex.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationIndex.js
@@ -581,7 +581,7 @@ Ext.extend(Shipping.MsChRecvapplicationIndex, Ext.Panel, {
this.onAuditPassClick();
},
scope: this
- }, '-', {
+ }, {
text: '驳回提交', //审核通过
iconCls: "btndelete",
id: 'btnAuditBack',
@@ -964,12 +964,12 @@ Ext.extend(Shipping.MsChRecvapplicationIndex, Ext.Panel, {
},
-
onAuditBackClick: function () {
this.winAuditBackShow.show();
},
+
onAuditBack: function (ORREASON) {
var selections = this.gridList.getSelectionModel().getSelection();
@@ -1029,6 +1029,7 @@ Ext.extend(Shipping.MsChRecvapplicationIndex, Ext.Panel, {
}); //end Ext.Ajax.request
},
+
getCondition: function () {
var form = this.formSearch.getForm();
if (!form.isValid()) {
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
index c615829d..9ff43965 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
@@ -1124,7 +1124,7 @@ namespace DSWeb.MvcShipping.Controllers
#endregion
- #region
+ #region 上传附件
[HttpPost]
public ContentResult UploadFile ( )
{
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
index 2a377fcd..85ac33ea 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
@@ -1239,7 +1239,6 @@ namespace DSWeb.MvcShipping.Controllers
#endregion
-
#region 提交 审核
public ContentResult SQQR ( string USERID, string data ) //申请签入
@@ -2484,7 +2483,7 @@ namespace DSWeb.MvcShipping.Controllers
}
#endregion
- #region
+ #region 取消放单通知
public ContentResult GGTD(string data,string status) //取消放单通知
{
@@ -2521,7 +2520,6 @@ namespace DSWeb.MvcShipping.Controllers
#endregion
-
public ContentResult SaveLog ( string data )
{
var headData = JsonConvert.Deserialize(data);
@@ -2566,6 +2564,7 @@ namespace DSWeb.MvcShipping.Controllers
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
return new ContentResult() { Content = json };
}
+
public ContentResult GetBLINFOLIST(int start, int limit, string sort, string CUSTNAME,string SALE)
{
var dataList = MsOp_BLISSUEDAL.GetBLINFOLIST(CUSTNAME, SALE);
@@ -2757,6 +2756,8 @@ namespace DSWeb.MvcShipping.Controllers
#endregion
+
+
}
}
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpBill/MsOpBillDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpBill/MsOpBillDAL.cs
index f0b27e2e..01301dfc 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpBill/MsOpBillDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpBill/MsOpBillDAL.cs
@@ -235,9 +235,31 @@ namespace DSWeb.Areas.MvcShipping.DAL
{
strSql.Append(",b.INVOICENO INVNO,b.INVOICEMAKETIME BILLDATE,(select ShowName from [user] where GID=b.APPLICANT) as BILLUSER,(select ShowName from [user] where GID=b.OPERATOR) as CREATEUSER,'' SETTLETYPEREF");
}
-
+
+ if (dotype == "1")
+ {//ch_fee_settlement
+ strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97006 and EnumValueID=b.BILLSTATUS) as BILLSTATUSREF");
+ }else
+ if (dotype == "5")
+ {//ch_fee_recvapplication
+ strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=b.BILLSTATUS) as BILLSTATUSREF");
+ }
+ else
+ if (dotype == "4")
+ {//ch_fee_payapplication
+ strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=b.BILLSTATUS) as BILLSTATUSREF");
+ }
+ else
+ if (dotype == "6")
+ {//ch_fee_invoiceapplication
+ strSql.Append(" ,(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97010 and EnumValueID=b.BILLSTATUS) as BILLSTATUSREF");
+ }
+ else
+ strSql.Append(" ,'' BILLSTATUSREF");
+
strSql.Append(" FROM ch_fee_do c ");
+
if (dotype == "1")
{
strSql.Append(" left join ch_fee_settlement b on (b.BILLNO=c.BILLNO) ");
@@ -293,7 +315,7 @@ namespace DSWeb.Areas.MvcShipping.DAL
var strSql = new StringBuilder();
strSql.Append(" SELECT c.GID,c.BILLNO,c.BSNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
- strSql.Append(",b.INVNO,b.INVDATE BILLDATE,b.OP as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER");
+ strSql.Append(",b.INVNO,b.INVDATE BILLDATE,b.OP as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER,'' BILLSTATUSREF ");
strSql.Append(" FROM ch_fee_do_invoice c ");
strSql.Append(" left join ch_fee_invoicehexiao b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
@@ -338,7 +360,7 @@ namespace DSWeb.Areas.MvcShipping.DAL
data.SETTLETYPEREF = Convert.ToString(reader["SETTLETYPEREF"]);
data.CREATEUSER = Convert.ToString(reader["CREATEUSER"]);
-
+ data.BILLSTATUSREF = Convert.ToString(reader["BILLSTATUSREF"]);
#endregion
headList.Add(data);
}
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
index 5cb613bb..61108fee 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
@@ -3671,6 +3671,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
if (modifydata.SERVICE9) strSql.Append(",SERVICE9=1");
if (modifydata.SERVICE10) strSql.Append(",SERVICE10=1");
+ if (modifydata.VGM_TIME != "" && modifydata.VGM_TIME != null)
+ strSql.Append(",VGM_TIME=@VGM_TIME");
strSql.Append(" where BSNO=@BSNO ");
@@ -3902,6 +3904,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
db.AddInParameter(cmdupdate, "@SERVICECONTRACTNO", DbType.String, modifydata.SERVICECONTRACTNO);
if (modifydata.ORDERNO != "" && modifydata.ORDERNO != null)
db.AddInParameter(cmdupdate, "@ORDERNO", DbType.String, modifydata.ORDERNO);
+
+ if (modifydata.VGM_TIME != "" && modifydata.VGM_TIME != null)
+ db.AddInParameter(cmdupdate, "@VGM_TIME", DbType.String, modifydata.VGM_TIME);
+
db.AddInParameter(cmdupdate, "@BSNO", DbType.String, enumValue.BSNO);
db.ExecuteNonQuery(cmdupdate, tran);
db.AddInParameter(cmdupdateBL, "@BSNO", DbType.String, enumValue.BSNO);
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
index 995eff43..9f337976 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
@@ -3127,6 +3127,9 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
}
data.结费类型 = data.结费类型 + ",结算日期为 " + Convert.ToString(reader["stldate"]) + "";
data.STLDATE = Convert.ToString(reader["stldate"]);
+
+
+
#endregion
#region 该业务是否 欠费超期
@@ -3199,9 +3202,18 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
}
}
#endregion
-
- #region 提单签出 未签单
+
+ #region 显示目前已有明细箱号且未提单签出的业务的箱数
+
+ var _CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
+
+ var 未放单业务数 = 查询未放单量(_CUSTOMERNAME);
+
+ data.后续业务 = "未放单业务数:" + 未放单业务数.ToString();
+
+
+
//if (reader["NUMTYPPE"].ToString() == "提单签出")
//{
@@ -3268,10 +3280,11 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
}
#endregion
- data.InfoText = data.结费类型 + "\n";
- data.InfoText = data.InfoText + data.欠费超期 + "\n";
- data.InfoText = data.InfoText + data.累计欠费 + "\n";
- data.InfoText = data.InfoText + data.信用额度 + "\n";
+ data.InfoText = data.结费类型 + "\r\n";
+ data.InfoText = data.InfoText + data.欠费超期 + "\r\n";
+ data.InfoText = data.InfoText + data.累计欠费 + "\r\n";
+ data.InfoText = data.InfoText + data.信用额度 + "\r\n";
+ data.InfoText = data.InfoText + data.后续业务 + "\r\n";
#endregion
headList.Add(data);
@@ -3587,6 +3600,16 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
}
+ #endregion
+
+ #region 未放单量查询
+
+ public static int 查询未放单量(string CUSTOMERNAME) {
+ T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
+ var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(1) BLCOUNT from v_op_bs WHERE BLISSUESTATUS<>'提单签出' AND CUSTOMERNAME='" + CUSTOMERNAME + "'");
+ return Convert.ToInt32( BLCOUNT);
+ }
+
#endregion
}
}
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderIndex.js
index 1236fd3f..a711500c 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsAireOrder/MsAireOrderIndex.js
@@ -705,15 +705,15 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
}
}, {
dataIndex: 'BLISSUESTATUS',
- header: '提单签发状态', //'货物标识',
+ header: '提单签发状态', //'提单签发状态',
width: 120
}, {
dataIndex: 'DELIVERYDATE',
- header: '送仓日期', //'货物标识',
+ header: '送仓日期', //'送仓日期',
width: 100
}, {
dataIndex: 'INVNO',
- header: '发票号', //'货物标识',
+ header: '发票号', //'发票号',
width: 100
}, {
sortable: true,
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsFeeHistoryView.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsFeeHistoryView.js
index f52265c9..aae13c72 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsFeeHistoryView.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsFeeHistoryView.js
@@ -81,7 +81,8 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
{ name: 'DOAMOUNT', type: 'number' },
{ name: 'ORIGAMOUNT', type: 'number' },
{ name: 'EXCHANGERATE', type: 'number' },
- { name: 'REMARK', type: 'string' }
+ { name: 'REMARK', type: 'string' },
+ { name: 'BILLSTATUSREF', type: 'string' }
]
});
@@ -472,6 +473,11 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
dataIndex: 'BILLUSER',
header: '申请人',
width: 80
+ }, {
+ sortable: true,
+ dataIndex: 'BILLSTATUSREF',
+ header: '业务状态',
+ width: 80
}
]
});
@@ -589,6 +595,11 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
dataIndex: 'BILLUSER',
header: '申请人',
width: 80
+ }, {
+ sortable: true,
+ dataIndex: 'BILLSTATUSREF',
+ header: '业务状态',
+ width: 80
}
]
});
@@ -710,6 +721,11 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
dataIndex: 'SETTLETYPEREF',
header: '结算方式',
width: 80
+ }, {
+ sortable: true,
+ dataIndex: 'BILLSTATUSREF',
+ header: '业务状态',
+ width: 80
}
]
});
@@ -965,6 +981,11 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
dataIndex: 'BILLUSER',
header: '申请人',
width: 80
+ }, {
+ sortable: true,
+ dataIndex: 'BILLSTATUSREF',
+ header: '业务状态',
+ width: 80
}
]
});
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index 963cad5e..e364070a 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@@ -2098,6 +2098,25 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
}
});
+ //this.StoreISCANCEL = Ext.create('Ext.data.Store', {
+ // fields: ['value', 'text']
+ //});
+ //this.StoreISCANCEL.add({ 'value': '', 'text': '' });
+ //this.StoreISCANCEL.add({ 'value': '-1', 'text': '未退舱' });
+ //this.StoreISCANCEL.add({ 'value': '1', 'text': '已退舱' });
+ //this.StoreISCANCEL.add({ 'value': '2', 'text': '申请退舱' });
+ //this.StoreISCANCEL.add({ 'value': '4', 'text': '驳回申请' });
+
+ //this.comboxISCANCEL = Ext.create('DsExt.ux.RefTableCombox', {
+ // fieldLabel: '退舱状态', //'默认FRT',
+ // store: this.StoreISCANCEL,
+ // valueField: 'value',
+ // displayField: 'text',
+ // forceSelection: true,
+ // name: 'ISCANCEL',
+ // value:'-1'
+ //});
+
//#endregion
//#region formSearch 查询面板
@@ -2247,6 +2266,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
this.comboxISEI,
this.comboxPORTLOAD,
this.comboxDoc,
+ //this.comboxISCANCEL,
{
xtype: 'hiddenfield',
flex: 1.9,
@@ -7531,16 +7551,23 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
- items: [this.comboxDESTINATIONm, {
- fieldLabel: Zi.LAN.DESTINATIONID, //'卸港代码',
- name: 'DESTINATIONID'
- },{
- fieldLabel: Zi.LAN.ATD, //'开船日期',
+ items: [this.comboxDESTINATIONm,
+ {
+ fieldLabel: Zi.LAN.DESTINATIONID, //'卸港代码',
+ name: 'DESTINATIONID'
+ },{
+ fieldLabel: Zi.LAN.ATD, //'开船日期',
+ format: 'Y-m-d',
+ flex: 1,
+ xtype: 'datefield',
+ name: 'ATD'
+ }, {
+ fieldLabel: Zi.LAN.VGM_TIME, //'开船日期',
format: 'Y-m-d',
flex: 1,
xtype: 'datefield',
- name: 'ATD'
- }, { xtype: 'hiddenfield' }
+ name: 'VGM_TIME'
+ }
]
}, {
@@ -7630,7 +7657,6 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
me.onModifyClick()
-
}
}, {
text: Zi.LAN.btnreset, //"确认修改",
@@ -8862,6 +8888,16 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
var ISEI = form.findField('ISEI').getValue();
sql = sql + getAndConSql(sql, ISEI, "ISEI = '" + ISEI + "'");
+
+ //var ISCANCEL = form.findField('ISCANCEL').getValue();
+ //if (ISCANCEL) {
+ // if (ISCANCEL == "-1") {
+ // sql = sql + getAndConSql(sql, ISCANCEL, "B.ISCANCEL = '0'");
+ // } else {
+ // sql = sql + getAndConSql(sql, ISCANCEL, "B.ISCANCEL = '" + ISCANCEL +"'");
+ // }
+ //}
+
// //装货港
// var PORTLOAD = form.findField('PORTLOAD').getValue();
// sql = sql + getAndConSql(sql, PORTLOAD, "B.PORTLOAD like '%" + PORTLOAD + "%'");
diff --git a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7884e278..417e1f5b 100644
--- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -7,7 +7,7 @@
<_PublishTargetUrl>F:\DS7Deploy
- True|2022-09-15T09:51:03.0418191Z;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;
+ True|2022-09-19T09:29:15.0054651Z;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;
@@ -882,13 +882,13 @@
08/26/2022 20:26:40
- 09/06/2022 11:04:28
+ 09/19/2022 16:20:13
- 08/26/2022 20:31:11
+ 09/19/2022 15:23:58
- 09/05/2022 16:55:47
+ 09/19/2022 15:52:40
09/05/2022 16:50:15
@@ -5562,7 +5562,7 @@
08/04/2022 17:58:46
- 09/08/2022 14:25:11
+ 09/19/2022 14:26:55
08/02/2022 17:00:53
@@ -7161,7 +7161,7 @@
08/26/2022 20:26:43
- 08/26/2022 20:26:43
+ 09/19/2022 17:19:20
08/26/2022 20:26:43
@@ -7773,7 +7773,7 @@
08/26/2022 20:26:43
- 09/09/2022 11:05:21
+ 09/19/2022 17:38:13
08/26/2022 20:31:11
@@ -12822,10 +12822,10 @@
08/26/2022 20:26:37
- 09/16/2022 17:59:12
+ 09/19/2022 17:50:09
- 09/16/2022 17:59:12
+ 09/19/2022 17:50:09
08/26/2022 20:26:48
@@ -12885,19 +12885,19 @@
09/14/2022 18:07:40
- 09/16/2022 17:58:53
+ 09/19/2022 17:49:49
- 09/16/2022 17:11:44
+ 09/19/2022 17:27:46
- 09/16/2022 17:11:44
+ 09/19/2022 17:27:46
- 09/16/2022 17:58:53
+ 09/19/2022 17:49:49
- 09/16/2022 17:58:54
+ 09/19/2022 17:49:50
08/28/2022 03:33:29
@@ -17529,7 +17529,7 @@
08/26/2022 20:26:46
- 09/16/2022 17:59:07
+ 09/19/2022 17:50:04
08/26/2022 20:26:46
diff --git a/DSWeb/bin/DSWeb.XmlSerializers.dll b/DSWeb/bin/DSWeb.XmlSerializers.dll
index 82a46503..e5f5818c 100644
Binary files a/DSWeb/bin/DSWeb.XmlSerializers.dll and b/DSWeb/bin/DSWeb.XmlSerializers.dll differ
diff --git a/DSWeb/sql/update.mdb b/DSWeb/sql/update.mdb
index 10803d55..a270f0f3 100644
Binary files a/DSWeb/sql/update.mdb and b/DSWeb/sql/update.mdb differ
diff --git a/DSWeb/sql/update.rar b/DSWeb/sql/update.rar
new file mode 100644
index 00000000..352b25a8
Binary files /dev/null and b/DSWeb/sql/update.rar differ