dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

20241121

Browse Source
ShenZhenCHJY
dengyu 2 days ago
parent 2a190070c8
commit 1eb39a1fcf
5 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -6410,6 +6410,14 @@ namespace DSWeb.Areas.CommMng.DAL
/// <returns></returns> /// <returns></returns>
public static DBResult CheckLogin(HttpSessionStateBase Session) public static DBResult CheckLogin(HttpSessionStateBase Session)
{ {
/* 典型调用方式
var canlogin = BasicDataRefDAL.CheckLogin(Session);
if (!canlogin.Success)
{
return (ContentResult)canlogin.Data;
}
*/
var result = new DBResult(); var result = new DBResult();
if (Convert.ToString(Session["COMPANYID"]).Trim() == "" || Convert.ToString(Session["USERID"]).Trim() == "" || Convert.ToString(Session["CODENAME"]).Trim() == "" || Convert.ToString(Session["SHOWNAME"]).Trim() == "" || Convert.ToString(Session["DEPTNAME"]).Trim() == "") if (Convert.ToString(Session["COMPANYID"]).Trim() == "" || Convert.ToString(Session["USERID"]).Trim() == "" || Convert.ToString(Session["CODENAME"]).Trim() == "" || Convert.ToString(Session["SHOWNAME"]).Trim() == "" || Convert.ToString(Session["DEPTNAME"]).Trim() == "")

9
DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
Unescape Escape View File

@ -361,16 +361,17 @@ namespace DSWeb.MvcShipping.Controllers
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true")) if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
{ {
if (!string.IsNullOrEmpty(sortstr)) var sortstring = DatasetSort.Getsortstring(sort);
if (!string.IsNullOrEmpty(sortstring))
{ {
strSql.Append(" order by " + sortstr); strSql.Append(" order by " + sortstring);
} }
else else
{ {
strSql.Append(" order by CUSTNAME,OPDATE,MBLNO "); strSql.Append(" order by CUSTNAME,OPDATE,MBLNO ");
//if (amendstr == "true") //if (amendstr == "true")
// strSql.Append(" order by F.CUSTOMERNAME,A.OPDATE,B.MBLNO "); // strSql.Append(" order by F.CUSTOMERNAME,A.OPDATE ");
//else strSql.Append(" order by F.CUSTOMERNAME,B.OPDATE,B.MBLNO "); //else strSql.Append(" order by F.CUSTOMERNAME,B.OPDATE ");
} }

40
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -9759,7 +9759,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
if (OpseaeHead.CARRIER == "ONE") if (OpseaeHead.CARRIER == "ONE")
{ {
_result.Add("PLACERECEIPTCODE", OpseaeDjyOrderHead.PLACERECEIPTID); _result.Add("PLACERECEIPTCODE", OpseaeHead.PLACERECEIPTID);
_result.Add("ShipInfoJson", OpseaeDjyOrderHead.ShipInfoJson); _result.Add("ShipInfoJson", OpseaeDjyOrderHead.ShipInfoJson);
_result.Add("bookingAddr", OpseaeDjyOrderHead.bookingAddr); _result.Add("bookingAddr", OpseaeDjyOrderHead.bookingAddr);
} }
@ -10581,9 +10581,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
//var 中远港口EDINAME = "COSCOPORT"; //var 中远港口EDINAME = "COSCOPORT";
var 装货港大简云code = OpseaeDjyOrderHead.PORTLOADID; var 装货港大简云code = OpseaeHead.PORTLOADID;
var 目的地大简云code = OpseaeDjyOrderHead.DESTINATIONID; var 目的地大简云code = OpseaeHead.DESTINATIONID;
var 收货地大简云code = OpseaeHead.PLACERECEIPTID;
//20240507 如果两港均为空 不进行判断 直接返回true //20240507 如果两港均为空 不进行判断 直接返回true
if (string.IsNullOrWhiteSpace(装货港大简云code) && string.IsNullOrWhiteSpace(目的地大简云code)) if (string.IsNullOrWhiteSpace(装货港大简云code) && string.IsNullOrWhiteSpace(目的地大简云code))
@ -10591,11 +10593,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
return result.OK(); return result.OK();
} }
var 装货港大简云EDICODEItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 大简云EDINAME && x.PORTID == 装货港大简云code); //var 装货港大简云EDICODEItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 大简云EDINAME && x.PORTID == 装货港大简云code);
var 目的地大简云EDICODEItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 大简云EDINAME && x.PORTID == 目的地大简云code); //var 目的地大简云EDICODEItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 大简云EDINAME && x.PORTID == 目的地大简云code);
//var 收货地大简云EDICODEItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 大简云EDINAME && x.PORTID == 收货地大简云code);
var 装货港ONEcode = ""; var 装货港ONEcode = "";
var 目的地ONEcode = ""; var 目的地ONEcode = "";
var 收货地ONEcode = "";
//var 装货港中远codeItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 中远港口代码EDINAME && x.PORTID == 装货港大简云EDICODEItem.EDICODE); //var 装货港中远codeItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 中远港口代码EDINAME && x.PORTID == 装货港大简云EDICODEItem.EDICODE);
//if (装货港中远codeItem != null) //if (装货港中远codeItem != null)
@ -10615,22 +10619,34 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
if (string.IsNullOrWhiteSpace(装货港ONEcode)) if (string.IsNullOrWhiteSpace(装货港ONEcode))
{ {
装货港ONEcode = GetDjyMapping(装货港大简云EDICODEItem.EDICODE, "PORTLOAD", "ONE"); 装货港ONEcode = GetDjyMapping(装货港大简云code, "PORTLOAD", "ONE");
} }
if (string.IsNullOrWhiteSpace(目的地ONEcode)) if (string.IsNullOrWhiteSpace(目的地ONEcode))
{ {
目的地ONEcode = GetDjyMapping(目的地大简云EDICODEItem.EDICODE, "PORTDISCHARGE", "ONE"); 目的地ONEcode = GetDjyMapping(目的地大简云code, "PORTDISCHARGE", "ONE");
}
if (string.IsNullOrWhiteSpace(收货地ONEcode))
{
收货地ONEcode = GetDjyMapping(收货地大简云code, "PORTLOAD", "ONE");
} }
if (string.IsNullOrWhiteSpace(装货港ONEcode)) if (string.IsNullOrWhiteSpace(装货港ONEcode))
{ {
return result.SetErrorInfo($"{装货港大简云EDICODEItem.PORTID} 没有在大简云设置其ONE港口代码"); return result.SetErrorInfo($"{装货港大简云code} 没有在大简云设置其ONE港口代码");
} }
if (string.IsNullOrWhiteSpace(目的地ONEcode)) if (string.IsNullOrWhiteSpace(目的地ONEcode))
{ {
return result.SetErrorInfo($"{目的地大简云EDICODEItem.PORTID} 没有在大简云设置其ONE港口代码"); return result.SetErrorInfo($"{目的地大简云code} 没有在大简云设置其ONE港口代码");
} }
if (string.IsNullOrWhiteSpace(收货地ONEcode))
{
return result.SetErrorInfo($"{收货地大简云code} 没有在大简云设置其ONE港口代码");
}
//3:从吴广的中远接口依据启运港目的港 当前日期+1 五周 查询船名航次 //3:从吴广的中远接口依据启运港目的港 当前日期+1 五周 查询船名航次
//20240507 日期改为 ETD-3 //20240507 日期改为 ETD-3
var _r1 = GetOneVoyno(装货港ONEcode, 目的地ONEcode); var _r1 = GetOneVoyno(装货港ONEcode, 目的地ONEcode);
@ -10915,7 +10931,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var rtn = ""; var rtn = "";
BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查中远船期", "发送"); BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查中远船期", "发送");
rtn = WebRequestHelper.DoPost(_IURL, sendParam, 10000); rtn = WebRequestHelper.DoPost(_IURL, sendParam, 30000);
BasicDataRefDAL.SaveLog(rtn, "", "查中远船期", "返回"); BasicDataRefDAL.SaveLog(rtn, "", "查中远船期", "返回");
var _r = JsonConvert.Deserialize<中远船期查询结果>(rtn); var _r = JsonConvert.Deserialize<中远船期查询结果>(rtn);
@ -11036,7 +11052,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var rtn = ""; var rtn = "";
BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查长荣船期", "发送"); BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查长荣船期", "发送");
rtn = WebRequestHelper.DoPost(_IURL, sendParam, 10000); rtn = WebRequestHelper.DoPost(_IURL, sendParam, 30000);
BasicDataRefDAL.SaveLog(rtn, "", "查长荣船期", "返回"); BasicDataRefDAL.SaveLog(rtn, "", "查长荣船期", "返回");
var _r = JsonConvert.Deserialize<长荣船期查询结果>(rtn); var _r = JsonConvert.Deserialize<长荣船期查询结果>(rtn);
@ -11094,7 +11110,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var rtn = ""; var rtn = "";
BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查ONE船期", "发送"); BasicDataRefDAL.SaveLog(JsonConvert.Serialize(sendParam), "", "查ONE船期", "发送");
rtn = WebRequestHelper.DoPost(_IURL, sendParam, 10000); rtn = WebRequestHelper.DoPost(_IURL, sendParam, 30000);
BasicDataRefDAL.SaveLog(rtn, "", "查ONE船期", "返回"); BasicDataRefDAL.SaveLog(rtn, "", "查ONE船期", "返回");
var _r = JsonConvert.Deserialize<ONE船期查询结果>(rtn); var _r = JsonConvert.Deserialize<ONE船期查询结果>(rtn);

6
DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js
Unescape Escape View File

@ -7292,6 +7292,9 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
sortstr = this.bslistcrsortfield + ' ' + this.bslistcrsortdire; sortstr = this.bslistcrsortfield + ' ' + this.bslistcrsortdire;
} }
var amendstr = 'false';
if (this.CheckAmend.checked == true) amendstr = 'true';
Ext.Msg.wait('正在组织数据, 请稍侯..'); Ext.Msg.wait('正在组织数据, 请稍侯..');
Ext.Ajax.request({ Ext.Ajax.request({
waitMsg: '正在组织数据...', waitMsg: '正在组织数据...',
@ -7301,7 +7304,8 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
start: 0, limit: this.PageSize, start: 0, limit: this.PageSize,
condition: Crsql, condition: Crsql,
printstr: 'true', printstr: 'true',
sortstr: sortstr sortstr: sortstr,
amendstr: amendstr
}, },
callback: function (options, success, response) { callback: function (options, success, response) {
if (success) { if (success) {

13
DSWeb/Areas/TruckMng/Controllers/MsWlTruckController.cs
Unescape Escape View File

@ -15,6 +15,7 @@ using System.Web;
using System.IO; using System.IO;
using System.Globalization; using System.Globalization;
using System.Web.Script.Serialization; using System.Web.Script.Serialization;
using DSWeb.Areas.CommMng.DAL;
namespace DSWeb.Areas.TruckMng.Controllers namespace DSWeb.Areas.TruckMng.Controllers
{ {
@ -188,6 +189,8 @@ namespace DSWeb.Areas.TruckMng.Controllers
/// <returns></returns> /// <returns></returns>
public ContentResult CertUpload () public ContentResult CertUpload ()
{ {
var jsonRespose = new JsonResponse { Success = false, Message = "" }; var jsonRespose = new JsonResponse { Success = false, Message = "" };
if (Request.Files.Count != 1) if (Request.Files.Count != 1)
@ -207,6 +210,16 @@ namespace DSWeb.Areas.TruckMng.Controllers
Directory.CreateDirectory(dirPath); Directory.CreateDirectory(dirPath);
} }
String fileExt = Path.GetExtension(imgFile.FileName).ToLower(); String fileExt = Path.GetExtension(imgFile.FileName).ToLower();
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 newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt; String newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt;
String filePath = dirPath + newFileName; String filePath = dirPath + newFileName;
imgFile.SaveAs(filePath); imgFile.SaveAs(filePath);

Write Preview
Loading…
Cancel
Save