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

1

Browse Source
master
wet 2 years ago
parent b32ba66dd7
commit a563afa026
15 changed files with 79 additions and 94 deletions
Show Stats Download Patch File Download Diff File

4
web/djy.IService/djy.IService.csproj
Unescape Escape View File

@ -15,4 +15,8 @@
<ProjectReference Include="..\djy.Model\djy.Model.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Report\" />
</ItemGroup>
</Project>

4
web/djy.Model/djy.Model.csproj
Unescape Escape View File

@ -28,4 +28,8 @@
<ProjectReference Include="..\Djy.Common\Common.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Report\" />
</ItemGroup>
</Project>

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

@ -896,7 +896,7 @@ namespace djy.Service.Ams
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrCount = DbBus.Get(DbList.AMSCenter).Select<AMS_Cntrno>().Where(x => x.IsDel != true && x.HID == item.GID ).ToList().Count(),
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 0,
@ -920,7 +920,7 @@ namespace djy.Service.Ams
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrCount = DbBus.Get(DbList.AMSCenter).Select<AMS_Cntrno>().Where(x => x.IsDel != true && x.HID == item.GID).ToList().Count(),
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 0,
@ -942,10 +942,10 @@ namespace djy.Service.Ams
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrCount = DbBus.Get(DbList.AMSCenter).Select<AMS_Cntrno>().Where(x => x.IsDel != true && x.HID == item.GID).ToList().Count(),
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 2,
SENDTYPE = 1,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}, 1);
@ -1029,30 +1029,13 @@ 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();
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState)) {
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 = house.MateState+","+retdto.status, NewNotice = "海关接收成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
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();
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
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 {
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();
}
}
}
}
@ -1075,34 +1058,10 @@ 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();
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
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
{
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();
}
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
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
{
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();
}
}
}
@ -1126,36 +1085,10 @@ 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();
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
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
{
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();
}
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();
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
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
{
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();
}
}
}
}
@ -1170,22 +1103,28 @@ namespace djy.Service.Ams
history.Operator = "系统管理员";
history.Remark = "您的单据"+house.HBLNo+"于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功")
{
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 == "修改发送成功")
{
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 == "重发发送成功" || house.NewNotice == "新增发送成功")
{
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 {
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 (retdto.status == "2Z")
@ -1199,22 +1138,28 @@ namespace djy.Service.Ams
history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo+ "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "箱货信息不匹配";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功")
{
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 == "修改发送成功")
{
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 == "重发发送成功" || house.NewNotice == "新增发送成功")
{
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 {
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
@ -1228,22 +1173,28 @@ namespace djy.Service.Ams
history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo+ "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "匹配失败";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功")
{
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 == "修改发送成功")
{
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 == "重发发送成功" || house.NewNotice == "新增发送成功")
{
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 {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
}

4
web/djy.Service/djy.Service.csproj
Unescape Escape View File

@ -23,4 +23,8 @@
<ProjectReference Include="..\djy.Model\djy.Model.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Report\" />
</ItemGroup>
</Project>

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_Report/Controllers/ApiBase.cs
Unescape Escape View File

@ -12,7 +12,7 @@ using Common.Tools;
using djy.IService.Djy;
using Common;
namespace djy_AmsApi.Controllers
namespace djy_Report.Controllers
{
/// <summary>

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

@ -0,0 +1,15 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace djy_Report.Controllers.Report
{
[AllowAnonymous]
public class ReportController : ApiBase
{
[HttpGet]
public string GetName() {
return "1";
}
}
}

2
web/djy_Report/Exceptionfilter.cs
Unescape Escape View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Common;
namespace djy_AmsApi
namespace djy_Report
{
public class Exceptionfilter : ActionFilterAttribute,IExceptionFilter
{

2
web/djy_Report/HangFireAuthorizeFilter.cs
Unescape Escape View File

@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace djy_AmsApi
namespace djy_Report
{
public class HangFireAuthorizeFilter : IDashboardAuthorizationFilter
{

2
web/djy_Report/HttpResponseExceptionFilter.cs
Unescape Escape View File

@ -7,7 +7,7 @@ using System.Text.Json;
using System.Threading.Tasks;
using Common;
namespace djy_AmsApi
namespace djy_Report
{
public class HttpResponseExceptionFilter : IActionFilter, IOrderedFilter
{

2
web/djy_Report/IOC.cs
Unescape Escape View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace djy_AmsApi
namespace djy_Report
{
/// <summary>
/// Ioc封装

2
web/djy_Report/MytMiddleware.cs
Unescape Escape View File

@ -8,7 +8,7 @@ using System.Threading.Tasks;
using Common;
using Common.Tools;
namespace djy_AmsApi
namespace djy_Report
{
/*
使用方法 在startup Configure中添加

4
web/djy_Report/Program.cs
Unescape Escape View File

@ -1,4 +1,4 @@
using djy_AmsApi;
using djy_Report;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
@ -9,7 +9,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace djy_AmsApi
namespace djy_Report
{
public class Program
{

4
web/djy_Report/Startup.cs
Unescape Escape View File

@ -16,13 +16,13 @@ using System.IO;
using Hangfire;
using System.Net.Mime;
using AutoMapper;
using djy_AmsApi;
using djy_Report;
using djy.Service;
using Common.Extensions;
using djy.Service.DjyService;
using djy.IService.Djy;
namespace djy_AmsApi
namespace djy_Report
{
public class Startup
{

7
web/djy_Report/djy_Report.csproj.user
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
</Project>
Write Preview
Loading…
Cancel
Save