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

Merge branch 'DS7_HYRD' of http://60.209.125.238:20010/dengyu/DS7 into DS7_HYRD

Browse Source
DS7_HYRD
hanxuntao 3 months ago
parent 71e4dbf83e 1268476906
commit a084be0fdd
4 changed files with 71 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -102,3 +102,5 @@ DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
/JobScheduler/bin/Debug/App_Data/Logs/error.log /JobScheduler/bin/Debug/App_Data/Logs/error.log
/UpgradeLog3.htm /UpgradeLog3.htm
/DSWeb/Areas/Account/Files /DSWeb/Areas/Account/Files
/DSWeb.DJY_RESP/publish
/DSWeb.DJY_RESP/packages

86
DSWeb/Areas/Account/Controllers/Chfee_lockController.cs
Unescape Escape View File

@ -1510,30 +1510,67 @@ namespace DSWeb.Areas.Account.Controllers
{ {
var cmdUpdate = db.GetSqlStringCommand( var cmdUpdate = db.GetSqlStringCommand(
@"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE BSNO=@BSNO "); @"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE BSNO=@BSNO ");
if (enumValue.OPLB.Equals("tMsWlPcHead")) if (enumValue.OPLB.Equals("tMsWlPcHead"))
{ {
cmdUpdate = db.GetSqlStringCommand( cmdUpdate = db.GetSqlStringCommand(
@"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE gid=@BSNO "); @"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE gid=@BSNO ");
} }
if (enumValue.OPLB == "WMS") if (enumValue.OPLB == "WMS")
{ {
cmdUpdate = db.GetSqlStringCommand( cmdUpdate = db.GetSqlStringCommand(
@"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE ASSOCIATEDNO=@BSNO "); @"UPDATE " + enumValue.OPLB + " SET ACCDATE=@ACCDATE WHERE ASSOCIATEDNO=@BSNO ");
} }
else if (enumValue.OPLB == "WMS_IN") else if (enumValue.OPLB == "WMS_IN")
{ {
cmdUpdate = db.GetSqlStringCommand( cmdUpdate = db.GetSqlStringCommand(
@"UPDATE WMS SET ACCDATE=@ACCDATE WHERE GID=@BSNO "); @"UPDATE WMS SET ACCDATE=@ACCDATE WHERE GID=@BSNO ");
} }
else if (enumValue.OPLB == "WMS_OUT") else if (enumValue.OPLB == "WMS_OUT")
{ {
cmdUpdate = db.GetSqlStringCommand( cmdUpdate = db.GetSqlStringCommand(
@"UPDATE WMS_OUT SET ACCDATE=@ACCDATE WHERE GID=@BSNO "); @"UPDATE WMS_OUT SET ACCDATE=@ACCDATE WHERE GID=@BSNO ");
} }
cmdUpdate.Parameters.Clear();
else if (enumValue.OPLB == "OP_WMS_IN_PLAN")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_IN_PLAN SET ACCDATE=CONVERT(datetime,@ACCDATE+'-1') WHERE WMSPLANID=@BSNO ");
}
else if (enumValue.OPLB == "OP_WMS_IN_DO")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_IN_DO SET ACCDATE=@ACCDATE WHERE WMSDOID=@BSNO ");
}
else if (enumValue.OPLB == "OP_WMS_OUT_DO")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_OUT_DO SET ACCDATE=@ACCDATE WHERE WMSDOID=@BSNO ");
}
else if (enumValue.OPLB == "OP_WMS_OUT_PLAN")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_OUT_PLAN SET ACCDATE=@ACCDATE WHERE WMSPLANID=@BSNO ");
}
else if (enumValue.OPLB == "OP_WMS_TRANSFERGOODS")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_TRANSFERGOODS SET ACCDATE=@ACCDATE WHERE WMSTRANSFERGOODSID=@BSNO ");
}
else if (enumValue.OPLB == "OP_WMS_MOVE")
{
cmdUpdate = db.GetSqlStringCommand(
@"UPDATE OP_WMS_MOVE SET ACCDATE=@ACCDATE WHERE WMSDOID=@BSNO ");
}
cmdUpdate.Parameters.Clear();
db.AddInParameter(cmdUpdate, "@BSNO", DbType.String, enumValue.BSNO); db.AddInParameter(cmdUpdate, "@BSNO", DbType.String, enumValue.BSNO);
db.AddInParameter(cmdUpdate, "@ACCDATE", DbType.String, newperiod); db.AddInParameter(cmdUpdate, "@ACCDATE", DbType.String, newperiod);
db.ExecuteNonQuery(cmdUpdate, tran); db.ExecuteNonQuery(cmdUpdate, tran);
@ -1558,8 +1595,9 @@ namespace DSWeb.Areas.Account.Controllers
json = JsonConvert.Serialize(new { Success = true, Message = msg }); json = JsonConvert.Serialize(new { Success = true, Message = msg });
tran.Commit(); tran.Commit();
} }
catch (Exception) catch (Exception e)
{ {
BasicDataRefDAL.SaveLog(JsonConvert.Serialize(e), "", "更改为下期", "错误");
tran.Rollback(); tran.Rollback();
json = JsonConvert.Serialize(new { Success = false, Message = "锁定失败" }); json = JsonConvert.Serialize(new { Success = false, Message = "锁定失败" });
} }

12
DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
Unescape Escape View File

@ -3217,7 +3217,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
// if ((stlamount != 0 && feedovalue.CURRENCY == "RMB") || (usdstlamount != 0 && feedovalue.CURRENCY == "USD")) // if ((stlamount != 0 && feedovalue.CURRENCY == "RMB") || (usdstlamount != 0 && feedovalue.CURRENCY == "USD"))
// { // {
if ((stlamount != 0 && feedovalue.CURRENCY == "RMB") || (usdstlamount != 0) || isAll) if ((stlamount != 0 && feedovalue.CURRENCY == "RMB") || (usdstlamount != 0) || (otstlamount != 0) || isAll)
{ {
if (feedovalue.CURRENCY == "RMB") if (feedovalue.CURRENCY == "RMB")
@ -3263,22 +3263,22 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
} }
else else
{ {
if ((feedovalue.AMOUNT - feedovalue.DOAMOUNT) <= usdstlamount || isAll) if ((feedovalue.AMOUNT - feedovalue.DOAMOUNT) <= otstlamount || isAll)
{ {
origamount = feedovalue.ORIGAMOUNT - feedovalue.ORIGSTLAMOUNT; origamount = feedovalue.ORIGAMOUNT - feedovalue.ORIGSTLAMOUNT;
amount = feedovalue.AMOUNT - feedovalue.DOAMOUNT; amount = feedovalue.AMOUNT - feedovalue.DOAMOUNT;
if (feedovalue.FEETYPE == 2) if (feedovalue.FEETYPE == 2)
usdstlamount = usdstlamount - amount; otstlamount = otstlamount - amount;
else else
usdstlamount = usdstlamount + amount; otstlamount = otstlamount + amount;
} }
else else
{ {
amount = usdstlamount; amount = otstlamount;
usdstlamount = 0; otstlamount = 0;
origamount = Convert.ToDecimal((feedovalue.ORIGAMOUNT * (amount / feedovalue.AMOUNT)).ToString("f2")); origamount = Convert.ToDecimal((feedovalue.ORIGAMOUNT * (amount / feedovalue.AMOUNT)).ToString("f2"));
} }
} }

2
DSWeb/Global.asax.cs
Unescape Escape View File

@ -115,7 +115,7 @@ namespace DSWeb
var ReceiveDjydc = ConfigurationManager.AppSettings["ReceiveDjydc"]; var ReceiveDjydc = ConfigurationManager.AppSettings["ReceiveDjydc"];
if (ReceiveDjydc != null && ReceiveDjydc.ToString() != "") if (ReceiveDjydc != null && ReceiveDjydc.ToString().ToUpper() == "TRUE")
{ {
DoReceiveDjydc(); DoReceiveDjydc();
} }

Write Preview
Loading…
Cancel
Save