Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

DSWeb.Common/DB/DS6Comm.cs

@@ -132,7 +132,7 @@ namespace DSWeb.Common.DB
         public string 移动电话 { get; set; }
         public string 传真 { get; set; }
         public string 邮箱 { get; set; }
-        public string 出生日期 { get; set; }
+        public DateTime? 出生日期 { get; set; }
         public string 家庭电话 { get; set; }
         public string 家庭住址 { get; set; }
         public string 备注 { get; set; }

JobPingTaiWork/Job_WLXX.cs

@@ -83,7 +83,9 @@ namespace JobPingTaiWork
 
                 sqlQuery += string.Format(" where isnull(HBLNO,'')='' and {0}>='{1}' and {2}<'{3}' ", queryfield, startdate, queryfield, enddate);
 
-                sqlQuery += " and not exists (select 1 from op_seae_edi_status where mfno=op_seae_edi.mfno and statustext= '接受申报' ) and dbo.getblno(mfno) not in(select mblno from wlxx_mblno) and isnull(ISdelete,0)=0 order by " + queryfield;
+                sqlQuery += " and not exists (select 1 from op_seae_edi_status where mfno=op_seae_edi.mfno and statustext= '接受申报' ) and dbo.getblno(mfno) not in(select mblno from wlxx_mblno) and isnull(ISdelete,0)=0" +
+                    " and getdate()> DATEADD(minute,10, SENDTIME) " +
+                    " order by " + queryfield;
 
                 var MBLNOList = DoWork.GetMBLNOList(connStr, sqlQuery);
 
@@ -200,7 +202,9 @@ namespace JobPingTaiWork
                     log.Debug($"请求数据：{reqObj}");
                     rtn = WebRequestHelper.DoPost(reqUrl, reqObj.ToString(Newtonsoft.Json.Formatting.None), reqTimeout * 1000);
                     log.Debug($"返回数据：{rtn}");
-                    
+
+                    //rtn = @"{""code"": 200, ""data"": [{""ChuKouBaoGuan"": """", ""FangXingShiJian"": """", ""FangXingZhuangTai"": ""未放行"", ""HuoWuZhuangTai"": ""进、出口货物"", ""ISFenDan"": false, ""JianShu"": ""670"", ""MBLNO"": ""227073853"", ""ShenBaoXiangShu"": ""1"", ""YARDNAME"": ""HLW_CD"", ""YuPeiJieGuo"": ""接受申报"", ""YuPeiShiJian"": ""2023/5/10 11:36:19"", ""YunDiJieGuo"": ""未申报"", ""YunDiShiJian"": """", ""ZhongLiang"": ""7259.30"", ""ZhuangZaiJieGuo"": ""未申报"", ""ZhuangZaiShiJian"": """", ""ZuDanInfo"": ""227073853"", ""vessel"": ""GERNER MAERSK"", ""voyage"": ""320N""}], ""msg"": ""ok"", ""request"": ""POST /v1/real/query""}";
+
                     try
                     {
                         var PortResult = Newtonsoft.Json.JsonConvert.DeserializeObject<RepWLXXModel>(rtn);

JobPingTaiWork/JsonResponse.cs

@@ -491,7 +491,7 @@ namespace JobPingTaiWork
         {
             edistatus.SetValue("gid", System.Guid.NewGuid().ToString());
 
-            var str = string.Format(" insert into op_seae_edi_status values(newid(),'{0}','{1}','{2}','{3}',getdate(),'{4}') ", edistatus.GetValue("mfno"), edistatus.GetValue("mblno"), edistatus.GetValue("statustext"), edistatus.GetValue("statustime"), edistatus.GetValue("ShenBaoXiangShu"));
+            var str = string.Format(" insert into op_seae_edi_status (gid,mfno,mblno,statustext,statustime,createtime,ShenBaoXiangShu) values(newid(),'{0}','{1}','{2}','{3}',getdate(),'{4}') ", edistatus.GetValue("mfno"), edistatus.GetValue("mblno"), edistatus.GetValue("statustext"), edistatus.GetValue("statustime"), edistatus.GetValue("ShenBaoXiangShu"));
 
             var _r = DoWork.ExecSql(connstr,str);