From 1b119eec73f599d82c8a724a11305b5e0a1ec845 Mon Sep 17 00:00:00 2001 From: dengyu Date: Wed, 25 Sep 2024 13:46:23 +0800 Subject: [PATCH] 20240925 --- .../Chfee_settlement/Chfee_SettlementDAL.cs | 13 + .../Viewsjs/MsOpApply/MsOpApplyIndex.js | 69 +++++- Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs | 232 +++++++++++++++++- Job_DSWMS_REPORT/quartz_jobs.xml | 176 ++++++++----- 4 files changed, 418 insertions(+), 72 deletions(-) diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index 8cfaad66..3a7d1fe0 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs @@ -4281,6 +4281,19 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement return result; } + public static DBResult PaySettlemetCanDo(List bodyList) + { + var result = new DBResult(); + + var cdc = new CommonDataContext(); + + + + + return result; + + } + /// /// 20231102 用于通过收费申请的审批通过 /// 自动产生收费结算 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js index 995458c1..8d274351 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js @@ -1315,7 +1315,9 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [{ + items: [ + + { fieldLabel: '编号', name: 'CustNo', enableKeyEvents: true, @@ -1326,7 +1328,9 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { } } } - }, { + } + + , { fieldLabel: '从报关日期', format: 'Y-m-d', xtype: 'datefield', @@ -1339,7 +1343,9 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { } } } - }, { + } + + , { fieldLabel: '到报关日期', format: 'Y-m-d', xtype: 'datefield', @@ -1366,7 +1372,9 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { scope: this } ] - }, { + } + + , { xtype: 'container', layout: 'hbox', defaultType: 'textfield', @@ -1446,7 +1454,48 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { scope: this } ] - } + } + + , { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [{ + labelWidth: 110, + fieldLabel: '从原产地证有效期', + xtype: 'datefield', + format: 'Y-m-d', + name: 'YCDZMDateBGN', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '..至', + xtype: 'datefield', + format: 'Y-m-d', + name: 'YCDZMDateEND', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { xtype: 'hiddenfield', flex: 1 } + , { xtype: 'hiddenfield', flex: 1 } + , { xtype: 'hiddenfield', flex: 1 } + , { xtype: 'hiddenfield', flex: 1 } + , { xtype: 'hiddenfield', flex: 1 } + , { xtype: 'hiddenfield', flex: 0.4 } + //, { xtype: 'hiddenfield',width: 70 } + ] + } ]//end items(fieldset 1) }//end fieldset 1 ]//end root items @@ -1792,7 +1841,7 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { this.panelTop = new Ext.Panel({ layout: "border", region: "north", - height: 108, + height: 125, items: [this.formSearch, this.panelBtn] }); @@ -3466,6 +3515,14 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { var accDate_Max = form.findField('PS_ACCDATEEND').getRawValue(); sql = sql + getAndConSql(sql, accDate_Max, " ACCDATE<='" + accDate_Max + "'"); + var YCDZMDateBGN = form.findField('YCDZMDateBGN').getRawValue(); + sql = sql + getAndConSql(sql, YCDZMDateBGN, " YCDZMDate>='" + YCDZMDateBGN + "'"); + + var YCDZMDateEND = form.findField('YCDZMDateEND').getRawValue(); + sql = sql + getAndConSql(sql, YCDZMDateEND, " YCDZMDate<='" + YCDZMDateEND + "'"); + + + // var opDateBgn = form.findField('OpDateBgn').getRawValue(); // sql = sql + getAndConSql(sql, opDateBgn, "OPDATE >='" + opDateBgn + "'"); diff --git a/Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs b/Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs index db71c268..9801f26a 100644 --- a/Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs +++ b/Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs @@ -17,7 +17,9 @@ using System.IO.Compression; namespace Job_DSWMS_REPORT { - + /// + /// 新仓储系统 分类监管 报文上传 + /// public class Job_DSWMS_REPORT_1 : IJob { private ILog log = LogManager.GetLogger(typeof(Job_DSWMS_REPORT_1)); @@ -45,30 +47,33 @@ namespace Job_DSWMS_REPORT //1：调用URL指定的接口 得到返回数据 取得其中的文件名 //2：从URL+文件名中取得文件，保存至指定文件夹 - + try { var filename = getFileName(); DownLoad(filename); } - catch (Exception ex) { + catch (Exception ex) + { log.Error("错误中断0:" + ex.Message); } } - public class WMSXMLResult { + public class WMSXMLResult + { bool status { get; set; } string code { get; set; } public string data { get; set; } } - private string getFileName() { + private string getFileName() + { string strBuff = ""; - var url = SERVERPORTUrl + "?USERCODE="+USERCODE+"&PWD="+ PWD; + var url = SERVERPORTUrl + "?USERCODE=" + USERCODE + "&PWD=" + PWD; var rtn = DoGet(url); @@ -108,7 +113,8 @@ namespace Job_DSWMS_REPORT responseString = GetResponseBody((HttpWebResponse)response); return responseString; } - catch (Exception e) { + catch (Exception e) + { return e.Message; } } @@ -158,7 +164,7 @@ namespace Job_DSWMS_REPORT stmMemory.Write(buffer, 0, i); } fileBytes = stmMemory.ToArray();//文件流Byte - FileStream fs = new FileStream(FilePath+"\\" + filename, FileMode.OpenOrCreate); + FileStream fs = new FileStream(FilePath + "\\" + filename, FileMode.OpenOrCreate); stmMemory.WriteTo(fs); stmMemory.Close(); fs.Close(); @@ -206,4 +212,214 @@ namespace Job_DSWMS_REPORT } + /// + /// 新仓储系统 分类监管 报文上传 + /// + public class Job_DSWMS_SaveDailyAmount : IJob + { + private ILog log = LogManager.GetLogger(typeof(Job_DSWMS_SaveDailyAmount)); + + private string USERCODE = ""; + private string PWD = ""; + private string SERVERUrl = ""; + private string SERVERPORTUrl = ""; + private string SERVERPORTUrl2 = ""; + private string FilePath = ""; + + public void Execute(IJobExecutionContext context) + { + log.Debug($"Execute开始"); + + USERCODE = context.JobDetail.JobDataMap.GetString("USERCODE"); + + PWD = context.JobDetail.JobDataMap.GetString("PWD"); + + SERVERUrl = context.JobDetail.JobDataMap.GetString("SERVERUrl"); + + //SERVERPORTUrl = context.JobDetail.JobDataMap.GetString("SERVERPORTUrl"); + + SERVERPORTUrl2 = context.JobDetail.JobDataMap.GetString("SERVERPORTUrl2"); + + //1：调用URL指定的接口 得到返回数据 取得其中的文件名 + + //2：从URL+文件名中取得文件，保存至指定文件夹 + + try + { + var _data = SetDo(); + + //DownLoad(filename); + } + catch (Exception ex) + { + log.Error("错误中断0:" + ex.Message); + } + + } + + public class WMSXMLResult + { + bool status { get; set; } + string code { get; set; } + public string data { get; set; } + + } + + private string getFileName() + { + string strBuff = ""; + + var url = SERVERPORTUrl + "?USERCODE=" + USERCODE + "&PWD=" + PWD; + + var rtn = DoGet(url); + + //"{\"status\":true,\"code\":null,\"message\":\"\",\"data\":\"Upload/FLJG/2021_07_06_YLDY_StockApply.FLJGRX\"}" + + var jsonObj = JsonConvert.DeserializeObject(rtn); + + return jsonObj.data; + } + + public static string DoPost(string url, string json, int timeout = 10000) + { + try + { + string responseString = "";//post返回的结果 + ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, err) => { return true; }; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls; + HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); + req.Method = "POST"; + req.Timeout = timeout; + req.Headers.Add("Accept-Encoding", "gzip, deflate"); + + if (!string.IsNullOrWhiteSpace(json)) + { + byte[] postBytes = Encoding.UTF8.GetBytes(json); + req.ContentType = "application/json; charset=utf-8"; + req.ContentLength = Encoding.UTF8.GetByteCount(json); + Stream stream = req.GetRequestStream(); + stream.Write(postBytes, 0, postBytes.Length); + stream.Close(); + } + else + { + req.ContentLength = 0; + } + var response = req.GetResponse(); + responseString = GetResponseBody((HttpWebResponse)response); + return responseString; + } + catch (Exception e) + { + return e.Message; + } + } + public static string DoGet(string url) + { + string responseString = "";//post返回的结果 + ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, err) => { return true; }; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls; + HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); + req.Method = "GET"; + req.ContentLength = 0; + + var response = req.GetResponse(); + Stream streamResponse = response.GetResponseStream(); + StreamReader streamRead = new StreamReader(streamResponse); + responseString = streamRead.ReadToEnd(); + response.Close(); + streamRead.Close(); + + return responseString; + } + public string DownLoad(string FileName) + { + var url = SERVERUrl + FileName; + + var fr = FileName.Split('/').ToList(); + + var fileSaveName = fr[fr.Count - 1]; + + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + request.Method = "GET"; + byte[] fileBytes; + using (WebResponse webRes = request.GetResponse()) + { + int length = (int)webRes.ContentLength; + HttpWebResponse response = webRes as HttpWebResponse; + Stream stream = response.GetResponseStream(); + var contentdisposition = response.Headers["Content-Disposition"]; + var filename = fileSaveName; + //读取到内存 + MemoryStream stmMemory = new MemoryStream(); + byte[] buffer = new byte[length]; + int i; + //将字节逐个放入到Byte中 + while ((i = stream.Read(buffer, 0, buffer.Length)) > 0) + { + stmMemory.Write(buffer, 0, i); + } + fileBytes = stmMemory.ToArray();//文件流Byte + FileStream fs = new FileStream(FilePath + "\\" + filename, FileMode.OpenOrCreate); + stmMemory.WriteTo(fs); + stmMemory.Close(); + fs.Close(); + return FilePath + filename; + } + } + + private string SetDo() + { + string strBuff = ""; + + var url = SERVERPORTUrl2 + "?USERCODE=" + USERCODE + "&PWD=" + PWD; + + var rtn = DoGet(url); + + //"{\"status\":true,\"code\":null,\"message\":\"\",\"data\":\"Upload/FLJG/2021_07_06_YLDY_StockApply.FLJGRX\"}" + + var jsonObj = JsonConvert.DeserializeObject(rtn); + + return jsonObj.data; + } + + private static string GetResponseBody(HttpWebResponse response) + { + string responseBody = string.Empty; + if (response.ContentEncoding != null && response.ContentEncoding.ToLower().Contains("gzip")) + { + using (GZipStream stream = new GZipStream(response.GetResponseStream(), CompressionMode.Decompress)) + { + using (StreamReader reader = new StreamReader(stream)) + { + responseBody = reader.ReadToEnd(); + } + } + } + else if (response.ContentEncoding != null && response.ContentEncoding.ToLower().Contains("deflate")) + { + using (DeflateStream stream = new DeflateStream( + response.GetResponseStream(), CompressionMode.Decompress)) + { + using (StreamReader reader = + new StreamReader(stream, Encoding.UTF8)) + { + responseBody = reader.ReadToEnd(); + } + } + } + else + { + using (Stream stream = response.GetResponseStream()) + { + using (StreamReader reader = new StreamReader(stream, Encoding.UTF8)) + { + responseBody = reader.ReadToEnd(); + } + } + } + return responseBody; + } + + } } diff --git a/Job_DSWMS_REPORT/quartz_jobs.xml b/Job_DSWMS_REPORT/quartz_jobs.xml index 6e5fd964..ac3e81eb 100644 --- a/Job_DSWMS_REPORT/quartz_jobs.xml +++ b/Job_DSWMS_REPORT/quartz_jobs.xml @@ -1,61 +1,121 @@  - - true - - - - - - Job_DSWMS_REPORT_1 - Job_DSWMS_REPORT_1 - DSWMS分公司定时上报库存 - Job_DSWMS_REPORT.Job_DSWMS_REPORT_1,Job_DSWMS_REPORT - true - false - - - SERVERUrl - http://123.234.180.6/:9991/ - - - SERVERPORTUrl - http://123.234.180.6/:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML - - - - USERCODE - fxq - - - - PWD - 123456 - - - - FilePath - C:\FTP - - - - - - - - - TriggerJob_DSWMS_REPORT - Job_DSWMS_REPORT_1 - 报文下载解析 - Job_DSWMS_REPORT_1 - Job_DSWMS_REPORT_1 - 1 - 3000 - - - - - - - + + true + + + + + + Job_DSWMS_REPORT_1 + Job_DSWMS_REPORT_1 + DSWMS分公司定时上报库存 + Job_DSWMS_REPORT.Job_DSWMS_REPORT_1,Job_DSWMS_REPORT + true + false + + + SERVERUrl + http://127.0.0.1:9991/ + + + SERVERPORTUrl + http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML + + + SERVERPORTUrl2 + http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/SetDailyWmsFeeCalandar + + + USERCODE + fxq + + + + PWD + 123456 + + + + FilePath + C:\FTP + + + + + + + + + TriggerJob_DSWMS_REPORT + Job_DSWMS_REPORT_1 + 报文下载解析 + Job_DSWMS_REPORT_1 + Job_DSWMS_REPORT_1 + 1 + 3000 + + + + + + Job_DSWMS_SaveDailyAmount + Job_DSWMS_SaveDailyAmount + DSWMS定时触发库存和仓储费计算 + Job_DSWMS_REPORT.Job_DSWMS_SaveDailyAmount,Job_DSWMS_REPORT + true + false + + + SERVERUrl + http://127.0.0.1:9991/ + + + SERVERPORTUrl + http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML + + + SERVERPORTUrl2 + http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/SetDailyWmsFeeCalandar + + + USERCODE + admin + + + + PWD + 123456 + + + + + + + + + + + TriggerDSWMS_SaveDailyAmount + Job_DSWMS_SaveDailyAmount + DSWMS定时触发库存和仓储费计算 + Job_DSWMS_SaveDailyAmount + Job_DSWMS_SaveDailyAmount + 0 35 0 * * ? + + + + + + \ No newline at end of file