From 2c3beee9d2aa4fc172bf5db1579b72e49ec80a3b Mon Sep 17 00:00:00 2001 From: dengyu Date: Fri, 6 Dec 2024 08:32:02 +0800 Subject: [PATCH] 20241206 --- .../Controllers/MsOpSeaeController.cs | 16 +- .../MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs | 236 ++++++++++-------- .../DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs | 22 +- .../DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs | 38 +-- .../Models/MsOpSeae/MsOpSeaeDjy.cs | 5 + .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js | 12 +- DSWeb/Areas/SysMng/Views/Enum/Edit.aspx | 2 +- DSWeb/Areas/SysMng/Views/Enum/Index.aspx | 2 +- .../Controllers/MsWlTruckController.cs | 11 + DSWeb/DSWeb.csproj | 67 ----- DSWeb/DSWeb.csproj.user | 4 +- DSWeb/Web.config | 20 +- 12 files changed, 215 insertions(+), 220 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 5ce382cc..79ed7bc2 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -1416,7 +1416,7 @@ namespace DSWeb.MvcShipping.Controllers //{ var djylist = new List(); djylist.Add(headData); - MsOpSeaeEdiPortDAL.SendToDJY(djylist, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(djylist, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); //} if (result.Success) { @@ -3897,7 +3897,7 @@ namespace DSWeb.MvcShipping.Controllers MsOpStatusNewDAL dal = new MsOpStatusNewDAL(); dal.UpdateMainStatus(bsnos, 4, uname); } - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; @@ -4268,7 +4268,7 @@ namespace DSWeb.MvcShipping.Controllers // result.Success = false; // result.Message = aFtpWeb.err; //} - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } else { @@ -4612,7 +4612,7 @@ namespace DSWeb.MvcShipping.Controllers } } - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } else @@ -4781,7 +4781,7 @@ namespace DSWeb.MvcShipping.Controllers } } - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } else @@ -5556,7 +5556,7 @@ namespace DSWeb.MvcShipping.Controllers } } - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } else { @@ -7074,7 +7074,7 @@ namespace DSWeb.MvcShipping.Controllers } } - MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"])); + MsOpSeaeEdiPortDAL.SendToDJY(headList, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"])); } catch @@ -13704,7 +13704,7 @@ namespace DSWeb.MvcShipping.Controllers } if (sendtype == "send") { - var _r = MsOpSeaeDAL.SendToDJY(headList, companyid); + var _r = MsOpSeaeDAL.SendToDJY(headList, companyid, Convert.ToString(Session["USERID"])); var jsonRespose1 = new JsonResponse(_r); return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose1) }; } diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index ea6d1132..5d619ff8 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -7873,7 +7873,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL } - public static DBResult SendToDJY(List headData, string companyid) + public static DBResult SendToDJY(List headData, string companyid,string USERID) { var result = new DBResult(); var DJYUPDATE = MsSysParamSetDAL.GetData("PARAMNAME='DJYUPDATE'"); @@ -7885,7 +7885,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL var DJYURL = MsSysParamSetDAL.GetData("PARAMNAME='DJYURL'"); if (!string.IsNullOrEmpty(DJYURL.PARAMVALUE)) { - var orderlist = CreateEdiDjy(headData); + var orderlist = CreateEdiDjy(headData,USERID); var strJson = JsonConvert.SerializeObject(new { COMPANY_NAME = strCompanyName, BOOKINGS = orderlist }); string rtn = WebRequestHelper.DoPost(DJYURL.PARAMVALUE + "/booking/ReceiveBookingData", strJson); } @@ -7935,115 +7935,131 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL return result; } - public static List CreateEdiDjy(List headData) - { - - var orderlist = new List(); - foreach (var bill in headData) - { - - var billams = GetAmsData("BSNO='" + bill.BSNO + "'"); - - var order = new ImportOrderViewModel(); - order.BSNO = bill.BSNO; - order.CUST_NO = bill.CUSTNO; - order.MBLNO = bill.MBLNO; - order.HBLNO = bill.HBLNO; - order.CONTRACTNO = bill.CONTRACTNO; - order.SHIPPER = bill.SHIPPER; - order.CONSIGNEE = bill.CONSIGNEE; - order.NOTIFYPARTY = bill.NOTIFYPARTY; - order.NOTIFYPARTY2 = billams.NOTIFYPARTYID2; - order.YARD = GetCustEDICode(bill.YARD, "DJY"); - - order.VESSEL = bill.VESSEL; - order.VOYNO = bill.VOYNO; - order.VoynoInner = bill.VOYNO; - order.ETD = bill.ETD; - order.CLOSINGDATE = bill.CLOSINGDATE; - order.CLOSEDOCDATE = bill.CLOSEDOCDATE; - order.ETA = bill.ETA; - order.PLACERECEIPTID = bill.PLACERECEIPTID; - order.PLACERECEIPT = bill.PLACERECEIPT; - order.PORTLOADID = bill.PORTLOADID; - order.PORTLOAD = bill.PORTLOAD; - order.PORTDISCHARGEID = bill.PORTDISCHARGEID; - order.PORTDISCHARGE = bill.PORTDISCHARGE; - order.PLACEDELIVERYID = bill.PLACEDELIVERYID; - order.PLACEDELIVERY = bill.PLACEDELIVERY; - order.DESTINATIONID = bill.DESTINATIONID; - order.DESTINATION = bill.DESTINATION; - order.NOBILL = bill.NOBILL; - // order.COPYNOBILLL = bill.COPYNOBILLL; - order.ISSUEPLACE = bill.ISSUEPLACE; - order.ISSUEPLACEID = bill.ISSUEPLACEID; - order.ISSUETYPE = bill.ISSUETYPE; - order.ISSUEDATE = bill.ISSUEDATE; - order.BLFRT = bill.BLFRT; - order.PREPARDAT = bill.PREPARDAT; - order.PAYABLEAT = bill.PAYABLEAT; - order.PREPARDAT_ID = GetPortEDICodeByEname(bill.PREPARDAT); - order.PAYABLEAT_ID = GetPortEDICodeByEname(bill.PAYABLEAT); - order.SERVICE = bill.SERVICE; - order.MARKS = bill.MARKS; - order.HSCODE = bill.HSCODE; - order.DESCRIPTION = bill.DESCRIPTION; - order.PKGS = Convert.ToInt32(bill.PKGS); - order.KINDPKGS = bill.KINDPKGS; - order.KGS = Convert.ToDecimal(bill.KGS); - order.CBM = Convert.ToDecimal(bill.CBM); - order.CARRIER = GetCustEDICode(bill.CARRIER, "DJY"); - order.CARGOID = bill.CARGOID; - order.DCLASS = bill.DCLASS; - order.DUNNO = bill.DUNNO; - order.DPAGE = bill.DPAGE; - order.DLABEL = bill.DLABEL; - order.TEMPID = bill.TEMPID; - order.TEMPSET = bill.TEMPSET; - order.REEFERF = bill.REEFERF; - order.HUMIDITY = bill.HUMIDITY; - order.ISCONTAINERSOC = bill.ISCONTAINERSOC; - order.EDIREMARK = bill.EDIREMARK; - order.REMARK = billams.SIREMARK; - order.PONO = bill.CUSTNO; - order.TOTALNO = bill.TOTALNO; - order.TEMPMIN = bill.TEMPMIN; - order.TEMPMAX = bill.TEMPMAX; - order.OP = bill.OP; - order.CUSTOMERNAME = bill.CUSTOMERNAME; - order.EMAIL = bill.MAILPROJECT; - order.FORWARDER = bill.FORWARDER; - order.SHIPAGENCY = bill.SHIPAGENCY; - order.VESSELID = bill.VESSELID; - - order.CARRIERID = GetCustEDICode(bill.CARRIER, "DJY"); - order.YARDID = GetCustEDICode(bill.YARD, "DJY"); - order.YardContract = bill.YARDATTN; - - var cntrlist = new List(); - var ctnsumlist = MsOpSeaeDAL.GetBodyList("BSNO='" + bill.BSNO + "'"); - foreach (var ctn in ctnsumlist) - { - var cntr = new OpCtnOrderEditViewModel(); - cntr.CTNALL = ctn.CTNALL; - cntr.CTNNUM = ctn.CTNNUM; - cntr.CNTRNO = ctn.CNTRNO; - cntr.SEALNO = ctn.SEALNO; - cntr.PKGS = ctn.PKGS; - cntr.KINDPKGS = ctn.KINDPKGS; - cntr.KGS = ctn.KGS; - cntr.CBM = ctn.CBM; - cntr.TAREWEIGHT = ctn.TAREWEIGHT; - cntr.WEIGHTYPE = ctn.WEIGHTYPE; - cntr.WEIGHKGS = ctn.WEIGHKGS; - cntrlist.Add(cntr); - + public static List CreateEdiDjy(List headData, string USERID) + { + + var condition = $" USERID='{USERID}' and THIRDPARTY='{"大简云用户key"}' "; + + var thirdpartyaccount = BasicDataRefDAL.GeneralSelect("sys_thidparty_account", "ACCOUNT", "ACCOUNTPSW", condition); + + var INPUTBY = ""; + if (thirdpartyaccount != null && thirdpartyaccount.Count > 0) + { + INPUTBY = thirdpartyaccount[0].GID; + } + + var orderlist = new List(); + + foreach (var bill in headData) + { + + var billams = GetAmsData("BSNO='" + bill.BSNO + "'"); + + var order = new ImportOrderViewModel(); + order.BSNO = bill.BSNO; + order.CUST_NO = bill.CUSTNO; + order.MBLNO = bill.MBLNO; + order.HBLNO = bill.HBLNO; + order.CONTRACTNO = bill.CONTRACTNO; + order.SHIPPER = bill.SHIPPER; + order.CONSIGNEE = bill.CONSIGNEE; + order.NOTIFYPARTY = bill.NOTIFYPARTY; + order.NOTIFYPARTY2 = billams.NOTIFYPARTYID2; + order.YARD = GetCustEDICode(bill.YARD, "DJY"); + + order.VESSEL = bill.VESSEL; + order.VOYNO = bill.VOYNO; + order.VoynoInner = bill.VOYNO; + order.ETD = bill.ETD; + order.CLOSINGDATE = bill.CLOSINGDATE; + order.CLOSEDOCDATE = bill.CLOSEDOCDATE; + order.ETA = bill.ETA; + order.PLACERECEIPTID = bill.PLACERECEIPTID; + order.PLACERECEIPT = bill.PLACERECEIPT; + order.PORTLOADID = bill.PORTLOADID; + order.PORTLOAD = bill.PORTLOAD; + order.PORTDISCHARGEID = bill.PORTDISCHARGEID; + order.PORTDISCHARGE = bill.PORTDISCHARGE; + order.PLACEDELIVERYID = bill.PLACEDELIVERYID; + order.PLACEDELIVERY = bill.PLACEDELIVERY; + order.DESTINATIONID = bill.DESTINATIONID; + order.DESTINATION = bill.DESTINATION; + order.NOBILL = bill.NOBILL; + // order.COPYNOBILLL = bill.COPYNOBILLL; + order.ISSUEPLACE = bill.ISSUEPLACE; + order.ISSUEPLACEID = bill.ISSUEPLACEID; + order.ISSUETYPE = bill.ISSUETYPE; + order.ISSUEDATE = bill.ISSUEDATE; + order.BLFRT = bill.BLFRT; + order.PREPARDAT = bill.PREPARDAT; + order.PAYABLEAT = bill.PAYABLEAT; + order.PREPARDAT_ID = GetPortEDICodeByEname(bill.PREPARDAT); + order.PAYABLEAT_ID = GetPortEDICodeByEname(bill.PAYABLEAT); + order.SERVICE = bill.SERVICE; + order.MARKS = bill.MARKS; + order.HSCODE = bill.HSCODE; + order.DESCRIPTION = bill.DESCRIPTION; + order.PKGS = Convert.ToInt32(bill.PKGS); + order.KINDPKGS = bill.KINDPKGS; + order.KGS = Convert.ToDecimal(bill.KGS); + order.CBM = Convert.ToDecimal(bill.CBM); + order.CARRIER = GetCustEDICode(bill.CARRIER, "DJY"); + order.CARGOID = bill.CARGOID; + order.DCLASS = bill.DCLASS; + order.DUNNO = bill.DUNNO; + order.DPAGE = bill.DPAGE; + order.DLABEL = bill.DLABEL; + order.TEMPID = bill.TEMPID; + order.TEMPSET = bill.TEMPSET; + order.REEFERF = bill.REEFERF; + order.HUMIDITY = bill.HUMIDITY; + order.ISCONTAINERSOC = bill.ISCONTAINERSOC; + order.EDIREMARK = bill.EDIREMARK; + order.REMARK = billams.SIREMARK; + order.PONO = bill.CUSTNO; + order.TOTALNO = bill.TOTALNO; + order.TEMPMIN = bill.TEMPMIN; + order.TEMPMAX = bill.TEMPMAX; + order.OP = bill.OP; + order.CUSTOMERNAME = bill.CUSTOMERNAME; + order.EMAIL = bill.MAILPROJECT; + order.FORWARDER = bill.FORWARDER; + order.SHIPAGENCY = bill.SHIPAGENCY; + order.VESSELID = bill.VESSELID; + + order.CARRIERID = GetCustEDICode(bill.CARRIER, "DJY"); + order.YARDID = GetCustEDICode(bill.YARD, "DJY"); + order.YardContract = bill.YARDATTN; + + if (!string.IsNullOrWhiteSpace(INPUTBY)) + { + order.INPUTBY = INPUTBY; + } + + var cntrlist = new List(); + var ctnsumlist = MsOpSeaeDAL.GetBodyList("BSNO='" + bill.BSNO + "'"); + foreach (var ctn in ctnsumlist) + { + var cntr = new OpCtnOrderEditViewModel(); + cntr.CTNALL = ctn.CTNALL; + cntr.CTNNUM = ctn.CTNNUM; + cntr.CNTRNO = ctn.CNTRNO; + cntr.SEALNO = ctn.SEALNO; + cntr.PKGS = ctn.PKGS; + cntr.KINDPKGS = ctn.KINDPKGS; + cntr.KGS = ctn.KGS; + cntr.CBM = ctn.CBM; + cntr.TAREWEIGHT = ctn.TAREWEIGHT; + cntr.WEIGHTYPE = ctn.WEIGHTYPE; + cntr.WEIGHKGS = ctn.WEIGHKGS; + cntrlist.Add(cntr); + + } + order.CtrnList = cntrlist; + orderlist.Add(order); + } + return orderlist; } - order.CtrnList = cntrlist; - orderlist.Add(order); - } - return orderlist; - } #endregion diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 7bd6be93..9da68724 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -45453,7 +45453,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL #region 上传大简云 - public static DBResult SendToDJY(List headData, string companyid) + public static DBResult SendToDJY(List headData, string companyid,string USERID) { var result = new DBResult(); var DJYUPDATE = MsSysParamSetDAL.GetData("PARAMNAME='DJYUPDATE'"); @@ -45465,7 +45465,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL var DJYURL = MsSysParamSetDAL.GetData("PARAMNAME='DJYURL'"); if (!string.IsNullOrEmpty(DJYURL.PARAMVALUE)) { - var orderlist = CreateEdiDjy(headData); + var orderlist = CreateEdiDjy(headData, USERID); var strJson = JsonConvert.SerializeObject(new { COMPANY_NAME = strCompanyName, BOOKINGS = orderlist }); //BasicDataRefDAL.SaveLog("url="+ DJYURL.PARAMVALUE + "/booking/ReceiveBookingData "+strJson,"","发送大简云","发送"); @@ -45534,8 +45534,19 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL return SendToDJYDel(headList, companyid); } - public static List CreateEdiDjy(List headData) + public static List CreateEdiDjy(List headData,string USERID) { + //20241205 根据第三方账号当中的大简云gid来填充录入人 + + var condition = $" USERID='{USERID}' and THIRDPARTY='{"大简云用户key"}' "; + + var thirdpartyaccount = BasicDataRefDAL.GeneralSelect("sys_thidparty_account", "ACCOUNT", "ACCOUNTPSW", condition); + + var INPUTBY = ""; + if (thirdpartyaccount != null && thirdpartyaccount.Count > 0) + { + INPUTBY = thirdpartyaccount[0].GID; + } var orderlist = new List(); foreach (var bill in headData) @@ -45619,6 +45630,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL order.YARDID = GetCustEDICode(bill.YARD, "DJY"); order.YardContract = bill.YARDATTN; + if (!string.IsNullOrWhiteSpace(INPUTBY)) + { + order.INPUTBY = INPUTBY; + } + var cntrlist = new List(); var ctnsumlist = MsOpSeaeDAL.MsOpSeaeDAL.GetBodyList("BSNO='" + bill.BSNO + "'"); foreach (var ctn in ctnsumlist) diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs index add0c63f..bba7b2ff 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs @@ -37,7 +37,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE { #region 提单列表 - static public List GetDataList ( string strCondition,int start,int limit,out int recordcount, string sort="",string USERID="" ) + static public List GetDataList(string strCondition, int start, int limit, out int recordcount, string sort = "", string USERID = "") { //合同信息/商品信息 var strSql = new StringBuilder(); strSql.Append(" select ob.GID,B.BSNO,B.mblno BLNO,B.HBLNO "); @@ -48,7 +48,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE strSql.Append(" ,ob.REMARK,ob.DELFLAG,ob.EXPRESSCORP,ob.EXPRESSNO,ob.ISADD,dbo.trimdate(ob.PUTSINGLETIME) PUTSINGLETIME "); strSql.Append(" ,ob.PUTSINGLE,ob.PAYTIME,ob.PAYRMB,ob.PAYUSD,sp.SPREMARK SPREMARK,sp.ISCHAOQI,sp.MNGBLSTATUS "); strSql.Append(" ,CASE WHEN(select COUNT(*) from v_op_seae_iscargo where CUSTOMERNAME=B.CUSTOMERNAME and BSNO<>B.BSNO)>0 THEN '有' ELSE '无' END CUSTCARGOAFTER "); -// strSql.Append(" ,CASE WHEN isnull(bf.CUSTOMERNAME,'')='' THEN '无' ELSE '有' END CUSTCARGOAFTER "); + // strSql.Append(" ,CASE WHEN isnull(bf.CUSTOMERNAME,'')='' THEN '无' ELSE '有' END CUSTCARGOAFTER "); strSql.Append(" ,B.BLTYPE,B.CUSTNO,B.customername,B.sale "); strSql.Append(" ,(select top 1 acctype from info_client_accdate where LINKGID=(select top 1 gid from info_client where SHORTNAME=B.customername) "); strSql.Append(" and BGNDATE<=B.ETD and ENDDATE>B.ETD and (isnull(SALE,'')='' or SALE=B.SALE)) acctype "); @@ -68,16 +68,16 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE strSql.Append(" from v_op_blissue_bill B "); strSql.Append(" left join op_blissue ob on ob.BSNO=B.BSNO "); strSql.Append(" left join v_op_gain_sum_ttl g on g.BSNO=B.BSNO "); -// strSql.Append(" left join v_op_seae_iscargo bf on (bf.CUSTOMERNAME=B.CUSTOMERNAME and bf.BSNO<>B.BSNO) "); + // strSql.Append(" left join v_op_seae_iscargo bf on (bf.CUSTOMERNAME=B.CUSTOMERNAME and bf.BSNO<>B.BSNO) "); strSql.Append(" left join v_op_blissuelist_Detail sp on sp.BSNO=B.BSNO "); strSql.Append(" left join op_seae ose on ose.BSNO = b.BSNO "); - + //2018年2月8日15:57:08 鼎世 李进举 提单管理不显示iscancel=1，2的数据 strSql.Append(" where (B.OPTYPE='主票' and B.iscancel<>1 and B.iscancel<>2 and B.MBLNO<>'' or (B.OPTYPE='分票' and B.HBLNO<>'') )"); var sortstring = DatasetSort.Getsortstring(sort); - + PagedQuaryParam pp = new PagedQuaryParam(); @@ -117,10 +117,10 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE return SetData(result); } - static public DBResult GetDataListStr(string strCondition, string sort,string USERID) + static public DBResult GetDataListStr(string strCondition, string sort, string USERID) { - var result = new DBResult(); - + var result = new DBResult(); + //合同信息/商品信息 var strSql = new StringBuilder(); strSql.Append(" select ob.GID,B.BSNO,B.mblno BLNO,B.HBLNO "); @@ -161,12 +161,12 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE } var rangestr = ""; - + rangestr = BasicDataRefDAL.GetRangeCondition(BasicDataRefDAL.RangeType.Visable, "OpBLISSUEList", USERID, "B.CORPID", new string[] { "OP", "CUSTSERVICE", "SALE" }); if (!string.IsNullOrEmpty(strCondition) && !string.IsNullOrWhiteSpace(rangestr)) { - strSql.Append(" and " + rangestr); + strSql.Append(" and " + rangestr); } var sortstring = DatasetSort.Getsortstring(sort); @@ -183,6 +183,8 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE result.Message = strCondition; return result; } + + static public MsOp_BLISSUEmb GetData ( string condition,string USERID ) { var recordcount = 0; @@ -1110,7 +1112,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE } #region - public static DBResult GGTD(List _List,string status, string USERID, string username) //签入 + public static DBResult GGTD(List _List, string status, string USERID, string username) //签入 { //var WorkFlowName = "MsOp_BLISSUE_IN"; Database db = DatabaseFactory.CreateDatabase(); @@ -1127,7 +1129,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE { - var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS='"+ status + "' where GID=@GID "); + var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS='" + status + "' where GID=@GID "); cmdupdate.Parameters.Clear(); db.AddInParameter(cmdupdate, "@GID", DbType.String, _bill.GID); @@ -1135,22 +1137,22 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE var log = new WorkLogmb(); log.BSNO = _bill.GID; - log.ACTNAME = "'"+status+"'"; + log.ACTNAME = "'" + status + "'"; SaveLog(log, USERID); - var cmdupdate2 = db.GetSqlStringCommand(" update op_seae set BLISSUESTATUS='"+ status + "' where BSNO=@BSNO " - + " update op_seae_billmanage set BLISSUESTATUS='"+ status + "' where AS_ID=@BSNO3 " - + " update op_seai set BLISSUESTATUS='"+ status + "' where BSNO=@BSNO2 "); + var cmdupdate2 = db.GetSqlStringCommand(" update op_seae set BLISSUESTATUS='" + status + "' where BSNO=@BSNO " + + " update op_seae_billmanage set BLISSUESTATUS='" + status + "' where AS_ID=@BSNO3 " + + " update op_seai set BLISSUESTATUS='" + status + "' where BSNO=@BSNO2 "); cmdupdate2.Parameters.Clear(); db.AddInParameter(cmdupdate2, "@BSNO", DbType.String, _bill.BSNO); db.AddInParameter(cmdupdate2, "@BSNO2", DbType.String, _bill.BSNO); db.AddInParameter(cmdupdate2, "@BSNO3", DbType.String, _bill.BSNO); db.ExecuteNonQuery(cmdupdate2, tran); - var blUpSQL = db.GetSqlStringCommand("insert into Op_SeaCover(CID,BSNO,COVERTITLE,COVERCONTEXT,OPERATOR,OPTIME,ISSYS) values(NEWID(),'" + _bill.BSNO + "','"+ status + "','"+ status + "','" + username + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1')"); + var blUpSQL = db.GetSqlStringCommand("insert into Op_SeaCover(CID,BSNO,COVERTITLE,COVERCONTEXT,OPERATOR,OPTIME,ISSYS) values(NEWID(),'" + _bill.BSNO + "','" + status + "','" + status + "','" + username + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1')"); db.ExecuteNonQuery(blUpSQL, tran); - var blUpSQL2 = db.GetSqlStringCommand("insert into op_status(ST_ID,BSNO,STATUS,ISCOMP,COMPTIME,INPUTTIME,STTYPE,COMPOP) values(NEWID(),'" + _bill.BSNO + "','"+ status + "',1,'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1','" + username + "')"); + var blUpSQL2 = db.GetSqlStringCommand("insert into op_status(ST_ID,BSNO,STATUS,ISCOMP,COMPTIME,INPUTTIME,STTYPE,COMPOP) values(NEWID(),'" + _bill.BSNO + "','" + status + "',1,'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1','" + username + "')"); db.ExecuteNonQuery(blUpSQL2, tran); } diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDjy.cs b/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDjy.cs index bd62f51b..c59f99f5 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDjy.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDjy.cs @@ -154,6 +154,11 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeDjy public string YardContract { get; set; } public string DangerType { get; set; } + /// + /// 20241205 增加录入人字段 + /// 允许传此账号在大简云的showname或者codename + /// + public string INPUTBY { get; set; } public string OP { get; set; } public string DOC { get; set; } public string SALE { get; set; } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index f39c1cfe..e506914b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -14887,7 +14887,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 } }, - onsetCtnClick: function (type,fieldname) { + onsetCtnClick: function (type, fieldname) { var BSSTATUS = this.formHead.getForm().findField('BSSTATUSREF').getValue(); if (BSSTATUS == '锁定') { @@ -14902,7 +14902,9 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 if (selectedRecords.length == 0) { Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'请先选择要操作的业务!!' return; - } else { + } + + else { var rec = selectedRecords[0].data; for (i = 0; i < this.storeBodyList.getCount(); i += 1) { @@ -14919,7 +14921,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 memberyf.set("KGS", KGS); - + var TAREWEIGHT = memberyf.get('TAREWEIGHT'); if (!TAREWEIGHT) TAREWEIGHT = 0; var TTLWEIGHT = Add(KGS, TAREWEIGHT, 4); @@ -14930,7 +14932,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 if (fieldname == "CBM") { memberyf.set("CBM", rec.CBM); } - + }; @@ -14968,6 +14970,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 } }; + } + } }, diff --git a/DSWeb/Areas/SysMng/Views/Enum/Edit.aspx b/DSWeb/Areas/SysMng/Views/Enum/Edit.aspx index 2971a29b..9a463ca4 100644 --- a/DSWeb/Areas/SysMng/Views/Enum/Edit.aspx +++ b/DSWeb/Areas/SysMng/Views/Enum/Edit.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Areas/TruckMng/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Areas/MvcShipping/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> diff --git a/DSWeb/Areas/SysMng/Views/Enum/Index.aspx b/DSWeb/Areas/SysMng/Views/Enum/Index.aspx index 06316501..f9624301 100644 --- a/DSWeb/Areas/SysMng/Views/Enum/Index.aspx +++ b/DSWeb/Areas/SysMng/Views/Enum/Index.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Areas/TruckMng/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Areas/MvcShipping/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> diff --git a/DSWeb/Areas/TruckMng/Controllers/MsWlTruckController.cs b/DSWeb/Areas/TruckMng/Controllers/MsWlTruckController.cs index 6752499b..de071e67 100644 --- a/DSWeb/Areas/TruckMng/Controllers/MsWlTruckController.cs +++ b/DSWeb/Areas/TruckMng/Controllers/MsWlTruckController.cs @@ -15,6 +15,7 @@ using System.Web; using System.IO; using System.Globalization; using System.Web.Script.Serialization; +using DSWeb.Areas.CommMng.DAL; namespace DSWeb.Areas.TruckMng.Controllers { @@ -197,6 +198,16 @@ namespace DSWeb.Areas.TruckMng.Controllers return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + string name = Request.Files[0].FileName; + string ext = Path.GetExtension(name).ToLower(); + string[] allowExt = new string[] { ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".pdf" }; + if (!allowExt.Contains(ext)) + { + var result = new DBResult(); + result.SetErrorInfo("不允许上传此类文件"); + return BasicDataRefDAL.GetContentResult(result); + } + var imgFile = Request.Files["file"]; var truckNo = Request.Form["TruckNo"].ToString().Trim(); var Cert_Type = Request.Form["Cert_Type"].ToString().Trim(); diff --git a/DSWeb/DSWeb.csproj b/DSWeb/DSWeb.csproj index 3942642c..21fad3cd 100644 --- a/DSWeb/DSWeb.csproj +++ b/DSWeb/DSWeb.csproj @@ -7327,51 +7327,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14685,27 +14640,6 @@ Designer - - - - - - - - - - - - - - - - - - - - - @@ -14729,7 +14663,6 @@ - diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index b93622d6..99c7c0d3 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -2,9 +2,9 @@ ShowAllFiles - D:\DONGSHENG7\DS7HHYT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml + D:\DS7_QDHHYT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml true - Release|Any CPU + Debug|Any CPU diff --git a/DSWeb/Web.config b/DSWeb/Web.config index b838f8c6..c47cc186 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -93,17 +93,25 @@ --> - - + - --> + + + + + - +