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

·11

Browse Source
master
wet 2 years ago
parent a04046ac86
commit a82c61c918
11 changed files with 226 additions and 173 deletions
Show Stats Download Patch File Download Diff File

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

@ -1036,13 +1036,15 @@ namespace djy.Service.Ams
Response req = new Response();
try
{
AMSReturnDto retdto = Json.JsonToObject<AMSReturnDto>(msg);
_LogsAdd("SaveReceipt", "post", $"AMS接口推送：{msg}");
if (retdto != null)
{
DbBus.Get(DbList.AMSCenter).Transaction(() =>
{
var masterid = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && x.GID == retdto.businessId).ToList().Select(x => x.PID).FirstOrDefault();
var house = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.GID == retdto.businessId).ToOne();
if (retdto.status == "W2")
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { State = "1" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
@ -1063,7 +1065,21 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else if (house.NewNotice == "修改发送成功")
{
if (house.MateState.Contains("3Z"))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z,"+retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
@ -1092,7 +1108,22 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
else if (house.NewNotice == "修改发送成功")
{
if (house.MateState.Contains("3Z"))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
@ -1119,7 +1150,8 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
@ -1155,7 +1187,8 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
@ -1190,7 +1223,8 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
@ -1225,12 +1259,14 @@ namespace djy.Service.Ams
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
});
}
else
{
@ -1410,6 +1446,8 @@ namespace djy.Service.Ams
public List<CommonCodeValue> GetCodeProvince(string code)
{
try
{
if (!string.IsNullOrEmpty(code))
{
var List = DbBus.Get(DbList.Common).Select<CodeProvince>().ToList().Where(x => x.Country == code).Select(x => new CommonCodeValue
{
@ -1417,6 +1455,19 @@ namespace djy.Service.Ams
Value = x.ENName,
}).Distinct().ToList();
return List;
}
else {
var List = DbBus.Get(DbList.Common).Select<CodeProvince>().ToList().Select(x => new CommonCodeValue
{
Code = x.Code,
Value = x.ENName,
}).Distinct().ToList();
return List;
}
}
catch (Exception e)
{

1
web/djy.Service/Report/ReportService.cs
Unescape Escape View File

@ -149,6 +149,7 @@ namespace djy.Service.Report
DbBus.Get(DbList.DSDB).Insert(report).ExecuteAffrows();
Gid = report.GID;
}
if (DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID==Gid).ToOne().IsBook==true) {
return "该模板已经订阅过了";

2
web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

File diff suppressed because one or more lines are too long

12
web/djy.WebApi/appsettings.Development.json
Unescape Escape View File

@ -8,7 +8,7 @@
},
"AllowedHosts": "*",
"WebConfig": {
"IdentServerUrl": "http://123.234.225.158:35101",
"IdentServerUrl": "http://60.209.125.238:35101",
"WebId": 234,
"IsDev": true,
"Area": "山东省|青岛市|市南区",
@ -28,7 +28,7 @@
"Rbmq_UserName": "djy_paas",
"Rbmq_Password": "123qwe",
"Rbmq_Sqlhost": "Data Source =192.168.1.205,1433; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true",
"DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
"DapperDbString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
"DataConnList": [
{
"SysKey": "AMS",
@ -36,7 +36,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "Common",
@ -44,7 +44,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "djydb",
@ -52,7 +52,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
},
{
@ -61,7 +61,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
}

2
web/djy.WebApi/djy_AmsApi.csproj.user
Unescape Escape View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

2
web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.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_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-08-11T03:53:01.3573178Z;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;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>
<History>True|2022-08-11T06:45:29.1942046Z;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;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>

12
web/djy_IsfApi/appsettings.Development.json
Unescape Escape View File

@ -8,7 +8,7 @@
},
"AllowedHosts": "*",
"WebConfig": {
"IdentServerUrl": "http://123.234.225.158:35101",
"IdentServerUrl": "http://60.209.125.238:35101",
"WebId": 234,
"IsDev": true,
"Area": "ɽ¶«Ê¡|ÇൺÊÐ|ÊÐÄÏÇø",
@ -28,7 +28,7 @@
"Rbmq_UserName": "djy_paas",
"Rbmq_Password": "123qwe",
"Rbmq_Sqlhost": "Data Source =192.168.1.205,1433; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true",
"DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
"DapperDbString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;",
"DataConnList": [
{
"SysKey": "AMS",
@ -36,7 +36,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "Common",
@ -44,7 +44,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "djydb",
@ -52,7 +52,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
},
{
@ -61,7 +61,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
}

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>

11
web/djy_Report/Controllers/Report/ReportController.cs
Unescape Escape View File

@ -85,11 +85,7 @@ namespace djy_Report.Controllers.Report
result.Message = "登录过期，请重新登录！";
return result;
}
if (string.IsNullOrEmpty(Gid)) {
result.Code = 201;
result.Message = "没有相关业务ID";
return result;
}
if (string.IsNullOrEmpty(Gid)&&!isBook)
{
result.Code = 201;
@ -97,6 +93,11 @@ namespace djy_Report.Controllers.Report
return result;
}
result.data = ser.IsBook(Gid, TemplateId,isBook, DJson,user);
if(result.data == "没有找到此业务的计费规则！")
{
result.Code = 201;
result.Message = "没有找到此业务的计费规则！";
}
return result;
}
#endregion

2
web/djy_Report/Properties/PublishProfiles/FolderProfile.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_Report\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-07-28T09:10:51.7248412Z;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
<History>True|2022-08-12T09:21:59.5918968Z;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
</PropertyGroup>
</Project>

10
web/djy_Report/appsettings.Development.json
Unescape Escape View File

@ -8,7 +8,7 @@
},
"AllowedHosts": "*",
"WebConfig": {
"IdentServerUrl": "http://123.234.225.158:35101",
"IdentServerUrl": "http://60.209.125.238:35101",
"WebId": 234,
"IsDev": true,
"IsReport": true,
@ -36,7 +36,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDongSheng; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevDongSheng; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "Common",
@ -44,7 +44,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;"
},
{
"SysKey": "djydb",
@ -52,7 +52,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true"
},
{
@ -61,7 +61,7 @@
"Index": 100,
"DataType": 1,
"Status": 0,
"ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
"ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true"
}

Write Preview
Loading…
Cancel
Save