diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs index 5aead644..4f3fe2d0 100644 --- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs @@ -30,6 +30,7 @@ using System.Text.RegularExpressions; using System.Web; using System.Web.Mvc; using System.Security.Cryptography; +using System.Data.Entity.Migrations; namespace DSWeb.Areas.CommMng.DAL { @@ -5010,6 +5011,8 @@ namespace DSWeb.Areas.CommMng.DAL if (infoList != null && infoList.Count > 0) { infoList[0].PROPVALUE = DicToStr(InfoDic); + cdc.OP_LOGICINFO.AddOrUpdate(infoList[0]); + cdc.SaveChanges(); } else { var newinfo = new OP_LOGICINFO_md(); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs index 9e6e7733..0b448615 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs @@ -32,6 +32,7 @@ using DSWeb.Common.DB; using System.Data.Entity.Migrations; using DSWeb.Areas.Dispatch.DB_Wx; using CommonDataContext = DSWeb.Common.DB.CommonDataContext; +using DSWeb.Areas.CommMng.DAL; namespace DSWeb.MvcShipping.Controllers { @@ -569,6 +570,7 @@ namespace DSWeb.MvcShipping.Controllers } #endregion + //20230131 对op_logicinfo字段 duiyuehao 的处理 if (isPost) { @@ -577,7 +579,12 @@ namespace DSWeb.MvcShipping.Controllers var BSNO = headData.BSNO; if (result.Success == true) { - //--result = MsOpOtherDAL.SaveDetail(headData, bodyList, Convert.ToString(Session["USERID"])); + var dic = new Dictionary + { + { "DUIYUEHAO", headData.DUIYUEHAO } + }; + BasicDataRefDAL.SaveLogicInfo(headData.BSNO, "舱单业务", dic); + } else { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs index 18212a6c..e5a2adba 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs @@ -18,6 +18,7 @@ using DSWeb.MvcShipping.Models.MsSysBillNoSet; using DSWeb.MvcShipping.DAL.MsSysBillNoSet; using DSWeb.MvcShipping.DAL.MsChFeeDAL; using DSWeb.MvcShipping.Models.MsChFee; +using DSWeb.Areas.CommMng.DAL; namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL { @@ -60,7 +61,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL strSql.Append(" MODIFIEDTIME, ORDERNO,OPERATOR,CUSTOMERNAME2,STLNAME,STLDATE,ENTERP,BOOKNO,dbo.F_GetBillDrFeeStatus(op_other.BSNO) DRFEESTATUS,dbo.F_GetBillCrFeeStatus(op_other.BSNO) CRFEESTATUS,ISPRINTPR,I.TTLDR,I.TTLINVDR,I.TTLDUIDR "); strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=op_other.SALECORPID) as SALECORP,CLOSINGDATE,CLOSEDOCDATE,SALEDEPT,CUSTOMSER,WAREHOUSE,COUNTRYOFORIGIN"); strSql.Append(",(SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID = op_other.BSNO) as AMENDCOUNT"); - strSql.Append(",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,op_other.BillFeeStatus FROM op_other"); + strSql.Append(",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,op_other.BillFeeStatus "); + + //20230131 增加对op_logic.propname='舱单业务'的支持， + //对账约号：DUIYUEHAO + strSql.Append(",(select top 1 propvalue from op_logicinfo where bsno=op_other.BSNO and propname='舱单业务') Logicinfo"); + //20230131 增加SHIPAGENT船代，SOURCEOP源操作 + strSql.Append(",SHIPAGENT,SOURCEOP"); + + strSql.Append( " FROM op_other"); strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=op_other.BSNO) "); if (!string.IsNullOrEmpty(strCondition)) { @@ -149,7 +158,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL strSql = strSql + ", ACCDATE, BSSOURCE, BSSOURCEDETAIL, OP, CUSTSERVICE,FRCUSTSERVICE, SALE, CORPID, TRANSTYPE, VESSEL, VOYNO, CONVERT(char(10), ETD, 20) as ETD, PORTLOAD, PORTDISCHARGE, TRADETYPE, GOODSNAME, KGS, NETWEIGHT, PKGS, KINDPKGS, CBM,CTNALL,CTNNUM, ISVOU, VOUNO, REMARK, (select top 1 showname from [user] where GID=op_other.CREATEUSER) as CREATEUSER, CREATETIME, (select top 1 showname from [user] where GID=op_other.MODIFIEDUSER) as MODIFIEDUSER, MODIFIEDTIME, ORDERNO,OPERATOR,CUSTOMERNAME2,STLNAME,STLDATE,ENTERP,BOOKNO "; strSql = strSql + ",SALECORPID,(select [NAME] from [company] where GID=SALECORPID) as SALECORP,CLOSINGDATE,CLOSEDOCDATE,SALEDEPT,CUSTOMSER,WAREHOUSE,COUNTRYOFORIGIN"; strSql = strSql + ",(SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID = op_other.BSNO) as AMENDCOUNT"; - strSql = strSql + ",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,'' DRFEESTATUS,'' CRFEESTATUS,ISPRINTPR,0 TTLDR,0 TTLINVDR,0 TTLDUIDR,BillFeeStatus FROM op_other"; + strSql = strSql + ",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,'' DRFEESTATUS,'' CRFEESTATUS,ISPRINTPR,0 TTLDR,0 TTLINVDR,0 TTLDUIDR,BillFeeStatus " + + ",(select top 1 propvalue from op_logicinfo where bsno=op_other.BSNO and propname='舱单业务') Logicinfo" + + ",SHIPAGENT,SOURCEOP " + + "FROM op_other"; if (!string.IsNullOrEmpty(condition)) { @@ -286,11 +298,20 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL if (reader["CLOSINGDATE"] != DBNull.Value) data.CLOSINGDATE = Convert.ToDateTime(reader["CLOSINGDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期 if (reader["CLOSEDOCDATE"] != DBNull.Value) - data.CLOSEDOCDATE = Convert.ToDateTime(reader["CLOSEDOCDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期 + data.CLOSEDOCDATE = Convert.ToDateTime(reader["CLOSEDOCDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截单日期 data.CUSTOMSER = Convert.ToString(reader["CUSTOMSER"]);//分公司代码 data.WAREHOUSE = Convert.ToString(reader["WAREHOUSE"]);//分公司代码 data.COUNTRYOFORIGIN = Convert.ToString(reader["COUNTRYOFORIGIN"]);//分公司代码 + if (reader["Logicinfo"] != DBNull.Value) { + var dic = BasicDataRefDAL.StrToDic(Convert.ToString(reader["Logicinfo"])); + if (dic.ContainsKey("DUIYUEHAO")) { + data.DUIYUEHAO = dic["DUIYUEHAO"]; + } + } + + data.SHIPAGENT = Convert.ToString(reader["SHIPAGENT"]);//船代 + data.SOURCEOP = Convert.ToString(reader["SOURCEOP"]);//源操作 #endregion headList.Add(data); diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpOther/MsOpOtherEntity.cs b/DSWeb/Areas/MvcShipping/Models/MsOpOther/MsOpOtherEntity.cs index e3f01800..f4c57242 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOpOther/MsOpOtherEntity.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOpOther/MsOpOtherEntity.cs @@ -897,6 +897,38 @@ namespace DSWeb.MvcShipping.Models.MsOpOther set { _closedocdate = value; } } + private string _DUIYUEHAO; + /// + /// 对账约号 存于op_logicinfo + /// + /// + public string DUIYUEHAO + { + get { return _DUIYUEHAO; } + set { _DUIYUEHAO = value; } + } + + private string _SHIPAGENT; + /// + /// 船代 + /// + [ModelDB] + public string SHIPAGENT + { + get { return _SHIPAGENT; } + set { _SHIPAGENT = value; } + } + + private string _SOURCEOP; + /// + /// 对账约号 + /// + [ModelDB] + public string SOURCEOP + { + get { return _SOURCEOP; } + set { _SOURCEOP = value; } + } #endregion diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js index fbec4e04..cf8cf5ea 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js @@ -98,7 +98,10 @@ { name: 'SERVICE14', type: 'string' }, { name: 'SERVICE15', type: 'string' }, { name: 'SERVICE16', type: 'string' }, - { name: 'BillFeeStatus', type: 'string' } + { name: 'BillFeeStatus', type: 'string' }, + { name: 'DUIYUEHAO', type: 'string' }, + { name: 'SHIPAGENT', type: 'string' }, + { name: 'SOURCEOP', type: 'string' } ] }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js index 13dc656c..0e73a2a3 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js @@ -469,6 +469,32 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, { valueField: 'GID', displayField: 'NAME' }); + + this.storeShipAgent = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsShipping.ux.CustomRefModel', + proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' } + }); + this.storeShipAgent.load({ params: { condition: "ISCARRIER='1'" } }); + this.comboxShipAgent = Ext.create('DsExt.ux.RefTableCombox', { + fieldLabel: '船代', + store: this.storeShipAgent, + forceSelection: true, + matchFieldWidth: false, + name: 'SHIPAGENT', + valueField: 'CustName', + displayField: 'CodeAndName', + listeners: { + scope: this, + 'select': function (combo, records, eOpts) { + if (records.length > 0) { + + + } + } + } + }); + + _this = this; this.formHead = Ext.widget('form', { region: 'north', @@ -594,7 +620,17 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [this.comboxCUSTOMERNAME2 , { xtype: 'hiddenfield', flex: 5 }] + items: [this.comboxCUSTOMERNAME2 + ,this.comboxShipAgent + ,{ + fieldLabel: '对账约号', + name: 'DUIYUEHAO' + } + , { + fieldLabel: '源操作', + name: 'SOURCEOP' + } + , { xtype: 'hiddenfield', flex: 2 }] } ]//end items(fieldset 1) }]//end root items diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js index 864804da..a77233d3 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js @@ -629,6 +629,18 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, { dataIndex: 'SALECORP', header:'所属分部', //'货物标识', width: 120 + }, { + dataIndex: 'DUIYUEHAO', + header: '对账约号', //'', + width: 120 + }, { + dataIndex: 'SHIPAGENT', + header: '船代', //'', + width: 120 + }, { + dataIndex: 'SOURCEOP', + header: '源操作', //'', + width: 120 }]; this.girdcolums = this.initgirdcolums; diff --git a/UpdateSQL/MAIN.INI b/UpdateSQL/MAIN.INI index 10192f24..da0a37e7 100644 --- a/UpdateSQL/MAIN.INI +++ b/UpdateSQL/MAIN.INI @@ -3,7 +3,7 @@ Provider=SQLOLEDB.1; Password=Ds20040201; Persist Security Info=False; User ID=sa; -Initial Catalog=shippingweb_jh_dev; +Initial Catalog=ShippingWeb_JHCSK; Data Source=60.209.125.238,26600; Use Procedure for Prepare=1; Auto Translate=True; diff --git a/UpdateSQL/update.mdb b/UpdateSQL/update.mdb index b420e1b9..ea307ad6 100644 Binary files a/UpdateSQL/update.mdb and b/UpdateSQL/update.mdb differ diff --git a/UpdateSQL/update.rar b/UpdateSQL/update.rar deleted file mode 100644 index 94221e3c..00000000 Binary files a/UpdateSQL/update.rar and /dev/null differ