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

20230206-2

Browse Source
临时发布20240103
ddlucky 2 years ago
parent f784f6405d
commit 4f4b625b35
7 changed files with 96 additions and 76 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -2725,7 +2725,7 @@ namespace DSWeb.Common.DB
public string GOODSNAME { get; set; }
public string GROSSWEIGHT { get; set; }
public string MEASUREMENT { get; set; }
public string PKGS { get; set; }
public int? PKGS { get; set; }
public string KINDPKGS { get; set; }
public decimal? KGS { get; set; }
public decimal? CBM { get; set; }
@ -2757,7 +2757,7 @@ namespace DSWeb.Common.DB
public string NOTIFYPARTYCOUNTRYSECOND { get; set; }
public string NOTIFYPARTYTELSECOND { get; set; }
public string NOTIFYPARTYEMAILSECOND { get; set; }
public string ISHP { get; set; }
public bool? ISHP { get; set; }
public string PRINTSTATUS { get; set; }
public DateTime? INPUTDATE { get; set; }
public string SHIPPERNAME { get; set; }

11
DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationIndex.js
Unescape Escape View File

@ -131,7 +131,16 @@ Ext.extend(Shipping.MsChRecvapplicationIndex, Ext.Panel, {
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 120
}, {
},
//{
// sortable: true,
// dataIndex: 'APPLYTIME',
// header: '申请日期',
// width: 100
//},
{
sortable: true,
dataIndex: 'APPLYTIME',
header: '申请日期',

134
DSWeb/Areas/MvcShipping/Controllers/MsOpReceiptController.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using HcUtility.Comm;
using HcUtility.Core;
using System.IO;
using DSWeb.Areas.CommMng.DAL;
using DSWeb.Common.DB;
namespace DSWeb.MvcShipping.Controllers
{
@ -310,78 +311,87 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时，请退出系统重新登录！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
var jsonRespose = new JsonResponse { Success = false, Message = "" };
if (Request.Files.Count != 1)
{
jsonRespose.Success = false;
jsonRespose.Message = "请选择上传的文件";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
var file = Request.Files["LoadFile"];
var CUSTNO = Request.Form["CUSTNO"];
var BSNO = Request.Form["BSNO"];
var TYPE = Request.Form["TYPE"];
var DOCUMENTATTACHEDCODE = Request.Form["DOCUMENTATTACHEDCODE"];
var DOCUMENTATTACHEDNO = Request.Form["DOCUMENTATTACHEDNO"];
if (file == null)
{
jsonRespose.Success = false;
jsonRespose.Message = "上传文件发生未知错误，请重新上传";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
var path = Server.MapPath("../../UploadFiles/MsOpFiles/" + CUSTNO);
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
var size = file.ContentLength;
var name =BasicDataRefDAL.DelOtherWord( Path.GetFileName(file.FileName));
var usercode = Convert.ToString(Session["USERCODE"]);
var partname=usercode + DateTime.Now.ToString("yyyyMMddHHmmssfff") + name;
string filename = path + "\\"+partname ;
string filenameURL = "../../UploadFiles/MsOpFiles/" + CUSTNO + "/" + partname;
if (System.IO.File.Exists(filename))
{
System.IO.File.Delete(filename);
}
file.SaveAs(filename);
if (!System.IO.File.Exists(filename))
{
var json = JsonConvert.Serialize(new { success = false, Message = "上传文件发生未知错误，请重新上传" });
return new ContentResult() { Content = json };
}
string ext = Path.GetExtension(file.FileName).ToLower();
if (ext == ".asp"||ext == ".aspx")
{
jsonRespose.Success = false;
jsonRespose.Message = "不允许上传ASP货ASPX文件";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
try
{
var jsonRespose = new JsonResponse { Success = false, Message = "" };
if (Request.Files.Count != 1)
{
jsonRespose.Success = false;
jsonRespose.Message = "请选择上传的文件";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
var file = Request.Files["LoadFile"];
var CUSTNO = Request.Form["CUSTNO"];
var BSNO = Request.Form["BSNO"];
var TYPE = Request.Form["TYPE"];
var DOCUMENTATTACHEDCODE = Request.Form["DOCUMENTATTACHEDCODE"];
var DOCUMENTATTACHEDNO = Request.Form["DOCUMENTATTACHEDNO"];
if (file == null)
{
jsonRespose.Success = false;
jsonRespose.Message = "上传文件发生未知错误，请重新上传";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
//20230206 增加逻辑 如果bsno来自一个op_seae_billmanage.as_id 则将BSNO改为它的op_seae_billmanag.BSNO
//该功能用于将在【提单管理】模块中，选择分单之后上传的附件，在主单的【单据管理】模块中可见
var cdc = new CommonDataContext();
var fenlist = cdc.OP_SEAE_BILLMANAGE.Where(x => x.AS_ID == CUSTNO).ToList();
if (fenlist != null && fenlist.Count > 0) {
BSNO = fenlist[0].BSNO;
}
var path = Server.MapPath("../../UploadFiles/MsOpFiles/" + CUSTNO);
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
var size = file.ContentLength;
var name =BasicDataRefDAL.DelOtherWord( Path.GetFileName(file.FileName));
var usercode = Convert.ToString(Session["USERCODE"]);
var partname=usercode + DateTime.Now.ToString("yyyyMMddHHmmssfff") + name;
string filename = path + "\\"+partname ;
string filenameURL = "../../UploadFiles/MsOpFiles/" + CUSTNO + "/" + partname;
if (System.IO.File.Exists(filename))
{
System.IO.File.Delete(filename);
}
file.SaveAs(filename);
if (!System.IO.File.Exists(filename))
{
var json = JsonConvert.Serialize(new { success = false, Message = "上传文件发生未知错误，请重新上传" });
return new ContentResult() { Content = json };
}
string ext = Path.GetExtension(file.FileName).ToLower();
if (ext == ".asp"||ext == ".aspx")
{
jsonRespose.Success = false;
jsonRespose.Message = "不允许上传ASP货ASPX文件";
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
var message = string.Empty;
var isSucess = MsOpReceiptDAL.UpdateFileData(filenameURL, name, BSNO, Convert.ToString(Session["USERID"]),TYPE,DOCUMENTATTACHEDCODE,DOCUMENTATTACHEDNO,CUSTNO);
var json = JsonConvert.Serialize(new { success = isSucess.Success, Message = isSucess.Message, data = filename });
return new ContentResult() { Content = json };
var json2 = JsonConvert.Serialize(new { success = isSucess.Success, Message = isSucess.Message, data = filename });
return new ContentResult() { Content = json2 };
}
catch (Exception)
catch (Exception e)
{
var json = JsonConvert.Serialize(new { success = false, Message = "上传文件出错，请确认文件正确性" });
var json = JsonConvert.Serialize(new { success = false, Message = $"上传文件出错，请确认文件正确性{e.Message}" });
return new ContentResult() { Content = json };
}

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

@ -2587,7 +2587,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
}
//insert into [op_status] (ST_ID,BSNO,[STATUS],ISCOMP,COMPTIME,COMPOP,INPUTBY,INPUTTIME,STTYPE,ISOPEN,REMARK ) values(NEWID(),@bsno,'退舱',1,getdate(),'AMDIN','ADMIN',GETDATE(),'3',1,'');
//iscancel=="0"时 同时执行
if (iscancel == "3")
if (iscancel == "0")
{
BasicDataRefDAL.ExecSql($"delete from[op_status] where bsno = '{bsno}' and[status] = '退舱'");
}

4
DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs
Unescape Escape View File

@ -1592,11 +1592,11 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
newrec.OPERATORTEL = fenitem.OPERATORTEL;
newrec.OPERATOREMAIL = fenitem.OPERATOREMAIL;
newrec.PKGS = fenitem.PKGS.ToString() ;
newrec.PKGS = fenitem.PKGS ;
newrec.KGS = fenitem.KGS;
newrec.CBM = fenitem.CBM;
newrec.NOPKGS = newrec.PKGS;
newrec.NOPKGS = newrec.PKGS.ToString();
newrec.GROSSWEIGHT = newrec.KGS.ToString();
newrec.MEASUREMENT = newrec.CBM.ToString();

15
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js
Unescape Escape View File

@ -673,11 +673,12 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
if (this.storeInfoClientContact.getCount() > 0) {
var member = this.storeInfoClientContact.getAt(0);
this.comboxInfoClientContact.setValue(member.data.SHOWNAME);
this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL);
this.formEdit.getForm().findField('OPERATORTEL').setValue(member.data.TEL);
this.formEdit.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL);
} else {
this.comboxInfoClientContact.setValue('');
this.formHead.getForm().findField('OPERATORTEL').setValue('');
this.formEdit.getForm().findField('OPERATORTEL').setValue('');
this.formEdit.getForm().findField('OPERATOREMAIL').setValue('');
}
}
},
@ -734,12 +735,12 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
if (Cargoinforecords.getCount() > 0) {
var Cargoinfodata = Cargoinforecords.getAt(0).data;
// this.formHead.getForm().findField('OPERATOREMAIL').setValue(Cargoinfodata.EMAIL);
this.formHead.getForm().findField('OPERATORTEL').setValue(Cargoinfodata.TEL);
// this.formHead.getForm().findField('OPERATORFAX').setValue(Cargoinfodata.FAX);
this.formEdit.getForm().findField('OPERATORTEL').setValue(Cargoinfodata.TEL);
this.formEdit.getForm().findField('OPERATOREMAIL').setValue(Cargoinfodata.EMAIL);
} else {
// this.formHead.getForm().findField('OPERATOREMAIL').setValue('');
this.formHead.getForm().findField('OPERATORTEL').setValue('');
// this.formHead.getForm().findField('OPERATORFAX').setValue('');
this.formEdit.getForm().findField('OPERATORTEL').setValue('');
this.formEdit.getForm().findField('OPERATOREMAIL').setValue('');
}
}
}

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js
Unescape Escape View File

@ -1374,7 +1374,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
});
this.storeDocList.load({
params: { condition: "BSNO='" + BSNO +"' AND RECEIPTTYPE='提单'" },
params: { condition: "(BSNO='" + BSNO + "' or R_GID='" + BSNO + "') AND RECEIPTTYPE='提单'" },
waitMsg: "正在查询数据...",
scope: this,
callback: function () {

Write Preview
Loading…
Cancel
Save