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

1

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent 21b681e64b
commit 6a39663ff8
14 changed files with 166 additions and 41 deletions
Show Stats Download Patch File Download Diff File

27
DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs
Unescape Escape View File

@ -543,11 +543,23 @@ namespace DSWeb.Areas.Account.Controllers
var headData = JsonConvert.Deserialize<ChSettlement>(data);
var result = new DBResult();
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
var yiyuemojiezhang = "本期已月末结账,无法删除此单据！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
yiyuemojiezhang = "The current period has been settled at the end of the month, and this document cannot be deleted！";
}
var period = ChMonthCloseDAL.GetData("", Convert.ToString(Session["COMPANYID"]));
if (Convert.ToDateTime(period.FDAY) > Convert.ToDateTime(headData.SETTLETIME))
{
result.Success = false;
result.Message = "本期已月末结账,无法删除此单据!";
result.Message = yiyuemojiezhang;
}
else result.Success = true;
@ -607,11 +619,22 @@ namespace DSWeb.Areas.Account.Controllers
var headData = JsonConvert.Deserialize<ChSettlement>(data);
var result = new DBResult();
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
var yiyuemojiezhang = "本期已月末结账,无法删除此单据！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
yiyuemojiezhang = "The current period has been settled at the end of the month, and this document cannot be deleted！";
}
var period = ChMonthCloseDAL.GetData("", Convert.ToString(Session["COMPANYID"]));
if (Convert.ToDateTime(period.FDAY) > Convert.ToDateTime(headData.SETTLETIME))
{
result.Success = false;
result.Message = "本期已月末结账,无法删除此单据!";
result.Message = yiyuemojiezhang;
}
else result.Success = true;

2
DSWeb/Areas/Account/Models/MsOpBill/MsOpBill.cs
Unescape Escape View File

@ -251,6 +251,8 @@ namespace DSWeb.Areas.Account.Models.MsOpBill
public string AGENTID { get; set; }
public string CUSTOMSER { get; set; }
public string TRUCKER { get; set; }
#endregion
public MsOpBill()

48
DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/FileUpload.js
Unescape Escape View File

@ -28,10 +28,38 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
{ 'value': '5', 'text': '车俩照片' },
{ 'value': '6', 'text': '驾驶员身份证'}]
});
Zi.LAN.File_Type = '文件类型';
Zi.LAN.filefield = '附件';
Zi.LAN.selectfile = '选择文件...';
Zi.LAN.File_DocType = '单据类型';
Zi.LAN.File_DocNo = '单据编号';
Zi.LAN.upload = '上传';
Zi.LAN.selectfiletype = '请选择要上传证件的类型！';
Zi.LAN.uploadtishi = '提示';
Zi.LAN.uploadfujianshangchuanchenggong = '附件上传成功！';
Zi.LAN.uploadfujianshangchuanshibai = '附件上传失败！';
Zi.LAN.uploadclose = '关闭';
if (strLANGUAGES == 'en-us') {
Zi.LAN.File_Type = 'FileType';
Zi.LAN.filefield = 'Attachment';
Zi.LAN.selectfile = 'Select File...';
Zi.LAN.File_DocType = 'Doc Type';
Zi.LAN.File_DocNo = 'Doc Number';
Zi.LAN.upload = 'Upload';
Zi.LAN.selectfiletype = 'Select the type of document to upload！';
Zi.LAN.uploadtishi = 'prompt';
Zi.LAN.uploadfujianshangchuanchenggong = 'Attachment uploaded successfully！';
Zi.LAN.uploadfujianshangchuanshibai = 'Attachment upload failed！';
Zi.LAN.uploadclose = 'Close';
}
_this = this;
this.cmbType = Ext.create('Ext.form.ComboBox', {
fieldLabel: '文件类型',
fieldLabel: Zi.LAN.File_Type,
queryMode: 'local',
name: 'File_Type',
triggerAction: 'all',
@ -63,10 +91,10 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
{
xtype: 'filefield',
name: 'file',
fieldLabel: '附件',
fieldLabel: Zi.LAN.filefield,
labelWidth: 80,
anchor: '100%',
buttonText: '选择文件...'
buttonText: Zi.LAN.selectfile
}, {
xtype: 'textfield',
hidden: true,
@ -76,13 +104,13 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
}
, {
xtype: 'textfield',
fieldLabel: '单据类型',
fieldLabel: Zi.LAN.File_DocType ,
name: 'File_DocType',
// readOnly:true,
labelWidth: 80
}, {
xtype: 'textfield',
fieldLabel: '单据编号',
fieldLabel: Zi.LAN.File_DocNo,
name: 'File_DocNo',
// readOnly: true,
labelWidth: 80
@ -92,14 +120,14 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
layout: "form",
id: 'importForm',
buttons: [{
text: "上传",
text: Zi.LAN.upload,
handler: function (button, event) {
var form = Ext.getCmp("importForm").getForm();
form.findField('BillNo').setValue(this.BillNo);
var typenum = 1;
if (typenum == null || typenum == 'null' || typenum == '0') {
Ext.MessageBox.alert('提示', '请选择要上传证件的类型！');
Ext.MessageBox.alert(Zi.LAN.uploadtishi, Zi.LAN.selectfiletype);
return;
}
@ -111,7 +139,7 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
var win = Ext.getCmp("uploadWin");
win.close();
Ext.Msg.alert('提示', '附件上传成功！');
Ext.Msg.alert(Zi.LAN.uploadtishi, Zi.LAN.uploadfujianshangchuanchenggong);
//if (_this.Obj != null)
// _this.CallBackFun(_this.Obj);
//else
@ -119,14 +147,14 @@ Ext.extend(Shipping.FileUpload, Ext.Window, {
// .LoadData('edit', "BILLNO='" + win.BillNo + "'");
},
failure: function (f, a) {
Ext.Msg.alert('提示', '附件上传失败！' + a.result.Message);
Ext.Msg.alert(Zi.LAN.uploadtishi, Zi.LAN.uploadfujianshangchuanshibai + a.result.Message);
}
});
}
},
scope: this
}, {
text: "关闭",
text: Zi.LAN.uploadclose,
handler: function (button, event) {
var win = Ext.getCmp("uploadWin");
win.close();

3
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js
Unescape Escape View File

@ -332,4 +332,5 @@ Zi.LAN.YES = "是";
Zi.LAN.NO = "否";
Zi.LAN.YSCZP = '已生成支票,不允许重复生成!';
Zi.LAN.STLCURR = '原币结算';
Zi.LAN.DANHAO = '单号';
Zi.LAN.DANHAO = '单号';
Zi.LAN.DELETECHENGGONG = '删除成功！';

79
DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
Unescape Escape View File

@ -369,6 +369,24 @@ namespace DSWeb.MvcShipping.Controllers
public ContentResult Save(string bsno, string chfeebody,string isyj="0")
{
string LAN = Convert.ToString(Session["LANGUAGES"]);
var custnamestr = "客户名称：";
var xitongbucunzai = "系统中不存在,请检查";
var yifeiyongsuoding = "已费用锁定,不允许添加修改费用！";
var yiyuemojiezhuan = "已月末结转,不允许添加修改费用！";
var yiDRfeiyongsuoding = "应收费用已锁定,不允许添加修改费用！";
var yiCRfeiyongsuoding = "应付费用已锁定,不允许添加修改费用！";
if (LAN == "en-us") {
custnamestr = "Customer Name：";
xitongbucunzai = "Not present in the system, please check";
yifeiyongsuoding = "Fee locked, adding or modifying fees not allowed！";
yiyuemojiezhuan = "Carried forward at the end of the month, adding or modifying fees is not allowed！";
yiDRfeiyongsuoding = "DR are locked and cannot be added or modified！";
yiCRfeiyongsuoding = "CR are locked and cannot be added or modified！";
}
int iResult = 0;
var bodyList = JsonConvert.Deserialize<List<MsChFee>>(chfeebody);
var result =new DBResult();
@ -392,7 +410,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success =false,
Message ="客户名称："+custstr+" ，系统中不存在,请检查！",
Message = custnamestr + custstr+" ，"+ xitongbucunzai,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
@ -471,7 +489,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "已费用锁定,不允许添加修改费用！",
Message = yifeiyongsuoding,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
@ -485,7 +503,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "已月末结转,不允许添加修改费用！",
Message = yiyuemojiezhuan,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
@ -503,7 +521,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "已费用锁定,不允许添加修改费用！",
Message = yifeiyongsuoding,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
@ -526,7 +544,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "应收费用已锁定,不允许添加修改费用！",
Message = yiDRfeiyongsuoding,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
@ -534,7 +552,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "应付费用已锁定,不允许添加修改费用！",
Message = yiCRfeiyongsuoding,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
@ -719,6 +737,16 @@ namespace DSWeb.MvcShipping.Controllers
public ContentResult Delete(string bsno,string data)
{
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
}
int iResult = 0;
var bodyList = data;
var result = new DBResult();
@ -732,7 +760,7 @@ namespace DSWeb.MvcShipping.Controllers
if (iResult == 1)
{
result.Success = true;
result.Message = "删除成功！";
result.Message = shanchuchenggong;
}
else if (iResult == 0)
@ -765,6 +793,17 @@ namespace DSWeb.MvcShipping.Controllers
{
int iResult = 0;
var bodyList = data;
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
}
var result = new DBResult();
if (bodyList != "" || bodyList != null)
@ -776,7 +815,7 @@ namespace DSWeb.MvcShipping.Controllers
if (iResult == 1)
{
result.Success = true;
result.Message = "删除成功！";
result.Message = shanchuchenggong;
}
else if (iResult == 0)
@ -810,9 +849,16 @@ namespace DSWeb.MvcShipping.Controllers
var head = JsonConvert.Deserialize<MsOpAmend>(data);
T_ALL_DA T_ALL_DA = new T_ALL_DA();
string LAN = Convert.ToString(Session["LANGUAGES"]);
var genggaidancunzaifeiyong = "更改单存在费用,不允许删除！";
if (LAN == "en-us")
{
genggaidancunzaifeiyong = "fees and deletion is not allowed！";
}
var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from ch_fee WHERE BSNO='" + head.BSNO + "'");
var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from ch_fee WHERE BSNO='" + head.BSNO + "'");
if (BLCOUNT == "0")
{
var modb = new ModelObjectDB();
@ -823,7 +869,7 @@ namespace DSWeb.MvcShipping.Controllers
}
else {
var jsonRespose = new JsonResponse { Success = false, Message ="更改单存在费用,不允许删除！" };
var jsonRespose = new JsonResponse { Success = false, Message = genggaidancunzaifeiyong };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
@ -1027,7 +1073,16 @@ namespace DSWeb.MvcShipping.Controllers
{
//var headData = JsonConvert.Deserialize<List<MsOpAmend>>(data);
var errstr = "";
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
var cunzaifeiyong = "存在费用，请先删除费用才能删除此票更改单！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
cunzaifeiyong = "There are fees, please delete the fees first before deleting this amend！";
}
if (headData != null)
{
@ -1053,8 +1108,8 @@ namespace DSWeb.MvcShipping.Controllers
}
}
if (errstr == "") errstr = "删除成功！";
else errstr = "存在费用，请先删除费用才能删除此票更改单！";
if (errstr == "") errstr = shanchuchenggong;
else errstr = cunzaifeiyong;
var jsonRespose = new JsonResponse { Success = true, Message = errstr };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };

13
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs
Unescape Escape View File

@ -1192,12 +1192,23 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时，请退出系统重新登录！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
string LAN = Convert.ToString(Session["LANGUAGES"]);
var shanchuchenggong = "删除成功！";
var cunzaifeiyong = "存在费用，请先删除费用才能删除此票业务！";
if (LAN == "en-us")
{
shanchuchenggong = "Successfully deleted！";
cunzaifeiyong = "There are fees, please delete the fees first before deleting this Bill！";
}
//
var head = JsonConvert.Deserialize<MsOpSeai>(data);
var isfee = MsOpSeaiDAL.GetFeeCount(head.BSNO);
if (isfee)
{
var jsonRespose = new JsonResponse { Success = false, Message ="此票业务存在费用，请先删除费用才能删除此票业务！" };
var jsonRespose = new JsonResponse { Success = false, Message = cunzaifeiyong };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
else {

6
DSWeb/Areas/MvcShipping/DAL/MsFeeTemplate/MsFeeTemplateDAL.cs
Unescape Escape View File

@ -343,7 +343,7 @@ namespace DSWeb.MvcShipping.DAL.MsFeeTemplate
}
else if (FeeTempDetail.Client == 4)
{
customername ="";
customername = enumbillValue.TRUCKER;
custtype = "车队";
}
else if (FeeTempDetail.Client == 5)
@ -373,8 +373,8 @@ namespace DSWeb.MvcShipping.DAL.MsFeeTemplate
}
else if (FeeTempDetail.Client == 11)
{
//customername = enumbillValue.SHIPAGENCY;
custtype = "委托单位";
customername = enumbillValue.SHIPAGENCY;
custtype = "船代";
}
}

16
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -47784,19 +47784,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (ctn != null) {
bookingid = ctn.PCTN_ID;
var opseae = opseaelist.Find(x => x.GROUPBS == bookingid);
var OPAMS = GetAmsData("BSNO='" + opseae.BSNO + "'");
OPAMS.RAILWAY_PORTLOAD = bookingid;
OPAMS.RAILWAY_PORTDISCHARG = ctn.CTN_ID;
if (OPAMS.AMSNO=="*")
var OPAMS = opamslist.Find(x=>x.BSNO==opseae.BSNO);
if (OPAMS == null)
{
OPAMS = GetAmsData("BSNO='" + opseae.BSNO + "'");
OPAMS.DbOperationType = DbOperationType.DbotIns;
OPAMS.AMSNO = Guid.NewGuid().ToString();
opamslist.Add(OPAMS);
}
else {
OPAMS.DbOperationType = DbOperationType.DbotUpd;
OPAMS.ModelUIStatus = "E";
OPAMS.RAILWAY_PORTLOAD = bookingid;
OPAMS.RAILWAY_PORTDISCHARG = ctn.CTN_ID;
}
OPAMS.ATTN = tmpBILL.ContactName;
OPAMS.ATTNTEL = tmpBILL.EmergencyPhone;
@ -47820,7 +47818,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
OPAMS.DCPACKINGCODE = tmpBILL.DCPackingCode;
OPAMS.PSNAME = tmpBILL.PSName;
OPAMS.MPCODE = tmpBILL.MPCode;
opamslist.Add(OPAMS);
//var modb = new ModelObjectDB();
//modb.Save(OPAMS);
}

1
DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_en-us.js
Unescape Escape View File

@ -239,6 +239,7 @@ Zi.LAN.SELECTDELTURE = "确定要删除选中的附件吗？";
Zi.LAN.DENGLUXINXIBUQUAN = "登录信息不全，请退出重新登录";
Zi.LAN.SELECTAMOUNT = "选中金额:";
Zi.LAN.DANGQIANWEIBAOCUN = "当前账单未保存,不允许添加！";
Zi.LAN.wsUSD = "USD未收";
//#endregion

1
DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/Zi_zh-cn.js
Unescape Escape View File

@ -242,3 +242,4 @@ Zi.LAN.SELECTDELTURE = "确定要删除选中的附件吗？";
Zi.LAN.DENGLUXINXIBUQUAN = "登录信息不全，请退出重新登录";
Zi.LAN.SELECTAMOUNT = "选中金额:";
Zi.LAN.DANGQIANWEIBAOCUN = "当前账单未保存,不允许添加！";
Zi.LAN.wsUSD = "USD未收";

2
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
Unescape Escape View File

@ -7714,7 +7714,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
}); //end Ext.Ajax.request
} else {
Ext.Msg.show({ title: Zi.LAN.FEE.TiShi, msg: "删除成功！", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.FEE.TiShi, msg: Zi.LAN.DELETECHENGGONG, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
}

2
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js
Unescape Escape View File

@ -285,7 +285,7 @@ Zi.LAN.WEITIJIAO = "未提交";
Zi.LAN.ZHENGPIAOTIJIAO = "整票提交";
Zi.LAN.SHENHETONGGUO = "审核通过";
Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
Zi.LAN.DELETECHENGGONG = '删除成功！';
//#endregion
//Zi.LAN.FEE. = "";

3
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js
Unescape Escape View File

@ -290,7 +290,8 @@ Zi.LAN.ZHENGPIAOTIJIAO = "整票提交";
Zi.LAN.SHENHETONGGUO = "审核通过";
Zi.LAN.ZHENGPIAOBOHUI = "整票驳回";
Zi.LAN.YES = "是";
Zi.LAN.wsUSD = "USD未收";
Zi.LAN.DELETECHENGGONG = '删除成功！';
//#endregion
//Zi.LAN.FEE. = "";

4
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -3187,6 +3187,8 @@
<Content Include="Areas\SysMng\ViewJs\SysUser\SysUserEdit.js" />
<Content Include="Areas\SysMng\ViewJs\SysUser\SysUserIndex.js" />
<Content Include="Areas\SysMng\ViewJs\SysUser\SysUserModel.js" />
<Content Include="Areas\SysMng\ViewJs\USERINFO\Zi_en-us.js" />
<Content Include="Areas\SysMng\ViewJs\USERINFO\Zi_zh-cn.js" />
<Content Include="Areas\SysMng\Views\DBTableConn\Edit.aspx" />
<Content Include="Areas\SysMng\Views\DBTableConn\Index.aspx" />
<Content Include="Areas\SysMng\Views\SysTask\Execution.aspx" />
@ -3199,6 +3201,7 @@
<Content Include="Areas\TruckMng\Viewsjs\MsCustTruckConsignee\MsCustTruckConsigneeIndex.js" />
<Content Include="Areas\TruckMng\Viewsjs\MsCustTruckConsignee\MsCustTruckConsigneeModel.js" />
<Content Include="Areas\TruckMng\Viewsjs\MsOpTruckBulk\MsRptTruckBulkCtnProfitIndex.js" />
<Content Include="Areas\TruckMng\Viewsjs\MsWlBs\MsRptPcWFSDIndex.js" />
<Content Include="Areas\TruckMng\Viewsjs\MsWlBs\PcAmendFee.js" />
<Content Include="Areas\TruckMng\Views\MsCustTruckConsignee\Index.aspx" />
<Content Include="Areas\TruckMng\Views\MsOpTruckBulk\RptLrCtnIndex.aspx" />
@ -4375,6 +4378,7 @@
<Content Include="Areas\TruckMng\Views\MsWlTruckTeam\Index.aspx" />
<Content Include="Areas\TruckMng\Views\MsWl_LK_CargoInfo\Index.aspx" />
<Content Include="Areas\TruckMng\Views\MsWlBsCtn\PcIndex.aspx" />
<Content Include="Areas\TruckMng\Views\PcHeadEdit_WFSD\RptTruckIndex.aspx" />
<Content Include="Areas\TruckMng\Views\RPT_ly\Index.aspx" />
<Content Include="Areas\TruckMng\Views\TMSRPT\MONTH_View.aspx" />
<Content Include="Areas\TruckMng\Views\WlBsCard\Edit.aspx" />

Write Preview
Loading…
Cancel
Save