From 5d1f3504129c176ed11b9b2987de44f6dd7454ac Mon Sep 17 00:00:00 2001 From: dengyu Date: Tue, 23 Jul 2024 10:11:51 +0800 Subject: [PATCH] 20240722 --- .../MvcShipping/Controllers/OP_SERVICEBILLController.cs | 9 ++++++++- JobAutoCreateFee/quartz_jobs.xml | 9 +++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs b/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs index df50f48f..20ce18bb 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs @@ -28,6 +28,8 @@ using System.Collections.Specialized; using Newtonsoft.Json.Linq; using System.Configuration; using AlibabaCloud.SDK.Dingtalkyida_1_0.Models; +using System.Threading; +using DSWeb.MvcShipping.DAL.MsOpSeaeDAL; @@ -449,11 +451,16 @@ namespace DSWeb.MvcShipping.Controllers //var teststr = "[{\"SyncType\":null,\"Id\":545706023460934,\"BSNO\":null,\"BSSTATUS\":null,\"BSSTATUSNAME\":\"已收到BC\",\"BSDATE\":\"2024-05-11T00:00:00\",\"MBLNO\":\"238422500\",\"HBLNO\":null,\"BOOKINGNO\":\"545706023460933\",\"CONTRACTNO\":\"\",\"SERVICECONTRACTNO\":null,\"SHIPPERID\":null,\"CONSIGNEEID\":null,\"NOTIFYPARTYID\":null,\"SHIPPER\":null,\"CONSIGNEE\":null,\"NOTIFYPARTY\":null,\"NOTIFYPARTY2\":null,\"YARDID\":\"JIEFENG\",\"YARD\":\"捷丰场站\",\"VESSELID\":null,\"VESSEL\":\"WAN HAI A12\",\"VOYNO\":\"420E\",\"VOYNOINNER\":\"420E\",\"ETD\":\"2024-05-19T00:00:00\",\"ATD\":null,\"CLOSINGDATE\":\"2024-05-17T12:00:00\",\"CLOSEDOCDATE\":null,\"CLOSEVGMDATE\":\"2024-05-17T11:00:00\",\"ETA\":\"2024-06-09T00:00:00\",\"PLACERECEIPTID\":\"CNTAO\",\"PLACERECEIPT\":\"QINGDAO\",\"PORTLOADID\":\"CNTAO\",\"PORTLOAD\":\"QINGDAO\",\"PORTDISCHARGEID\":null,\"PORTDISCHARGE\":\"MANZANILLO\",\"PLACEDELIVERYID\":null,\"PLACEDELIVERY\":\"MANZANILLO\",\"DESTINATIONID\":null,\"DESTINATION\":\"MANZANILLO\",\"NOBILL\":null,\"COPYNOBILL\":null,\"ISSUETYPE\":null,\"ISSUEDATE\":null,\"ISSUEPLACEID\":null,\"ISSUEPLACE\":null,\"BLFRT\":null,\"PREPARDAT\":null,\"PAYABLEAT\":null,\"SERVICE\":null,\"MARKS\":null,\"HSCODE\":null,\"DESCRIPTION\":null,\"PKGS\":null,\"KINDPKGS\":null,\"KGS\":null,\"CBM\":null,\"TOTALNO\":null,\"CNTRTOTAL\":\"40NOR*1\",\"CARRIERID\":\"MSK\",\"CARRIER\":\"马士基\",\"CARGOID\":null,\"DCLASS\":null,\"DUNNO\":null,\"DPAGE\":null,\"DLABEL\":null,\"LINKMAN\":null,\"TEMPID\":null,\"TEMPSET\":null,\"REEFERF\":null,\"HUMIDITY\":null,\"TEMPMIN\":null,\"TEMPMAX\":null,\"ISCONTAINERSOC\":null,\"SOREMARK\":null,\"SIREMARK\":null,\"YARDREMARK\":null,\"COMPID\":null,\"COMPNAME\":null,\"SHIPPERNAME\":null,\"SHIPPERADDR1\":null,\"SHIPPERADDR2\":null,\"SHIPPERADDR3\":null,\"SHIPPERCITY\":null,\"SHIPPERPROVINCE\":null,\"SHIPPERPOSTCODE\":null,\"SHIPPERCOUNTRY\":null,\"SHIPPERATTN\":null,\"SHIPPERTEL\":null,\"CONSIGNEENAME\":null,\"CONSIGNEEADDR1\":null,\"CONSIGNEEADDR2\":null,\"CONSIGNEEADDR3\":null,\"CONSIGNEECITY\":null,\"CONSIGNEEPROVINCE\":null,\"CONSIGNEEPOSTCODE\":null,\"CONSIGNEERCOUNTRY\":null,\"CONSIGNEEATTN\":null,\"CONSIGNEETEL\":null,\"NOTIFYPARTYNAME\":null,\"NOTIFYPARTYADDR1\":null,\"NOTIFYPARTYADDR2\":null,\"NOTIFYPARTYADDR3\":null,\"NOTIFYPARTYCITY\":null,\"NOTIFYPARTYPROVINCE\":null,\"NOTIFYPARTYPOSTCODE\":null,\"NOTIFYPARTYCOUNTRY\":null,\"NOTIFYPARTYATTN\":null,\"NOTIFYPARTYTEL\":null,\"PONO\":null,\"OPID\":\"524224711618629\",\"DOCID\":\"532340049842245\",\"OP\":\"黄妍锋\",\"DOC\":\"何雨菲\",\"SALEID\":\"524224711700549\",\"SALE\":\"郎玥\",\"CUSTSERVICEID\":\"532340049842245\",\"CUSTSERVICE\":\"何雨菲\",\"CUSTOMERNAME\":\"青岛泛达\",\"FORWARDER\":null,\"SHIPAGENCY\":null,\"CUSTOMSER\":null,\"TRUCKER\":null,\"AGENTID\":null,\"CUSTOMERID\":530585598431343,\"FORWARDERID\":null,\"SHIPAGENCYID\":null,\"CUSTOMSERID\":null,\"TRUCKERID\":null,\"AGENTNAME\":null,\"WEITUO\":null,\"CONSIGNEEDOORADDR\":null,\"SHIPPERDOORADDR\":null,\"SCACCODE\":null,\"ITNCODE\":null,\"PREPARDATID\":null,\"PAYABLEATID\":null,\"CUSTNO\":null,\"TRANSPORTID\":null,\"TRANSPORT\":\"MANZANILLO\",\"THIRDPAYADDR\":null,\"YARDCONTRACT\":null,\"YARDCONTRACTTEL\":null,\"YARDCONTRACTEMAIL\":null,\"FEESELF\":null,\"LANECODE\":null,\"LANENAME\":null,\"FREIGHTPAYER\":null,\"GOODSCODE\":null,\"GOODSNAME\":null,\"PKGSTOTAL\":null,\"KGSTOTAL\":null,\"CBMTOTAL\":null,\"ROUTEID\":\"\",\"ROUTE\":null,\"Warehouse\":null,\"WarehouseID\":null,\"EPCode\":null,\"LineName\":null,\"DZRemark\":null,\"CZRemark\":null,\"TMBLNO\":null,\"ShippingMethod\":null,\"CtnDayNum\":null,\"CreatedUserName\":\"何雨菲\",\"ZhanCangFlag\":null,\"SourceCode\":null,\"SourceName\":null,\"YgtETD\":null,\"StartETA\":null,\"StartATA\":null,\"MiddleETA\":null,\"MiddleETD\":null,\"MiddleATA\":null,\"MiddleATD\":null,\"ATA\":null,\"ShenQingXiangShi\":null,\"ForeignAgent\":null,\"VERSION\":\"aa319801-e08b-4a54-880e-ea749b7017cc\",\"ThirdPay\":null,\"ThirdPayCode\":null,\"ctnInputs\":[{\"Id\":545706023477317,\"BILLID\":545706023460934,\"CTNCODE\":\"40NOR\",\"CTNALL\":\"40NOR\",\"CTNNUM\":1,\"TEU\":0,\"CNTRNO\":\"\",\"SEALNO\":\"\",\"PKGS\":0,\"KINDPKGS\":null,\"KGS\":0.0000,\"CBM\":0.0000,\"TAREWEIGHT\":0.0000,\"CTNSTATUS\":null,\"WEIGHTYPE\":null,\"WEIGHKGS\":0.0000,\"WEIGHATTN\":null,\"VGMCONNCOM\":null,\"WEIGHTEL\":null,\"WEIGHDATE\":\"\",\"VGMADDR\":null,\"VGMEMAIL\":null,\"REMARK\":null,\"ctnDetailInputs\":[]}],\"BookingEDIExt\":{\"WeiTuoFang\":\"\",\"SendCode\":\"\",\"ReceiveCode\":\"\",\"NotifyCdoe\":\"\",\"SalerCode\":\"\",\"MasterBolIndicator\":\"\",\"EmanifestHbl\":\"\",\"ConsigneeEdiCode\":\"\",\"ShipperEdiCode\":\"\",\"EDIAttn\":\"\",\"EDIAttnTel\":\"\",\"EDIAttnMail\":\"\",\"AMSConsignee\":\"\",\"AMSNotifyParty\":\"\",\"OpEName\":\"\",\"OpTel\":\"\",\"OpEmail\":\"\",\"ACIHBL\":\"\",\"S0CC0C\":\"\",\"GoodsName\":\"\",\"MasterBolIndicatorName\":\"\",\"SalerCodeName\":\"\",\"CKHI\":\"\",\"CNCM\":\"\",\"WNCM\":\"\",\"OrderRemark\":\"\",\"ExRemark1\":\"\",\"ExRemark2\":\"\",\"ExRemark3\":\"\",\"ExRemark4\":\"\",\"KingTareweight\":null,\"CNPTNo\":null,\"XMCYWY\":null,\"EmcNameAccount\":null},\"LineManage\":null,\"LineManageID\":\"\",\"childrens\":[],\"GoodsStatus\":[{\"StatusName\":\"已收到BC\",\"FinishTime\":\"2024-05-11T11:36:53\",\"Remark\":null,\"ExtData\":null}],\"Files\":[{\"Id\":545706024718405,\"FileName\":\"DB_aabhbdbhejda0x0A1D.pdf\",\"FileType\":\"bc\",\"FilePath\":\"BookingAttach\\\\545706023460934\\\\20240511102331\\\\DB_aabhbdbhejda0x0A1D.pdf\"},{\"Id\":545706024820805,\"FileName\":\"DB_aabhbdbhejda0x0A1D_MODIFY.pdf\",\"FileType\":\"bc_notice\",\"FilePath\":\"BookingAttach\\\\bcnoticefile\\\\545706023460934\\\\20240511102331\\\\DB_aabhbdbhejda0x0A1D_MODIFY.pdf\"}],\"ExtendState\":null,\"StatusLogs\":[]}]"; - MqWorkDAL.DingCangToDS7(teststr); + //MqWorkDAL.DingCangToDS7(teststr); //SERVICEBILL_MqWorkDAL.Do_SERVICEBILLToDS7("{\"AnnexIdList\":[],\"MailFlag\":true,\"MailBillNo\":\"SDFSFSFDAS\",\"MessageType\":3,\"MessageDesc\":\"发票附件信息推送\",\"OrderId\":545335646356229,\"Mblno\":\"TEST20240510\"}"); + //测试 生成edi舱单费 + //var cdc = new CommonDataContext(); + var headList = MsOpSeaeDAL.GetDataList("MBLNO IN ('" + teststr + "')", "1BEC90E1-9780-472F-90C2-0C6390C044A4", "系统管理员", "Comcab2d43f60454327af30a131fc1d3abd"); + + MsOpSeaeEdiController. MakeFee(headList, "中远", "B", "1BEC90E1-9780-472F-90C2-0C6390C044A4"); return BasicDataRefDAL.GetContentResult(result); diff --git a/JobAutoCreateFee/quartz_jobs.xml b/JobAutoCreateFee/quartz_jobs.xml index 5c22b8fc..16cad4a2 100644 --- a/JobAutoCreateFee/quartz_jobs.xml +++ b/JobAutoCreateFee/quartz_jobs.xml @@ -18,7 +18,7 @@ ConnectString - Data Source=221.215.122.2,12456;Initial Catalog=2024_0322;Persist Security Info=True;User ID=sa;Password=Ds20040201 + Data Source=221.215.122.2,12456;Initial Catalog=Shippingweb_HHYT;Persist Security Info=True;User ID=sa;Password=Ds20040201 - 0 0/1 * * * ? + 0 0 7,12 * * ? + 0 0/1 * * * ? --> + 0 0 1 1 ? -1