whm
/
djyweb_ams
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

Browse Source
master
wet 2 years ago
parent 41f11a0ac9
commit b422b15df7
6 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
web/djy.Service/Ams/AmsService.cs
Unescape Escape View File

@ -475,10 +475,10 @@ namespace djy.Service.Ams
var data = rlt.GetValue("data").ToString();
JObject drlt = JObject.Parse(data);
var result = drlt.GetValue("result").ToString();
var errorInfo = drlt.GetValue("errorInfo").ToString();
if (code == "F" || result == "false")
{
var errorInfo = drlt.GetValue("errorInfo").ToString();
AMS_MasterHistory history = new AMS_MasterHistory();
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = oid;

48
web/djy.Service/ISF/IsfService.cs
Unescape Escape View File

@ -288,28 +288,28 @@ namespace djy.Service.Isf
if (msgType != "3")
{
//if (msgType == "1" || msgType == "4")
//{
// ///扣费接口
// var getfinrs = fin.Expend(new CustFee
// {
// SENDUSERID = user.GID,
// LURURENID = user.GID,
// CtnrCount = 1,
// CtnrInfo = string.Empty,
// BSTYPE = 16,
// SENDTYPE = 0,
// BSNO = oid.ToString(),
// MBLNO = master.MBLNO.ToString(),
// }
// , 0);
// if (!getfinrs.Status)
// {
// req.Code = 201;
// req.Message = getfinrs.Message;
// return req;
// }
//}
if (msgType == "1" || msgType == "4")
{
///扣费接口
var getfinrs = fin.Expend(new CustFee
{
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrInfo = string.Empty,
BSTYPE = 16,
SENDTYPE = 0,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}
, 0);
if (!getfinrs.Status)
{
req.Code = 201;
req.Message = getfinrs.Message;
return req;
}
}
var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList();
var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList();
Info info = new Info();
@ -445,9 +445,9 @@ namespace djy.Service.Isf
var data = rlt.GetValue("data").ToString();
JObject drlt = JObject.Parse(data);
var result = drlt.GetValue("code").ToString();
var errorInfo = drlt.GetValue("msg").ToString();
if (result!="1") {
var errorInfo = drlt.GetValue("msg").ToString();
history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid;
history.SendTime = DateTime.Now;

3
web/djy.WebApi/Controllers/AMS/AmsController.cs
Unescape Escape View File

@ -22,6 +22,7 @@ namespace djy_AmsApi.Controllers.AMS
{
IAmsService ser = IOC.AddServer<IAmsService>();
#region 查询接口
[HttpGet("Load")]
public object Load([FromQuery] AMSQuery request)
@ -128,8 +129,6 @@ namespace djy_AmsApi.Controllers.AMS
}
#endregion
#region pdf导出
[HttpGet("ExportPDF")]
public IActionResult ExportPDF(string ids)

2
web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
Unescape Escape View File

@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-07-05T03:23:47.7031600Z;</History>
<History>True|2022-07-07T03:23:54.2426892Z;True|2022-07-05T16:20:17.0177653+08:00;True|2022-07-05T16:19:13.8760086+08:00;True|2022-07-05T11:23:47.7031600+08:00;</History>
</PropertyGroup>
</Project>

4
web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<_PublishTargetUrl>F:\DJY.AMS\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-07-04T09:29:37.9437422Z;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00;</History>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-07-07T03:27:16.6078315Z;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00;</History>
</PropertyGroup>
</Project>

2
web/djy_IsfApi/djy_IsfApi.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>

Write Preview
Loading…
Cancel
Save