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

船期信息

Browse Source
optimize
wet 2 years ago
parent 40a6d2806f
commit 6d0964f325
6 changed files with 482 additions and 14 deletions
Show Stats Download Patch File Download Diff File

29
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -54,6 +54,7 @@ using Myshipping.Application.Helper;
using System.Net; using System.Net;
using Furion.DistributedIDGenerator; using Furion.DistributedIDGenerator;
using System.Linq.Expressions; using System.Linq.Expressions;
using Myshipping.Core.Extension;
namespace Myshipping.Application namespace Myshipping.Application
{ {
@ -366,7 +367,7 @@ namespace Myshipping.Application
} }
var entity = input.Adapt<BookingOrder>(); var entity = input.Adapt<BookingOrder>();
entity.TOTALNO = NumberToUpper.ToUpper(entity.PKGS==null?0: entity.PKGS);
await _rep.InsertAsync(entity); await _rep.InsertAsync(entity);
if (input.ctnInputs != null) if (input.ctnInputs != null)
{ {
@ -410,12 +411,11 @@ namespace Myshipping.Application
CreatedUserName = UserManager.Name CreatedUserName = UserManager.Name
}); });
////分单不调用 //////分单不调用
//if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO)) //{
{ // await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO);
await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO); //}
}
return entity.Id; return entity.Id;
} }
@ -474,6 +474,7 @@ namespace Myshipping.Application
} }
var main = await _rep.AsQueryable().Where(x => x.Id == input.Id).FirstAsync(); var main = await _rep.AsQueryable().Where(x => x.Id == input.Id).FirstAsync();
var entity = input.Adapt<BookingOrder>(); var entity = input.Adapt<BookingOrder>();
entity.TOTALNO = NumberToUpper.ToUpper(entity.PKGS == null ? 0 : entity.PKGS);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == input.Id).Select(x => x.Id).ToListAsync(); var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == input.Id).Select(x => x.Id).ToListAsync();
await _repCtn.DeleteAsync(x => x.BILLID == input.Id); await _repCtn.DeleteAsync(x => x.BILLID == input.Id);
@ -574,13 +575,13 @@ namespace Myshipping.Application
OldValue = _oldvalue, OldValue = _oldvalue,
NewValue = _value, NewValue = _value,
}); });
if (descriptor.Name == "YARDID" || descriptor.Name == "YARD" || descriptor.Name == "MBLNO") //if (descriptor.Name == "YARDID" || descriptor.Name == "YARD" || descriptor.Name == "MBLNO")
{ //{
if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO)) // if (!string.IsNullOrWhiteSpace(input.YARDID) && !string.IsNullOrWhiteSpace(input.YARD) && !string.IsNullOrWhiteSpace(input.MBLNO))
{ // {
await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO); // await SendTrace(entity.Id.ToString(), entity.YARDID, entity.YARD, entity.MBLNO);
} // }
} //}
} }
} }
} }

79
Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
Unescape Escape View File

@ -0,0 +1,79 @@
using System;
using SqlSugar;
using System.ComponentModel;
using Myshipping.Core.Entity;
namespace Myshipping.Application.Entity
{
/// <summary>
/// 船期信息
/// </summary>
[SugarTable("vesselinfo")]
[Description("船期信息")]
public class DjyVesselInfo : PrimaryKeyEntity
{
/// <summary>
/// 租户Id
/// </summary>
public long? TenantId { get; set; }
/// <summary>
/// 船名
/// </summary>
public string Vessel { get; set; }
/// <summary>
/// 航次
/// </summary>
public string Voyno { get; set; }
/// <summary>
/// 装货港
/// </summary>
public string PortLoading { get; set; }
/// <summary>
/// 中转港
/// </summary>
public string PortTransit { get; set; }
/// <summary>
/// 卸货港
/// </summary>
public string PortDischarge { get; set; }
/// <summary>
/// 装货港ID
/// </summary>
public string PortLoadingId { get; set; }
/// <summary>
/// 装货港ID
/// </summary>
public string PortTransitId { get; set; }
/// <summary>
/// 卸货港ID
/// </summary>
public string PortDischargeId { get; set; }
/// <summary>
/// 开船日期
/// </summary>
public DateTime? ETD { get; set; }
/// <summary>
/// 截港日期
/// </summary>
public DateTime? ClosingDate { get; set; }
/// <summary>
/// 预抵日期
/// </summary>
public DateTime? ETA { get; set; }
/// <summary>
/// 默认码头
/// </summary>
public string Wharf { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string CARRIER { get; set; }
/// <summary>
/// 船公司ID
/// </summary>
public string CARRIERID { get; set; }
/// <summary>
/// 内部航次
/// </summary>
public string InsideVoyno { get; set; }
}
}

183
Myshipping.Core/Extension/NumberToUpper.cs
Unescape Escape View File

@ -0,0 +1,183 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Core.Extension
{
public static class NumberToUpper
{
/// <summary>
/// 单个数字转为大写
/// </summary>
/// <param name="c">小写阿拉伯数字 0---9</param>
/// <returns>大写数字</returns>
private static string getint(char c)
{
string str = "";
switch (c)
{
case '0':
str = "零";
break;
case '1':
str = "壹";
break;
case '2':
str = "贰";
break;
case '3':
str = "叁";
break;
case '4':
str = "肆";
break;
case '5':
str = "伍";
break;
case '6':
str = "陆";
break;
case '7':
str = "柒";
break;
case '8':
str = "拐";
break;
case '9':
str = "玖";
break;
}
return str;
}
/// <summary>
/// 把一个单元转为大写，如亿单元，万单元，个单元
/// </summary>
/// <param name="str">这个单元的小写数字（4位长，若不足，则前面补零）</param>
/// <param name="strDW">亿，万，元</param>
/// <returns>转换结果</returns>
private static string getupper(string str, string strDW)
{
if (str == "0000")
return "";
string ret = "";
string tmp1 = getint(str[0]);
string tmp2 = getint(str[1]);
string tmp3 = getint(str[2]);
string tmp4 = getint(str[3]);
if (tmp1 != "零")
{
ret = ret + tmp1 + "仟";
}
else
{
ret = ret + tmp1;
}
if (tmp2 != "零")
{
ret = ret + tmp2 + "佰";
}
else
{
if (tmp1 != "零") //保证若有两个零'00'，结果只有一个零，下同
ret = ret + tmp2;
}
if (tmp3 != "零")
{
ret = ret + tmp3 + "拾";
}
else
{
if (tmp2 != "零")
ret = ret + tmp3;
}
if (tmp4 != "零")
{
ret = ret + tmp4;
}
if (ret[0] == '零') //若第一个字符是'零'，则去掉
ret = ret.Substring(1);
if (ret[ret.Length - 1] == '零') //若最后一个字符是'零'，则去掉
ret = ret.Substring(0, ret.Length - 1);
return ret + strDW; //加上本单元的单位
}
/// <summary>
/// 数字转换成大写
/// </summary>
/// <param name="d"></param>
/// <returns></returns>
public static string ToUpper(dynamic d)
{
if (d == 0)
return "零";
string je = d.ToString("####.00");
if (je.Length > 15)
return "";
je = new String('0', 15 - je.Length) + je; //若小于15位长，前面补0
string stry = je.Substring(0, 4); //取得'亿'单元
string strw = je.Substring(4, 4); //取得'万'单元
string strg = je.Substring(8, 4); //取得'元'单元
string strf = je.Substring(13, 2); //取得小数部分
string str1 = "", str2 = "", str3 = "";
str1 = getupper(stry, "亿"); //亿单元的大写
str2 = getupper(strw, "万"); //万单元的大写
str3 = getupper(strg, " "); //元单元的大写
string str_y = "", str_w = "";
if (je[3] == '0' || je[4] == '0') //亿和万之间是否有0
str_y = "零";
if (je[7] == '0' || je[8] == '0') //万和元之间是否有0
str_w = "零";
string ret = str1 + str_y + str2 + str_w + str3; //亿，万，元的三个大写合并
for (int i = 0; i < ret.Length; i++) //去掉前面的"零"
{
if (ret[i] != '零')
{
ret = ret.Substring(i);
break;
}
}
for (int i = ret.Length - 1; i > -1; i--) //去掉最后的"零"
{
if (ret[i] != '零')
{
ret = ret.Substring(0, i + 1);
break;
}
}
if (ret[ret.Length - 1] != ' ') //若最后不位不是'元'，则加一个'元'字
ret = ret + "";
if (ret == "零零") //若为零元，则去掉"元数"，结果只要小数部分
ret = "";
if (strf == "00") //下面是小数部分的转换
{
ret = ret + "整";
}
else
{
string tmp = "";
tmp = getint(strf[0]);
if (tmp == "零")
ret = ret + tmp;
else
ret = ret + tmp + "角";
tmp = getint(strf[1]);
if (tmp == "零")
ret = ret + "整";
else
ret = ret + tmp + "分";
}
if (ret[0] == '零')
{
ret = ret.Substring(1); //防止0.03转为"零叁分"，而直接转为"叁分"
}
return ret; //完成，返回
}
}
}

126
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -5138,6 +5138,28 @@
<param name="prop"></param> <param name="prop"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Myshipping.Core.Extension.NumberToUpper.getint(System.Char)">
<summary>
单个数字转为大写
</summary>
<param name="c">小写阿拉伯数字 0---9</param>
<returns>大写数字</returns>
</member>
<member name="M:Myshipping.Core.Extension.NumberToUpper.getupper(System.String,System.String)">
<summary>
把一个单元转为大写，如亿单元，万单元，个单元
</summary>
<param name="str">这个单元的小写数字（4位长，若不足，则前面补零）</param>
<param name="strDW">亿，万，元</param>
<returns>转换结果</returns>
</member>
<member name="M:Myshipping.Core.Extension.NumberToUpper.ToUpper(System.Object)">
<summary>
数字转换成大写
</summary>
<param name="d"></param>
<returns></returns>
</member>
<member name="T:Myshipping.Core.PagedQueryableExtensions"> <member name="T:Myshipping.Core.PagedQueryableExtensions">
<summary> <summary>
分页拓展类 分页拓展类
@ -10532,6 +10554,25 @@
发件SSL 发件SSL
</summary> </summary>
</member> </member>
<member name="T:Myshipping.Core.Service.DjyVesselInfoService">
<summary>
用户自定义配置服务
</summary>
</member>
<member name="M:Myshipping.Core.Service.DjyVesselInfoService.AddOrUpdate(Myshipping.Application.Entity.DjyVesselInfo)">
<summary>
新增编辑
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.DjyVesselInfoService.GetList(System.String)">
<summary>
下拉列表
</summary>
<param name="KeyWord"></param>
<returns></returns>
</member>
<member name="T:Myshipping.Core.Service.DjyWebsiteAccountConfigService"> <member name="T:Myshipping.Core.Service.DjyWebsiteAccountConfigService">
<summary> <summary>
网站账号维护服务 网站账号维护服务
@ -16423,5 +16464,90 @@
<param name="node"></param> <param name="node"></param>
<param name="childNodeLists"></param> <param name="childNodeLists"></param>
</member> </member>
<member name="T:Myshipping.Application.Entity.DjyVesselInfo">
<summary>
船期信息
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.Vessel">
<summary>
船名
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.Voyno">
<summary>
航次
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortLoading">
<summary>
装货港
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortTransit">
<summary>
中转港
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortDischarge">
<summary>
卸货港
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortLoadingId">
<summary>
装货港ID
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortTransitId">
<summary>
装货港ID
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.PortDischargeId">
<summary>
卸货港ID
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.ETD">
<summary>
开船日期
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.ClosingDate">
<summary>
截港日期
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.ETA">
<summary>
预抵日期
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.Wharf">
<summary>
默认码头
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.CARRIER">
<summary>
船公司
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.CARRIERID">
<summary>
船公司ID
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.InsideVoyno">
<summary>
内部航次
</summary>
</member>
</members> </members>
</doc> </doc>

67
Myshipping.Core/Service/DjyVesselInfo/DjyVesselInfoService.cs
Unescape Escape View File

@ -0,0 +1,67 @@
using Myshipping.Core;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Linq;
using System.Threading.Tasks;
using Myshipping.Core.Entity;
using Myshipping.Application.Entity;
using Furion.FriendlyException;
using System.Collections.Generic;
namespace Myshipping.Core.Service
{
/// <summary>
/// 用户自定义配置服务
/// </summary>
[ApiDescriptionSettings(Name = "DjyVesselInfo", Order = 1)]
public class DjyVesselInfoService : IDjyVesselInfoService, IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<DjyVesselInfo> _rep;
private readonly ISysCacheService _sysCacheService;
public DjyVesselInfoService(SqlSugarRepository<DjyVesselInfo> rep, ISysCacheService sysCacheService)
{
_sysCacheService = sysCacheService;
_rep = rep;
}
/// <summary>
/// 新增编辑
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<long> AddOrUpdate(DjyVesselInfo dto)
{
if (dto == null)
{
throw Oops.Bah("请传入数据！");
}
if (dto.Id == 0)
{
await _rep.InsertAsync(dto);
}
else
{
await _rep.AsUpdateable(dto).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
return dto.Id;
}
/// <summary>
/// 下拉列表
/// </summary>
/// <param name="KeyWord"></param>
/// <returns></returns>
public async Task<dynamic> GetList(string KeyWord) {
//获取船名
List<CodeVessel> list = await _sysCacheService.GetAllCodeVessel();
var tlist= await _rep.AsQueryable().Where(x => x.TenantId == UserManager.TENANT_ID).ToListAsync();
return null;
}
}
}

12
Myshipping.Core/Service/DjyVesselInfo/IDjyVesselInfoService.cs
Unescape Escape View File

@ -0,0 +1,12 @@
using Myshipping.Core;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Myshipping.Core.Entity;
namespace Myshipping.Core.Service
{
public interface IDjyVesselInfoService
{
}
}
Write Preview
Loading…
Cancel
Save