diff --git a/D7MqClient/D7MqClient/JFtoDjyBackNo.cs b/D7MqClient/D7MqClient/JFtoDjyBackNo.cs index adf9548d..96b1b6a7 100644 --- a/D7MqClient/D7MqClient/JFtoDjyBackNo.cs +++ b/D7MqClient/D7MqClient/JFtoDjyBackNo.cs @@ -128,7 +128,7 @@ namespace D7MqClient if (!string.IsNullOrEmpty(CUSTNO)) { var strSql = new StringBuilder(); - strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + CUSTNO + "' AND ISNULL(MBLNO,'')='' "); + strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + CUSTNO + "' AND (ISNULL(MBLNO,'')='' or MBLNO LIKE '%*') "); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); cmd.ExecuteNonQuery(); logger.Debug($"执行语句1：{strSql.ToString()}"); @@ -136,7 +136,7 @@ namespace D7MqClient if (!string.IsNullOrEmpty(IRCODE)) { var strSql = new StringBuilder(); - strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + IRCODE + "' AND ISNULL(MBLNO,'')='' "); + strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + IRCODE + "' AND (ISNULL(MBLNO,'')='' or MBLNO LIKE '%*') "); SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon); cmd.ExecuteNonQuery(); logger.Debug($"执行语句1：{strSql.ToString()}"); diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs index cbbe5111..c30068d1 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs @@ -4128,6 +4128,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice str = str.Replace("[主提单号]", enumValue.MBLNO); str = str.Replace("[分提单号]", enumValue.HBLNO); str = str.Replace("[委托单位]", enumValue.CUSTOMERNAME); + str = str.Replace("[订舱编号]", enumValue.ORDERNO); str = str.Replace("[开船日期]", enumValue.ETD); str = str.Replace("[揽货人]", enumValue.SALE); str = str.Replace("[船名]", enumValue.VESSEL); @@ -4170,6 +4171,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice str = str.Replace("[主提单号]", ""); str = str.Replace("[委托单位]", ""); str = str.Replace("[开船日期]", ""); + str = str.Replace("[订舱编号]", ""); str = str.Replace("[揽货人]", ""); str = str.Replace("[船名]", ""); str = str.Replace("[航次]", ""); diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs index b2d2ad20..057d785f 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs @@ -525,7 +525,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin var strSql = new StringBuilder(); strSql.Append(" SELECT c.GID,c.BSNO,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,ISNULL(c.ORIGSTLAMOUNT,0) AS ORIGSTLAMOUNT,c.EXCHANGERATE "); strSql.Append(",c.FEETYPE,c.CUSTOMERNAME as FEEOBJNAME,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF,(SELECT EXCHANGERATE from ch_fee where GID=c.FEEID) ORIGEXCHANGERATE"); - strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO"); + strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO"); strSql.Append(",b.CUSTOMERNAME"); strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD"); strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE"); @@ -559,7 +559,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin strSql.Append(" SELECT '' GID,'' BSNO,'' FEEID,'' FEENAME,'' CURRENCY,sum(ISNULL((case when c.ORIGCURRENCY='RMB' THEN case when c.FEETYPE=1 THEN ORIGAMOUNT ELSE -ORIGAMOUNT END ELSE 0 END),0)) AMOUNT,0 DOAMOUNT"); strSql.Append(",'' ORIGCURRENCY,sum(ISNULL((case when c.ORIGCURRENCY!='RMB' THEN case when c.FEETYPE=1 THEN ORIGAMOUNT ELSE -ORIGAMOUNT END ELSE 0 END),0)) ORIGAMOUNT,0 ORIGSTLAMOUNT,0 EXCHANGERATE,0 ORIGEXCHANGERATE "); strSql.Append(",1 FEETYPE,'' FEEOBJNAME,'收' AS FEETYPEREF"); - strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO"); + strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO"); strSql.Append(",b.CUSTOMERNAME"); strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD"); strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE"); @@ -572,7 +572,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin { strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) and " + strCondition); } - strSql.Append(" GROUP BY b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO"); + strSql.Append(" GROUP BY b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO"); strSql.Append(",b.CUSTOMERNAME"); strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD"); strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE"); @@ -635,6 +635,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin data.ORIGEXCHANGERATE = Convert.ToDecimal(reader["ORIGEXCHANGERATE"]); data.Remark = Convert.ToString(reader["Remark"]); data.INPUTMODE = Convert.ToString(reader["INPUTMODE"]); + data.ORDERNO = Convert.ToString(reader["ORDERNO"]); #endregion headList.Add(data); } diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js b/DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js index 13004f2b..758a9881 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js @@ -7,7 +7,8 @@ { name: 'BILLNO', type: 'string' }, { name: 'BSNO', type: 'string' }, { name: 'PARENTID', type: 'string' }, - { name: 'BSSTATUSREF', type: 'string' }, + { name: 'BSSTATUSREF', type: 'string' }, + { name: 'ORDERNO', type: 'string' }, { name: 'FEESTATUSREF', type: 'string' }, { name: 'BLISSUESTATUS', type: 'string' }, { name: 'ACCDATE', type: 'string' }, diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js index 31a40def..26a18a39 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js @@ -1965,7 +1965,12 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { dataIndex: 'MBLNO', header: '主提单号', width: 120 - }, { + }, { + sortable: true, + dataIndex: 'ORDERNO', + header: '订舱编号', + width: 120 + }, { sortable: true, dataIndex: 'CUSTOMERNAME', header: '委托单位', @@ -5814,6 +5819,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, { StoreFieldName.add({ "OPLBNAME": "委托编号" }); StoreFieldName.add({ "OPLBNAME": "主提单号" }); StoreFieldName.add({ "OPLBNAME": "委托单位" }); + StoreFieldName.add({ "OPLBNAME": "订舱编号" }); StoreFieldName.add({ "OPLBNAME": "船名" }); StoreFieldName.add({ "OPLBNAME": "航次" }); StoreFieldName.add({ "OPLBNAME": "开船日期" }); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js index 7d486168..b2ba2290 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js @@ -4849,6 +4849,7 @@ SetRemarksTemplate: function () { StoreFieldName.add({ "OPLBNAME": "委托编号" }); StoreFieldName.add({ "OPLBNAME": "主提单号" }); StoreFieldName.add({ "OPLBNAME": "分提单号" }); + StoreFieldName.add({ "OPLBNAME": "订舱编号" }); StoreFieldName.add({ "OPLBNAME": "委托单位" }); StoreFieldName.add({ "OPLBNAME": "船名" }); StoreFieldName.add({ "OPLBNAME": "航次" }); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index a120eb3d..a2c54cf3 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -19665,7 +19665,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL icount++; } - r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'"); + //r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + ":::::" + GetDateStr(bill.ETD, "yyyyMMdd") + ":::::'"); + r.WriteLine("11:" + bill.VESSELID + ":" + bill.VESSEL + ":" + bill.VOYNO + "::::::::::'"); icount++; @@ -19675,7 +19676,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL var DESTINATIONID = GetPortEDICode(OpBill.DESTINATIONID, type); var DESTINATION = OpBill.DESTINATION; - if (carrier == "ONE") + if (carrier == "ONE"|| carrier == "ZIM") { DESTINATIONID = ""; DESTINATION = ""; @@ -19704,7 +19705,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL var DESTINATIONID = GetPortEDICode(bill.DESTINATIONID, type); var DESTINATION = bill.DESTINATION; - if (carrier == "ONE") + if (carrier == "ONE" || carrier == "ZIM") { DESTINATIONID = ""; DESTINATION = ""; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_InternalTrade/MsOp_InternalTradeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_InternalTrade/MsOp_InternalTradeDAL.cs index 127c9e02..afd2d9ea 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOp_InternalTrade/MsOp_InternalTradeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_InternalTrade/MsOp_InternalTradeDAL.cs @@ -255,7 +255,10 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_InternalTrade db.AddInParameter(cmdInsert, "@ORDERNO", DbType.String, Convert.ToString(row["系统订单号"])); db.AddInParameter(cmdInsert, "@LOTNO", DbType.String, Convert.ToString(row["批次号"])); db.AddInParameter(cmdInsert, "@GOODSNAME", DbType.String, Convert.ToString(row["品名"])); - db.AddInParameter(cmdInsert, "@PACKEGS", DbType.String, Convert.ToString(row["单柜数量"])); + if (string.IsNullOrEmpty(Convert.ToString(row["单柜数量"]))) + db.AddInParameter(cmdInsert, "@PACKEGS", DbType.String, 0); + else + db.AddInParameter(cmdInsert, "@PACKEGS", DbType.String, Convert.ToString(row["单柜数量"])); db.AddInParameter(cmdInsert, "@LOADDATE", DbType.String, Convert.ToString(row["装箱时间"])); db.AddInParameter(cmdInsert, "@LOADADDR", DbType.String, Convert.ToString(row["装箱地点"])); db.AddInParameter(cmdInsert, "@SEQUENCE", DbType.Int16, num); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js index 76f29a06..532a17a0 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js @@ -50,7 +50,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }); this.storeCodeGoodsList.load(); this.comboxGOODSNAME = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: 'Description of Goods （包装种类与货名）', + fieldLabel: Zi.LAN.DESCRIPTIONSTR, store: this.storeCodeGoodsList, flex: 1.5, labelWidth: 250, @@ -72,7 +72,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { //发货人 this.comboxShipper = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: 'Shipper (发货人)', + fieldLabel: Zi.LAN.SHIPPERID, store: this.storeShipper, // forceSelection: true, queryMode: 'remote', @@ -114,7 +114,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { //收货人 this.comboxConsignee = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: 'Consignee (收货人)', + fieldLabel: Zi.LAN.CONSIGNEEID, labelWidth: 150, labelAlign: 'left', store: this.storeConsignee, @@ -156,7 +156,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { //通知人 this.comboxNotifyParty = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: 'Notify Party (通知人)', + fieldLabel: Zi.LAN.NOTIFYPARTYID, store: this.storenotifyparty, labelWidth: 150, labelAlign: 'left', @@ -197,7 +197,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { //通知人 this.comboxNotifyPartySecond = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: 'Another Notify Party (第二通知人)', + fieldLabel: Zi.LAN.NOTIFYPARTYID2, store: this.storenotifypartySecond, labelWidth: 200, labelAlign: 'left', @@ -238,7 +238,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { //收货人 this.comboxAgent = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '代 理', + fieldLabel: Zi.LAN.AGENTID, store: this.storeagent, forceSelection: true, name: 'AGENTID', @@ -273,7 +273,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeTemplate.load({ params: { condition: ""} }); this.comboxTemplate = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '提单模板', + fieldLabel: Zi.LAN.TEMPLATE, store: this.storeTemplate, forceSelection: true, name: 'TEMPLATE', @@ -289,7 +289,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.comboxBILLTYPE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '提单类型', + fieldLabel: Zi.LAN.BILLTYPE, store: this.StoreBILLTYPE, forceSelection: true, name: 'BILLTYPE', @@ -306,7 +306,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeVoyVeg.load({ params: { condition: ""} }); this.comboxVoyVeg = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '船 名', + fieldLabel: Zi.LAN.VESSEL, store: this.storeVoyVeg, name: 'VESSEL', valueField: 'VESSEL', @@ -369,7 +369,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeCodeLoadport.load(); this.comboxPORTLOAD = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '装货港', + fieldLabel: Zi.LAN.PORTLOAD, store: this.storeCodeLoadport, queryMode: 'remote', minChars: 1, @@ -391,7 +391,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '卸货港', + fieldLabel: Zi.LAN.PORTDISCHARGE, matchFieldWidth: false, store: this.storeCodeDisport, queryMode: 'remote', @@ -423,7 +423,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }); this.comboxDESTINATION = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '目的地', + fieldLabel: Zi.LAN.DESTINATION, matchFieldWidth: false, store: this.storeCodeDisport2, queryMode: 'remote', @@ -453,7 +453,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }); this.comboxPLACEDELIVERY = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '交货地', + fieldLabel: Zi.LAN.PLACEDELIVERY, matchFieldWidth: false, store: this.storeCodeDisport3, queryMode: 'remote', @@ -474,7 +474,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }); this.comboxPLACERECEIPT = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '收货地点', + fieldLabel: Zi.LAN.PLACERECEIPTID, matchFieldWidth: false, store: this.storeCodeDisport4, name: 'PLACERECEIPTID', @@ -503,7 +503,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeFrt.load({ params: { condition: ""} }); this.comboxBLFRT = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '付费方式', + fieldLabel: Zi.LAN.BLFRT, store: this.storeFrt, forceSelection: true, name: 'BLFRT', @@ -520,7 +520,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeSERVICE.load({ params: { condition: ""} }); this.comboxSERVICE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '运输条款', + fieldLabel: Zi.LAN.SERVICE, store: this.storeSERVICE, forceSelection: true, name: 'SERVICE', @@ -536,7 +536,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.storeISSUETYPE.load({ params: { condition: ""} }); this.comboxISSUETYPE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '签单方式', + fieldLabel: Zi.LAN.ISSUETYPE, store: this.storeISSUETYPE, forceSelection: true, name: 'ISSUETYPE', @@ -573,7 +573,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.StoreBLNUM.add({ "NUM": "TEN" }); this.comboxBLNUM = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '提单份数', + fieldLabel: Zi.LAN.NOBILL, store: this.StoreBLNUM, forceSelection: true, name: 'NOBILL', @@ -598,7 +598,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }); this.storeCodePackage.load(); this.comboxKINDPKGS = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '包 装', + fieldLabel: Zi.LAN.KINDPKGS, labelWidth: 70, store: this.storeCodePackage, // padding: '0 0 0 10', @@ -673,8 +673,8 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { selType: 'cellmodel', tbar: [{ - text: '增加明细', - tooltip: '增加明细', + text: Zi.LAN.btnadddetail, + tooltip: Zi.LAN.btnadddetail, id: "btnadddetail", iconCls: "btnadddetail", handler: function (button, event) { @@ -682,8 +682,8 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, scope: this }, '-', { - text: '删除明细', - tooltip: '删除明细', + text: Zi.LAN.btndeldetail, + tooltip: Zi.LAN.btndeldetail, id: "btndeldetail", iconCls: "btndeletedetail", handler: function (button, event) { @@ -691,15 +691,15 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, scope: this }, '-', { - text: '更新合计', - tooltip: '更新合计', + text: Zi.LAN.UpdateDetail, + tooltip: Zi.LAN.UpdateDetail, handler: function (button, event) { this.onUpdateDetailClick(button, event); }, scope: this }, '-', { - text: '调入主单信息', - tooltip: '调入主单信息', + text: Zi.LAN.upMasterCtn, + tooltip: Zi.LAN.upMasterCtn, handler: function (button, event) { this.upMasterCtn(); }, @@ -721,16 +721,16 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, { sortable: true, dataIndex: 'CTNCODE', - header: '序号', + header: Zi.LAN.CTNCODE, width: 30 }, { dataIndex: 'CTNALL', - header: '箱型', + header: Zi.LAN.CTNALL, width: 70, editor: this.comboxCTNALL }, { dataIndex: 'CTNNUM', - header: '箱量', + header: Zi.LAN.CTNNUM, width: 50, editor: { xtype: 'numberfield', @@ -739,7 +739,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'CNTRNO', - header: '箱号', + header: Zi.LAN.CNTRNO, width: 100, editor: { xtype: 'textfield', @@ -747,7 +747,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'SEALNO', - header: '封号', + header: Zi.LAN.SEALNO, width: 80, editor: { xtype: 'textfield', @@ -756,7 +756,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, { sortable: true, dataIndex: 'PKGS', - header: '件数', + header: Zi.LAN.PKGS, width: 60, editor: { xtype: 'numberfield', @@ -765,12 +765,12 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'KINDPKGS', - header: '件数包装', + header: Zi.LAN.KINDPKGS, width: 100, editor: this.comboxKINDPKGS_CTN }, { dataIndex: 'KGS', - header: '重量', + header: Zi.LAN.KGS3, width: 60, editor: { xtype: 'textfield', @@ -778,7 +778,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'CBM', - header: '尺码', + header: Zi.LAN.CBM2, width: 60, editor: { xtype: 'textfield', @@ -786,7 +786,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'TAREWEIGHT', - header: '箱皮重', + header: Zi.LAN.TAREWEIGHT, width: 60, editor: { xtype: 'textfield', @@ -794,7 +794,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { } }, { dataIndex: 'REMARK', - header: '备注', + header: Zi.LAN.REMARK, width: 150, editor: { xtype: 'textfield', @@ -806,7 +806,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { this.panelBodyCtn = new Ext.Panel({ - title: '分票分箱明细', + title: Zi.LAN.panelBodyCtn, layout: "border", height: 185, //margin: '5 10', @@ -891,16 +891,16 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { flex: 0.6, defaultType: 'textfield', items: [{ - fieldLabel: '企业代码', + fieldLabel: Zi.LAN.CODE, name: 'SHIPPERCODE' }, { - fieldLabel: '国家代码', + fieldLabel: Zi.LAN.COUNTRY, name: 'SHIPPERCOUNTRY' },{ - fieldLabel: '电话', + fieldLabel: Zi.LAN.TEL, name: 'SHIPPERTEL' },{ - fieldLabel: '邮箱', + fieldLabel: Zi.LAN.EMAIL, name: 'SHIPPEREMAIL' }] @@ -937,16 +937,16 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { flex: 0.6, defaultType: 'textfield', items: [{ - fieldLabel: '企业代码', + fieldLabel: Zi.LAN.CODE, name: 'CONSIGNEECODE' }, { - fieldLabel: '国家代码', + fieldLabel: Zi.LAN.COUNTRY, name: 'CONSIGNEECOUNTRY' }, { - fieldLabel: '电话', + fieldLabel: Zi.LAN.TEL, name: 'CONSIGNEETEL' }, { - fieldLabel: '邮箱', + fieldLabel: Zi.LAN.EMAIL, name: 'CONSIGNEEEMAIL' }] @@ -985,16 +985,16 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { flex: 0.6, defaultType: 'textfield', items: [{ - fieldLabel: '企业代码', + fieldLabel: Zi.LAN.CODE, name: 'NOTIFYPARTYCODE' }, { - fieldLabel: '国家代码', + fieldLabel: Zi.LAN.COUNTRY, name: 'NOTIFYPARTYCOUNTRY' }, { - fieldLabel: '电话', + fieldLabel: Zi.LAN.TEL, name: 'NOTIFYPARTYTEL' }, { - fieldLabel: '邮箱', + fieldLabel: Zi.LAN.EMAIL, name: 'NOTIFYPARTYEMAIL' }] @@ -1022,7 +1022,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { fieldLabel: 'AS_ID', name: 'AS_ID', hidden: true }, { - fieldLabel: '主提单号', + fieldLabel: Zi.LAN.MBLNO, name: 'MBLNO', listeners: { scope: this, @@ -1037,7 +1037,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { flex: 1, defaultType: 'textfield', items: [{ - fieldLabel: '分提单号', //'分提单号', + fieldLabel: Zi.LAN.HBLNO, //'分提单号', name: 'HBLNO', listeners: { scope: this, @@ -1113,16 +1113,16 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { flex: 0.6, defaultType: 'textfield', items: [{ - fieldLabel: '企业代码', + fieldLabel: Zi.LAN.CODE, name: 'NOTIFYPARTYCODESECOND' }, { - fieldLabel: '国家代码', + fieldLabel: Zi.LAN.COUNTRY, name: 'NOTIFYPARTYCOUNTRYSECOND' }, { - fieldLabel: '电话', + fieldLabel: Zi.LAN.TEL, name: 'NOTIFYPARTYTELSECOND' }, { - fieldLabel: '邮箱', + fieldLabel: Zi.LAN.EMAIL, name: 'NOTIFYPARTYEMAILSECOND' }] @@ -1147,19 +1147,19 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', layout: 'hbox', items: [{ - fieldLabel: '开船日期', + fieldLabel: Zi.LAN.ETD, format: 'Y-m-d', flex: 1, xtype: 'datefield', name: 'ETD' }, { - fieldLabel: '预抵日期', + fieldLabel: Zi.LAN.ETA, format: 'Y-m-d', flex: 1, xtype: 'datefield', name: 'ETA' }, this.comboxVoyVeg, { - fieldLabel: '航次', + fieldLabel: Zi.LAN.VOYNO, flex: 1, name: 'VOYNO', listeners: { @@ -1201,7 +1201,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', items: [{ xtype: 'label', - html: 'Seal No.（封志号）' + html: 'Seal No.' }, { xtype: 'textareafield', grow: true, @@ -1210,7 +1210,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { anchor: '100%' }, { xtype: 'label', - html: 'Marks & Nos.（标记与号码) ' + html: Zi.LAN.MARKSSTR }, { xtype: 'textareafield', grow: true, @@ -1240,7 +1240,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, items: [{ xtype: 'label', - html: '         货物描述' + html: Zi.LAN.DESCRIPTIONSTR }] }, { xtype: 'textareafield', @@ -1266,7 +1266,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', items: [{ xtype: 'label', - html: '         No.of containers or pkgs.
         （箱数或件数)' + html: Zi.LAN.NOPKGS }, { xtype: 'textareafield', grow: true, @@ -1315,7 +1315,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', layout: 'hbox', items: [{ - fieldLabel: '总件数', + fieldLabel: Zi.LAN.zPKGS, labelWidth: 70, readOnly: true, name: 'PKGS' @@ -1327,7 +1327,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { items: [this.comboxKINDPKGS] }, { xtype: 'label', - html: '          Gross Weight 毛重（公斤）' + html: Zi.LAN.GROSSWEIGHT }, { xtype: 'textareafield', grow: true, @@ -1371,7 +1371,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, items: [{ labelWidth: 70, - fieldLabel: '总重量', + fieldLabel: Zi.LAN.zKGS, name: 'KGS' }, { xtype: 'label', @@ -1380,7 +1380,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }] }, { xtype: 'label', - html: '          Measurement 尺码（立方米)' + html: Zi.LAN.MEASUREMENT }, { xtype: 'textareafield', grow: true, @@ -1421,7 +1421,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { layout: 'hbox', items: [{ labelWidth: 70, - fieldLabel: '总尺码', + fieldLabel: Zi.LAN.zCBM, name: 'CBM' }, { xtype: 'label', @@ -1440,7 +1440,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { layout: 'hbox', defaultType: 'textfield', items: [{ - fieldLabel: '件数大写', + fieldLabel: Zi.LAN.TOTALNO, name: 'TOTALNO' }] }, { @@ -1448,12 +1448,12 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', layout: 'hbox', items: [this.comboxISSUETYPE, { - fieldLabel: '签单日期', + fieldLabel: Zi.LAN.ISSUEDATE, format: 'Y-m-d', xtype: 'datefield', name: 'ISSUEDATE' }, { - fieldLabel: '签单地点', + fieldLabel: Zi.LAN.ISSUEPLACEID, name: 'ISSUEPLACE' }, this.comboxBLNUM] }, { @@ -1461,10 +1461,10 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { defaultType: 'textfield', layout: 'hbox', items: [this.comboxBLFRT, { - fieldLabel: '预付地点', + fieldLabel: Zi.LAN.PREPARDAT, name: 'PREPARDAT' }, { - fieldLabel: '到付地点', + fieldLabel: Zi.LAN.PAYABLEAT, name: 'PAYABLEAT' }, this.comboxSERVICE] }, { @@ -1474,14 +1474,14 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { items: [{ xtype: 'textareafield', grow: true, - fieldLabel: '其 他', + fieldLabel: Zi.LAN.OTREMARK, height: 60, name: 'ORDERCONTENT', anchor: '100%' }, { xtype: 'textareafield', grow: true, - fieldLabel: '备 注', + fieldLabel: Zi.LAN.REMARK, height: 60, name: 'REMARKS', anchor: '100%' @@ -1529,63 +1529,63 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { { sortable: true, dataIndex: 'HBLNO', - header: '分提单号', + header: Zi.LAN.HBLNO, width: 140 }, { sortable: true, dataIndex: 'TEMPLATE', - header: '模板名称', + header: Zi.LAN.TEMPLATE, width: 120 }, { sortable: true, dataIndex: 'BILLTYPE', - header: '提单类型', + header: Zi.LAN.BILLTYPE, width: 120 }, { sortable: true, dataIndex: 'BLISSUESTATUS', - header: '提单签发状态', + header: Zi.LAN.BLISSUESTATUS, width: 120 }, { sortable: true, id: '', dataIndex: 'PKGS', - header: '件数', //'件数', + header: Zi.LAN.PKGS, //'件数', width: 80 }, { sortable: true, id: '', dataIndex: 'KGS', - header: '毛重', //'毛重', + header: Zi.LAN.KGS2, //'毛重', width: 80 }, { sortable: true, id: '', dataIndex: 'CBM', - header: '尺码', //'尺码', + header: Zi.LAN.CBM2, //'尺码', width: 80 }, { sortable: true, dataIndex: 'INPUTBY', - header: '录入人', + header: Zi.LAN.INPUTBY2, width: 80 }, { sortable: true, dataIndex: 'INPUTDATE', - header: '录入时间', + header: Zi.LAN.INPUTDATE, width: 80 }, { sortable: true, dataIndex: 'MODIFYTIME', - header: '修改时间', + header: Zi.LAN.BSDATE, width: 80 }]; @@ -1638,7 +1638,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { region: "north", tbar: [{ id: 'btnESave', - text: "保存", + text: Zi.LAN.SaveGridPanel, iconCls: "btnsave", handler: function (button, event) { this.Save('0'); @@ -1646,14 +1646,14 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { scope: this }, { id: 'btnESaveAndNew', - text: "保存并新建", + text: Zi.LAN.btnESaveAndNew, handler: function (button, event) { this.Save('2'); }, scope: this }, { id: 'btnECopyNew', - text: "复制新建", + text: Zi.LAN.copyadd, handler: function (button, event) { var basicForm = this.formEdit.getForm(); this.opStatus = 'add'; @@ -1676,14 +1676,14 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, scope: this }, { - text: "新建", + text: Zi.LAN.btnadd, handler: function (button, event) { this.LoadData('add', ''); }, scope: this }, '-', { - text: "调入主单信息", + text: Zi.LAN.upMasterCtn, handler: function (button, event) { this.formEdit.getForm().findField('VESSEL').setValue(this.MainEditRecord.data.VESSEL); this.formEdit.getForm().findField('VOYNO').setValue(this.MainEditRecord.data.VOYNO); @@ -1718,7 +1718,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { scope: this }, '-', { id: 'btnEHistryCopy', - text: "历史引入", + text: Zi.LAN.btnSeaeHistryCopy, handler: function (button, event) { DsOpenEditWin('/MvcShipping/MsOpSeae/HistryBillIndex', "提单历史引入", "600", "940", "10", "10"); @@ -1726,14 +1726,14 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, scope: this }, '-', { - text: "删除", + text: Zi.LAN.btndelete, iconCls: "btndelete", handler: function (button, event) { this.onDeleteClick(button, event); }, scope: this }, '-', { - text: "打印", + text: Zi.LAN.Print, iconCls: "btnprint", handler: function (button, event) { this.Print(); @@ -1746,7 +1746,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }, scope: this }, '-', { - text: "EDI报文导出", //"EDI报文导出", + text: Zi.LAN.EdiExport, //"EDI报文导出", menu: [{ text: "Cargo Smart", //"Cargo Smart", handler: function (menu, event) { @@ -1778,7 +1778,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { ], scope: this }, '-', { - text: "国外舱单", + text: Zi.LAN.GuoWaiCangDan, menu: [ { text: "日本AFR", handler: function (menu, event) { @@ -1812,7 +1812,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }], scope: this }, '-', { - text: "船代舱单", + text: Zi.LAN.ChuanDaiCangDan, menu: [ { text: "申报分票", handler: function (menu, event) { @@ -1826,7 +1826,7 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { }], scope: this }, '-', { - text: "其他操作", + text: Zi.LAN.OtherCaoZuo, menu: [{ text: "转换成大写字母", handler: function (menu, event) { _this.onUpCaseClick(menu, event); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index f368ff0a..b2c877da 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -1142,6 +1142,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (selectdata.TEL != '') this.formscn.getForm().findField('NOTIFYPARTYTEL').setValue(selectdata.TEL); if (selectdata.CORPID != '') this.formscn.getForm().findField('NOTIFYPARTYCODE').setValue(selectdata.CORPID); } else { + this.formEdit.getForm().findField('NOTIFYPARTY').setValue(''); } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 71f9dc48..c9a33a50 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -1128,11 +1128,11 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { width: 120 }, { dataIndex: 'CARGOID', - header: '货物标示', //'货物标识', + header: Zi.LAN.CARGOID, //'货物标识', width: 120 }, { dataIndex: 'BLISSUESTATUS', - header: '提单签发状态', //'货物标识', + header: Zi.LAN.BLISSUESTATUS, //'货物标识', width: 120, renderer: function (value, meta) { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js index ddfdc55b..1bee59db 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js @@ -687,4 +687,11 @@ Zi.LAN.IRCODE = "CSR/IR号"; Zi.LAN.ESL = "ESL业务执行"; Zi.LAN.ESL_ETA = "ESL到港时间更新"; Zi.LAN.ESL_CWFPCX = "ESL舱位分配查询"; -Zi.LAN.ESL_GSDXZ = "ESL格式单批量接收"; \ No newline at end of file +Zi.LAN.ESL_GSDXZ = "ESL格式单批量接收"; +Zi.LAN.TEMPLATE = "提单模板"; +Zi.LAN.BILLTYPE = "提单类型"; +Zi.LAN.UpdateDetail = "更新合计"; +Zi.LAN.upMasterCtn = "调入主单信息"; +Zi.LAN.BLISSUESTATUS = "提单签发状态"; +Zi.LAN.CARGOID = "货物标识"; +Zi.LAN.INPUTDATE = "录入时间"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index 415c7699..e5d1691f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -715,6 +715,13 @@ Zi.LAN.ESL = "ESL业务执行"; Zi.LAN.ESL_ETA = "ESL到港时间更新"; Zi.LAN.ESL_CWFPCX = "ESL舱位分配查询"; Zi.LAN.ESL_GSDXZ = "ESL格式单批量接收"; +Zi.LAN.TEMPLATE = "提单模板"; +Zi.LAN.BILLTYPE = "提单类型"; +Zi.LAN.UpdateDetail = "更新合计"; +Zi.LAN.upMasterCtn = "调入主单信息"; +Zi.LAN.BLISSUESTATUS = "提单签发状态"; +Zi.LAN.CARGOID = "货物标识"; +Zi.LAN.INPUTDATE = "录入时间"; //Zi.LAN. = ""; diff --git a/DSWeb/Areas/SoftMng/Viewsjs/SingleAudit/SingleIndex.js b/DSWeb/Areas/SoftMng/Viewsjs/SingleAudit/SingleIndex.js index a630ae9b..d40bda94 100644 --- a/DSWeb/Areas/SoftMng/Viewsjs/SingleAudit/SingleIndex.js +++ b/DSWeb/Areas/SoftMng/Viewsjs/SingleAudit/SingleIndex.js @@ -467,7 +467,7 @@ Ext.extend(Shipping.SingleIndex, Ext.Panel, { return ''; } - var sql = ''; + var sql = " s.COMPOP<>'" + SHOWNAME + "' "; var BillState = form.findField('BillState').getValue(); diff --git a/DSWeb/Areas/SysMng/Controllers/SysUserController.cs b/DSWeb/Areas/SysMng/Controllers/SysUserController.cs index d5ecafcd..01953312 100644 --- a/DSWeb/Areas/SysMng/Controllers/SysUserController.cs +++ b/DSWeb/Areas/SysMng/Controllers/SysUserController.cs @@ -141,6 +141,9 @@ namespace DSWeb.Areas.SysMng.Controllers head.CREATETIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); head.MODIFIEDUSER = Session["USERID"].ToString(); head.MODIFIEDTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + head.MODIFYPASSTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + } else if (opstatus == "edit") diff --git a/DSWeb/Areas/SysMng/Controllers/USERINFOController.cs b/DSWeb/Areas/SysMng/Controllers/USERINFOController.cs index 9e6c60a0..e3c8b162 100644 --- a/DSWeb/Areas/SysMng/Controllers/USERINFOController.cs +++ b/DSWeb/Areas/SysMng/Controllers/USERINFOController.cs @@ -17,6 +17,7 @@ using Newtonsoft.Json.Linq; using DSWeb.MvcShipping.DAL.MsSysParamSet; using DSWeb.Areas.CommMng.DAL; using Newtonsoft.Json; +using DSWeb.EntityDA; namespace DSWeb.Areas.SysMng.Controllers { @@ -93,6 +94,7 @@ namespace DSWeb.Areas.SysMng.Controllers var _USERID = Session["USERID"].ToString(); var condition = " GID='" + _USERID + "'"; string username = headData.USERNAME; + var iscgps = false; if (!string.IsNullOrEmpty(headData.PASSWORD)) { @@ -110,7 +112,7 @@ namespace DSWeb.Areas.SysMng.Controllers } else { - + iscgps = true; } } @@ -136,6 +138,14 @@ namespace DSWeb.Areas.SysMng.Controllers ModelObjectConvert.ToModelObjectList(bodyList), ModelObjectConvert.ToModelObjectList(DelbodyList) ); + + if (iscgps) { + T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA(); + var blUpSQL = " update [user] set MODIFYPASSTIME=getdate() WHERE GID='"+headData.GID+"' "; + bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + + } + var jsonRespose = new JsonResponse { Success = result.Success, diff --git a/DSWeb/Areas/SysMng/Models/SYSUSER/SYSUSERModel.cs b/DSWeb/Areas/SysMng/Models/SYSUSER/SYSUSERModel.cs index 796e7fe9..3004a362 100644 --- a/DSWeb/Areas/SysMng/Models/SYSUSER/SYSUSERModel.cs +++ b/DSWeb/Areas/SysMng/Models/SYSUSER/SYSUSERModel.cs @@ -189,8 +189,9 @@ namespace DSWeb.Areas.SysMng.Models.SysUser get { return _DINGTALKACCOUNT; } set { _DINGTALKACCOUNT = value; } } + [ModelDB(MDBType = ModelDBOprationType.Insert)] + public string MODIFYPASSTIME { get; set; } - public string COMPANYID { get { return _COMPANYID; } diff --git a/DSWeb/Areas/SysMng/Models/USERINFO/USERINFO.cs b/DSWeb/Areas/SysMng/Models/USERINFO/USERINFO.cs index cd3c8d3b..ad1d10aa 100644 --- a/DSWeb/Areas/SysMng/Models/USERINFO/USERINFO.cs +++ b/DSWeb/Areas/SysMng/Models/USERINFO/USERINFO.cs @@ -81,6 +81,9 @@ namespace DSWeb.Areas.SysMng.Models.USERINFO get { return _DJY_PASSWORD2; } set { _DJY_PASSWORD2 = value; } } + //[ModelDB] + //public string MODIFYPASSTIME {get;set;} + #endregion public USERmb() diff --git a/DSWeb/EntityDA/UserDA.cs b/DSWeb/EntityDA/UserDA.cs index e03aee6c..9c0769d8 100644 --- a/DSWeb/EntityDA/UserDA.cs +++ b/DSWeb/EntityDA/UserDA.cs @@ -109,11 +109,11 @@ namespace DSWeb.EntityDA private const string SQL_UPDATE_USER_PASSWORD_BY_GID = " UPDATE [user] SET PASSWORD = @password WHERE GID = @gid "; - private const string SQL_SELECT_USER_BY_COMPANY_AND_USERNAME = " SELECT A.GID,A.USERNAME,A.CODENAME,A.PASSWORD,A.SHOWNAME,A.ENROLLTIME,A.CREATEUSER,A.MODIFIEDUSER,A.MODIFIEDTIME,A.ISDELETED,A.ISDISABLE FROM company B INNER JOIN user_company C ON B.GID = C.COMPANYID INNER JOIN [user] A ON C.USERID = A.GID WHERE B.CODENAME = @CODENAME AND A.CODENAME = @USERNAME AND A.ISDELETED =0 AND A.ISDISABLE =0 AND B.ISDELETED =0 AND B.ISDISABLE =0 order by A.codename "; + private const string SQL_SELECT_USER_BY_COMPANY_AND_USERNAME = " SELECT A.GID,A.USERNAME,A.CODENAME,A.PASSWORD,A.SHOWNAME,A.ENROLLTIME,A.CREATEUSER,A.MODIFIEDUSER,A.MODIFIEDTIME,A.ISDELETED,A.ISDISABLE,A.MODIFYPASSTIME FROM company B INNER JOIN user_company C ON B.GID = C.COMPANYID INNER JOIN [user] A ON C.USERID = A.GID WHERE B.CODENAME = @CODENAME AND A.CODENAME = @USERNAME AND A.ISDELETED =0 AND A.ISDISABLE =0 AND B.ISDELETED =0 AND B.ISDISABLE =0 order by A.codename "; private const string SQL_UPDATE_USER_ISDELETED = " UPDATE [user] SET ISDELETED = 1,DELETEUSER = @delete_user,DELETETIME = GETDATE() WHERE GID = @gid "; - private const string SQL_SELECT_USER_LOGIN = " SELECT A.GID,A.USERNAME,A.CODENAME,A.PASSWORD,A.SHOWNAME,A.ENROLLTIME,A.CREATEUSER,A.MODIFIEDUSER,A.MODIFIEDTIME,A.ISDELETED,A.ISDISABLE " + private const string SQL_SELECT_USER_LOGIN = " SELECT A.GID,A.USERNAME,A.CODENAME,A.PASSWORD,A.SHOWNAME,A.ENROLLTIME,A.CREATEUSER,A.MODIFIEDUSER,A.MODIFIEDTIME,A.ISDELETED,A.ISDISABLE,A.MODIFYPASSTIME " + " FROM [user] AS A LEFT JOIN user_company as B ON A.GID = B.USERID INNER JOIN company AS C ON B.COMPANYID = C.GID WHERE A.CODENAME = @codename AND " + " A.PASSWORD collate Chinese_PRC_CS_AS_WS= @password AND C.CODENAME = @company_code_name "; @@ -235,6 +235,11 @@ namespace DSWeb.EntityDA { userEntity.IsDisable = sqlRead.GetBoolean(10); } + if (!sqlRead.IsDBNull(11)) + { + userEntity.MODIFYPASSTIME = sqlRead.GetDateTime(11); + } + else userEntity.MODIFYPASSTIME = DateTime.Now; } } @@ -2089,6 +2094,11 @@ namespace DSWeb.EntityDA { userEntity.IsDisable = sqlRead.GetBoolean(10); } + if (!sqlRead.IsDBNull(11)) + { + userEntity.MODIFYPASSTIME = sqlRead.GetDateTime(11); + } + else userEntity.MODIFYPASSTIME = DateTime.Now; } } diff --git a/DSWeb/FeeCodes/UserAdapter.aspx.cs b/DSWeb/FeeCodes/UserAdapter.aspx.cs index 2f46ebf1..b7f59e92 100644 --- a/DSWeb/FeeCodes/UserAdapter.aspx.cs +++ b/DSWeb/FeeCodes/UserAdapter.aspx.cs @@ -78,7 +78,26 @@ namespace DSWeb.FeeCodes } else { - Response.Write(UserEntity.ShowName.ToString().Trim()); + T_ALL_DA T_ALL_DA = new T_ALL_DA(); + var PARAMVALUE = T_ALL_DA.GetStrSQL("PARAMVALUE", + "select top 1 PARAMVALUE from sys_param_set where PARAMNAME='PASSWORDDAYS' "); + if (PARAMVALUE !="0"&& PARAMVALUE != ""&&UserEntity.MODIFYPASSTIME!=null) + { + if (DateTime.Now.AddDays(-15)<(UserEntity.MODIFYPASSTIME.AddDays(Convert.ToInt32(PARAMVALUE)))) + { + if (((UserEntity.MODIFYPASSTIME.AddDays(Convert.ToInt32(PARAMVALUE))) - DateTime.Now).TotalDays>0) + Response.Write(UserEntity.ShowName.ToString().Trim() + " 注意：密码还有" + (int)((UserEntity.MODIFYPASSTIME.AddDays(Convert.ToInt32(PARAMVALUE)))-DateTime.Now).TotalDays + "天过期！"); + else + Response.Write(UserEntity.ShowName.ToString().Trim() + " 注意：密码已过期！"); + } + else { + Response.Write(UserEntity.ShowName.ToString().Trim()); + } + } + else + { + Response.Write(UserEntity.ShowName.ToString().Trim()); + } } } return; diff --git a/DSWeb/Login.aspx.cs b/DSWeb/Login.aspx.cs index c9acde40..20469613 100644 --- a/DSWeb/Login.aspx.cs +++ b/DSWeb/Login.aspx.cs @@ -359,6 +359,20 @@ namespace DSWeb { ck0 = cookie.setCookie("isCheckBox", Server.UrlEncode("0")); } + PARAMVALUE = T_ALL_DA.GetStrSQL("PARAMVALUE", + "select top 1 PARAMVALUE from sys_param_set where PARAMNAME='PASSWORDDAYS' "); + if (PARAMVALUE != "0" && PARAMVALUE != ""&& userEntity.MODIFYPASSTIME!=null) + { + if ((userEntity.MODIFYPASSTIME.AddDays(Convert.ToInt32(PARAMVALUE))-DateTime.Now).TotalDays<=0) + { + Page.ClientScript.RegisterStartupScript(this.GetType(), "key4", + ""); + + return; + } + } + + #region 判断IP限制 diff --git a/DSWeb/Models/UserEntity.cs b/DSWeb/Models/UserEntity.cs index 85a52947..0fe15a09 100644 --- a/DSWeb/Models/UserEntity.cs +++ b/DSWeb/Models/UserEntity.cs @@ -144,6 +144,8 @@ namespace DSWeb.Models get { return _baseInfo; } set { _baseInfo = value; } } + + public DateTime MODIFYPASSTIME { get;set;} #endregion } }