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

20240605

Browse Source
QDHHYT
ddlucky 6 months ago
parent 096dc078fb
commit 42bc09a5d5
4 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,6 +29,8 @@ using DSWeb.MvcShipping.Models.MsOpBill;
using MsOpBill = DSWeb.Areas.Account.Models.MsOpBill.MsOpBill;
using DSWeb.MvcShipping.DAL.MsOpSeaeDAL;
using DSWeb.Areas.Account.Models.BSNOLB;
using DSWeb.Areas.CommMng.DAL;
using DSWeb.Common.DB;
namespace DSWeb.MvcShipping.Controllers
{
@ -155,7 +157,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json };
}
public ContentResult GetSaleDataList(string billno, int type, string optype, string condition)
public ContentResult GetSaleDataList(string billno, int type, string optype, string condition)
{
var fieldcomm = "";
if (condition != null && condition.Trim() != "")
@ -242,7 +244,7 @@ namespace DSWeb.MvcShipping.Controllers
var json = JsonConvert.Serialize(new { Success = result.Success});
return new ContentResult() { Content = json };
}
public ContentResult GetAmendGainData(string bsno,string bltype="")
public ContentResult GetAmendGainData(string bsno,string bltype="")
{
var dataList = new List<MsChFeeGain>();
@ -648,50 +650,15 @@ namespace DSWeb.MvcShipping.Controllers
if (bodyList !="" ||bodyList != null)
{
iResult = MsChFeeDAL.DeleteFee(bodyList);
MsChFeeDAL.p_op_gain(bsno, Convert.ToString(Session["USERID"]));
var delGidListStr = data.Replace("'", "");
var delGidList = delGidListStr.Split(',').ToList();
}
if (iResult == 1)
{
result.Success = true;
result.Message = "删除成功！";
}
else if (iResult == 0)
{
result.Success = false;
result.Message = "出现错误,未删除！";
}
else if (iResult == -1)
{
result.Success = false;
result.Message = "有异常,删除失败！";
}
else if (iResult == -2)
{
result.Success = false;
result.Message = "删除异常,事务已回滚成功！";
}
var jsonRespose = new JsonResponse
{
Success = result.Success,
Message = result.Message,
// Data = MsChFeeDAL.GetDataList(headData.BillNo, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), CookieConfig.GetCookie_OrgCode(Request))
};
var cdc = new CommonDataContext();
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
var delFee = cdc.ch_fee.Where(x => delGidList.Contains(x.GID)).ToList();
public ContentResult DeleteCtn(string bsno, string data)
{
int iResult = 0;
var bodyList = data;
var result = new DBResult();
BasicDataRefDAL.SaveLog(bodyList, Convert.ToString(Session["USERID"]), "删除费用", "删除");
if (bodyList != "" || bodyList != null)
{
iResult = MsChFeeDAL.DeleteFee(bodyList);
MsChFeeDAL.p_op_gain(bsno, Convert.ToString(Session["USERID"]));
@ -700,7 +667,7 @@ namespace DSWeb.MvcShipping.Controllers
{
result.Success = true;
result.Message = "删除成功！";
}
else if (iResult == 0)
{
@ -728,6 +695,50 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
//public ContentResult DeleteCtn(string bsno, string data)
//{
// int iResult = 0;
// var bodyList = data;
// var result = new DBResult();
// if (bodyList != "" || bodyList != null)
// {
// iResult = MsChFeeDAL.DeleteFee(bodyList);
// MsChFeeDAL.p_op_gain(bsno, Convert.ToString(Session["USERID"]));
// }
// if (iResult == 1)
// {
// result.Success = true;
// result.Message = "删除成功！";
// }
// else if (iResult == 0)
// {
// result.Success = false;
// result.Message = "出现错误,未删除！";
// }
// else if (iResult == -1)
// {
// result.Success = false;
// result.Message = "有异常,删除失败！";
// }
// else if (iResult == -2)
// {
// result.Success = false;
// result.Message = "删除异常,事务已回滚成功！";
// }
// var jsonRespose = new JsonResponse
// {
// Success = result.Success,
// Message = result.Message,
// // Data = MsChFeeDAL.GetDataList(headData.BillNo, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), CookieConfig.GetCookie_OrgCode(Request))
// };
// return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
//}
public ContentResult DeleteAmend(string data)
{
var head = JsonConvert.Deserialize<MsOpAmend>(data);

11
DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs
Unescape Escape View File

@ -30,6 +30,7 @@ using DSWeb.Areas.SysMng.DAL.SysUser;
using DSWeb.Areas.Import.DAL.ReceiptDoc;
using Renci.SshNet.Common;
using DSWeb.Common.DB;
using DSWeb.Areas.MvcShipping.Models.Message.VGM;
namespace DSWeb.MvcShipping.Controllers
{
@ -1007,7 +1008,8 @@ namespace DSWeb.MvcShipping.Controllers
var headData = JsonConvert.Deserialize<MsSeaeOrder>(data.Replace("}", ",") + data2.Replace("{", "").Replace("}", ",") + data3.Replace("{", ""));
var bodyList = JsonConvert.Deserialize<List<MsSeaeOrderCtn>>(body);
//if (!string.IsNullOrEmpty(headData.AUDITOPERATOR))
headData.AUDITOPERATOR = Convert.ToString(Session["SHOWNAME"]);
headData.AUDITOPERATOR = Convert.ToString(Session["SHOWNAME"]);
headData.AUDITDATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
headData.ORSTATUS = "0";
headData.DbOperationType = DbOperationType.DbotUpd;
@ -1458,7 +1460,12 @@ namespace DSWeb.MvcShipping.Controllers
{
var headData = JsonConvert.Deserialize<MsSeaeOrder>(data);
//if (!string.IsNullOrEmpty(headData.AUDITOPERATOR))
var condition = $" B.ORDNO='{headData.ORDNO}' ";
headData = MsSeaeOrderDAL.GetData(condition, CookieConfig.GetCookie_UserId(Request));
headData.AUDITOPERATOR = Convert.ToString(Session["SHOWNAME"]);
headData.AUDITDATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
headData.ORSTATUS = "0";

2
DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
Unescape Escape View File

@ -723,6 +723,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
sqlTran.Commit();
iResult = 1;//状态为1表示插入成功
}
catch (Exception execError)

11
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js
Unescape Escape View File

@ -290,7 +290,16 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
dataIndex: 'ORDEROP_EMAIL',
header: '操作邮箱',
width: 140
}];
},
{
sortable: true,
dataIndex: 'SERVICECONTRACTNO',
header: '服务合同号',
width: 100
}
];
this.girdcolums = this.initgirdcolums;
this.girdcolums = DsTruck.GetGridPanel(USERID, this.formname, this.initgirdcolums, 1); //使用者id，表名，中间column数组，跳过一开始的几列

Write Preview
Loading…
Cancel
Save