diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs index c409b6df..ecdddcd7 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs @@ -1659,6 +1659,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication if (string.IsNullOrWhiteSpace(head.PAYCOMPANYID)) { head.PAYCOMPANYID = SaleCorpList[0]; + + + cdc.ch_fee_invoiceapplication.AddOrUpdate(head); cdc.SaveChanges(); } diff --git a/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs index ff3f6fec..19561a9f 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs @@ -956,6 +956,15 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication if (string.IsNullOrWhiteSpace(head.SALECORPID)) { head.SALECORPID = SaleCorpList[0]; + + //20230222 增加逻辑 同时设定发票申请的银行信息 + var curr = head.CURR; + if (string.IsNullOrWhiteSpace(curr)) curr = "RMB"; + var companybanklist = cdc.sys_bank.Where(x => x.LINKID == head.SALECORPID && x.ISSTOP != true && x.CURRENCY == curr).ToList(); + if (companybanklist != null && companybanklist.Count > 0) { + head.ACCOUNT = companybanklist[0].GID; + } + cdc.ch_fee_recvapplication.AddOrUpdate(head); cdc.SaveChanges(); } diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs index f8aea41a..76c587b0 100644 --- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs @@ -6769,6 +6769,22 @@ namespace DSWeb.Areas.CommMng.DAL }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + + /// + /// 海运现结买单的结算日期 + /// + /// + /// + public static string 现结买单结算日期(string ETD) + { + var result = Convert.ToDateTime(ETD).AddDays(14).ToString("yyyy-MM-dd"); + return result; + } + public static string 现结买单结算日期_空运(string ETD) + { + var result = Convert.ToDateTime(ETD).AddDays(14).ToString("yyyy-MM-dd"); + return result; + } } diff --git a/DSWeb/Areas/Mobile/Controllers/BookSpaceController.cs b/DSWeb/Areas/Mobile/Controllers/BookSpaceController.cs index 435c49bf..2477e0df 100644 --- a/DSWeb/Areas/Mobile/Controllers/BookSpaceController.cs +++ b/DSWeb/Areas/Mobile/Controllers/BookSpaceController.cs @@ -125,7 +125,7 @@ namespace DSWeb.Areas.Mobile.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs index 8e614717..5f13c3bf 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs @@ -238,7 +238,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ; } } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs index e2ab7e95..4724128a 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs @@ -585,7 +585,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ; } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs index f3452f08..54ae7e05 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs @@ -498,7 +498,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ; } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs index 61907c73..aaf62dc2 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs @@ -290,7 +290,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ISSUEDATE; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ; } } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs index cbd7e936..0964f21d 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs @@ -26,6 +26,7 @@ using DSWeb.Areas.SysMng.DAL.SysUser; using DSWeb.MvcShipping.DAL.MsCodeOpTemplate; using DSWeb.MvcShipping.DAL.ChMonthCloseDAL; using DSWeb.MvcShipping.DAL.MsChFeeDAL; +using DSWeb.Areas.CommMng.DAL; namespace DSWeb.MvcShipping.Controllers { @@ -426,7 +427,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); ; } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpRailwayController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpRailwayController.cs index 33a97bb1..8e05d557 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpRailwayController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpRailwayController.cs @@ -257,7 +257,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.STLDATE; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.STLDATE); } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs index 85ca0de1..a63b491d 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs @@ -970,7 +970,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs index 3a359fb7..25bb8d8c 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs @@ -2314,15 +2314,7 @@ namespace DSWeb.MvcShipping.Controllers { if (_p.BLSTATUS == "提单签出" || _p.BLSTATUS == "扣单") { - /* - result.Success = false; - result.Message = "只有录入状态的提单才能申请签入"; - var jsonRespose = new JsonResponse - { - Success = result.Success, - Message = result.Message, - Data = null - };*/ + } else { @@ -2400,12 +2392,12 @@ namespace DSWeb.MvcShipping.Controllers var bsnoStr = "'" + string.Join("','", _L.Select(s => s.BSNO)) + "'"; var _b_head = MsOp_BLISSUEDAL.CanCheckOut(bsnoStr); - if (_b_head.Success && (bool)_b_head.Data == false) + if (!_b_head.Success ) { jsonRespose = new JsonResponse { - Success = result.Success, - Message = result.Message, + Success = _b_head.Success, + Message = _b_head.Message, }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index 3c96130c..b9bd55ac 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -319,7 +319,7 @@ namespace DSWeb.MvcShipping.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } } diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index b23d8942..74c2cf55 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -2144,6 +2144,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL } } + + + //if (headData.ORDERNO != "" && headData.ORDERNO != null) //{ // var ct = MsOpSeaeDAL.GetRdCount("BSNO<>'" + headData.BSNO + "' AND ORDERNO='" + headData.ORDERNO + "' and CORPID='" + Convert.ToString(Session["COMPANYID"]) + "'"); @@ -2165,7 +2168,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } @@ -2247,7 +2250,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL } } - + if (!string.IsNullOrWhiteSpace(headData.TRADETERM)) + { + errorstr += $"贸易条款必须正确填写;"; + } headData.BSSOURCE = headData.BSSOURCE.Trim(); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs index 4f298313..c6981213 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs @@ -987,7 +987,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE else if (visiblerange == "1") { //str = " (ob.SALECORPID='" + companyid + "' or (select companyid from vw_user where showname=ob.OPNAME)='" + companyid + "' or (select companyid from vw_user where showname=ob.AUDITOR)='" + companyid + "' ) "; - str = " (ob.SALECORPID='" + companyid + "' or exists(select 1 from vw_user where companyid='" + companyid + "' and showname in(ob.OPNAME,ob.AUDITOR,ob.SALE)) "; + str = " (ob.SALECORPID='" + companyid + "' or exists(select 1 from vw_user where companyid='" + companyid + "' and showname in(ob.OPNAME,ob.AUDITOR,ob.SALE))) "; } VSSQL = VSSQL.Trim(); if (!string.IsNullOrEmpty(VSSQL)) @@ -1623,6 +1623,23 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE //var WorkFlowName = "MsOp_BLISSUE_IN"; Database db = DatabaseFactory.CreateDatabase(); var result = new DBResult(); + + //20230221 增加判断 如果ussuetype=swb的，不进行扣单操作 + foreach (var _bill in _List) + { + if (_bill.ISSUETYPE == "SWB" && _bill.BLISSUESTATUS!="扣单") { + result.Success = false; + result.Message = $"签单方式SWB的业务[{_bill.CUSTNO}]不能扣单"; + } + if (string.IsNullOrWhiteSpace(_bill.ISSUETYPE)) + { + result.Success = false; + result.Message = $"签单方式未指定的业务[{_bill.CUSTNO}]不能扣单"; + } + } + + + using (var conn = db.CreateConnection()) { conn.Open(); @@ -1633,6 +1650,8 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE foreach (var _bill in _List) { + + var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS='扣单' where GID=@GID and BLSTATUS ='签出' "); if (_bill.BLSTATUS == "扣单") { @@ -3527,18 +3546,20 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE var result = new DBResult(); result.OK(); - //判断标准 该客户的全部其他业务 是否存在 BLISSUESTATUS<>'提单签出' 的 + //判断标准 该客户的全部其他业务 是否存在 BLISSUESTATUS<>'提单签出' 且其下属明细中没有箱号长度11位的箱号 的 var recordcount = 0; var bsnostr ="'"+ string.Join("','", headList.Select(s => s.BSNO))+ "'"; - var 其他未签出业务List = GetDataList($" b.CUSTOMERNAME='{headList[0].CUSTOMERNAME}' and b.BLISSUESTATUS<>'提单签出' and b.BSNO not in({bsnostr})", 0, 9, out recordcount); + var 其他未签出业务List = GetDataList($" b.CUSTOMERNAME='{headList[0].CUSTOMERNAME}' and b.BLISSUESTATUS<>'提单签出' and exists(select 1 from op_ctn where BSNO=b.BSNO and len(CNTRNO)=11) and b.BSNO not in({bsnostr})", 0, 9, out recordcount); if (recordcount > 0) { result.OK("", false); } - else { + else + { result.OK("", true); } + return result; } diff --git a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs index 408940d4..4a72b719 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs @@ -88,8 +88,23 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL } strSql.Append(@") as num , * from(select "); + GetDataListBuilder(ref strSql); - strSql.Append("ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD"); + + if (!string.IsNullOrEmpty(strCondition)) + { + strSql.Append(" where " + strCondition); + } + // + strSql.Append(@")as t2 )as t "); + strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit)); // + + var isNoForward = MsBaseInfoDAL.MsBaseInfoDAL.GetUserModuleEnable("modMsNoForward", userid); + return SetData(strSql,"",isNoForward); + } + + public static void GetDataListBuilder(ref StringBuilder strSql) { + strSql.Append(" ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD"); strSql.Append(",SHIPPER,CONSIGNEE,NOTIFYPARTY,VESSEL,VOYNO,ETD,PlACERECEIPT,PlACERECEIPTID,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE"); strSql.Append(",PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,ISSUEPLACEID,BLFRT"); strSql.Append(",PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS"); @@ -113,17 +128,6 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL strSql.Append(" from crm_seaeorder B"); strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE "); - - if (!string.IsNullOrEmpty(strCondition)) - { - strSql.Append(" where " + strCondition); - } - // - strSql.Append(@")as t2 )as t "); - strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit)); // - - var isNoForward = MsBaseInfoDAL.MsBaseInfoDAL.GetUserModuleEnable("modMsNoForward", userid); - return SetData(strSql,"",isNoForward); } public static int getTotalCount(string strCondition, string userid, string usercode, string companyid) @@ -188,28 +192,10 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL } // var strSql = new StringBuilder(); - strSql.Append("SELECT ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD"); - strSql.Append(",SHIPPER,CONSIGNEE,NOTIFYPARTY,VESSEL,VOYNO,ETD,PlACERECEIPT,PlACERECEIPTID,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE"); - strSql.Append(",PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,ISSUEPLACEID,BLFRT"); - strSql.Append(",PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS"); - strSql.Append(",KGS,CBM,TOTALNO,CNTRTOTAL,INPUTBY,INVNO,CARGOID,HSCODE,DCLASS,DUNNO,REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN"); - strSql.Append(",CUSTOMSNUM,REMARK,STATUS1,STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION"); - strSql.Append(",ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,STLNAME,STLDATE,OCEANFEE,ISUSD,ISCOMMISSIONBACK,CARRIER,CARRIERATTN"); - strSql.Append(",CARRIERTEL,CARRIEREMAIL,FORWARDER,FORWARDERATTN,FORWARDERTEL,FORWARDEREMAIL,SALE,PACKINGTYPE,BLTYPE,OP,FRCUSTSERVICE"); - strSql.Append(",CUSTSERVICE,doc,AUDITOPERATOR,AUDITDATE,DPAGE,DLABEL,LINKMAN,BILLNUM,AGENTID,AGENT,TRANSPORT"); - strSql.Append(",(CASE ORSTATUS WHEN '8' THEN '确认订舱' WHEN '0' THEN '审核通过' WHEN '1' THEN '提交审核' WHEN '2' THEN '驳回' WHEN '4' THEN '退舱' else '录入状态' end) as ORSTATUSREF "); - strSql.Append(",(SELECT CUSTNO FROM V_OP_BILL V WHERE V.BSNO=B.BSNO) as CUSTNO "); - strSql.Append(",(SELECT MBLNO FROM V_OP_BILL V WHERE V.BSNO=B.BSNO) as MBLNOREF,MBLNO,SALEDEPT,BSSOURCE,BSSOURCEDETAIL,(select top 1 sale from info_client where SHORTNAME=B.CUSTOMERNAME) DEFSALE "); - strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,1) DRFEESTATUS"); - strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,2) CRFEESTATUS"); - strSql.Append(",'' SenderMobile,'' SenderEmail,CONTRACTNO,'' AMSSHIPPER,'' AMSCONSIGNEE,'' AMSNOTIFYPARTY,CONFIRMOP,CONFIRMDATE,OPERATOR,OPERATORTEL,FBP,DESTFBP,MAXWEIGHT,PLANPROFIT,OPERATOREMAIL,LANE,SERVICECONTRACTNO "); - strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP"); - strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE ,TRADETERM,DIANSHANGORDERNO,BCNO "); + strSql.Append("SELECT "); + + GetDataListBuilder(ref strSql); - strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME "); - strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME"); - strSql.Append(",B.ISEI,B.TEU"); - strSql.Append(" from crm_seaeorder B"); if (!string.IsNullOrEmpty(strCondition)) { strSql.Append(" where " + strCondition); diff --git a/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs b/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs index 03652dc8..f77595d9 100644 --- a/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs +++ b/DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs @@ -11,6 +11,7 @@ using System.Text; using DSWeb.Areas.MvcShipping.Models.MsCodeVesselSetModel; using DSWeb.MvcShipping.DAL.MsInfoClient; using DSWeb.MvcShipping.DAL.MsOpSeaeDAL; +using DSWeb.Areas.CommMng.DAL; namespace DSWeb.Areas.MvcShipping.DAL.code_vesselModelDal { @@ -260,7 +261,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.code_vesselModelDal if (_dmb.STLNAME == "") { STLNAME = "现结买单"; - STLDATE = headData.ETD; + STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } var cmdupdate = db.GetSqlStringCommand(@"update op_seae set ETD='" + headData.ETD + "',ATD='" + headData.ATD + "',STLNAME='" + STLNAME + "',STLDATE='" + STLDATE + "' where BSNO='" + enumValue.BSNO + "'"); db.ExecuteNonQuery(cmdupdate, tran); diff --git a/DSWeb/Areas/MvcShipping/Views/MsRptOpBsList/Index.aspx b/DSWeb/Areas/MvcShipping/Views/MsRptOpBsList/Index.aspx index 00fee298..8ca850f0 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsRptOpBsList/Index.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsRptOpBsList/Index.aspx @@ -14,6 +14,7 @@ <%-- --%> + diff --git a/DSWeb/Areas/MvcShipping/Views/MsRptOpProfit/Index.aspx b/DSWeb/Areas/MvcShipping/Views/MsRptOpProfit/Index.aspx index 815d2ddb..95f39e36 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsRptOpProfit/Index.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsRptOpProfit/Index.aspx @@ -24,6 +24,7 @@ <%-- --%> + diff --git a/DSWeb/Areas/MvcShipping/Views/MsRptOpProfitMonth/Index.aspx b/DSWeb/Areas/MvcShipping/Views/MsRptOpProfitMonth/Index.aspx index 0bffcaee..aeddfbae 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsRptOpProfitMonth/Index.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsRptOpProfitMonth/Index.aspx @@ -23,6 +23,7 @@ <%-- --%> + diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index e86b7d2c..557e17c3 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -30,9 +30,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { redAlertFields: [], mainWin: null, showField: null, - + BULIAO:false, initUIComponents: function () { + _this = this; this.serialNo = 0; //this.bodyDel = []; this.itemindex = 1; @@ -255,7 +256,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.CustomRefModel', proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' } }); -// this.storeCustCode.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items); + // this.storeCustCode.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items); this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.CUSTOMERNAME, //'委托单位', @@ -264,7 +265,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { queryMode: 'remote', minChars: 2, queryParam: 'CODENAME', - autoSelect:true, + autoSelect: true, name: 'CUSTOMERNAME', valueField: 'CustName', displayField: 'CodeAndName', @@ -303,7 +304,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } else { } - + } else if (this.SALEORDERDEPTBYOP == 1) { var recs = DsStoreQueryBy(this.storeOpCode, 'UserName', records[0].data.OP); if (recs.getCount() > 0) { @@ -432,7 +433,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.comboxISEI = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.ISEI, //'委托分公司', store: this.storeISEI, - readOnly:true, + readOnly: true, forceSelection: true, flex: 1, name: 'ISEI', @@ -465,7 +466,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.OPERATOR, //'客户操作', store: this.storeInfoClientContact, -// flex: 0.6, + // flex: 0.6, // forceSelection: true, name: 'OPERATOR', valueField: 'SHOWNAME', @@ -505,7 +506,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { fieldLabel: Zi.LAN.INSURANCEOP, //'客户财务', store: this.storeInfoClientContactIN, // forceSelection: true, - name: 'FINANCIALSTAFFFAX', + name: 'FINANCIALSTAFFFAX', valueField: 'SHOWNAME', displayField: 'SHOWNAME' }); @@ -565,7 +566,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.CustomRefModel', proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListYARD' } }); -// this.storeYARD.loadData(this.mainWin.GetPubStore("OPSEAE_YARD").data.items); + // this.storeYARD.loadData(this.mainWin.GetPubStore("OPSEAE_YARD").data.items); this.storeYARD.load(); // this.comboxYARD = Ext.create('DsExt.ux.RefTableCombox', { @@ -1270,22 +1271,22 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, { fieldLabel: Zi.LAN.MASTERNO, //'业务编号', name: 'MASTERNO', hidden: true - }, { - fieldLabel: Zi.LAN.ORDERTYPE, //'订舱方式', - name: 'ORDERTYPE', hidden: true - }, { + }, { + fieldLabel: Zi.LAN.ORDERTYPE, //'订舱方式', + name: 'ORDERTYPE', hidden: true + }, { fieldLabel: Zi.LAN.CREATETIME, //'CREATETIME', name: 'CREATETIME', hidden: true }, { fieldLabel: Zi.LAN.INPUTBY, //'INPUTBY', name: 'INPUTBY', hidden: true - }, { - fieldLabel:'WARNCOUNT', //'CNTRTOTAL', - name: 'WARNCOUNT', hidden: true - }, { - fieldLabel: 'BLISSUESTATUS', //'CNTRTOTAL', - name: 'BLISSUESTATUS', hidden: true - }, { + }, { + fieldLabel: 'WARNCOUNT', //'CNTRTOTAL', + name: 'WARNCOUNT', hidden: true + }, { + fieldLabel: 'BLISSUESTATUS', //'CNTRTOTAL', + name: 'BLISSUESTATUS', hidden: true + }, { fieldLabel: 'DRFEESTATUS', //'MSHIPPERID', name: 'DRFEESTATUS', hidden: true }, { @@ -1304,11 +1305,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { fieldLabel: Zi.LAN.MSHIPPER, //'MSHIPPER', xtype: 'textareafield', name: 'MSHIPPER', hidden: true - }, { - fieldLabel:'MDESCRIPTION', //'MSHIPPER', - xtype: 'textareafield', - name: 'MDESCRIPTION', hidden: true - }, + }, { + fieldLabel: 'MDESCRIPTION', //'MSHIPPER', + xtype: 'textareafield', + name: 'MDESCRIPTION', hidden: true + }, //{ //fieldLabel: Zi.LAN.OPERATORTEL, //'TEL', //name: 'OPERATORTEL', hidden: true @@ -1349,17 +1350,17 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { fieldLabel: Zi.LAN.ACCDATE, //'会计期间', xtype: 'monthfield', name: 'ACCDATE' - }, this.comboxBLTYPE, this.comboxMailProject, this.comboxSaleCompany] + }, this.comboxBLTYPE, this.comboxMailProject, this.comboxSaleCompany] }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [this.comboxISEI,this.comboxCustCode, this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, { - fieldLabel: Zi.LAN.STLNAME, //'委托编号', - //flex: 0.5, - readOnly: true, - name: 'STLNAME' - } + items: [this.comboxISEI, this.comboxCustCode, this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, { + fieldLabel: Zi.LAN.STLNAME, //'委托编号', + //flex: 0.5, + readOnly: true, + name: 'STLNAME' + } , { fieldLabel: Zi.LAN.STLDATE, //'结算日期', readOnly: true, format: 'Y-m-d', @@ -1368,7 +1369,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { readOnly: true, // xtype: 'datefield', name: 'STLDATE', id: "STLDATE" - }] + }] }, { xtype: 'container', layout: 'hbox', @@ -1439,8 +1440,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.GetContractFee(); }, scope: this - }] - }, this.comboxClientContactIN + }] + }, this.comboxClientContactIN //, { // fieldLabel: Zi.LAN.CONTRACTNO, //'运费协议号', @@ -1463,13 +1464,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //flex: 0.5, name: 'SERVICECONTRACTNO' }, { - fieldLabel: Zi.LAN.FINANCIALSTAFFTEL, //'ATD', - format: 'Y-m-d', - //flex: 0.5, - xtype: 'datefield', - //labelWidth: 55, - name: 'FINANCIALSTAFFTEL' - }, { + fieldLabel: Zi.LAN.FINANCIALSTAFFTEL, //'ATD', + format: 'Y-m-d', + //flex: 0.5, + xtype: 'datefield', + //labelWidth: 55, + name: 'FINANCIALSTAFFTEL' + }, { fieldLabel: Zi.LAN.APPLYNO, //'申请放箱号', name: 'APPLYNO' }, this.comboxInfoClientContact, //{ @@ -1478,7 +1479,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //labelWidth: 25, //flex: 0.4, name: 'OPERATORTEL' - }, this.comboxClientFCContact] + }, this.comboxClientFCContact] } ]//end items(fieldset 1) @@ -1759,17 +1760,17 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { return '拼箱'; else return '整箱'; } - }, { - dataIndex: 'ISTEMP', + }, { + dataIndex: 'ISTEMP', header: Zi.LAN.ISTEMP, //'箱状态', - width: 70, + width: 70, editor: this.comboxISTEMP, renderer: function (value, p, record) { if (value == '1') return '是'; - else return '否'; + else return '否'; } - }, { + }, { dataIndex: 'MASTERNO', header: Zi.LAN.MASTERNO2, //'主拼号', width: 100, @@ -1862,18 +1863,18 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { allowBlank: false, selectOnFocus: true } + }, + { + sortable: true, + dataIndex: 'TIXIANGSHIJIAN', + header: Zi.LAN.TIXIANGSHIJIAN, //'VGM称重日期', + editor: { + xtype: 'datefield', + format: 'Y-m-d' }, - { - sortable: true, - dataIndex: 'TIXIANGSHIJIAN', - header: Zi.LAN.TIXIANGSHIJIAN, //'VGM称重日期', - editor: { - xtype: 'datefield', - format: 'Y-m-d' - }, - renderer: Ext.util.Format.dateRenderer('Y-m-d'), - width: 100 - }, { + renderer: Ext.util.Format.dateRenderer('Y-m-d'), + width: 100 + }, { dataIndex: 'CTNDAY', header: Zi.LAN.CTNDAY, width: 60, @@ -1980,12 +1981,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, { text: Zi.LAN.YinRuEXCELCtnDetail, //"多品名", handler: function (button, event) { - _this.onImportCtnAndDetailClick(button, event,''); + _this.onImportCtnAndDetailClick(button, event, ''); } }, { - text: Zi.LAN.YinRuEXCELCtnDetail+'(二)', //"多品名", + text: Zi.LAN.YinRuEXCELCtnDetail + '(二)', //"多品名", handler: function (button, event) { - _this.onImportCtnAndDetailClick(button, event,'2'); + _this.onImportCtnAndDetailClick(button, event, '2'); } }], scope: this @@ -2157,7 +2158,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { store: this.storeVoyVeg, name: 'VESSEL', valueField: 'VESSEL', - flex:1.2, + flex: 1.2, displayField: 'VESSEL', listeners: { scope: this, @@ -2270,7 +2271,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.CodeDisportModel', proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' } }); - // this.storeCodeDisport4.loadData(this.mainWin.GetPubStore("CODE_PORTLOAD").data.items); + // this.storeCodeDisport4.loadData(this.mainWin.GetPubStore("CODE_PORTLOAD").data.items); this.storeCodeDisport5 = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CodeDisportModel', @@ -2301,14 +2302,14 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //this.storeCodeDisport7.loadData(this.mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items); //this.storeCodeDisport8.loadData(this.mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items); //this.storeCodeDisport9.loadData(this.mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items); - + //国内港口（出口装货港、进口卸货港） this.storeCodeLoadport = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CodeLoadportModel', proxy: { url: '/CommMng/BasicDataRef/GetCodeLoadportListRm' } }); -// this.storeCodeLoadport.loadData(this.mainWin.GetPubStore("CODE_PORTLOAD").data.items); + // this.storeCodeLoadport.loadData(this.mainWin.GetPubStore("CODE_PORTLOAD").data.items); // this.storeCodeLoadport.load(); // var astoreCodeDisport = parentWin.storeCodeDisport; @@ -2447,7 +2448,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港', store: this.storeCodeDisport, name: 'PORTDISCHARGEID', - matchFieldWidth:false, + matchFieldWidth: false, forceSelection: true, valueField: 'EDICODE', queryMode: 'remote', @@ -2467,11 +2468,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (this.DESTINATIONSAMEASPORTDISCHARGE == 1) { this.formEdit.getForm().findField('DESTINATIONID').setValue(records[0].data.EDICODE); this.formEdit.getForm().findField('DESTINATION').setValue(records[0].data.PORT); - } else - var DESTINATION = this.formEdit.getForm().findField('DESTINATION').getValue(); + } else + var DESTINATION = this.formEdit.getForm().findField('DESTINATION').getValue(); if (DESTINATION == null || DESTINATION == '') { - this.formEdit.getForm().findField('DESTINATIONID').setValue(records[0].data.EDICODE); - this.formEdit.getForm().findField('DESTINATION').setValue(records[0].data.PORT); + this.formEdit.getForm().findField('DESTINATIONID').setValue(records[0].data.EDICODE); + this.formEdit.getForm().findField('DESTINATION').setValue(records[0].data.PORT); } // var PLACEDELIVERY = this.formEdit.getForm().findField('PLACEDELIVERY').getValue(); // if (PLACEDELIVERY == null || PLACEDELIVERY == '') { @@ -2521,8 +2522,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.formEdit.getForm().findField('PORTDISCHARGE').setValue(port); var DESTINATION = this.formEdit.getForm().findField('DESTINATION').getValue(); if (DESTINATION == null || DESTINATION == '') { - this.formEdit.getForm().findField('DESTINATIONID').setValue(edicode); - this.formEdit.getForm().findField('DESTINATION').setValue(port); + this.formEdit.getForm().findField('DESTINATIONID').setValue(edicode); + this.formEdit.getForm().findField('DESTINATION').setValue(port); } } @@ -2871,7 +2872,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.CodeDisportModel', proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' } }); -// this.storeCodeDisport10.loadData(this.mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items); + // this.storeCodeDisport10.loadData(this.mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items); this.comboxTRANSPORT = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.TRANSPORT,//中转港 @@ -2931,13 +2932,14 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { store: this.storeISSUETYPE, forceSelection: true, name: 'ISSUETYPE', + id: 'ISSUETYPE', valueField: 'BLTYPE', displayField: 'BLTYPE', listeners: { scope: this, 'select': function (combo, records, eOpts) { if (records.length > 0) { - if (records[0].data.NOBILL!='') { + if (records[0].data.NOBILL != '') { this.formEdit.getForm().findField('NOBILL').setValue(records[0].data.NOBILL); this.formEdit.getForm().findField('COPYNOBILL').setValue(records[0].data.COPYNOBILL); } else { @@ -3323,8 +3325,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { { xtype: 'button', iconCls: "btnsearchBig", - handler: function (button, event) { - this.ShowBigEdit("SHIPPER",'发货人'); + handler: function (button, event) { + this.ShowBigEdit("SHIPPER", '发货人'); }, scope: this }, @@ -3663,7 +3665,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { layout: 'hbox', items: [ { - fieldLabel: Zi.LAN.ETD , //'ATD', + fieldLabel: Zi.LAN.ETD, //'ATD', format: 'Y-m-d', flex: 0.8, @@ -3720,10 +3722,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var ISSUEDATE = basicForm.findField('ISSUEDATE').getRawValue(); //if (ISSUEDATE == '') { - basicForm.findField('ISSUEDATE').setValue(ETD); + basicForm.findField('ISSUEDATE').setValue(ETD); //} var FEESTATUSREF = _this.formHead.getForm().findField('FEESTATUSREF').getValue(); - if ((_this.accdatesameetd == 1) && (FEESTATUSREF=='未锁定')) { + if ((_this.accdatesameetd == 1) && (FEESTATUSREF == '未锁定')) { var mydatestr = Ext.util.Format.date(ETD, 'Y-m'); if (_this.MsPeriod.CLOSEDAY != 0) { var myday = Ext.util.Format.date(ETD, 'd'); @@ -3926,7 +3928,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.FormatTextarea(30, "DESCRIPTION"); }, scope: this - },{ + }, { xtype: 'button', text: "35", handler: function (button, event) { @@ -4483,7 +4485,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var field = basicForm.findField('BSNO'); var BSNO = 'topseae' + NewGuid(); var oldbsno = field.getValue(); - this.LoadCopyData(oldbsno, true,false); + this.LoadCopyData(oldbsno, true, false); var children = this.tabSeaepanel.items; if (children) { @@ -4512,49 +4514,49 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.panelOcr.hide(); }, scope: this - },{ - id: 'btnECopyNewFee', - text: Zi.LAN.copyadd + '(含费用)', //"复制新建", - handler: function (button, event) { - var btnESave = Ext.getCmp('btnESave'); - - if (btnESave.isDisabled() || this.getIsModify == '') { - var basicForm = this.formHead.getForm(); - this.opStatus = 'add'; - basicForm.findField('BSNO').setDisabled(false); - var field = basicForm.findField('BSNO'); - var BSNO = 'topseae' + NewGuid(); - var oldbsno = field.getValue(); - this.LoadCopyData(oldbsno, false, true); - - var children = this.tabSeaepanel.items; - if (children) { - for (var i = children.length - 1, len = 0; i >= len; i--) { - if (children.items[i].id) { - if (children.items[i].id == 'pnlmodNewOpSeaeInfo') { - // this.tabSeaepanel.setActiveTab(i); - } else { - children.items[i].close(); - } + }, { + id: 'btnECopyNewFee', + text: Zi.LAN.copyadd + '(含费用)', //"复制新建", + handler: function (button, event) { + var btnESave = Ext.getCmp('btnESave'); + + if (btnESave.isDisabled() || this.getIsModify == '') { + var basicForm = this.formHead.getForm(); + this.opStatus = 'add'; + basicForm.findField('BSNO').setDisabled(false); + var field = basicForm.findField('BSNO'); + var BSNO = 'topseae' + NewGuid(); + var oldbsno = field.getValue(); + this.LoadCopyData(oldbsno, false, true); + + var children = this.tabSeaepanel.items; + if (children) { + for (var i = children.length - 1, len = 0; i >= len; i--) { + if (children.items[i].id) { + if (children.items[i].id == 'pnlmodNewOpSeaeInfo') { + // this.tabSeaepanel.setActiveTab(i); + } else { + children.items[i].close(); } } } - this.tabSeaepanel.doLayout(); + } + this.tabSeaepanel.doLayout(); - } else { - this.copybill = false; - this.copyfee = true; + } else { + this.copybill = false; + this.copyfee = true; - this.CopyNew(); + this.CopyNew(); - } + } - this.panelOcr.hide(); - }, - scope: this - }] + this.panelOcr.hide(); + }, + scope: this + }] }, '-', { text: Zi.LAN.GuanBi, //"关闭", handler: function (button, event) { @@ -4562,8 +4564,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, scope: this }, { - text: Zi.LAN.btnadd, //"新建", - id:'btnaddbs', + text: Zi.LAN.btnadd, //"新建", + id: 'btnaddbs', handler: function (button, event) { this.LoadData('add', ''); //var basicForm = this.formEdit.getForm(); @@ -4603,21 +4605,21 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, { text: Zi.LAN.AMS, //"AMS", // id: 'EDI-AMS', -// hidden: true, + // hidden: true, handler: function (menu, event) { _this.onCreateAfrClick(menu, event, 3); } }, { text: 'EMANIFEST', //"AMS", // id: 'EDI-AMS', -// hidden: true, + // hidden: true, handler: function (menu, event) { _this.onCreateAfrClick(menu, event, 'EMANIFEST'); } }, { text: 'ISF', //"AMS", // id: 'EDI-AMS', -// hidden: true, + // hidden: true, handler: function (menu, event) { _this.onCreateAfrClick(menu, event, 'ISF'); } @@ -4690,7 +4692,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { _this.onCreateEDIClick(menu, event, 'WYYARD'); } }, { - text: Zi.LAN.GLJYARD, + text: Zi.LAN.GLJYARD, id: 'EDI-GLJYARD', hidden: true, handler: function (menu, event) { @@ -4708,13 +4710,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { _this.onCreateEDIClick(menu, event, 'WDEDI'); } }, { - text: Zi.LAN.WYEDI, //"外代EDI", - id: 'EDI-WYEDI', - hidden: true, - handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'WYEDI'); - } - }, { + text: Zi.LAN.WYEDI, //"外代EDI", + id: 'EDI-WYEDI', + hidden: true, + handler: function (menu, event) { + _this.onCreateEDIClick(menu, event, 'WYEDI'); + } + }, { text: Zi.LAN.COSCOEDI, //"中远EDI", menu: [ { @@ -4742,150 +4744,150 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { scope: this }, { text: Zi.LAN.YDEDI, //"远大EDI", - id: 'EDI-YDEDI', - hidden: true, + id: 'EDI-YDEDI', + hidden: true, handler: function (menu, event) { _this.onCreateEDIClick(menu, event, 'YDEDI'); } }, { text: Zi.LAN.ZTEDI, //"中通EDI", - id: 'EDI-ZTEDI', - hidden: true, + id: 'EDI-ZTEDI', + hidden: true, handler: function (menu, event) { _this.onCreateEDIClick(menu, event, 'ZTEDI'); } }, { text: Zi.LAN.SJJEDI, //"锦江航运EDI", - id: 'EDI-SJJEDI', - hidden: true, + id: 'EDI-SJJEDI', + hidden: true, handler: function (menu, event) { _this.onCreateEDIClick(menu, event, 'SJJEDI'); } }, { text: Zi.LAN.INTTREDI, //"INTTR EDI", - id: 'EDI-INTTREDI', - hidden: true, + id: 'EDI-INTTREDI', + hidden: true, handler: function (menu, event) { _this.onCreateINTTRClick(menu, event); } }, { text: Zi.LAN.YiTongEDI, //"亿通 EDI", - id: 'EDI-YTEDI', - hidden: true, + id: 'EDI-YTEDI', + hidden: true, handler: function (menu, event) { _this.onCreateYTClick(menu, event); } }, { text: Zi.LAN.IFTMBFEDI, //"交通部EDI", - id: 'EDI-IFTMBFEDI', - hidden: true, + id: 'EDI-IFTMBFEDI', + hidden: true, handler: function (menu, event) { _this.onCreateIFTMBFClick(menu, event); } }, { text: Zi.LAN.IFCSUMEDI, //"交通部舱单报文"，需求编号：SR2017072600004 - id: 'EDI-IFCSUMEDI', - hidden: true, + id: 'EDI-IFCSUMEDI', + hidden: true, handler: function (menu, event) { _this.onCreateIFCSUMClick(menu, event); } - }, - //{ - //text: Zi.LAN.PILEDI, //"太平船务EDI", - // id: 'EDI-PILEDI', - //handler: function (menu, event) { - // _this.onCreatePILClick(menu, event); - //} - //}, - { + }, + //{ + //text: Zi.LAN.PILEDI, //"太平船务EDI", + // id: 'EDI-PILEDI', + //handler: function (menu, event) { + // _this.onCreatePILClick(menu, event); + //} + //}, + { text: Zi.LAN.PILEDICeShi, //"太平船务新EDI测试", - id: 'EDI-PILNEWEDI', - hidden: true, + id: 'EDI-PILNEWEDI', + hidden: true, handler: function (menu, event) { _this.onCreatePILClick2(menu, event); } }, { text: Zi.LAN.MAERSKEDI, //"马士基 EDI", - id: 'EDI-MAERSKEDI', - hidden: true, + id: 'EDI-MAERSKEDI', + hidden: true, handler: function (menu, event) { _this.onCreateMAERSKClick(menu, event); } }, { text: Zi.LAN.HMMEDI, //"现代HMM EDI", - id: 'EDI-HMMEDI', - hidden: true, + id: 'EDI-HMMEDI', + hidden: true, handler: function (menu, event) { _this.onCreateHMMClick(menu, event); } }, { text: Zi.LAN.OOCLEDI, //"东方海外OOCL EDI", - id: 'EDI-OOCLEDI', - hidden: true, + id: 'EDI-OOCLEDI', + hidden: true, handler: function (menu, event) { _this.onCreateOOCLClick(menu, event); } }, { text: Zi.LAN.CMAVGM, //"CMA VGM", - id: 'EDI-CMAVGMEDI', - hidden: true, + id: 'EDI-CMAVGMEDI', + hidden: true, handler: function (menu, event) { _this.onCreateCMAVGMClick(menu, event); } - }, { - text: Zi.LAN.CMAEDI, //"CMA VGM", - id: 'EDI-CMAEDI', - hidden: true, - handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'CMAEDI'); - } - }, { + }, { + text: Zi.LAN.CMAEDI, //"CMA VGM", + id: 'EDI-CMAEDI', + hidden: true, + handler: function (menu, event) { + _this.onCreateEDIClick(menu, event, 'CMAEDI'); + } + }, { text: Zi.LAN.YMLEDI, //"阳明EDI", - id: 'EDI-YMLEDI', - hidden: true, + id: 'EDI-YMLEDI', + hidden: true, handler: function (menu, event) { _this.onCreateEDIClick(menu, event, 'YML'); } - }, { - text: Zi.LAN.ESLEDI, //"阳明EDI", - id: 'EDI-ESLEDI', - hidden: true, - handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'ESLEDI'); - } - }, { - text: Zi.LAN.EVERGREENEDI, //"阳明EDI", - id: 'EDI-EVERGREENEDI', - hidden: true, - handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'EVERGREENEDI'); - } - }, { + }, { + text: Zi.LAN.ESLEDI, //"阳明EDI", + id: 'EDI-ESLEDI', + hidden: true, + handler: function (menu, event) { + _this.onCreateEDIClick(menu, event, 'ESLEDI'); + } + }, { + text: Zi.LAN.EVERGREENEDI, //"阳明EDI", + id: 'EDI-EVERGREENEDI', + hidden: true, + handler: function (menu, event) { + _this.onCreateEDIClick(menu, event, 'EVERGREENEDI'); + } + }, { text: Zi.LAN.NBPORTEDI, //"宁波电子口岸", - id: 'EDI-NBPORTEDI', - hidden: true, + id: 'EDI-NBPORTEDI', + hidden: true, handler: function (menu, event) { _this.onCreateNBPORTEDIClick(menu, event); } }, { text: Zi.LAN.CargoSmartEDI, //"Cargo Smart", - id: 'EDI-CARGOSMARTEDI', - hidden: true, + id: 'EDI-CARGOSMARTEDI', + hidden: true, handler: function (menu, event) { _this.onCreateCargoSmartEDIClick(menu, event); } }, { text: Zi.LAN.ShenYuanEDI, //"神原 EDI", - id: 'EDI-SHENYUANEDI', - hidden: true, + id: 'EDI-SHENYUANEDI', + hidden: true, handler: function (menu, event) { _this.onCreateShenYuanEDIClick(menu, event); } } , { text: Zi.LAN.WYLYGEDI, //"外运_连云港 EDI", //需求分析：SR2017091400001 - id: 'EDI-WYLYGEDI', - hidden: true, + id: 'EDI-WYLYGEDI', + hidden: true, handler: function (menu, event) { _this.onCreateWYLYGEDIClick(menu, event); } @@ -4896,19 +4898,19 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } }, { text: Zi.LAN.ShanghaiCustoms, - id: 'EDI-SHANGHAICUSTOMEDI', - hidden: true, + id: 'EDI-SHANGHAICUSTOMEDI', + hidden: true, handler: function (menu, event) { _this.onCreateShangHaiCustoms(menu, event); } - }, { - text: Zi.LAN.winEFEDIShow, - id: 'EDI-EFEDI', - hidden: true, - handler: function (menu, event) { - _this.onCreateEFEDIClick(menu, event); - } + }, { + text: Zi.LAN.winEFEDIShow, + id: 'EDI-EFEDI', + hidden: true, + handler: function (menu, event) { + _this.onCreateEFEDIClick(menu, event); } + } ], scope: this }, '-', { @@ -4974,23 +4976,23 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { handler: function (menu, event) { _this.onImportBillEditClick(); } - }, { - text: Zi.LAN.ImportMSCBill, //"引入EXCEL", - iconCls: "btnexportexcel", - handler: function (menu, event) { - _this.onImportMSCEditClick(); - } - }, { + }, { + text: Zi.LAN.ImportMSCBill, //"引入EXCEL", + iconCls: "btnexportexcel", + handler: function (menu, event) { + _this.onImportMSCEditClick(); + } + }, { text: '生成保单', //"生成报关业务", handler: function (menu, event) { _this.ShengChengBaoDan(); } - }, '-',{ - text: '查看罐箱业务成本核算', - handler: function (menu, event) { - _this.onCheckCtnApply(); - } - }], + }, '-', { + text: '查看罐箱业务成本核算', + handler: function (menu, event) { + _this.onCheckCtnApply(); + } + }], scope: this }, '-', { text: 'OCR', //快速录入, @@ -5042,7 +5044,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } - ], + ], scope: this }, '-', { id: 'btnRuleWarning', @@ -5591,15 +5593,15 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { fieldLabel: Zi.LAN.ENTERPID, //'单位编码', name: 'ENTERPID' }, { - fieldLabel: Zi.LAN.CUSTOMSNUM, //'报关票数', - flex: 0.5, + fieldLabel: Zi.LAN.CUSTOMSNUM, //'报关票数', + flex: 0.5, name: 'CUSTOMSNUM' - }, { - fieldLabel: Zi.LAN.PRERECORD, //'预录数', - flex: 0.5, - labelWidth: 45, - name: 'PRERECORD' - }, { + }, { + fieldLabel: Zi.LAN.PRERECORD, //'预录数', + flex: 0.5, + labelWidth: 45, + name: 'PRERECORD' + }, { fieldLabel: Zi.LAN.CLEARCUSTOMDATE, //'通关日期', format: 'Y-m-d', flex: 1, @@ -5803,67 +5805,67 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, { name: 'ENTERPRISECODETYPE2', hidden: true//企业代码类型 - }, - { - name: 'INLANE', hidden: true//企业代码类型 - }, - { - name: 'USERAILWAY', hidden: true//企业代码类型 - }, - { - name: 'USERIVER', hidden: true//企业代码类型 - }, - { - name: 'USETRUCK', hidden: true//企业代码类型 - }, - { - name: 'RAILWAY_ETD', hidden: true//企业代码类型 - }, - { - name: 'RAILWAY_PORTLOAD', hidden: true//企业代码类型 - }, - { - name: 'RAILWAY_TRANSPORT', hidden: true//企业代码类型 - }, - { - name: 'RAILWAY_PORTDISCHARG', hidden: true//企业代码类型 - }, - { - xtype: 'textareafield',name: 'RAILWAY_REMARK', hidden: true//企业代码类型 - }, - { - name: 'RIVER_ETD', hidden: true//企业代码类型 - }, - { - name: 'RIVER_PORTLOAD', hidden: true//企业代码类型 - }, - { - name: 'RIVER_TRANSPORT', hidden: true//企业代码类型 - }, - { - name: 'RIVER_PORTDISCHARG', hidden: true//企业代码类型 - }, - { - xtype: 'textareafield',name: 'RIVER_REMARK', hidden: true//企业代码类型 - }, - { - name: 'TRUCK_ETD', hidden: true//企业代码类型 - }, - { - name: 'TRUCK_PORTLOAD', hidden: true//企业代码类型 - }, - { - name: 'TRUCK_TRANSPORT', hidden: true//企业代码类型 - }, - { - name: 'TRUCK_PORTDISCHARG', hidden: true//企业代码类型 - }, - { - xtype: 'textareafield',name: 'TRUCK_REMARK', hidden: true//企业代码类型 - }, - { - xtype: 'textareafield', name: 'CDESCRIPTION', hidden: true//企业代码类型 - }, + }, + { + name: 'INLANE', hidden: true//企业代码类型 + }, + { + name: 'USERAILWAY', hidden: true//企业代码类型 + }, + { + name: 'USERIVER', hidden: true//企业代码类型 + }, + { + name: 'USETRUCK', hidden: true//企业代码类型 + }, + { + name: 'RAILWAY_ETD', hidden: true//企业代码类型 + }, + { + name: 'RAILWAY_PORTLOAD', hidden: true//企业代码类型 + }, + { + name: 'RAILWAY_TRANSPORT', hidden: true//企业代码类型 + }, + { + name: 'RAILWAY_PORTDISCHARG', hidden: true//企业代码类型 + }, + { + xtype: 'textareafield', name: 'RAILWAY_REMARK', hidden: true//企业代码类型 + }, + { + name: 'RIVER_ETD', hidden: true//企业代码类型 + }, + { + name: 'RIVER_PORTLOAD', hidden: true//企业代码类型 + }, + { + name: 'RIVER_TRANSPORT', hidden: true//企业代码类型 + }, + { + name: 'RIVER_PORTDISCHARG', hidden: true//企业代码类型 + }, + { + xtype: 'textareafield', name: 'RIVER_REMARK', hidden: true//企业代码类型 + }, + { + name: 'TRUCK_ETD', hidden: true//企业代码类型 + }, + { + name: 'TRUCK_PORTLOAD', hidden: true//企业代码类型 + }, + { + name: 'TRUCK_TRANSPORT', hidden: true//企业代码类型 + }, + { + name: 'TRUCK_PORTDISCHARG', hidden: true//企业代码类型 + }, + { + xtype: 'textareafield', name: 'TRUCK_REMARK', hidden: true//企业代码类型 + }, + { + xtype: 'textareafield', name: 'CDESCRIPTION', hidden: true//企业代码类型 + }, this.comboxLASTPORTOFCALL, { fieldLabel: '日期', //'报关日期', format: 'Y-m-d', @@ -5892,13 +5894,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'ORDERREMARK', anchor: '100%' }, { - xtype: 'textareafield', - grow: true, - fieldLabel: Zi.LAN.FORWARD, //'委托方', - height: 60, - name: 'FORWARD', - anchor: '100%' - }, { + xtype: 'textareafield', + grow: true, + fieldLabel: Zi.LAN.FORWARD, //'委托方', + height: 60, + name: 'FORWARD', + anchor: '100%' + }, { xtype: 'textareafield', grow: true, fieldLabel: Zi.LAN.SIREMARK, //'SI备注', @@ -5906,21 +5908,21 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'SIREMARK', anchor: '100%' }] + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [{ + fieldLabel: 'FREIGHT PAYER', //'SCAC编号', + labelWidth: 100, + flex: 3, + name: 'FREIGHTPAYER' }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [{ - fieldLabel: 'FREIGHT PAYER', //'SCAC编号', - labelWidth: 100, - flex: 3, - name: 'FREIGHTPAYER' - }, { - fieldLabel: 'ESL LINE CODE', //'SCAC编号', - labelWidth: 100, - name: 'ESLLINECODE' - }] - }, { + fieldLabel: 'ESL LINE CODE', //'SCAC编号', + labelWidth: 100, + name: 'ESLLINECODE' + }] + }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', @@ -6130,32 +6132,32 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'BSNOLIST', anchor: '100%' }] + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [{ + fieldLabel: Zi.LAN.ACICODE, //'收货人邮编', + name: 'ACICODE' }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [{ - fieldLabel: Zi.LAN.ACICODE, //'收货人邮编', - name: 'ACICODE' - }, { - fieldLabel: Zi.LAN.TACCODE, //'收货人税号', - name: 'TACCODE' - }, { - fieldLabel: Zi.LAN.ERNCODE, //'收货人国家', - name: 'ERNCODE' - }] + fieldLabel: Zi.LAN.TACCODE, //'收货人税号', + name: 'TACCODE' }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [{ - fieldLabel: Zi.LAN.VAECODE, //, - name: 'VAECODE' - }, { - fieldLabel: Zi.LAN.FECCODE, //'收货人税号', - name: 'FECCODE' - }] + fieldLabel: Zi.LAN.ERNCODE, //'收货人国家', + name: 'ERNCODE' + }] + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [{ + fieldLabel: Zi.LAN.VAECODE, //, + name: 'VAECODE' + }, { + fieldLabel: Zi.LAN.FECCODE, //'收货人税号', + name: 'FECCODE' }] + }] }] } @@ -6297,7 +6299,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'OpSeaeShipper', proxy: { url: '/MvcShipping/MsOpSeae/GetShipperListRm' } }); - // this.MstoreShipper.load({ params: { condition: "shippertype=2 AND ISPUBLIC=1 " } }); + // this.MstoreShipper.load({ params: { condition: "shippertype=2 AND ISPUBLIC=1 " } }); //发货人 this.McomboxShipper = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.SHIPPERID, //'Shipper (发货人)', @@ -6330,7 +6332,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'OpSeaeShipper', proxy: { url: '/MvcShipping/MsOpSeae/GetShipperListRm' } }); - // this.MstoreConsignee.load({ params: { condition: "shippertype=1 AND ISPUBLIC=1 " } }); + // this.MstoreConsignee.load({ params: { condition: "shippertype=1 AND ISPUBLIC=1 " } }); // this.storeShipper.load({ params: { condition: "ISCONTROLLER='1'"} }); @@ -6370,7 +6372,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'OpSeaeShipper', proxy: { url: '/MvcShipping/MsOpSeae/GetShipperListRm' } }); - // this.Mstorenotifyparty.load({ params: { condition: "shippertype=3 AND ISPUBLIC=1 " } }); + // this.Mstorenotifyparty.load({ params: { condition: "shippertype=3 AND ISPUBLIC=1 " } }); // this.storeShipper.load({ params: { condition: "ISCONTROLLER='1'"} }); @@ -6602,7 +6604,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.MsOpSeaeEdiTemplate', proxy: { url: '/MvcShipping/MsOpSeaeEdiTemplate/GetDataListRm' } }); -// this.storeNameFa.load({ params: { condition: "TYPE = 'F'" } }); + // this.storeNameFa.load({ params: { condition: "TYPE = 'F'" } }); this.comboxNameFa = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.NAME, store: this.storeNameFa, @@ -6828,7 +6830,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.MsOpSeaeEdiTemplate', proxy: { url: '/MvcShipping/MsOpSeaeEdiTemplate/GetDataListRm' } }); -// this.storeNameShou.load({ params: { condition: "TYPE = 'S'" } }); + // this.storeNameShou.load({ params: { condition: "TYPE = 'S'" } }); this.comboxNameShou = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.NAME, store: this.storeNameShou, @@ -7069,7 +7071,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.MsOpSeaeEdiTemplate', proxy: { url: '/MvcShipping/MsOpSeaeEdiTemplate/GetDataListRm' } }); -// this.storeNameTong.load({ params: { condition: "TYPE = 'T'" } }); + // this.storeNameTong.load({ params: { condition: "TYPE = 'T'" } }); this.comboxNameTong = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.NAME, store: this.storeNameTong, @@ -7351,8 +7353,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'CDESCRIPTION', anchor: '100%' }, { - xtype: 'hiddenfield', flex: 1 - }, { xtype: 'hiddenfield', flex: 1 }] + xtype: 'hiddenfield', flex: 1 + }, { xtype: 'hiddenfield', flex: 1 }] } ] }); //end this.formEdit @@ -7424,7 +7426,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { flex: 1, frame: true, items: [ - { + { xtype: 'container', layout: 'hbox', defaultType: 'textfield', @@ -7652,34 +7654,34 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } } }, { - boxLabel: Zi.LAN.RIVER, - name: 'USERIVER', - xtype: 'checkboxfield', - inputValue: '1', - listeners: { - scope: this, - 'change': function (field, newValue, oldValue, eOpts) { - if (field.checked) { - this.panelRIVER.setVisible(true); - } - else this.panelRIVER.setVisible(false); + boxLabel: Zi.LAN.RIVER, + name: 'USERIVER', + xtype: 'checkboxfield', + inputValue: '1', + listeners: { + scope: this, + 'change': function (field, newValue, oldValue, eOpts) { + if (field.checked) { + this.panelRIVER.setVisible(true); } + else this.panelRIVER.setVisible(false); } - }, { - boxLabel: Zi.LAN.TRUCK, - name: 'USETRUCK', - xtype: 'checkboxfield', - inputValue: '1', - listeners: { - scope: this, - 'change': function (field, newValue, oldValue, eOpts) { - if (field.checked) { - this.panelTRUCK.setVisible(true); - } - else this.panelTRUCK.setVisible(false); + } + }, { + boxLabel: Zi.LAN.TRUCK, + name: 'USETRUCK', + xtype: 'checkboxfield', + inputValue: '1', + listeners: { + scope: this, + 'change': function (field, newValue, oldValue, eOpts) { + if (field.checked) { + this.panelTRUCK.setVisible(true); } + else this.panelTRUCK.setVisible(false); } - },{ xtype: 'hiddenfield' } + } + }, { xtype: 'hiddenfield' } ] }, this.panelRailWay, this.panelRIVER, this.panelTRUCK ] @@ -7690,10 +7692,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //#region 增加一个步骤进度条 - this.StepProgressLine= Ext.widget({ + this.StepProgressLine = Ext.widget({ //xtype: 'form', //autoShow: true, - height:70, + height: 70, width: 500, //items: { xtype: 'form', @@ -7743,10 +7745,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //itemSelector: 'div.step', } - - + + }); - + //#endregion @@ -7779,7 +7781,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }); this.panelMBL = new Ext.Panel({ - hidden:true, + hidden: true, title: Zi.LAN.panelMBL, //'MASTER单信息', layout: "border", region: 'center', @@ -7802,7 +7804,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }); - + this.tabSeaeWTpanel = new Ext.TabPanel({ activeTab: 0, @@ -7831,7 +7833,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { autoScroll: true, frame: false, //closable:true, - items: [ + items: [ this.panelBtn, @@ -7908,6 +7910,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QingXianBaoCunYeWu, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'请先保存业务信息后再打开其他模块！' } else { if (record.data.NAME == 'modSeaeAllFee') { + //20230221 如果没有柜号没有提单号 不允许打开费用模块 var paneltabitems = new Shipping.SeaeFee({ id: 'pnl' + record.data.NAME, layout: "border", @@ -7918,6 +7921,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { title: record.data.DESCRIPTION }); } else if (record.data.NAME == 'modSeaeAmendFee') { + var paneltabitems = new Shipping.SeaeAmendFee({ id: 'pnl' + record.data.NAME, layout: "border", @@ -8059,6 +8063,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, this); + //SERVICE9 补料 + + //#endregion //#region 直发舱单 @@ -8093,7 +8100,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { defaultType: 'textfield', items: [{ xtype: 'radiogroup', - fieldLabel:'操作类型', //'报文类型', + fieldLabel: '操作类型', //'报文类型', id: 'dsfFILETYPE', defaults: { flex: 1 @@ -8101,13 +8108,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { layout: 'hbox', items: [ { - boxLabel:'新增', //'订舱', + boxLabel: '新增', //'订舱', name: 'FILETYPE', checked: true, inputValue: 'B' //,id: 'radio1' }, { - boxLabel:'修改', //'确认', + boxLabel: '修改', //'确认', name: 'FILETYPE', inputValue: 'E' //,id: 'radio2' @@ -8120,9 +8127,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { ] } ] - },{ + }, { xtype: 'radiogroup', - fieldLabel: '船代', //'船公司', + fieldLabel: '船代', //'船公司', columns: 2, vertical: true, id: 'dCARRIER', @@ -8189,7 +8196,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { { xtype: 'textareafield', grow: true, - fieldLabel:'备注', //'EDI备注', + fieldLabel: '备注', //'EDI备注', height: 60, id: 'dREMARK', name: 'EDIREMARK', @@ -8231,7 +8238,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var REMARK = dREMARK.getValue(); var cgFILETYPE = Ext.getCmp('dsfFILETYPE'); var FILETYPE = cgFILETYPE.getValue(); - if (FILETYPE == 'D' && REMARK=='') { + if (FILETYPE == 'D' && REMARK == '') { Ext.Msg.show({ title: '提示', msg: '删除舱单,删除原因为必填', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK }); return; @@ -8957,11 +8964,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { boxLabel: Zi.LAN.FILEROLE_GX, //'更新', name: 'FILEROLE', inputValue: '5' - }, { - boxLabel: Zi.LAN.TUI_B, //'更新', - name: 'FILEROLE', - inputValue: '1' - }] + }, { + boxLabel: Zi.LAN.TUI_B, //'更新', + name: 'FILEROLE', + inputValue: '1' + }] }] }, { xtype: 'container', @@ -9038,12 +9045,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'CARRIER', inputValue: 'NDAL', checked: false - }, { - boxLabel:'OOLU', //'NDS', - name: 'CARRIER', - inputValue: 'OOLU', - checked: false - }] + }, { + boxLabel: 'OOLU', //'NDS', + name: 'CARRIER', + inputValue: 'OOLU', + checked: false + }] }] }]//end items(fieldset 1) }]//end root items @@ -9104,8 +9111,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (me.CheckNADFWIDInttr.checked) { IsNADFW = 1; } - me.doSave('0','INTTR') -// me.onSaveINTTR(FILETYPE.FILETYPE, FILEROLE.FILEROLE, IsBill, CARRIER.CARRIER, IsNADFW, Ext.getCmp('tbNADFWID').getValue().toString(), Ext.getCmp('tbNADFW').getValue().toString()); + me.doSave('0', 'INTTR') + // me.onSaveINTTR(FILETYPE.FILETYPE, FILEROLE.FILEROLE, IsBill, CARRIER.CARRIER, IsNADFW, Ext.getCmp('tbNADFWID').getValue().toString(), Ext.getCmp('tbNADFW').getValue().toString()); } }, { text: Zi.LAN.GuanBi, //"关闭", @@ -10096,41 +10103,41 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { boxLabel: Zi.LAN.FILETYPE_E, //'确认', name: 'FILETYPE', inputValue: 'E' - }, { - boxLabel: Zi.LAN.FILETYPE_VGM, //'VGM', - name: 'FILETYPE', - inputValue: 'V' - //,id: 'radio3' - } + }, { + boxLabel: Zi.LAN.FILETYPE_VGM, //'VGM', + name: 'FILETYPE', + inputValue: 'V' + //,id: 'radio3' + } ] }] }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [this.CheckBillCargoSmartEDI, { - fieldLabel: '销售代码', //'发票号', - id: 'CargoSmartSALEID', - name: 'SALEID' - }] - }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [this.CheckNADFWIDCargoSmart, { - //fieldLabel: '货代代码', - labelWidth: 70, - allowBlank: false, - id: 'cgtbNADFWID', - name: 'tbNADFWID' - }, { - fieldLabel: Zi.LAN.tbNADFW, //'货代称呼', - labelWidth: 70, - allowBlank: false, - id: 'cgtbNADFW', - name: 'tbNADFW' - }] - }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [this.CheckBillCargoSmartEDI, { + fieldLabel: '销售代码', //'发票号', + id: 'CargoSmartSALEID', + name: 'SALEID' + }] + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [this.CheckNADFWIDCargoSmart, { + //fieldLabel: '货代代码', + labelWidth: 70, + allowBlank: false, + id: 'cgtbNADFWID', + name: 'tbNADFWID' + }, { + fieldLabel: Zi.LAN.tbNADFW, //'货代称呼', + labelWidth: 70, + allowBlank: false, + id: 'cgtbNADFW', + name: 'tbNADFW' + }] + }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', @@ -10172,31 +10179,31 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { inputValue: 'COSU', checked: true }, { - boxLabel: 'CMA', //'中远COSCO', - name: 'CARRIER', - inputValue: 'CMDU', - checked: false - }, { - boxLabel: 'MSC', //'中远COSCO', - name: 'CARRIER', - inputValue: 'MSCU', - checked: false - }, { - boxLabel: 'SM LINE', //'中远COSCO', - name: 'CARRIER', - inputValue: 'SAFM', - checked: false - }, { - boxLabel: 'HMM', //'中远COSCO', - name: 'CARRIER', - inputValue: 'HDMU', - checked: false - }, { - boxLabel: 'OOCL', //'中远COSCO', - name: 'CARRIER', - inputValue: 'OOLU', - checked: false - }] + boxLabel: 'CMA', //'中远COSCO', + name: 'CARRIER', + inputValue: 'CMDU', + checked: false + }, { + boxLabel: 'MSC', //'中远COSCO', + name: 'CARRIER', + inputValue: 'MSCU', + checked: false + }, { + boxLabel: 'SM LINE', //'中远COSCO', + name: 'CARRIER', + inputValue: 'SAFM', + checked: false + }, { + boxLabel: 'HMM', //'中远COSCO', + name: 'CARRIER', + inputValue: 'HDMU', + checked: false + }, { + boxLabel: 'OOCL', //'中远COSCO', + name: 'CARRIER', + inputValue: 'OOLU', + checked: false + }] }] } ]//end items(fieldset 1) @@ -10664,32 +10671,32 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { checked: false }] }] - }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [{ - xtype: 'radiogroup', - fieldLabel: 'CARRIER', //'代理地区', - columns: 2, - vertical: true, - id: 'pilCARRIER', - items: [ - { - boxLabel: 'PIL', //'CNTAO', - name: 'CARRIER', - inputValue: 'PIL', - checked: true - }, { - boxLabel: 'PILMELL', //'CNSHA', - name: 'CARRIER', - inputValue: 'PILMELL', - checked: false - } - ] - } + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [{ + xtype: 'radiogroup', + fieldLabel: 'CARRIER', //'代理地区', + columns: 2, + vertical: true, + id: 'pilCARRIER', + items: [ + { + boxLabel: 'PIL', //'CNTAO', + name: 'CARRIER', + inputValue: 'PIL', + checked: true + }, { + boxLabel: 'PILMELL', //'CNSHA', + name: 'CARRIER', + inputValue: 'PILMELL', + checked: false + } ] } + ] + } // , { // xtype: 'container', // layout: 'hbox', @@ -10717,13 +10724,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { name: 'FORWARD2' } ] - }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [this.comboxPilCode - ] - } + }, { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [this.comboxPilCode + ] + } ]//end items(fieldset 1) }//end fieldset 1 ]//end root items @@ -11228,17 +11235,17 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { boxLabel: Zi.LAN.FILETYPE_VGM, //'VGM', name: 'FILETYPE', inputValue: 'V' - }, { - boxLabel: Zi.LAN.FILETYPE_YARD, //'场站报文', - name: 'FILETYPE', - inputValue: 'Y' - }] + }, { + boxLabel: Zi.LAN.FILETYPE_YARD, //'场站报文', + name: 'FILETYPE', + inputValue: 'Y' + }] }] }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [this.CheckBillHMM, this.CheckJHYARD] + items: [this.CheckBillHMM, this.CheckJHYARD] }, { xtype: 'container', layout: 'hbox', @@ -11815,7 +11822,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, { text: Zi.LAN.YinRuEXCELCtnDetail, //"多品名", handler: function (button, event) { - _this.onImportCtnAndDetailClick(button, event,''); + _this.onImportCtnAndDetailClick(button, event, ''); } }, { text: Zi.LAN.YinRuEXCELCtnDetail + '(二)', //"多品名", @@ -12135,9 +12142,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { ] } ] - },{ + }, { xtype: 'radiogroup', - fieldLabel:'船代', //'船公司', + fieldLabel: '船代', //'船公司', columns: 2, vertical: true, id: 'dCARRIER_HBLNO', @@ -12182,21 +12189,21 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { inputValue: Zi.LAN.CARRIER_ZhenHua, //'振华', checked: false }, { - boxLabel:'中港联', //'中通', + boxLabel: '中港联', //'中通', name: 'CARRIER', - inputValue:'中港联', //'中通', + inputValue: '中港联', //'中通', checked: false }, { boxLabel: Zi.LAN.CARRIER_ZhongHai, //'中海', name: 'CARRIER', inputValue: Zi.LAN.CARRIER_ZhongHai, //'中海', checked: false - }, { - boxLabel: '东方海外', //'中海', - name: 'CARRIER', - inputValue: '东方海外', //'中海', - checked: false - }] + }, { + boxLabel: '东方海外', //'中海', + name: 'CARRIER', + inputValue: '东方海外', //'中海', + checked: false + }] }, this.CheckVessel_HBLNO, { xtype: 'textareafield', grow: true, @@ -12667,7 +12674,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.FormBigMemoShow = Ext.widget('form', { frame: true, region: 'center', - height:480, + height: 480, autoScroll: true, bodyPadding: 5, fieldDefaults: { @@ -12688,10 +12695,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { items: [ { xtype: 'textareafield', -// grow: true, + // grow: true, name: 'DSMEMO', anchor: '100%', - height:480, + height: 480, listeners: { scope: this, blur: function (field, The, eOpts) { @@ -12707,7 +12714,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }); this.winBigMemoShow = Ext.create('Ext.window.Window', { - title:"", //"集装箱明细", + title: "", //"集装箱明细", width: 750, height: 550, //plain : true, @@ -12724,7 +12731,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { bodyStyle: "padding:0 0 0 0", items: [this.FormBigMemoShow], buttons: [{ - text:'退出并保存', //"关闭", + text: '退出并保存', //"关闭", minWidth: 70, handler: function () { _this.showField.setValue(_this.FormBigMemoShow.getForm().findField('DSMEMO').getValue()); @@ -12739,7 +12746,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //#region 加载事件 InitData: function () { this.opStatus = 'add'; - + var condition = ''; _this = this; if (parentWin) { @@ -12747,7 +12754,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.opStatus = ret[0]; this.StoreList = ret[1]; this.editRecord = ret[2]; - + if (this.isfen) { this.MainEditRecord = ret[3]; this.mainWin = ret[4]; @@ -12787,9 +12794,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var checkboxSingleItem = "{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "'"; checkboxSingleItem += "}"; } else { - var checkboxSingleItem = ",{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "'"; + var checkboxSingleItem = ",{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "',listeners : { change: function(el, checked) { if (checked) { _this.ServiceChecked(\"" + memberyf.data.SERVICENAME + "\") }else{ _this.ServiceChecked(\"" + memberyf.data.SERVICENAME + "\",false)} }}"; // checkboxSingleItem += "}"; } + checkboxitems += checkboxSingleItem; }; checkboxitems += "]"; @@ -12861,8 +12869,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (this.MainEditRecord.data.BLTYPE == '合票主票') this.formHead.getForm().findField('BLTYPE').setValue('合票分票'); - else - this.formHead.getForm().findField('BLTYPE').setValue('拼箱分票'); + else + this.formHead.getForm().findField('BLTYPE').setValue('拼箱分票'); this.formHead.getForm().findField('BLTYPE').readOnly = true; this.formHead.getForm().findField('CUSTNO').setValue(''); this.formHead.getForm().findField('MBLNO').setReadOnly(false); @@ -12872,39 +12880,39 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var cbm = 0; if (this.MainEditRecord.data.BLTYPE != '合票主票') _this.storeBodyList.load({ - params: { condition: "BSNO='" + this.MainEditRecord.get('BSNO') + "'" }, - callback: function (r, options, success) { - if (success) { - if (r.length != 0) { - for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { - var memberbody = _this.storeBodyList.getAt(j); - memberbody.set("CTN_ID", NewGuid()); - memberbody.set("BSNO", "*"); - memberbody.set("PKGS", memberbody.data.PKGS.add(-memberbody.data.FENPKGS)); - memberbody.set("KGS", memberbody.data.KGS.add(-memberbody.data.FENKGS)); - memberbody.set("CBM", memberbody.data.CBM.add(-memberbody.data.FENCBM)); - memberbody.commit(); - - }; - for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { - var memberbody = _this.storeBodyList.getAt(j); - if (memberbody.data.PKGS == 0) _this.storeBodyList.remove(memberbody); - }; - _this.setAllTotal(); - var KGS = _this.formEdit.getForm().findField('KGS').getValue(); - _this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); - var CBM = _this.formEdit.getForm().findField('CBM').getValue(); - _this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); - var PKGS = _this.formEdit.getForm().findField('PKGS').getValue(); - var sKINDPKGS = _this.formEdit.getForm().findField('KINDPKGS').getValue(); - _this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); - _this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + sKINDPKGS + ' ONLY.'); + params: { condition: "BSNO='" + this.MainEditRecord.get('BSNO') + "'" }, + callback: function (r, options, success) { + if (success) { + if (r.length != 0) { + for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { + var memberbody = _this.storeBodyList.getAt(j); + memberbody.set("CTN_ID", NewGuid()); + memberbody.set("BSNO", "*"); + memberbody.set("PKGS", memberbody.data.PKGS.add(-memberbody.data.FENPKGS)); + memberbody.set("KGS", memberbody.data.KGS.add(-memberbody.data.FENKGS)); + memberbody.set("CBM", memberbody.data.CBM.add(-memberbody.data.FENCBM)); + memberbody.commit(); - } + }; + for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { + var memberbody = _this.storeBodyList.getAt(j); + if (memberbody.data.PKGS == 0) _this.storeBodyList.remove(memberbody); + }; + _this.setAllTotal(); + var KGS = _this.formEdit.getForm().findField('KGS').getValue(); + _this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); + var CBM = _this.formEdit.getForm().findField('CBM').getValue(); + _this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); + var PKGS = _this.formEdit.getForm().findField('PKGS').getValue(); + var sKINDPKGS = _this.formEdit.getForm().findField('KINDPKGS').getValue(); + _this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); + _this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + sKINDPKGS + ' ONLY.'); + + } + } } - } - }); + }); Ext.Ajax.request({ waitMsg: Zi.LAN.ZhengZaiChaXunShuJu, //'正在查询主表数据...', @@ -12955,7 +12963,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.LoadPeriod(this.opStatus); - } else { + } + else { Ext.Ajax.request({ @@ -13030,6 +13039,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.SetTOTALNO(data.NOPKGS); } + this.SetServiceCheck(data); + } else { Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); } @@ -13097,7 +13108,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, // end LoadDate - LoadCopyData: function (bsno, CopyBill,CopyFee) { + LoadCopyData: function (bsno, CopyBill, CopyFee) { Ext.Ajax.request({ waitMsg: Zi.LAN.ZhengZaiChaXunShuJu, //'正在查询主表数据...', @@ -13342,7 +13353,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var oDate1 = new Date(data.CLOSEETDDAY); var oDate2 = new Date(this.MsPeriod.FDAY); if (oDate1.getTime() >= oDate2.getTime()) - this.formEdit.getForm().findField('ETD').setMinValue(data.CLOSEETDDAY); + this.formEdit.getForm().findField('ETD').setMinValue(data.CLOSEETDDAY); } } @@ -13480,6 +13491,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //#region 保存 保存方法 Save: function (type) { // if (type=='0'||type=='1') { + + if (!this.CheckBuliao()) { + //alert(outmsg); + return; + } + if (1 == 2) { this.doSave(type); } else { @@ -13531,7 +13548,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, //end save - doSave: function (type,dofn) { + doSave: function (type, dofn) { //#region 保存 var basicForm = this.formEdit.getForm(); @@ -13628,7 +13645,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (this.accdatesameetd == 1) { var ETD = this.formEdit.getForm().findField('ETD').getRawValue(); var FEESTATUSREF = this.formHead.getForm().findField('FEESTATUSREF').getValue(); - if ((FEESTATUSREF=='锁定')||(ETD == '')) { + if ((FEESTATUSREF == '锁定') || (ETD == '')) { } else { var oDate1 = new Date(ETD); @@ -13848,7 +13865,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.formAMS.getForm().findField('CONSIGNEEATTN').setValue(this.formscn.getForm().findField('CONSIGNEEATTN').getValue()); this.formAMS.getForm().findField('CONSIGNEETEL').setValue(this.formscn.getForm().findField('CONSIGNEETEL').getValue()); this.formAMS.getForm().findField('CONSIGNEEEMAIL').setValue(this.formscn.getForm().findField('CONSIGNEEEMAIL').getValue()); - if (this.formscn.getForm().findField('CONSIGNEECOUNTRY').getValue()!='') + if (this.formscn.getForm().findField('CONSIGNEECOUNTRY').getValue() != '') this.formAMS.getForm().findField('CONSIGNEECOUNTRY').setValue(this.formscn.getForm().findField('CONSIGNEECOUNTRY').getValue()); this.formAMS.getForm().findField('NOTIFYPARTYCODE').setValue(this.formscn.getForm().findField('NOTIFYPARTYCODE').getValue()); this.formAMS.getForm().findField('NOTIFYPARTYNAME').setValue(this.formscn.getForm().findField('NOTIFYPARTYNAME').getValue()); @@ -13885,7 +13902,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.formAMS.getForm().findField('TRUCK_TRANSPORT').setValue(this.formPrepTrans.getForm().findField('TRUCK_TRANSPORT').getValue()); this.formAMS.getForm().findField('TRUCK_PORTDISCHARG').setValue(this.formPrepTrans.getForm().findField('TRUCK_PORTDISCHARG').getValue()); this.formAMS.getForm().findField('TRUCK_REMARK').setValue(this.formPrepTrans.getForm().findField('TRUCK_REMARK').getValue()); - + this.formAMS.getForm().findField('AMSNO').setDisabled(false); var data = this.formAMS.getForm().getValues(false, false, false); var data2 = this.formAMSPIL.getForm().getValues(false, false, false); @@ -14242,7 +14259,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (e.field == 'KGS' || e.field == 'TAREWEIGHT') { var KGS = e.record.data['KGS']; var TAREWEIGHT = e.record.data['TAREWEIGHT']; - var TTLWEIGHT = Add(KGS, TAREWEIGHT,4); + var TTLWEIGHT = Add(KGS, TAREWEIGHT, 4); e.record.set('TTLWEIGHT', TTLWEIGHT); //var WEIGHKGS = e.record.data['WEIGHKGS']; //if (WEIGHKGS==0||WEIGHKGS=='') @@ -14315,8 +14332,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (this.storeBodyList.getCount() > 0) { var memberbody = this.storeBodyList.getAt(this.storeBodyList.getCount() - 1); prdata = memberbody.data; -// CTNSTATUS = memberbody.data.CTNSTATUS; -// MASTERNO = memberbody.data.MASTERNO; + // CTNSTATUS = memberbody.data.CTNSTATUS; + // MASTERNO = memberbody.data.MASTERNO; } var newSerialno = this.DsGetNewNo(this.storeBodyList); @@ -14727,11 +14744,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var selectrecords = DsStoreQueryBy(this.storeVoyVeg, 'VESSEL', sVESSEL); if (selectrecords.getCount() > 0) { var selectdata = selectrecords.getAt(0).data; - if (selectdata.EDICODE!='') - this.formEdit.getForm().findField('VESSELID').setValue(selectdata.EDICODE); + if (selectdata.EDICODE != '') + this.formEdit.getForm().findField('VESSELID').setValue(selectdata.EDICODE); } else { - if (this.formEdit.getForm().findField('VESSELID').getValue()=='') - this.formEdit.getForm().findField('VESSELID').setValue(''); + if (this.formEdit.getForm().findField('VESSELID').getValue() == '') + this.formEdit.getForm().findField('VESSELID').setValue(''); } this.Save('0'); } @@ -14744,10 +14761,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (selectrecords.getCount() > 0) { var selectdata = selectrecords.getAt(0).data; if (selectdata.EDICODE != '') - this.formEdit.getForm().findField('VESSELID').setValue(selectdata.EDICODE); + this.formEdit.getForm().findField('VESSELID').setValue(selectdata.EDICODE); } else { if (this.formEdit.getForm().findField('VESSELID').getValue() == '') - this.formEdit.getForm().findField('VESSELID').setValue(''); + this.formEdit.getForm().findField('VESSELID').setValue(''); } this.Save('0'); } else this.Save('0'); @@ -14755,7 +14772,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } } else this.Save('0'); -// this.Save('0'); + // this.Save('0'); } else { if (jsonresult.Success) { Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.emptyMsg, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'没有提取的相关数据！' @@ -15256,7 +15273,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { return; }, - onImportCtnAndDetailClick: function (button, event,type) { + onImportCtnAndDetailClick: function (button, event, type) { var BSSTATUS = this.formHead.getForm().findField('BSSTATUSREF').getValue(); if (BSSTATUS == '锁定') { @@ -15375,18 +15392,18 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, setPKGSTotal: function () { var total = this.calcDetailTotal('PKGS'); - if (total!=0) - this.setHeadFieldValue('PKGS', total); + if (total != 0) + this.setHeadFieldValue('PKGS', total); }, setKGSTotal: function () { var total = this.calcDetailTotal('KGS'); if (total != 0) - this.setHeadFieldValue('KGS', total); + this.setHeadFieldValue('KGS', total); }, setCBMTotal: function () { var total = this.calcDetailTotal('CBM'); if (total != 0) - this.setHeadFieldValue('CBM', total); + this.setHeadFieldValue('CBM', total); }, calcDetailTotal: function (fieldName) { @@ -15725,7 +15742,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { //#region 直发舱单EDI - onSendDS: function (carrier, iscgvessel, remarks,filetype) { + onSendDS: function (carrier, iscgvessel, remarks, filetype) { var BSNO = this.formHead.getForm().findField('BSNO').getValue(); var BSNOStr = "'" + BSNO + "'"; var _this = this; @@ -15779,7 +15796,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { dcarrier: carrier, iscvessel: iscgvessel, remarks: remarks, - filetype:filetype + filetype: filetype }, callback: function (options, success, response) { if (success) { @@ -15889,7 +15906,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { CodeAndName: member.data.DEFVALUE }); if (member.data.FIELDNAME == 'CUSTOMERNAME') - this.storeCustCode.add(recordCustCode); + this.storeCustCode.add(recordCustCode); // if (member.data.FIELDNAME=='YARD') // this.storeYARD.add(recordCustCode); if (member.data.FIELDNAME == 'CARRIER') @@ -15950,7 +15967,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var headfield = this.formPrepTrans.getForm().findField(member.data.FIELDNAME); if (headfield != NaN && headfield != null) headfield.setValue(member.data.DEFVALUE); - + }; @@ -19231,71 +19248,71 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { return; } - Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu); - Ext.Ajax.request({ - waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu, - url: '/MvcShipping/MsOpSeae/GetyardctnList', - params: { - bs: bsno, - mblno: mblno, - yard: 'YGT', - isweb: true - }, - callback: function (options, success, response) { - if (success) { - var jsonresult = Ext.JSON.decode(response.responseText); - if (jsonresult.Success) { + Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu); + Ext.Ajax.request({ + waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu, + url: '/MvcShipping/MsOpSeae/GetyardctnList', + params: { + bs: bsno, + mblno: mblno, + yard: 'YGT', + isweb: true + }, + callback: function (options, success, response) { + if (success) { + var jsonresult = Ext.JSON.decode(response.responseText); + if (jsonresult.Success) { - var statusdata = jsonresult.data; - var boxitems = ""; + var statusdata = jsonresult.data; + var boxitems = ""; - formCustomDataShow = Ext.widget('form', { - region: 'center', - autoScroll: true, height: 460, - // border: false, - bodyPadding: 0, - html: jsonresult.data + formCustomDataShow = Ext.widget('form', { + region: 'center', + autoScroll: true, height: 460, + // border: false, + bodyPadding: 0, + html: jsonresult.data - }); + }); - me = this; - winCustomDataShow = Ext.create('Ext.window.Window', { - title: "", - // closeAction: 'hide', - width: 1100, - height: 500, - layout: 'fit', - resizable: true, - modal: true, - closeAction: 'close', - closable: true, - items: [formCustomDataShow], - buttons: [{ - text: Zi.LAN.GuanBi, //"关闭", - minWidth: 70, - handler: function () { - winCustomDataShow.close(); - } - }] - }); + me = this; + winCustomDataShow = Ext.create('Ext.window.Window', { + title: "", + // closeAction: 'hide', + width: 1100, + height: 500, + layout: 'fit', + resizable: true, + modal: true, + closeAction: 'close', + closable: true, + items: [formCustomDataShow], + buttons: [{ + text: Zi.LAN.GuanBi, //"关闭", + minWidth: 70, + handler: function () { + winCustomDataShow.close(); + } + }] + }); - winCustomDataShow.show(); + winCustomDataShow.show(); - Ext.Msg.hide(); + Ext.Msg.hide(); - } - else { - Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); - } } - }, - failure: function (response, options) { - Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); - }, - success: function (response, options) { }, - scope: this - }); //end Ext.Ajax.request + else { + Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + } + } + }, + failure: function (response, options) { + Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + }, + success: function (response, options) { }, + scope: this + }); //end Ext.Ajax.request }, //#endregion @@ -19862,7 +19879,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var recorddoc = DsStoreQueryBy(_this.StoreOpRange, 'OPID', custservice); if (recorddoc.getCount() > 0) { canedit = true; - }else + } else canedit = false; } } @@ -20771,15 +20788,15 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { _this.formHead.getForm().findField('MBLNO').setValue(resultData.MBLNO); _this.formEdit.getForm().findField('VESSEL').setValue(resultData.VESSEL); _this.formEdit.getForm().findField('VOYNO').setValue(resultData.VOYNO); - // _this.formEdit.getForm().findField('PKGS').setValue(resultData.PKGS); + // _this.formEdit.getForm().findField('PKGS').setValue(resultData.PKGS); _this.formEdit.getForm().findField('NOPKGS').setValue(resultData.NOPKGS); _this.formEdit.getForm().findField('GROSSWEIGHT').setValue(resultData.GROSSWEIGHT); -// _this.formEdit.getForm().findField('KGS').setValue(resultData.KGS); + // _this.formEdit.getForm().findField('KGS').setValue(resultData.KGS); _this.formEdit.getForm().findField('MEASUREMENT').setValue(resultData.MEASUREMENT); -// _this.formEdit.getForm().findField('CBM').setValue(resultData.CBM); + // _this.formEdit.getForm().findField('CBM').setValue(resultData.CBM); _this.formEdit.getForm().findField('BLFRT').setValue(resultData.BLFRT); _this.formEdit.getForm().findField('SERVICE').setValue(resultData.SERVICE); -// _this.formAMS.getForm().findField('NOTIFYPARTYID2').setValue(resultData.MNOTIFYPARTY); + // _this.formAMS.getForm().findField('NOTIFYPARTYID2').setValue(resultData.MNOTIFYPARTY); condition = "BSNO='" + BSNO + "'"; _this.storeBodyList.load({ params: { condition: condition } }); } @@ -21017,7 +21034,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { var sql5 = ""; var sql6 = ""; - PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6, MBLNO, '', '','', billNo); + PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6, MBLNO, '', '', '', billNo); } } else { @@ -21140,11 +21157,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } } - + var drmodify = this.storeBodyList.getModifiedRecords(); - if (panelEdit.formEdit.getForm().isDirty() == true ||panelEdit.formHead.getForm().isDirty() == true || panelEdit.formEDI.getForm().isDirty() == true || drmodify.length != 0) { + if (panelEdit.formEdit.getForm().isDirty() == true || panelEdit.formHead.getForm().isDirty() == true || panelEdit.formEDI.getForm().isDirty() == true || drmodify.length != 0) { return '业务信息'; } else return ''; @@ -21311,10 +21328,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { ' ONLY.'); } - } + } , SetKGS: function (weightkgs) { - var SS = weightkgs.replace(",",""); + var SS = weightkgs.replace(",", ""); var i = SS.indexOf("\n"); var num = 0; if (i > 0) { @@ -21352,7 +21369,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } - ,onCheckCtnApply: function () { + , onCheckCtnApply: function () { //恒成 操作模块 点击放箱号，可以跳出成本核算 /MvcContainer/MsOpCtnApply/CostEdit APPLYNO = this.formHead.getForm().findField('APPLYNO').getValue(); DsOpenMultiEditWin('/MvcContainer/MsOpCtnApply/CostEdit?opener=OPSEAI&APPLYNO=' + APPLYNO); @@ -21363,9 +21380,59 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { ShowOPUSERINFO(bsno); } - , SetCanEdit() { - //根据当前数据状态 设定按钮的状态 - + //, SetCanEdit() { + // //根据当前数据状态 设定按钮的状态 + + //} + + , ServiceChecked(SERVICENAME, checked = true) { + //alert(SERVICENAME); + //SERVICENAME=补料 签单方式和柜号改为必填 + if (SERVICENAME == "补料") { + //签单方式 + var 签单方式 = Ext.getCmp("ISSUETYPE"); + 签单方式.allowBlank = !checked; + this.BULIAO = checked; + } + } + , SetServiceCheck(data) { + //alert(data.SERVICE9); + //if (!data.SERVICE9) { + //签单方式 + var 签单方式 = Ext.getCmp("ISSUETYPE"); + 签单方式.allowBlank = !data.SERVICE9; + this.BULIAO = data.SERVICE9; + + //} + } + , CheckBuliao() { + var 补料 = Ext.getCmp("SERVICE9"); + //alert(补料.value); 返回 true + if (补料.value == true) { + return this.CheckHaveCNTRNO(); + } else { + return true; + } + } + , CheckHaveCNTRNO() { + + var _result = true; + + if (this.storeBodyList.length == 0) { + Ext.Msg.show({ title: Zi.LAN.JingGao, msg: "已补料的业务，必须有正确长度的箱号", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'已是最后一票' + return false; + } + //遍历箱信息 看看试否有箱号长度不等于11 如有则返回false； + for (var i = 0; i < this.storeBodyList.getCount(); i += 1) { + var member = this.storeBodyList.getAt(i); + var CNTRNO = member.data.CNTRNO + ""; + if (CNTRNO.length != 11) { + Ext.Msg.show({ title: Zi.LAN.JingGao, msg: "已补料的业务，必须有正确长度的箱号", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'已是最后一票' + return false; + } + } + return _result; + } }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 5ece58fa..fd1e7372 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -14448,7 +14448,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { _this = this; - _this = this; + Ext.Ajax.request({ waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu, url: '/MvcShipping/MsOp_BLISSUE/CanCheckOut', @@ -14506,7 +14506,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { _html = _html + "

"; Ext.getCmp("FDINFO").update(_html); } else { - //return; + return; } } else { return; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js index fbcbb29c..f40e1b8a 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js @@ -4200,11 +4200,18 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { var selections = this.gridList.getSelectionModel().getSelection(); var bodyList = []; + var _bsno = ""; + var _linkgid = ""; for (i = 0; i < selections.length; i += 1) { var member = selections[i]; bodyList.push(member); }; + if (bodyList.length > 0) { + _bsno = bodyList[0].data.BSNO; + _linkgid = bodyList[0].data.GID; + } + var jsonBody = ConvertRecordsToJsonAll(bodyList); if (jsonBody == '') { @@ -4223,6 +4230,13 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { //this.winQCShow.close(); //Ext.getCmp("REASON").setValue(""); this.onRefreshClick(); + + this.storeLog.load({ + params: { + condition: " (BSNO='" + _linkgid + "' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + _bsno + "'))" + } + }); + } }, failure: function (response, options) { diff --git a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs index c2292a3d..a88b6050 100644 --- a/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs +++ b/DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs @@ -248,7 +248,7 @@ namespace DSWeb.Areas.TruckMng.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } } if (headData.ORDERNO != "") { @@ -488,7 +488,7 @@ namespace DSWeb.Areas.TruckMng.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } } @@ -662,7 +662,7 @@ namespace DSWeb.Areas.TruckMng.Controllers if (_dmb.STLNAME == "") { headData.STLNAME = "现结买单"; - headData.STLDATE = headData.ETD; + headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); } } diff --git a/DSWeb/Web.config b/DSWeb/Web.config index ef570223..434c5e25 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -94,15 +94,15 @@ - + - +