diff --git a/DSWeb.DJYMQ/DS7Service.cs b/DSWeb.DJYMQ/DS7Service.cs index 2efeac2e..ce38ef7d 100644 --- a/DSWeb.DJYMQ/DS7Service.cs +++ b/DSWeb.DJYMQ/DS7Service.cs @@ -159,8 +159,7 @@ namespace DSWeb.Service.Output.DS7 #region 测试文本 /* 测试时前面增加两个注释号 - var testjson = @"[{""Id"":438548467748934,""BSNO"":null,""BSSTATUS"":null,""BSSTATUSNAME"":""已收到BC"",""BSDATE"":""2023-07-13T00:00:00"",""MBLNO"":""140301248130"",""HBLNO"":"""",""BOOKINGNO"":""438548467748933"",""CONTRACTNO"":"""",""SERVICECONTRACTNO"":null,""SHIPPERID"":null,""CONSIGNEEID"":null,""NOTIFYPARTYID"":null,""SHIPPER"":""JINXIANG HONGSHENG TRADING CO.,LTD.\nCUIKOU VILLAGE,YUSHAN STREET,JINXIANG COUNTY,\nJINING CITY,SHANDONG PROVINCE CHINA"",""CONSIGNEE"":""BOBO VEGETABLES&FRUIT TRADING L.L.C\nSHOP-03, BUILDING NO.9 VEGETABLE \nAND FRUIT MARKET \nAL AWEER DUBAI U.A.E\n(TEL:+971555375678\nEMAIL:781480062@QQ.COM NO SHOW)\n\n\n"",""NOTIFYPARTY"":""BOBO VEGETABLES&FRUIT TRADING L.L.C\nSHOP-03, BUILDING NO.9 VEGETABLE \nAND FRUIT MARKET \nAL AWEER DUBAI U.A.E\n(TEL:+971555375678\nEMAIL:781480062@QQ.COM NO SHOW)\n\n"",""NOTIFYPARTY2"":"""",""YARDID"":""CHANGRONG"",""YARD"":""长荣场站"",""VESSELID"":null,""VESSEL"":""CMA CGM SYMI"",""VOYNO"":""0MD8LW"",""VOYNOINNER"":""0MD8LW1MA"",""ETD"":""2023-07-20T00:00:00"",""ATD"":null,""CLOSINGDATE"":null,""CLOSEDOCDATE"":null,""CLOSEVGMDATE"":null,""ETA"":null,""PLACERECEIPTID"":"""",""PLACERECEIPT"":"""",""PORTLOADID"":""CNTAO"",""PORTLOAD"":""QINGDAO,CHINA"",""PORTDISCHARGEID"":""AEJEA"",""PORTDISCHARGE"":""JEBEL ALI"",""PLACEDELIVERYID"":"""",""PLACEDELIVERY"":"""",""DESTINATIONID"":""AEJEA"",""DESTINATION"":""JEBEL ALI"",""NOBILL"":"""",""COPYNOBILL"":"""",""ISSUETYPE"":"""",""ISSUEDATE"":null,""ISSUEPLACEID"":"""",""ISSUEPLACE"":""QINGDAO,CHINA"",""BLFRT"":""FREIGHT PREPAID"",""PREPARDAT"":""QINGDAO,CHINA"",""PAYABLEAT"":"""",""SERVICE"":"""",""MARKS"":"""",""HSCODE"":"""",""DESCRIPTION"":""FRESH GARLIC\nTEMP:-3'C\nVENT:15CBM/H\nHS:07032000"",""PKGS"":0,""KINDPKGS"":"""",""KGS"":0.00000,""CBM"":0.0000,""TOTALNO"":"""",""CNTRTOTAL"":""40'RH*1"",""CARRIERID"":""EMC"",""CARRIER"":""长荣海运"",""CARGOID"":""R"",""DCLASS"":"""",""DUNNO"":"""",""DPAGE"":"""",""DLABEL"":"""",""LINKMAN"":"""",""TEMPID"":"""",""TEMPSET"":"""",""REEFERF"":"""",""HUMIDITY"":"""",""TEMPMIN"":"""",""TEMPMAX"":"""",""ISCONTAINERSOC"":false,""SOREMARK"":""CMA CGM SYMI 0MD8LW1MA"",""SIREMARK"":"""",""YARDREMARK"":"""",""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"":"""",""OPID"":""356029266374725"",""DOCID"":""356029265051717"",""OP"":""王亚萍"",""DOC"":""秦璐"",""SALEID"":""386903403057221"",""SALE"":""姜中正"",""CUSTSERVICEID"":"""",""CUSTSERVICE"":"""",""CUSTOMERNAME"":""金乡泓盛"",""FORWARDER"":""青岛怡升昌"",""SHIPAGENCY"":"""",""CUSTOMSER"":"""",""TRUCKER"":"""",""AGENTID"":"""",""CUSTOMERID"":411597103960133,""FORWARDERID"":""QDYSCGYLGL"",""SHIPAGENCYID"":"""",""CUSTOMSERID"":"""",""TRUCKERID"":"""",""AGENTNAME"":"""",""WEITUO"":"""",""CONSIGNEEDOORADDR"":null,""SHIPPERDOORADDR"":null,""SCACCODE"":"""",""ITNCODE"":"""",""PREPARDATID"":""CNTAO"",""PAYABLEATID"":"""",""CUSTNO"":""0720-AMA-01"",""TRANSPORTID"":"""",""TRANSPORT"":"""",""THIRDPAYADDR"":"""",""YARDCONTRACT"":"""",""YARDCONTRACTTEL"":"""",""YARDCONTRACTEMAIL"":"""",""FEESELF"":false,""LANECODE"":"""",""LANENAME"":""AMA"",""FREIGHTPAYER"":"""",""GOODSCODE"":"""",""GOODSNAME"":"""",""PKGSTOTAL"":"""",""KGSTOTAL"":"""",""CBMTOTAL"":"""",""ROUTEID"":"""",""ROUTE"":"""",""Warehouse"":"""",""WarehouseID"":"""",""EPCode"":"""",""LineName"":""波斯湾"",""DZRemark"":"" 单20"",""CZRemark"":""1 蒜"",""TMBLNO"":null,""ShippingMethod"":null,""CtnDayNum"":null,""CreatedUserName"":""王亚萍"",""ZhanCangFlag"":""否"",""SourceCode"":null,""SourceName"":null,""YgtETD"":""2023-07-20T08:00:00"",""StartETA"":""2023-07-19T02:00:00"",""StartATA"":null,""MiddleETA"":null,""MiddleETD"":null,""MiddleATA"":null,""MiddleATD"":null,""ATA"":null,""ShenQingXiangShi"":null,""ForeignAgent"":null,""VERSION"":""21367795-1c5d-4700-b02d-53d2552fe091"",""ThirdPay"":null,""ThirdPayCode"":null,""ctnInputs"":[{""Id"":438548467802181,""BILLID"":438548467748934,""CTNCODE"":""4"",""CTNALL"":""40'RH"",""CTNNUM"":1,""TEU"":null,""CNTRNO"":""1"",""SEALNO"":""1"",""PKGS"":null,""KINDPKGS"":"""",""KGS"":null,""CBM"":null,""TAREWEIGHT"":null,""CTNSTATUS"":null,""WEIGHTYPE"":""累加"",""WEIGHKGS"":null,""WEIGHATTN"":null,""VGMCONNCOM"":null,""WEIGHTEL"":null,""WEIGHDATE"":"""",""VGMADDR"":null,""VGMEMAIL"":null,""REMARK"":null,""ctnDetailInputs"":[]},{""Id"":438548467802192,""BILLID"":438548467748934,""CTNCODE"":""4"",""CTNALL"":""40'RH"",""CTNNUM"":1,""TEU"":null,""CNTRNO"":""2"",""SEALNO"":""2"",""PKGS"":null,""KINDPKGS"":"""",""KGS"":null,""CBM"":null,""TAREWEIGHT"":null,""CTNSTATUS"":null,""WEIGHTYPE"":""累加"",""WEIGHKGS"":null,""WEIGHATTN"":null,""VGMCONNCOM"":null,""WEIGHTEL"":null,""WEIGHDATE"":"""",""VGMADDR"":null,""VGMEMAIL"":null,""REMARK"":null,""ctnDetailInputs"":[]}],""BookingEDIExt"":{""WeiTuoFang"":"""",""SendCode"":"""",""ReceiveCode"":"""",""NotifyCdoe"":"""",""SalerCode"":""CN097 | CHARLES GAO"",""MasterBolIndicator"":""3"",""EmanifestHbl"":"""",""ConsigneeEdiCode"":"""",""ShipperEdiCode"":"""",""EDIAttn"":"""",""EDIAttnTel"":"""",""EDIAttnMail"":"""",""AMSConsignee"":"""",""AMSNotifyParty"":"""",""OpEName"":"""",""OpTel"":"""",""OpEmail"":"""",""ACIHBL"":"""",""S0CC0C"":"""",""GoodsName"":"""",""MasterBolIndicatorName"":""Not Applicable/Straight bl | 无HBL"",""SalerCodeName"":"""",""CKHI"":"""",""CNCM"":"""",""WNCM"":"""",""OrderRemark"":"""",""ExRemark1"":"""",""ExRemark2"":"""",""ExRemark3"":"""",""ExRemark4"":"""",""KingTareweight"":null,""CNPTNo"":"""",""XMCYWY"":null,""EmcNameAccount"":null},""LineManage"":null,""LineManageID"":null,""childrens"":[],""GoodsStatus"":[{""StatusName"":""已订舱"",""FinishTime"":""2023-07-13T17:41:07"",""Remark"":null,""ExtData"":null},{""StatusName"":""已收到BC"",""FinishTime"":""2023-07-14T10:01:45"",""Remark"":null,""ExtData"":null}]}] -"; + var testjson = @"[{""Id"":432815572209734,""BSNO"":null,""BSSTATUS"":null,""BSSTATUSNAME"":""已放单"",""BSDATE"":""2023-06-27T10:31:06"",""MBLNO"":""TAHT30956300"",""HBLNO"":"""",""BOOKINGNO"":""432815572209733"",""CONTRACTNO"":""PILNEAAUTAR"",""SERVICECONTRACTNO"":null,""SHIPPERID"":null,""CONSIGNEEID"":null,""NOTIFYPARTYID"":null,""SHIPPER"":""JINING OPTIMUM FRUITS & \nVEGETABLES CO.,LTD. \nROOM 301 HUAFU ON THE EAST \nOF YUMANCHENG HOTEL,HUOJU \nROAD,JINING,SHANDONG,CHINA "",""CONSIGNEE"":""OCEAN SKY ENTERPRISE LTD\nPO BOX 1988,HONIARA \nSOLOMON ISLANDS"",""NOTIFYPARTY"":""LONGO INTERNATIONAL CO., \nLIMITED\nUNIT 17, 9/F., TOWER A, NEW \nMANDARIN PLAZA,NO.14 SCIENCE \nMUSEUM ROAD, TSIMSHATSUI,*"",""NOTIFYPARTY2"":"""",""YARDID"":""DAYA"",""YARD"":""大亚场站"",""VESSELID"":null,""VESSEL"":""KOTA SABAS"",""VOYNO"":""0071W"",""VOYNOINNER"":""KSAB0071W"",""ETD"":""2023-07-04T00:00:00"",""ATD"":""2023-07-08T22:00:00"",""CLOSINGDATE"":null,""CLOSEDOCDATE"":null,""CLOSEVGMDATE"":null,""ETA"":null,""PLACERECEIPTID"":""CNTAO"",""PLACERECEIPT"":""QINGDAO,CHINA"",""PORTLOADID"":""CNTAO"",""PORTLOAD"":""QINGDAO,CHINA"",""PORTDISCHARGEID"":""SBHIR"",""PORTDISCHARGE"":""HONIARA,SOLOMON ISLANDS"",""PLACEDELIVERYID"":""SBHIR"",""PLACEDELIVERY"":""HONIARA,SOLOMON ISLANDS"",""DESTINATIONID"":""SBHIR"",""DESTINATION"":""HONIARA,SOLOMON ISLANDS"",""NOBILL"":"""",""COPYNOBILL"":"""",""ISSUETYPE"":""等通知电放"",""ISSUEDATE"":null,""ISSUEPLACEID"":""CNTAO"",""ISSUEPLACE"":""QINGDAO,CHINA"",""BLFRT"":""FREIGHT COLLECT"",""PREPARDAT"":"""",""PAYABLEAT"":""HONIARA,SOLOMON ISLANDS"",""SERVICE"":"""",""MARKS"":""N/M"",""HSCODE"":""070320"",""DESCRIPTION"":""CHINESE GARLIC\nHS CODE:070320\nTEMP;-3'C\nVENT;5CBM/H\nHUMI;CLOSE \nCARGO IS STOWED IN A REFRIGERATED \nCONTAINER SET AT THE SHIPPER'S REQUESTED \nCARRYING TEMPERATURE OF -3 DEGREES CELSIUS. \n*KOWLOON. HONG KONG \nALSO NOTIFY \nMAINFOODS INTERNATIONAL CO.,LTD LIMITED. \nUNIT 1402A 14/F THE BELGIAN BANK BLDG \nNOS 721-725 NATHAN HONGKONG "",""PKGS"":1000,""KINDPKGS"":""CARTONS"",""KGS"":11000.00000,""CBM"":20.0000,""TOTALNO"":""SAY: ONLY."",""CNTRTOTAL"":""20'RH*1"",""CARRIERID"":""PIL"",""CARRIER"":""PIL"",""CARGOID"":""R"",""DCLASS"":"""",""DUNNO"":"""",""DPAGE"":"""",""DLABEL"":"""",""LINKMAN"":"""",""TEMPID"":""C"",""TEMPSET"":""-3"",""REEFERF"":""5"",""HUMIDITY"":""65"",""TEMPMIN"":""-3"",""TEMPMAX"":""-3"",""ISCONTAINERSOC"":false,""SOREMARK"":"""",""SIREMARK"":"""",""YARDREMARK"":"""",""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"":"""",""OPID"":""356029269409861"",""DOCID"":""397867924111429"",""OP"":""李媛媛"",""DOC"":""马静怡"",""SALEID"":""386903403057221"",""SALE"":""姜中正"",""CUSTSERVICEID"":""361415851073605"",""CUSTSERVICE"":""张妍"",""CUSTOMERNAME"":""济宁大同-楷天"",""FORWARDER"":""山东领鲜"",""SHIPAGENCY"":""外代船代-大简云"",""CUSTOMSER"":"""",""TRUCKER"":"""",""AGENTID"":"""",""CUSTOMERID"":410962428182597,""FORWARDERID"":""SDLX"",""SHIPAGENCYID"":""WDCDDJY"",""CUSTOMSERID"":"""",""TRUCKERID"":"""",""AGENTNAME"":"""",""WEITUO"":"""",""CONSIGNEEDOORADDR"":null,""SHIPPERDOORADDR"":null,""SCACCODE"":"""",""ITNCODE"":"""",""PREPARDATID"":"""",""PAYABLEATID"":""SBHIR"",""CUSTNO"":"""",""TRANSPORTID"":"""",""TRANSPORT"":"""",""THIRDPAYADDR"":"""",""YARDCONTRACT"":"""",""YARDCONTRACTTEL"":"""",""YARDCONTRACTEMAIL"":"""",""FEESELF"":false,""LANECODE"":"""",""LANENAME"":"""",""FREIGHTPAYER"":"""",""GOODSCODE"":""170"",""GOODSNAME"":""FRESH PRODUCE (ONION,GARLIC,POTATO)"",""PKGSTOTAL"":"""",""KGSTOTAL"":"""",""CBMTOTAL"":"""",""ROUTEID"":"""",""ROUTE"":"""",""Warehouse"":"""",""WarehouseID"":"""",""EPCode"":"""",""LineName"":""澳新"",""DZRemark"":""V拖7"",""CZRemark"":""0 蒜 楷天 到付！ dd"",""TMBLNO"":null,""ShippingMethod"":null,""CtnDayNum"":null,""CreatedUserName"":""马静怡"",""ZhanCangFlag"":""否"",""SourceCode"":""1"",""SourceName"":""自揽货"",""YgtETD"":""2023-07-08T18:00:00"",""StartETA"":""2023-07-07T06:00:00"",""StartATA"":""2023-07-07T04:50:00"",""MiddleETA"":null,""MiddleETD"":null,""MiddleATA"":null,""MiddleATD"":null,""ATA"":null,""ShenQingXiangShi"":null,""ForeignAgent"":null,""VERSION"":""d2be1dae-7555-466c-8896-bf1497da448d"",""ThirdPay"":null,""ThirdPayCode"":null,""ctnInputs"":[{""Id"":434922056499269,""BILLID"":432815572209734,""CTNCODE"":""14"",""CTNALL"":""20'RH"",""CTNNUM"":1,""TEU"":null,""CNTRNO"":""PCIU5838850"",""SEALNO"":""CQ0339253"",""PKGS"":1000,""KINDPKGS"":""CARTONS"",""KGS"":11000.0000,""CBM"":20.0000,""TAREWEIGHT"":2960.0000,""CTNSTATUS"":null,""WEIGHTYPE"":""累加"",""WEIGHKGS"":13960.0000,""WEIGHATTN"":null,""VGMCONNCOM"":null,""WEIGHTEL"":null,""WEIGHDATE"":"""",""VGMADDR"":null,""VGMEMAIL"":null,""REMARK"":null,""ctnDetailInputs"":[]}],""BookingEDIExt"":{""WeiTuoFang"":"""",""SendCode"":"""",""ReceiveCode"":"""",""NotifyCdoe"":"""",""SalerCode"":""CN097 | CHARLES GAO"",""MasterBolIndicator"":""3"",""EmanifestHbl"":"""",""ConsigneeEdiCode"":""HIRFS230012"",""ShipperEdiCode"":""CN218868"",""EDIAttn"":"""",""EDIAttnTel"":"""",""EDIAttnMail"":"""",""AMSConsignee"":"""",""AMSNotifyParty"":"""",""OpEName"":"""",""OpTel"":"""",""OpEmail"":"""",""ACIHBL"":"""",""S0CC0C"":"""",""GoodsName"":"""",""MasterBolIndicatorName"":""Not Applicable/Straight bl | 无HBL"",""SalerCodeName"":"""",""CKHI"":"""",""CNCM"":"""",""WNCM"":"""",""OrderRemark"":""CN218868"",""ExRemark1"":"""",""ExRemark2"":"""",""ExRemark3"":"""",""ExRemark4"":"""",""KingTareweight"":null,""CNPTNo"":""CN218868"",""XMCYWY"":null,""EmcNameAccount"":null},""LineManage"":null,""LineManageID"":null,""childrens"":[],""GoodsStatus"":[{""StatusName"":""已收到BC"",""FinishTime"":""2023-06-27T10:31:06"",""Remark"":null,""ExtData"":null},{""StatusName"":""截单"",""FinishTime"":""2023-07-03T17:50:09"",""Remark"":null,""ExtData"":null},{""StatusName"":""提交VGM"",""FinishTime"":""2023-07-03T17:56:26"",""Remark"":null,""ExtData"":null},{""StatusName"":""提交舱单"",""FinishTime"":""2023-07-03T17:56:28"",""Remark"":null,""ExtData"":null},{""StatusName"":""已放单"",""FinishTime"":""2023-07-13T16:15:45"",""Remark"":null,""ExtData"":null}]}]"; byte[] byteArray = System.Text.Encoding.Default.GetBytes(testjson); var strBody = Encoding.UTF8.GetString(byteArray.ToArray()); @@ -3323,13 +3322,18 @@ SELECT @ps_BillNo as N'billno'"; DateTime now = DateTime.Now; DateTime today2 = new DateTime(now.Year, now.Month, now.Day); + var 装运方式 = "整箱"; + if (船公司.IndexOf("拼箱") >= 0) { + 装运方式 = "拼箱"; + } + var result = new t_op_seae_md { 业务编号 = bsno, 业务状态 = string.IsNullOrWhiteSpace( bsstatusname)? "接受委托": bsstatusname, 费用状态 = "录入状态", 会计期间 = etd==null? today2: etd, - 装运方式 = "整箱", + 装运方式 = 装运方式, 周次 = weeks, 录入日期 = bsdate, //bsdate new DateTime(2070, 1, 1) ? DateTime.Now: bsdate, 主提单号 = mblno, @@ -3701,26 +3705,34 @@ SELECT @ps_BillNo as N'billno'"; public string dealGoodsinfo(string goodscode, string goodsname,string description,string hscode) { var result = ""; - var d6 = new DS6DataContext(); - var 当前货名 = d6.t_code_goods.Where(x => x.货物名称 == goodsname).ToList(); - if (当前货名 == null || 当前货名.Count == 0) + + try { - if (!string.IsNullOrWhiteSpace(goodsname)) + var d6 = new DS6DataContext(); + var 当前货名 = d6.t_code_goods.Where(x => x.货物名称 == goodsname).ToList(); + if (当前货名 == null || 当前货名.Count == 0) { - var newrec = new t_code_goods_md(); - - newrec.代码 = SetLength(goodscode, 10); - newrec.货物名称 = SetLength(goodsname, 100); - result = newrec.货物名称; - newrec.货物描述 = SetLength(description, 600); - newrec.商品编码 = SetLength(hscode, 10); - d6.t_code_goods.Add(newrec); - d6.SaveChanges(); + if (!string.IsNullOrWhiteSpace(goodsname)) + { + var newrec = new t_code_goods_md(); + + newrec.代码 = SetLength(goodscode, 10); + newrec.货物名称 = SetLength(goodsname, 100); + result = newrec.货物名称; + newrec.货物描述 = SetLength(description, 600); + newrec.商品编码 = SetLength(hscode, 10); + d6.t_code_goods.Add(newrec); + d6.SaveChanges(); + } + } + else + { + result = 当前货名[0].货物名称; } } - else - { - result = 当前货名[0].货物名称; + catch (Exception e) { + var str=JsonConvert.SerializeObject(e); + logger.Error(str); } return result; } diff --git a/JobReqWebData/bin/Release/quartz_jobs.xml b/JobReqWebData/bin/Release/quartz_jobs.xml index 5c7dac81..b02b4adf 100644 --- a/JobReqWebData/bin/Release/quartz_jobs.xml +++ b/JobReqWebData/bin/Release/quartz_jobs.xml @@ -6,518 +6,6 @@ - - - JobSendRequest - SendRequest - 发送数据请求 - JobReqWebData.JobSendRequest,JobReqWebData - true - false - - - - ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - QuerySql - - select MBLNO,C.YARDCODE as YARDNAME,'' as WEBUSERNAME,'' as WEBUSERPASS FROM OP_SEAE b - left join code_yarddata_set c on (c.YARD=b.YARD) WHERE MBLNO!='' AND ETD>=GETDATE()-30 AND ETD<=GETDATE()+10 AND ISNULL(C.YARDCODE,'')!='' - and not exists (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='重箱返场') - UNION - select MBLNO,'YGT' as YARDNAME,'15163472790' as WEBUSERNAME,'19861115qq' as WEBUSERPASS FROM OP_SEAE b - WHERE MBLNO!='' AND ETD>=GETDATE()-10 AND ETD<=GETDATE()+10 AND - exists (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='空箱出场' ) - and not EXISTS (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='装船出运') - - - - - ReqUrl - http://47.104.90.170:5000/save - - - - Customer - SDBT - - - - Password - abc123 - - - - RequestTimeout - 30 - - - - - - - - TriggerSendRequest - SendRequest - 发送数据请求触发器 - JobSendRequest - SendRequest - 0 0/10 * * * ? * - - - - - - JobGetData - GetData - 获取数据 - JobReqWebData.JobGetData,JobReqWebData - true - false - - - - ReqUrl - http://47.104.90.170:5000/extract - - - - ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - Customer - SDBT - - - - Password - abc123 - - - - RequestTimeout - 60 - - - - - - - - TriggerGetData - GetData - 获取数据触发器 - JobGetData - GetData - 0 0/3 * * * ? * - - - - - - JobSendAccount - SendAccount - 获取数据 - JobReqWebData.JobSendAccount,JobReqWebData - true - false - - - - ReqUrl - http://47.104.90.170:5000/account/password - - - - Customer - SDBT - - - - Password - abc123 - - - - RequestTimeout - 30 - - - - AccountJson - - [{ - "WEBUSERNAME": "18560748070", - "WEBPASSWORD": "SDbt8888", - "YARDNAME": "YGT" - },{ - "WEBUSERNAME": "18678203935", - "WEBPASSWORD": "Qd123456", - "YARDNAME": "YGT" - },{ - "WEBUSERNAME": "13805337465", - "WEBPASSWORD": "QingDao123", - "YARDNAME": "YGT" - }] - - - - - - - - - TriggerSendAccount - SendAccount - 发送账号任务触发器 - JobSendAccount - SendAccount - 0 - 0 - - - - - - - JobXmcSend - JobXmcSend - 发送数据请求 - JobReqWebData.JobXmcSend,JobReqWebData - true - false - - - - ConnectString - Data Source=qdhaohong.dongshengsoft.net;Initial Catalog=ShippingWeb_QDHH;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - QuerySql - - select MBLNO,'XMC' as YARDNAME FROM OP_SEAE b left join code_yarddata_set c on (c.YARD=b.YARD) WHERE MBLNO<>'' AND ETD>=CONVERT(DATETIME,CONVERT(VARCHAR(10),dateadd(day,-90,GETDATE()),21)) AND ETD<CONVERT(DATETIME,CONVERT(VARCHAR(10),dateadd(day,-60,GETDATE()),21)) AND FORWARDER = '山东外运' - - - - - ReqUrl - - http://47.104.90.170:6000/xmc/savedata - - - - - custname - - QDHH - - - - custpsw - - QDHH123 - - - - - - RequestTimeout - 60 - - - - - - - - - - TriggerJobXmcSend - JobXmcSend - 发送数据请求触发器 - JobXmcSend - JobXmcSend - 0 45 17 1/1 * ? * - - - - - - - JobXmcGet - JobXmcGet - 箱满仓按提单号取费用_获取 - JobReqWebData.JobXmcGet,JobReqWebData - true - false - - - - - ConnectString - Data Source=qdhaohong.dongshengsoft.net;Initial Catalog=ShippingWeb_QDHH;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - - ReqUrl - - http://47.104.90.170:6000/xmc/extract - - - - - custname - - QDHH - - - - custpsw - - QDHH123 - - - - - - RequestTimeout - 60 - - - - - - - - - TriggerXmcGet - JobXmcGet - 箱满仓按提单号取费用_读取信息触发器 - JobXmcGet - JobXmcGet - 0 0/2 * * * ? * - - - - - - - JobSendATDRequest - SendATDRequest - 发送数据请求 - JobReqWebData.JobSendATDRequest,JobReqWebData - true - false - - - - ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - QuerySql - - select distinct VESSEL ship_name,VOYNO as voyage_number,'' as web_name,'' as web_psw FROM OP_SEAE b - WHERE MBLNO!='' AND ETD>=GETDATE()-30 AND ETD<=GETDATE()+10 - - - - - ReqUrl - http://118.190.106.151:5500/ygt/cbjh/new/extract - - - - Customer - SDBT - - - - Password - abc123 - - - - RequestTimeout - 30 - - - - - - - - TriggerSendRequest - SendATDRequest - 发送数据请求触发器 - JobSendATDRequest - SendATDRequest - 0 0/10 * * * ? * - - - - - - JobGetATDData - GetATDData - 获取数据 - JobReqWebData.JobGetATDData,JobReqWebData - true - false - - - - ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - - ReqUrl - http://118.190.106.151:5500/ygt/cbjh/new/save - - - - Customer - SDBT - - - - Password - abc123 - - - - RequestTimeout - 30 - - - - - - - - TriggerSendRequest - GetATDData - 发送数据请求触发器 - JobGetATDData - GetATDData - 0 0/10 * * * ? * - - - - - - - JobGetImpData - GetImpData - 发送数据请求 - JobReqWebData.JobGetImpData,JobReqWebData - true - false - - - - ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 - - - - QuerySql - - select MBLNO FROM OP_SEAI b - WHERE MBLNO!='' AND ETD>=GETDATE()-10 AND ETD<=GETDATE()+10 - and not EXISTS (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='海关放行') - - - - - ReqUrl - http://47.104.90.170:5000/query - - - - Customer - SDBT - - - - Password - abc123 - - - - YGTUser - SDBT - - - - YGTPsw - abc123 - - - - Yardid - YGT_ZHCW - - - - RequestTimeout - 30 - - - - SleepTime - 70 - - - - - - - - TriggerSendRequest - SendRequest - 发送数据请求触发器 - JobSendRequest - SendRequest - 0 0/10 * * * ? * - - - @@ -531,7 +19,7 @@ ConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 + Data Source=60.209.125.238,52314;Initial Catalog=shippingweb1;Persist Security Info=True;User ID=sa;Password=Ds20040201 @@ -539,21 +27,20 @@ select bl.AS_ID,bl.BSNO,b.CUSTNO,b.CONTRACTNO PONO,bl.MBLNO,bl.HBLNO,b.CUSTOMERNAME,bl.SHIPPER,bl.CONSIGNEE,bl.PORTLOAD,bl.DESTINATION ,CASE WHEN len(b.DESTINATIONID)!=5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(b.DESTINATIONID,2)) END as COUNTRY - ,b.VESSEL,b.VOYNO,bl.CNTRTOTAL,b.BLTYPE,b.[SERVICE],b.ETD,b.ATD,b.CARRIER,bl.NOPKGS,bl.DESCRIPTION,bl.GROSSWEIGHT,bl.MEASUREMENT,b.HSCODE,b.FINANCIALSTAFFFAX INSURANCEOP + ,b.VESSEL,b.VOYNO,bl.CNTRTOTAL,b.BLTYPE,b.[SERVICE],b.ETD,b.ATD,b.ETA,b.CARRIER,bl.NOPKGS,bl.DESCRIPTION,bl.GROSSWEIGHT,bl.MEASUREMENT,b.HSCODE,b.FINANCIALSTAFFFAX INSURANCEOP ,(SELECT TOP 1 COMPTIME FROM op_status WHERE [STATUS]='Approached' AND BSNO=B.BSNO) LINKCUSTTIME ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='接单' AND BSNO=B.BSNO) CREATETIME ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='出号' AND BSNO=B.BSNO) MBLNOTIME ,bl.MODIFYTIME BSDATE FROM op_seae_billmanage bl LEFT JOIN op_seae b on (b.bsno=bl.BSNO) - WHERE - bl.MODIFYTIME>=DATEADD(HOUR,-12 ,getdate()) + WebConnectString - Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201 + Data Source=127.0.0.1;Initial Catalog=EIPI_WEB;Persist Security Info=True;User ID=sa;Password=Ds20040201 @@ -564,17 +51,17 @@ - + TriggerSendRequest - SendATDRequest + SendDs7DataRequest 发送数据请求触发器 - JobSendATDRequest - SendATDRequest - 0 0/10 * * * ? * + JobDs7ToWeb + SendDs7DataRequest + 0/1 * * * * ? * - +