1

DSWeb/Areas/Account/Models/ChFee_do_Sum/BSNOLB.cs

@@ -41,6 +41,7 @@ namespace DSWeb.Areas.Account.Models.BSNOLB
         }
 
         public string ACCDATE { get; set; }
+        public string MASTERNO { get; set; }
 
         #endregion
 

DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js

@@ -147,7 +147,8 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                 { name: 'TTLINVDR', type: 'number' },
                 { name: 'TTLDUIDR', type: 'number' },
                 { name: 'PROFITRATE', type: 'string' },
-                { name: 'BillFeeStatus', type: 'string' }
+                { name: 'BillFeeStatus', type: 'string' },
+                { name: 'SUBMITSTATUS', type: 'string' }
 
             ],
             remoteSort: true,
@@ -1042,6 +1043,11 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
             dataIndex: 'PROFITRATE',
             header: '利润率',
             width: 80
+        }, {
+            sortable: true,
+            dataIndex: 'SUBMITSTATUS',
+            header: '提交状态',
+            width: 70
         }
 
             ];
@@ -1289,6 +1295,33 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
             }
         });
 
+        this.StoreSubmit = Ext.create('Ext.data.Store', {
+            fields: ['SUBMITSTATUS']
+        });
+        this.StoreSubmit.add({ "SUBMITSTATUS": "" });
+        this.StoreSubmit.add({ "SUBMITSTATUS": "全部" });
+        this.StoreSubmit.add({ "SUBMITSTATUS": "已提交" });
+        this.StoreSubmit.add({ "SUBMITSTATUS": "未提交" });
+
+        this.comboxSubmit = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: '显示已提交',
+            store: this.StoreSubmit,
+            forceSelection: true,
+            //           flex: 0.5,
+            //labelWidth: 60,
+            name: 'SUBMITSTATUS',
+            valueField: 'SUBMITSTATUS',
+            displayField: 'SUBMITSTATUS',
+            enableKeyEvents: true,
+            listeners: {
+                keyup: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+        });
+
 
         this.StoreIsVou = Ext.create('Ext.data.Store', {
             fields: ['OpLb']
@@ -1430,7 +1463,8 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                     defaults: {
                         anchor: '100%'
                     },
-                    items: [{
+                    items: [
+                        {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
@@ -1485,7 +1519,9 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
 
                             , this.comboxOp, this.comboxBillFeeStatus, this.comboxFSTATUS
                        ]
-                    }, {
+                        }
+
+                        , {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
@@ -1517,7 +1553,9 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                             }
                         }, this.comboxOpLock, this.comboxFeeLock
                        ]
-                    }, {
+                        }
+
+                        , {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
@@ -1573,7 +1611,25 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                             }
                             }, this.comboxIsVou, this.comboxOPTYPE
                        ]
-                    }
+                        }
+
+                        , {
+                            xtype: 'container',
+                            layout: 'hbox',
+                            defaultType: 'textfield',
+                            items: [this.comboxSubmit
+                                , { xtype: "hiddenfield" }
+                                , { xtype: "hiddenfield" }
+                                , { xtype: "hiddenfield" }
+                                , { xtype: "hiddenfield" }
+                                , { xtype: "hiddenfield" }
+                                , { xtype: "hiddenfield" }
+                            ]
+                        }
+
+
+                        //comboxSubmit
+
                     ]//end items(fieldset 1)
                 }//end fieldset 1   
             ]//end root items          
@@ -1623,6 +1679,22 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                         this.onRefreshClick(button, event);
                     },
                     scope: this
+                }, {
+                    text: "业务提交",
+                    id: "btnBsLockSubmit",
+                    menu: [
+                        {
+                            text: "所选业务提交",
+                            handler: function (menu, event) {
+                                _this.onSubmitLockClick(menu,1);
+                            }
+                        }, {
+                            text: "所选业务撤回",
+                            handler: function (menu, event) {
+                                _this.onSubmitLockClick(menu,2);
+                            }
+                        }],
+                    scope: this
                 }, '-', {
                     text: "生成凭证",
                     id: "btnCreateVoucher",
@@ -1988,7 +2060,7 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
         this.panelSearch = new Ext.Panel({
             layout: "border",
             region: "north",
-            height: 96,
+            height: 122,
             items: [this.formSearch]
         });
 
@@ -3225,6 +3297,85 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
 
     },
 
+
+    onSubmitLockClick: function (menu,  type) {
+        //1 提交 2撤回
+        _this = this;
+
+        var GidStr = '';
+        var records = _this.GridCheckBoxModel.selected.items;
+        if (records.length == 0) {
+            Ext.Msg.show({ title: '提示', msg: '请先选择要提交的业务!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
+        }
+        var bodyAddDatas = [];
+        for (var i = 0; i < records.length; i++) {
+            var rec = records[i];
+            var Gid = rec.data.BSNO;
+            //var status = rec.data.BSSTATUS;
+            //if (type == 2)
+            //    status = rec.data.BSSTATUS
+            //else status = rec.data.FEESTATUS
+
+            //if (status != true) {
+            //    bodyAddDatas.push(rec);
+            //}
+            if (GidStr != "") GidStr += ",";
+
+            GidStr += "" + Gid + "";
+        }
+
+        //if (bodyAddDatas.length == 0) {
+        //    Ext.Msg.show({ title: '提示', msg: '没有要锁定的业务!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+        //    return;
+
+        //} else {
+
+            var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
+            Ext.Ajax.request({
+                waitMsg: '正在提交...',
+                url: '/Account/Chfee_lock/SubmitLock',
+                timeout: 120000,
+                params: {
+                    BSNOS: GidStr,
+                    type: type
+                },
+                callback: function (options, success, response) {
+                    if (success) {
+                        var result = Ext.JSON.decode(response.responseText);
+                        if (!result.Success) {
+                            Ext.Msg.show({
+                                title: '提示',
+                                msg: result.Message,
+                                icon: Ext.MessageBox.ERROR,
+                                buttons: Ext.Msg.OK
+                            });
+                            return;
+                        } else {
+
+                            //Ext.Msg.show({ title: '提示', msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                            MsgTip("提示", result.Message, 3000);
+                            _this.onDsQuery();
+
+                        }
+
+                    } else {
+                        Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
+                    }
+                },
+                scope: this
+            });
+        //}
+
+
+
+
+
+
+
+    },
+
+
     onCreateVoucherSel: function () {
 
         var records = _this.GridCheckBoxModel.selected.items;
@@ -3487,6 +3638,14 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
             sql = sql + getAndConSql(sql, PS_ISVOU, " ISNULL(B.ISVOU,0)=0");
 
 
+        var SUBMITSTATUS = form.findField('SUBMITSTATUS').getValue();
+        if (SUBMITSTATUS == '已提交')
+            sql = sql + getAndConSql(sql, SUBMITSTATUS, " isnull(L.PROPVALUE,'')='已提交' ");
+        else if (SUBMITSTATUS == '未提交')
+            sql = sql + getAndConSql(sql, SUBMITSTATUS, " isnull(L.PROPVALUE,'')='' ");
+
+
+
         var BillFeeStatus = form.findField('BillFeeStatus').getValue();
         sql = sql + getAndConSql(sql, BillFeeStatus, "BillFeeStatus='" + BillFeeStatus + "'");
 

DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs

@@ -8,6 +8,7 @@ using DSWeb.Areas.RptMng.Comm;
 using DSWeb.Common.DB;
 using DSWeb.Dispatch.DAL;
 using DSWeb.EntityDA;
+using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
 using DSWeb.MvcShipping.DAL.MsSysParamSet;
 using DSWeb.SoftMng.BLL;
 using DSWeb.SoftMng.Model;
@@ -2427,5 +2428,82 @@ namespace DSWeb.Areas.CommMng.Controllers
             return BasicDataRefDAL.GetContentResult(result);
         }
 
+        #region 逻辑信息值
+        public JsonResult GetLogicInfo(string BSNO, string PROPNAME)
+        {
+
+            var dic = BasicDataRefDAL.GetLogicInfo(BSNO, PROPNAME);
+            if (dic.Count == 0)
+            {
+                return Json(new { Success = false });
+            }
+            else
+            {
+                return Json(new { Success = true, Data = dic });
+            }
+        }
+
+        public JsonResult GetLogicInfoList(string BSNOListStr, string PROPNAME)
+        {
+
+            var DataList = BasicDataRefDAL.GetLogicInfoList(BSNOListStr, PROPNAME);
+            if (DataList.Count == 0)
+            {
+                return Json(new { Success = false });
+            }
+            else
+            {
+                return Json(new { Success = true, Data = DataList });
+            }
+        }
+
+
+        public JsonResult SetLogicInfo(string BSNO, string PROPNAME, string NAME, string VALUE)
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add(NAME, VALUE);
+
+            try
+            {
+                BasicDataRefDAL.SaveLogicInfo(BSNO, PROPNAME, dic);
+                return Json(new { success = true });
+            }
+            catch (Exception e)
+            {
+                return Json(new { success = false, data = e.Message });
+            }
+        }
+
+        public JsonResult SaveLogicSingleValue(string BSNO, string PROPNAME, string VALUE)
+        {
+            try
+            {
+                BasicDataRefDAL.SaveLogicSingleInfo(BSNO, PROPNAME, VALUE);
+                return Json(new { success = true });
+            }
+            catch (Exception e)
+            {
+                return Json(new { success = false, data = e.Message });
+            }
+        }
+        public JsonResult GetLogicSingleValue(string BSNO, string PROPNAME)
+        {
+            var result = BasicDataRefDAL.GetLogicSingleInfo(BSNO, PROPNAME);
+
+            return Json(new { Success = true, Data = result });
+        }
+        #endregion
+
+        public ContentResult GetUserModuleEnable(string modename)
+        {
+            var _r = MsBaseInfoDAL.GetUserModuleEnable(modename, Convert.ToString(Session["USERID"]));
+
+            var result = new DBResult();
+
+            if (_r == true) result.OK();
+            if (_r == false) result.SetErrorInfo("无此权限");
+
+            return BasicDataRefDAL.GetContentResult(result);
+        }
     }
 }

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -4965,6 +4965,7 @@ namespace DSWeb.Areas.CommMng.DAL
         }
         #endregion
 
+
         #region 逻辑信息子表操作
 
         #region 将一个dictionary转化为用;;和::隔开的文本
@@ -5023,6 +5024,17 @@ namespace DSWeb.Areas.CommMng.DAL
             return result;
         }
 
+        public static List<OP_LOGICINFO_md> GetLogicInfoList(string BSNOListStr, string PROPNAME)
+        {
+
+            Common.DB.CommonDataContext cdc = new Common.DB.CommonDataContext();
+
+            List<string> BSNOList = BSNOListStr.Split(',').ToList();
+
+            var infoList = cdc.OP_LOGICINFO.Where(x => BSNOList.Contains(x.BSNO) && x.PROPNAME == PROPNAME).ToList();
+
+            return infoList;
+        }
         public static void SaveLogicInfo(string BSNO, string PROPNAME, Dictionary<string, string> InfoDic = null)
         {
 
@@ -5052,6 +5064,42 @@ namespace DSWeb.Areas.CommMng.DAL
             }
         }
 
+        public static void SaveLogicInfo(string BSNO, string PROPNAME, string NAME, string VALUE)
+        {
+
+            var dic = new Dictionary<string, string>();
+            dic.Add(NAME, VALUE);
+            SaveLogicInfo(BSNO, PROPNAME, dic);
+        }
+
+        public static void SaveLogicSingleInfo(string BSNO, string PROPNAME, string VALUE)
+        {
+            CommonDataContext cdc = new CommonDataContext();
+
+            var result = new Dictionary<string, string>();
+
+            var infoList = cdc.OP_LOGICINFO.Where(x => x.BSNO == BSNO && x.PROPNAME == PROPNAME).ToList();
+
+            if (infoList != null && infoList.Count > 0)
+            {
+
+                var updrec = infoList[0];
+                updrec.PROPVALUE = VALUE;
+                cdc.OP_LOGICINFO.AddOrUpdate(updrec);
+                cdc.SaveChanges();
+            }
+            else
+            {
+                var newinfo = new OP_LOGICINFO_md();
+                newinfo.GID = Guid.NewGuid();
+                newinfo.BSNO = BSNO;
+                newinfo.PROPNAME = PROPNAME;
+                newinfo.PROPVALUE = VALUE;
+                cdc.OP_LOGICINFO.Add(newinfo);
+                cdc.SaveChanges();
+            }
+        }
+
         public static Dictionary<string, string> GetLogicHaveValue(string PROPNAME, string fieldname, string fieldvalue)
         {
 
@@ -5063,9 +5111,11 @@ namespace DSWeb.Areas.CommMng.DAL
 
             if (infoList != null && infoList.Count > 0)
             {
-                foreach (var item in infoList) {
+                foreach (var item in infoList)
+                {
                     var lv = StrToDic(infoList[0].PROPVALUE);
-                    if (lv[fieldname] == fieldvalue) {
+                    if (lv[fieldname] == fieldvalue)
+                    {
                         result = lv;
                         result.Add("BSNO", item.BSNO);
                         return result;
@@ -5098,8 +5148,52 @@ namespace DSWeb.Areas.CommMng.DAL
             return result;
         }
 
+        public static string GetLogicSingleInfo(string BSNO, string PROPNAME)
+        {
+
+            CommonDataContext cdc = new CommonDataContext();
+
+            var result = "";
+
+            var infoList = cdc.OP_LOGICINFO.Where(x => x.BSNO == BSNO && x.PROPNAME == PROPNAME).ToList();
+
+            if (infoList != null && infoList.Count > 0)
+            {
+                result = infoList[0].PROPVALUE;
+            }
+
+            return result;
+        }
 
-        public static void SaveLogicDicInfo(string BSNO, string PROPNAME, Dictionary<string, string> paramdic ,string savevalue)
+        /// <summary>
+        /// 某模块 的fieldname字段取value值时 ，另一个recfield字段取recvalue值
+        /// 用于存储逻辑上关联的字段的最近一次取值
+        /// 例如：op_other（陆运模块） customername='往来单位A' 时： transtype运输类型='海运进口'
+        /// </summary>
+        /// <param name="formname"></param>
+        /// <param name="fieldname"></param>
+        /// <param name="value"></param>
+        /// <param name="recvalue"></param>
+        public static void 存储模块字段值最近对应取值(string formname, string fieldname, string value, string recfield, string recvalue)
+        {
+            var dic = new Dictionary<string, string>();
+            dic.Add("fieldname", fieldname);
+            dic.Add("fieldvalue", value);
+            dic.Add("recfield", recfield);
+            //dic.Add("recvalue", recvalue);
+            SaveLogicDicInfo("模块字段值最近取值", formname, dic, recvalue);
+        }
+
+        public static string 获取模块字段值最近取值(string formname, string fieldname, string value, string recfield)
+        {
+            var dic = new Dictionary<string, string>();
+            dic.Add("fieldname", fieldname);
+            dic.Add("fieldvalue", value);
+            dic.Add("recfield", recfield);
+            return GetLogicDicValue(formname, "模块字段值最近取值", dic, "recvalue");
+        }
+
+        public static void SaveLogicDicInfo(string BSNO, string PROPNAME, Dictionary<string, string> paramdic, string savevalue)
         {
 
             CommonDataContext cdc = new CommonDataContext();
@@ -5153,7 +5247,7 @@ namespace DSWeb.Areas.CommMng.DAL
 
                 if (值匹配)
                 {
-                    
+
                 }
                 else
                 {
@@ -5175,14 +5269,14 @@ namespace DSWeb.Areas.CommMng.DAL
 
         }
 
-        public static string GetLogicDicValue(string PROPNAME, string bsno, Dictionary<string, string> paramdic,string fieldname)
+        public static string GetLogicDicValue(string PROPNAME, string bsno, Dictionary<string, string> paramdic, string fieldname)
         {
 
             CommonDataContext cdc = new CommonDataContext();
 
             var result = "";
 
-            var infoList = cdc.OP_LOGICINFO.Where(x =>x.BSNO==bsno && x.PROPNAME == PROPNAME ).ToList();
+            var infoList = cdc.OP_LOGICINFO.Where(x => x.BSNO == bsno && x.PROPNAME == PROPNAME).ToList();
 
             var resultdic = new List<Dictionary<string, string>>();
 
@@ -5193,7 +5287,8 @@ namespace DSWeb.Areas.CommMng.DAL
                     var lv = StrToDic(item.PROPVALUE);
 
                     var 值匹配 = true;
-                    foreach (var ParamDicItem in paramdic) {
+                    foreach (var ParamDicItem in paramdic)
+                    {
                         if (lv.ContainsKey(ParamDicItem.Key))
                         {
                             if (lv[ParamDicItem.Key] == ParamDicItem.Value)
@@ -5205,49 +5300,23 @@ namespace DSWeb.Areas.CommMng.DAL
                                 值匹配 = false;
                             }
                         }
-                        else {
+                        else
+                        {
                             值匹配 = false;
                         }
                     }
-                    if(值匹配)
+                    if (值匹配)
                         resultdic.Add(lv);
                 }
             }
-            if (resultdic.Count > 0) {
+            if (resultdic.Count > 0)
+            {
                 result = resultdic[0][fieldname];
             }
 
             return result;
         }
 
-
-        /// <summary>
-        /// 某模块 的fieldname字段取value值时 ，另一个recfield字段取recvalue值
-        /// 用于存储逻辑上关联的字段的最近一次取值
-        /// 例如：op_other（陆运模块） customername='往来单位A' 时： transtype运输类型='海运进口'
-        /// </summary>
-        /// <param name="formname"></param>
-        /// <param name="fieldname"></param>
-        /// <param name="value"></param>
-        /// <param name="recvalue"></param>
-        public static void 存储模块字段值最近对应取值(string formname, string fieldname, string value, string recfield, string recvalue) 
-        {
-            var dic = new Dictionary<string, string>();
-            dic.Add("fieldname", fieldname);
-            dic.Add("fieldvalue", value);
-            dic.Add("recfield", recfield);
-            //dic.Add("recvalue", recvalue);
-            SaveLogicDicInfo("模块字段值最近取值", formname, dic, recvalue);
-        }
-
-        public static string 获取模块字段值最近取值(string formname, string fieldname, string value, string recfield)
-        {
-            var dic = new Dictionary<string, string>();
-            dic.Add("fieldname", fieldname);
-            dic.Add("fieldvalue", value);
-            dic.Add("recfield", recfield);
-            return GetLogicDicValue(formname, "模块字段值最近取值",  dic, "recvalue");
-        }
         #endregion
 
         #region SaveLog

DSWeb/Areas/MvcShipping/Viewsjs/Comm/DsComm.js

@@ -1557,4 +1557,57 @@ GetRecentFormFieldValue = function (formfielditem, formname, fieldname,  value,
     });
 }
 
-//#endregion
+//#endregion
+
+
+SaveLogic = function (BSNO, PROPNAME, NAME, VALUE) {
+    Ext.Ajax.request({
+        url: '/CommMng/BasicDataRef/SetLogicInfo',
+        cors: true,
+        params: {
+            BSNO: BSNO,//值
+            PROPNAME: PROPNAME,
+            NAME: NAME,
+            VALUE: VALUE
+        },
+
+        //method: 'post',
+        success: function (response) {
+            var resultData = eval('(' + response.responseText + ')');//JSON字符串=>JSON对象
+            if (!resultData.success) {
+                //失败
+                alert(resultData);
+            }
+            else {
+                alert(resultData);
+            }
+
+        }
+    });
+}
+
+
+SaveLogicSingle = function (BSNO, PROPNAME, VALUE) {
+    Ext.Ajax.request({
+        url: '/CommMng/BasicDataRef/SaveLogicSingleValue',
+        cors: true,
+        params: {
+            BSNO: BSNO,//值
+            PROPNAME: PROPNAME,
+            VALUE: VALUE
+        },
+
+        //method: 'post',
+        success: function (response) {
+            var resultData = eval('(' + response.responseText + ')');//JSON字符串=>JSON对象
+            if (!resultData.success) {
+                //失败
+                alert(resultData);
+            }
+            else {
+                alert(resultData);
+            }
+
+        }
+    });
+}

DSWeb/Areas/RptMng/Comm/RptHelper.cs

@@ -24,7 +24,7 @@ namespace DSWeb.Areas.RptMng.Comm
             return GetRptJsonResult(0, 0, dbRptResult, tableName, false);
         }
 
-        public static string GetRptJsonResult(int start, int limit, DBDataSetResult dbRptResult, string tableName, bool page,DatasetSort datasetsort=null,string filterstr="")
+        public static string GetRptJsonResult(int start, int limit, DBDataSetResult dbRptResult, string tableName, bool page,DatasetSort datasetsort=null,string filterstr="",int totalcount=0)
         {
             var json = string.Empty;
             List<Dictionary<string, object>> jsonSetData = null;
@@ -54,14 +54,28 @@ namespace DSWeb.Areas.RptMng.Comm
                 {
                     listjson = jsonSetData.AsEnumerable();
                 }
-                
-                json = JsonConvert.Serialize(new { success = dbRptResult.Success, message = dbRptResult.Message, totalCount = jsonSetData.Count, data = listjson.ToArray() });
+
+                var _count = jsonSetData.Count;
+
+                if (totalcount > 0) {
+                    _count= totalcount;
+                }
+
+
+                json = JsonConvert.Serialize(new { success = dbRptResult.Success, message = dbRptResult.Message, totalCount = _count, data = listjson.ToArray() });
             }
             else
             {
                 jsonSetData = new List<Dictionary<string, object>>();
-                
-                json = JsonConvert.Serialize(new { success = dbRptResult.Success, message = dbRptResult.Message, totalCount = jsonSetData.Count, data = jsonSetData.ToArray() });
+
+                var _count = jsonSetData.Count;
+
+                if (totalcount > 0)
+                {
+                    _count = totalcount;
+                }
+
+                json = JsonConvert.Serialize(new { success = dbRptResult.Success, message = dbRptResult.Message, totalCount = _count, data = jsonSetData.ToArray() });
             }
 
             return json;

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
 {
@@ -200,6 +201,17 @@ namespace DSWeb.Areas.TruckMng.Controllers
             var imgFile = Request.Files["file"];
             var truckNo = Request.Form["TruckNo"].ToString().Trim();
             var Cert_Type = Request.Form["Cert_Type"].ToString().Trim();
+
+            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);
+            }
+
             String strPath = "/Areas/TruckMng/CertImages/"+truckNo+"/";
             String dirPath = System.Web.HttpContext.Current.Server.MapPath(strPath);
             if (!Directory.Exists(dirPath))

Job_DSWMS_REPORT/Job_DSWMS_REPORT_1.cs

@@ -222,9 +222,10 @@ namespace Job_DSWMS_REPORT
         private string USERCODE = "";
         private string PWD = "";
         private string SERVERUrl = "";
-        private string SERVERPORTUrl = "";
+        //private string SERVERPORTUrl = "";
         private string SERVERPORTUrl2 = "";
         private string FilePath = "";
+        private string DAYS = "-1";
 
         public void Execute(IJobExecutionContext context)
         {
@@ -240,9 +241,7 @@ namespace Job_DSWMS_REPORT
 
             SERVERPORTUrl2 = context.JobDetail.JobDataMap.GetString("SERVERPORTUrl2");
 
-            //1：调用URL指定的接口 得到返回数据 取得其中的文件名
-
-            //2：从URL+文件名中取得文件，保存至指定文件夹
+            DAYS = context.JobDetail.JobDataMap.GetString("DAYS");
 
             try
             {
@@ -265,20 +264,20 @@ namespace Job_DSWMS_REPORT
 
         }
 
-        private string getFileName()
-        {
-            string strBuff = "";
+        //private string getFileName()
+        //{
+        //    string strBuff = "";
 
-            var url = SERVERPORTUrl + "?USERCODE=" + USERCODE + "&PWD=" + PWD;
+        //    var url = SERVERPORTUrl + "?USERCODE=" + USERCODE + "&PWD=" + PWD;
 
-            var rtn = DoGet(url);
+        //    var rtn = DoGet(url);
 
-            //"{\"status\":true,\"code\":null,\"message\":\"\",\"data\":\"Upload/FLJG/2021_07_06_YLDY_StockApply.FLJGRX\"}"
+        //    //"{\"status\":true,\"code\":null,\"message\":\"\",\"data\":\"Upload/FLJG/2021_07_06_YLDY_StockApply.FLJGRX\"}"
 
-            var jsonObj = JsonConvert.DeserializeObject<WMSXMLResult>(rtn);
+        //    var jsonObj = JsonConvert.DeserializeObject<WMSXMLResult>(rtn);
 
-            return jsonObj.data;
-        }
+        //    return jsonObj.data;
+        //}
 
         public static string DoPost(string url, string json, int timeout = 10000)
         {
@@ -372,7 +371,7 @@ namespace Job_DSWMS_REPORT
         {
             string strBuff = "";
 
-            var url = SERVERPORTUrl2 + "?USERCODE=" + USERCODE + "&PWD=" + PWD;
+            var url = SERVERPORTUrl2 + "?USERCODE=" + USERCODE + "&PWD=" + PWD + "&DAYS=" + DAYS;
 
             var rtn = DoGet(url);
 

Job_DSWMS_REPORT/bin/Debug/quartz_jobs.xml

@@ -1,61 +1,124 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <job-scheduling-data xmlns="http://quartznet.sourceforge.net/JobSchedulingData">
-  <processing-directives>
-    <overwrite-existing-data>true</overwrite-existing-data>
-  </processing-directives>
-  <schedule>
-
-
-    <job>
-      <name>Job_DSWMS_REPORT_1</name>
-      <group>Job_DSWMS_REPORT_1</group>
-      <description>DSWMS分公司定时上报库存</description>
-      <job-type>Job_DSWMS_REPORT.Job_DSWMS_REPORT_1,Job_DSWMS_REPORT</job-type>
-      <durable>true</durable>
-      <recover>false</recover>
-      <job-data-map>
-        <entry>
-          <key>SERVERUrl</key>
-          <value>http://123.234.180.6/:9991/</value>
-        </entry>   
-        <entry>
-          <key>SERVERPORTUrl</key>
-          <value>http://123.234.180.6/:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML</value>
-        </entry>
-
-        <entry>
-          <key>USERCODE</key>
-          <value>fxq</value>
-        </entry>
-        
-        <entry>
-          <key>PWD</key>
-          <value>123456</value>
-        </entry>
-
-        <entry>
-          <key>FilePath</key>
-          <value>C:\FTP</value>
-        </entry>        
-        
-      </job-data-map>
-    </job>
-
-    <trigger>
-
-      <simple>
-        <name>TriggerJob_DSWMS_REPORT</name>
-        <group>Job_DSWMS_REPORT_1</group>
-        <description>报文下载解析</description>
-        <job-name>Job_DSWMS_REPORT_1</job-name>
-        <job-group>Job_DSWMS_REPORT_1</job-group>
-        <repeat-count>1</repeat-count>
-        <repeat-interval>3000</repeat-interval>
-      </simple>
-    </trigger>
-
-
-
-
-  </schedule>
+	<processing-directives>
+		<overwrite-existing-data>true</overwrite-existing-data>
+	</processing-directives>
+	<schedule>
+
+
+		<job>
+			<name>Job_DSWMS_REPORT_1</name>
+			<group>Job_DSWMS_REPORT_1</group>
+			<description>DSWMS分公司定时上报库存</description>
+			<job-type>Job_DSWMS_REPORT.Job_DSWMS_REPORT_1,Job_DSWMS_REPORT</job-type>
+			<durable>true</durable>
+			<recover>false</recover>
+			<job-data-map>
+				<entry>
+					<key>SERVERUrl</key>
+					<value>http://127.0.0.1:9991/</value>
+				</entry>
+				<entry>
+					<key>SERVERPORTUrl</key>
+					<value>http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML</value>
+				</entry>
+				<entry>
+					<key>SERVERPORTUrl2</key>
+					<value>http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/SetDailyWmsFeeCalandar</value>
+				</entry>
+				<entry>
+					<key>USERCODE</key>
+					<value>fxq</value>
+				</entry>
+
+				<entry>
+					<key>PWD</key>
+					<value>123456</value>
+				</entry>
+
+				<entry>
+					<key>FilePath</key>
+					<value>C:\FTP</value>
+				</entry>
+				<entry>
+					<key>DAYS</key>
+					<value>-1</value>
+				</entry>
+			</job-data-map>
+		</job>
+
+		<trigger>
+
+			<simple>
+				<name>TriggerJob_DSWMS_REPORT</name>
+				<group>Job_DSWMS_REPORT_1</group>
+				<description>报文下载解析</description>
+				<job-name>Job_DSWMS_REPORT_1</job-name>
+				<job-group>Job_DSWMS_REPORT_1</job-group>
+				<repeat-count>1</repeat-count>
+				<repeat-interval>3000</repeat-interval>
+			</simple>
+		</trigger>
+
+
+		<job>
+			<name>Job_DSWMS_SaveDailyAmount</name>
+			<group>Job_DSWMS_SaveDailyAmount</group>
+			<description>DSWMS定时触发库存和仓储费计算</description>
+			<job-type>Job_DSWMS_REPORT.Job_DSWMS_SaveDailyAmount,Job_DSWMS_REPORT</job-type>
+			<durable>true</durable>
+			<recover>false</recover>
+			<job-data-map>
+				<entry>
+					<key>SERVERUrl</key>
+					<value>http://127.0.0.1:9991/</value>
+				</entry>
+				<entry>
+					<key>SERVERPORTUrl</key>
+					<value>http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/GetWMSXML</value>
+				</entry>
+				<entry>
+					<key>SERVERPORTUrl2</key>
+					<value>http://127.0.0.1:9991/api/VW_OP_WMS_AREAGOODS/SetDailyWmsFeeCalandar</value>
+				</entry>
+				<entry>
+					<key>USERCODE</key>
+					<value>admin</value>
+				</entry>
+
+				<entry>
+					<key>PWD</key>
+					<value>123456</value>
+				</entry>
+
+
+			</job-data-map>
+		</job>
+
+		<trigger>
+			<!--
+		  <simple>
+			  <name>TriggerDSWMS_SaveDailyAmount</name>
+			  <group>Job_DSWMS_SaveDailyAmount</group>
+			  <description>DSWMS定时触发库存和仓储费计算</description>
+			  <job-name>Job_DSWMS_SaveDailyAmount</job-name>
+			  <job-group>Job_DSWMS_SaveDailyAmount</job-group>
+			  <repeat-count>1</repeat-count>
+			  <repeat-interval>3000</repeat-interval>
+		  </simple>
+		  -->
+
+			<cron>
+				<name>TriggerDSWMS_SaveDailyAmount</name>
+				<group>Job_DSWMS_SaveDailyAmount</group>
+				<description>DSWMS定时触发库存和仓储费计算</description>
+				<job-name>Job_DSWMS_SaveDailyAmount</job-name>
+				<job-group>Job_DSWMS_SaveDailyAmount</job-group>
+				<cron-expression>0 35 0 * * ? </cron-expression>
+				<!--每日0点35分-->
+			</cron>
+		</trigger>
+
+
+	</schedule>
 </job-scheduling-data>

Job_DSWMS_REPORT/quartz_jobs.xml

@@ -40,7 +40,10 @@
 					<key>FilePath</key>
 					<value>C:\FTP</value>
 				</entry>
-
+				<entry>
+					<key>DAYS</key>
+					<value>-1</value>
+				</entry>
 			</job-data-map>
 		</job>