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

'增加，销售订舱确认时产生分单的逻辑'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent c2be5c0a0b
commit 3ce04f14d2
41 changed files with 54287 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
BookingJieFeng/BookingJieFeng.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

2
BookingWeb/BookingWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

BIN
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
4fd1eaeae63e5f6f06805555518f0d0d620e5893
678037f85c586ea56c9d27c1569e6c8026b148c7

16
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -62,3 +62,19 @@ H:\DS7\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CoreCompileInputs.cache
H:\DS7\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CopyComplete
H:\DS7\DSWeb.Common\obj\Debug\DSWeb.Common.dll
H:\DS7\DSWeb.Common\obj\Debug\DSWeb.Common.pdb
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\DSWeb.Common.dll.config
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\DSWeb.Common.dll
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\DSWeb.Common.pdb
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\EntityFramework.dll
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\EntityFramework.SqlServer.dll
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\log4net.dll
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\Newtonsoft.Json.dll
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\EntityFramework.xml
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\EntityFramework.SqlServer.xml
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\log4net.xml
H:\DS7_QDHHYT\DSWeb.Common\bin\Debug\Newtonsoft.Json.xml
H:\DS7_QDHHYT\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CoreCompileInputs.cache
H:\DS7_QDHHYT\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CopyComplete
H:\DS7_QDHHYT\DSWeb.Common\obj\Debug\DSWeb.Common.dll
H:\DS7_QDHHYT\DSWeb.Common\obj\Debug\DSWeb.Common.pdb

BIN
DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
View File

Binary file not shown.

54121
DSWeb.Interface/bin/Debug/EntityFramework.xml
View File

File diff suppressed because it is too large Load Diff

BIN
DSWeb.Interface/bin/Debug/HcDBUtility.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/HcDBUtility.pdb
View File

Binary file not shown.

2
DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
313079d5b5e9baef6c710db6228245ecda75d0c4
6296ca3c7af7bf8af8d7f8f6d06a05844f04768d

21
DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -38,3 +38,24 @@ H:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.cache
H:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CopyComplete
H:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.dll
H:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.pdb
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\DSWeb.Interface.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\DSWeb.Interface.pdb
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\DSWeb.Common.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\HcDBUtility.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Newtonsoft.Json.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\log4net.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Logging.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Data.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Common.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Microsoft.Practices.ObjectBuilder2.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\Microsoft.Practices.Unity.dll
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\DSWeb.Common.pdb
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\DSWeb.Common.dll.config
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\HcDBUtility.pdb
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\EntityFramework.xml
H:\DS7_QDHHYT\DSWeb.Interface\bin\Debug\log4net.xml
H:\DS7_QDHHYT\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.cache
H:\DS7_QDHHYT\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CopyComplete
H:\DS7_QDHHYT\DSWeb.Interface\obj\Debug\DSWeb.Interface.dll
H:\DS7_QDHHYT\DSWeb.Interface\obj\Debug\DSWeb.Interface.pdb

BIN
DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
View File

Binary file not shown.

4
DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs
Unescape Escape View File

@ -885,6 +885,10 @@ namespace DSWeb.MvcShipping.Controllers
result = MsSeaeOrderDAL.SendMailWithFile(mailtitle, Body.ToString(), filepath, mailto, Convert.ToString(Session["SHOWNAME"]));
}
//20220719 增加海运出口的分单信息（根据销售订舱的分单信息）
MsSeaeOrderDAL.OrderToOp_MakeFen(headData, Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
}

14
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -6147,6 +6147,20 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
return headList;
}
public static string GetShipperDetailByShipperid(string shipperid) {
var result = "";
var shipperlist = GetShipperList(" shipperid='" + shipperid + "'");
if (shipperlist != null && shipperlist.Count > 0) {
result = shipperlist[0].SHIPPERDETAIL;
}
return result;
}
#endregion
#region EF状态

78
DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs
Unescape Escape View File

@ -24,6 +24,7 @@ using DSWeb.Areas.Import.DAL.ReceiptDoc;
using MimeKit.Text;
using DSWeb.Common.DB;
using System.Linq;
using DSWeb.MvcShipping.DAL.MsOpSeaeDAL;
namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
{
@ -970,7 +971,16 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
public static DBResult OrderToOp(MsSeaeOrder OrderData, string accdate, string op, string custservice, string FORWARDER, string ORREMARK,string OPNAME,string COMPANYID,string userid)
{
var result = new DBResult();
if (string.IsNullOrWhiteSpace(OrderData.ETD))
{
result.SetErrorInfo("ETD不能为空");
return result;
}
var headData = new MsOpSeae();
OrderData.CONFIRMOP = OPNAME;
OrderData.CONFIRMDATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@ -1253,15 +1263,81 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
}
//20220719
OrderToOp_MakeFen(headData, userid,COMPANYID);
}
return result;
}
/// <summary>
/// 根据crm_seaeorder_fen的信息 产生
/// </summary>
/// <param name="OrderData"></param>
public static void OrderToOp_MakeFen(MsOpSeae opseae,string userid,string companyid) {
//寻找对应的分单列表
var cdc = new CommonDataContext();
var fenlist = cdc.crm_seaeorder_fen.Where(x => x.MASTERNO == opseae.BSNO).ToList();
if (fenlist != null && fenlist.Count > 0) {
foreach (var fen in fenlist) {
var newfenrec = new MsOpSeae();
newfenrec = opseae;
newfenrec.DbOperationType = DbOperationType.DbotIns;
newfenrec.BSNO = fen.BSNO;
newfenrec.MASTERNO = fen.MASTERNO;
newfenrec.CUSTOMERNAME = fen.CUSTOMERNAME;
newfenrec.SHIPPERID = fen.SHIPPERID;
newfenrec.SHIPPER = MsOpSeaeDAL.MsOpSeaeDAL.GetShipperDetailByShipperid(newfenrec.SHIPPERID);
newfenrec.CONSIGNEEID = fen.CONSIGNEEID;
newfenrec.CONSIGNEE = MsOpSeaeDAL.MsOpSeaeDAL.GetShipperDetailByShipperid(newfenrec.CONSIGNEEID);
newfenrec.NOTIFYPARTYID = fen.NOTIFYPARTYID;
newfenrec.NOTIFYPARTY = MsOpSeaeDAL.MsOpSeaeDAL.GetShipperDetailByShipperid(newfenrec.NOTIFYPARTYID);
newfenrec.PKGS = fen.PKGS.ToString();
newfenrec.KGS = fen.KGS.ToString();
newfenrec.CBM = fen.CBM.ToString();
newfenrec.MARKS = fen.MARKS;
newfenrec.DESCRIPTION = fen.DESCRIPTION;
var modb = new ModelObjectDB();
var result = modb.Save(newfenrec);
if (result.Success) {
MsSeaeOrderDAL.AddOrderDetail(fen.BSNO, fen.ORDNO, userid, companyid);
}
var fenctnlist = cdc.crm_seaeorderctn.Where(x => x.ORDNO == fen.ORDNO).ToList();
if (fenctnlist != null && fenctnlist.Count > 0) {
foreach (var fenctn in fenctnlist) {
var newctn = new op_ctn_md();
newctn.CTN_ID = Guid.NewGuid().ToString();
newctn.BSNO = newfenrec.BSNO;
newctn.CTNNUM = fenctn.CTNNUM;
newctn.CTNALL = fenctn.CTNALL;
if (fenctn.CTNALL.Length == 4) {
newctn.SIZE = fenctn.CTNALL.Substring(0, 2);
newctn.CTN = fenctn.CTNALL.Substring(2, 2);
}
newctn.REMARK= fenctn.REMARK;
newctn.vgmconncom = "";
newctn.TEU = 0;
newctn.WEIGHKGS = 0;
cdc.OP_CTN.Add(newctn);
}
}
cdc.SaveChanges();
}
}
}
#endregion
public static DBResult SendMailWithFile(string title, string context, string filePath, string MailToAddress,string username)
public static DBResult SendMailWithFile(string title, string context, string filePath, string MailToAddress,string username)
{
var result = new DBResult();

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>H:\DS7\DSWeb\Properties\PublishProfiles\配置文件1.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

8
DSWeb/Web.config
Unescape Escape View File

@ -97,14 +97,14 @@
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456 -->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
</connectionStrings>

BIN
DSWeb/bin/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb/bin/DSWeb.Interface.pdb
View File

Binary file not shown.

8
DSWeb/bin/DSWeb.dll.config
Unescape Escape View File

@ -97,14 +97,14 @@
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456 -->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
</connectionStrings>

BIN
DSWeb/bin/DSWeb.rar
View File

Binary file not shown.

BIN
DSWeb/bin/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/HcDBUtility.dll
View File

Binary file not shown.

BIN
DSWeb/bin/HcDBUtility.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.pdb
View File

Binary file not shown.

2
DispatchWeb/DispatchWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

BIN
HcDBUtility/bin/Debug/HcDBUtility.dll
View File

Binary file not shown.

BIN
HcDBUtility/bin/Debug/HcDBUtility.pdb
View File

Binary file not shown.

6
JsonHelper/obj/Debug/JsonHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -33,3 +33,9 @@ H:\DS7发布版2019\JsonHelper\obj\Debug\JsonHelper.dll
H:\DS7发布版2019\JsonHelper\obj\Debug\JsonHelper.pdb
H:\DS7发布版2019\JsonHelper\obj\Debug\JsonHelper.csproj.AssemblyReference.cache
H:\DS7\JsonHelper\obj\Debug\JsonHelper.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\JsonHelper\bin\Debug\JsonHelper.dll
H:\DS7_QDHHYT\JsonHelper\bin\Debug\JsonHelper.pdb
H:\DS7_QDHHYT\JsonHelper\obj\Debug\JsonHelper.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\JsonHelper\obj\Debug\JsonHelper.csproj.CoreCompileInputs.cache
H:\DS7_QDHHYT\JsonHelper\obj\Debug\JsonHelper.dll
H:\DS7_QDHHYT\JsonHelper\obj\Debug\JsonHelper.pdb

BIN
WebSqlHelper/bin/Debug/WebSqlHelper.dll
View File

Binary file not shown.

BIN
WebSqlHelper/bin/Debug/WebSqlHelper.pdb
View File

Binary file not shown.

BIN
WebSqlHelper/obj/Debug/WebSqlHelper.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
WebSqlHelper/obj/Debug/WebSqlHelper.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
23ed6e4eff810cee4e154ef0fe3e4ee29e5ceb3e
827d301a7d04857534eb624012ca3fc12d538c1a

13
WebSqlHelper/obj/Debug/WebSqlHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -76,3 +76,16 @@ H:\DS7发布版2019\WebSqlHelper\obj\Debug\WebSqlHelper.dll
H:\DS7发布版2019\WebSqlHelper\obj\Debug\WebSqlHelper.pdb
H:\DS7发布版2019\WebSqlHelper\obj\Debug\WebSqlHelper.csproj.AssemblyReference.cache
H:\DS7\WebSqlHelper\obj\Debug\WebSqlHelper.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\WebSqlHelper.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\WebSqlHelper.pdb
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Common.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Data.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Logging.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.ObjectBuilder.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.ObjectBuilder2.dll
H:\DS7_QDHHYT\WebSqlHelper\bin\Debug\Microsoft.Practices.Unity.dll
H:\DS7_QDHHYT\WebSqlHelper\obj\Debug\WebSqlHelper.csproj.AssemblyReference.cache
H:\DS7_QDHHYT\WebSqlHelper\obj\Debug\WebSqlHelper.csproj.CoreCompileInputs.cache
H:\DS7_QDHHYT\WebSqlHelper\obj\Debug\WebSqlHelper.csproj.CopyComplete
H:\DS7_QDHHYT\WebSqlHelper\obj\Debug\WebSqlHelper.dll
H:\DS7_QDHHYT\WebSqlHelper\obj\Debug\WebSqlHelper.pdb

BIN
WebSqlHelper/obj/Debug/WebSqlHelper.dll
View File

Binary file not shown.

BIN
WebSqlHelper/obj/Debug/WebSqlHelper.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save