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

Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent bd3855130d f4cb3af177
commit 09fba917dc
7 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape Escape View File

@ -93,3 +93,6 @@ DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
/Job_DSWMS_REPORT/bin/Debug/Newtonsoft.Json.xml
/DSWeb/Areas/Account/Files/IN2021070200001
/DSWeb/DSWeb.csproj.user
/JobReqWebData/bin/Release/Newtonsoft.Json.dll
/JobReqWebData/bin/Release/JobReqWebData.pdb
/JobReqWebData/bin/Release/JobReqWebData.dll

6
DSWeb.DJYMQ/DS7Service.cs
Unescape Escape View File

@ -180,7 +180,7 @@ namespace DSWeb.Service.Output.DS7
/* 测试时前面增加两个注释号 派车
///436354079932485
var testjson = @"{""head"":{""gid"":""438490327302213"",""messageType"":""TRUCK_SYNC"",""senderId"":""BOOKING_TRUCK"",""senderName"":""\u8BA2\u8231\u6D3E\u8F66"",""receiverId"":""DongshengHeChuan"",""receiverName"":""\u4E1C\u80DC\u548C\u5DDD"",""token"":null,""version"":""1.0"",""requestDate"":""2023-07-13 11:29:43"",""senderKey"":""BOOKING_TRUCK"",""requestAction"":""Sync""},""main"":{""operType"":""AddOrUpdate"",""tenantId"":349708986646597,""id"":438490327302213,""bookingId"":436354079932485,""truckId"":409875146088517,""truckCode"":""HSYCDXHS"",""truckName"":""\u5408\u76DB\u88D5\u8F66\u961F-\u559C\u5408\u76DB"",""toName"":null,""attn"":null,""attnTel"":null,""attnMail"":null,""attnFax"":null,""fromName"":""\u521D\u6653\u5B81"",""fromTel"":"""",""fromMobile"":""15376704956"",""fromMail"":""op37@hightrans.net"",""fromFax"":null,""kgs"":27.0000,""fee"":null,""payMethod"":""OWN_COMPANY"",""payMethodName"":""\u672C\u516C\u53F8\u53D1\u7968"",""truckTime"":""2023-07-13T11:21:12"",""yardid"":""MJCZ"",""yard"":""\u73C9\u94A7\u573A\u7AD9"",""yardcontract"":"""",""yardcontracttel"":"""",""factoryId"":null,""factoryCode"":null,""factoryName"":null,""factoryContact"":null,""factoryTel"":null,""returnTime"":null,""inYardID"":""MJCZ"",""inYard"":""\u73C9\u94A7\u573A\u7AD9"",""inYardContact"":"""",""inYardContractTel"":"""",""needArriveTime"":""2023-07-14T07:00:00"",""closingTime"":null,""pickUpTime"":null,""isGuaJi"":false,""attention"":null,""remark"":""0717X5\u5BF9\u5E94\u63D0\u5355\u53F7\u0027799310252819\uFF0C\u5B89\u639214\u53F7 \u5E73\u5EA6\u90ED\u5E84 \u88C5\u67DC\uFF0C\u8054\u7CFB\u4EBA \u65B9\u58EB\u6D9B18653293332\uFF0C\u6BDB\u91CD27\n\u9EBB\u70E6\u53F8\u673A\u63D0\u597D\u7684\u96C6\u88C5\u7BB1\uFF0C\u96C6\u88C5\u7BB1\u5B50\u5185\u90E8\u548C\u5916\u90E8\u7684\u6BCF\u4E2A\u9762\uFF0C\u9700\u8981\u62CD\u7167\u7247\u548C\u89C6\u9891\uFF0C\u7167\u7247\u548C\u89C6\u9891\u91CC\u7684\u7BB1\u53F7\u9700\u8981\u62CD\u5168\uFF0C\u5982\u679C\u662F\u665A\u4E0A\u63D0\u7BB1\uFF0C\u9EBB\u70E6\u767D\u5929\u518D\u62CD\uFF0C\u665A\u4E0A\u62CD\u7684\u4E0D\u6E05\u695A \u8C22\u8C22"",""dispatcherId"":356029261152325,""dispatcherName"":""\u7F57\u6C5F"",""factoryAddr"":null,""callBackStatus"":""SEND_DISPATCH"",""contaList"":[{""ctncode"":""4"",""ctnall"":""40\u0027RH"",""ctnnum"":1,""teu"":null,""cntrno"":"""",""sealno"":"""",""pkgs"":null,""kindpkgs"":"""",""kgs"":null,""cbm"":null,""tareweight"":null,""ctnstatus"":null,""weightype"":null,""weighkgs"":null,""weighattn"":null,""vgmconncom"":null,""weightel"":null,""weighdate"":null,""vgmaddr"":null,""vgmemail"":null,""remark"":null,""carNumber"":null,""carDriver"":null,""carDriverTel"":null}]}}";
var testjson = @"{""head"":{""gid"":""441000874426437"",""messageType"":""TRUCK_SYNC"",""senderId"":""BOOKING_TRUCK"",""senderName"":""\u8BA2\u8231\u6D3E\u8F66"",""receiverId"":""DongshengHeChuan"",""receiverName"":""\u4E1C\u80DC\u548C\u5DDD"",""token"":null,""version"":""1.0"",""requestDate"":""2023-07-20 15:41:04"",""senderKey"":""BOOKING_TRUCK"",""requestAction"":""Sync""},""main"":{""operType"":""AddOrUpdate"",""tenantId"":349708986646597,""id"":441000874426437,""bookingId"":436086681477189,""truckId"":409875318820933,""truckCode"":""ASJCD"",""truckName"":""\u5B89\u76DB\u6377\u8F66\u961F"",""toName"":null,""attn"":null,""attnTel"":null,""attnMail"":null,""attnFax"":null,""fromName"":""\u738B\u8D77\u51E4"",""fromTel"":""0532-85888610"",""fromMobile"":""15689135576"",""fromMail"":""OP76@hightrans.net"",""fromFax"":null,""kgs"":29.0000,""fee"":null,""payMethod"":""OWN_COMPANY"",""payMethodName"":""\u672C\u516C\u53F8\u53D1\u7968"",""truckTime"":""2023-07-20T13:36:37"",""yardid"":""ZHONGCHUANG"",""yard"":""\u4E2D\u521B\u573A\u7AD9"",""yardcontract"":"""",""yardcontracttel"":"""",""factoryId"":null,""factoryCode"":null,""factoryName"":null,""factoryContact"":""\u5C0F\u80E1 13562918972"",""factoryTel"":null,""returnTime"":""2023-07-23T09:00:00"",""inYardID"":""ZHONGCHUANG"",""inYard"":""\u4E2D\u521B\u573A\u7AD9"",""inYardContact"":"""",""inYardContractTel"":"""",""needArriveTime"":""2023-07-23T05:00:00"",""closingTime"":""2023-07-23T09:00:00"",""pickUpTime"":null,""isGuaJi"":false,""attention"":null,""remark"":null,""dispatcherId"":356029261152325,""dispatcherName"":""\u7F57\u6C5F"",""factoryAddr"":""\u5C71\u4E1C\u7701\u4E34\u6C82\u5E02\u5170\u9675\u53BFX005\u4E0EX111\u4EA4\u53C9\u53E3\u4E1C\u5357\u65B9\u5411650\u7C73\u5DE6\u53F3\n\n\u5170\u9675\u53BF\u5FD7\u5408\u98DF\u54C1\u6709\u9650\u516C\u53F8"",""callBackStatus"":""SEND_DISPATCH"",""contaList"":[{""ctncode"":""4"",""ctnall"":""40\u0027RH"",""ctnnum"":1,""teu"":null,""cntrno"":"""",""sealno"":"""",""pkgs"":2900,""kindpkgs"":""BAGS"",""kgs"":29000.0000,""cbm"":50.0000,""tareweight"":null,""ctnstatus"":null,""weightype"":null,""weighkgs"":null,""weighattn"":null,""vgmconncom"":null,""weightel"":null,""weighdate"":null,""vgmaddr"":null,""vgmemail"":null,""remark"":null,""carNumber"":null,""carDriver"":null,""carDriverTel"":null},{""ctncode"":""4"",""ctnall"":""40\u0027RH"",""ctnnum"":1,""teu"":null,""cntrno"":"""",""sealno"":"""",""pkgs"":2900,""kindpkgs"":""BAGS"",""kgs"":29000.0000,""cbm"":50.0000,""tareweight"":null,""ctnstatus"":null,""weightype"":null,""weighkgs"":null,""weighattn"":null,""vgmconncom"":null,""weightel"":null,""weighdate"":null,""vgmaddr"":null,""vgmemail"":null,""remark"":null,""carNumber"":null,""carDriver"":null,""carDriverTel"":null}]}}";
byte[] byteArray = System.Text.Encoding.Default.GetBytes(testjson);
@ -3377,7 +3377,7 @@ SELECT @ps_BillNo as N'billno'";
重量 = kgs,
尺码 = cbm,
件数大写 = totalno,
集装箱 = cntrtotal,//集装箱,
集装箱 = 集装箱,//cntrtotal,//
箱数大写 = 箱数大写,
计费标准 = 计费标准,
船公司 = 船公司,//carrier,
@ -4687,7 +4687,7 @@ SELECT @ps_BillNo as N'billno'";
ds6.t_op_seae.AddOrUpdate(opseae);
if (currHeadLetterList != null && currHeadLetterList.Count > 0)
if (currHeadLetterList == null || currHeadLetterList.Count == 0)
{
ds6.t_op_letter.Add(HeadLetter);
ds6.SaveChanges();

6
DSWeb/Areas/SoftMng/Controllers/ExportController.cs
Unescape Escape View File

@ -3303,17 +3303,17 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64"
var condition = "1=2";
if (updopseaiType == "1") {
condition = " ((isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "' ) ";
condition = " (isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "' ) ";
}
if (updopseaiType == "2")
{
condition = " ((isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + MBLNO + "' ) ";
condition = " (isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + MBLNO + "' ) ";
}
if (updopseaiType == "3")
{
condition = " ((isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "' ) or (isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "') )";
condition = " ( (isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "' ) or (isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "') )";
}
opseaiheadList = MsOpSeaiDAL.GetDataAll(condition);

16
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -3177,11 +3177,13 @@
<Content Include="Areas\Storage\Content\Storage\js\zepto.min.js" />
<Content Include="Areas\Storage\Content\Storage\js\zepto.weui.js" />
<Content Include="Areas\Storage\Views\Storage\img\num_icon.png" />
<Content Include="Areas\Storage\Views\Storage\KucunList2.aspx" />
<Content Include="Areas\Storage\Views\Storage\StorageMap.aspx" />
<Content Include="Areas\Storage\Views\Storage\KucunList.aspx" />
<Content Include="Areas\Storage\Views\Storage\StorageDetail.aspx" />
<Content Include="Areas\Storage\Views\Storage\StorageList.aspx" />
<Content Include="Areas\Storage\Views\Storage\UserRegist.aspx" />
<Content Include="Areas\Storage\Views\Storage\WUTONGKucunList.aspx" />
<Content Include="Areas\SysMng\ViewJs\DBTableConn\DBTableConnEdit.js" />
<Content Include="Areas\SysMng\ViewJs\DBTableConn\DBTableConnIndex.js" />
<Content Include="Areas\SysMng\ViewJs\DBTableConn\DBTableConnModel.js" />
@ -7841,6 +7843,13 @@
<Compile Include="Areas\Storage\Views\Shared\PC.Master.designer.cs">
<DependentUpon>PC.Master</DependentUpon>
</Compile>
<Compile Include="Areas\Storage\Views\Storage\KucunList2.aspx.cs">
<DependentUpon>KucunList2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Areas\Storage\Views\Storage\KucunList2.aspx.designer.cs">
<DependentUpon>KucunList2.aspx</DependentUpon>
</Compile>
<Compile Include="Areas\Storage\Views\Storage\StorageMap.aspx.cs">
<DependentUpon>StorageMap.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -7876,6 +7885,13 @@
<Compile Include="Areas\Storage\Views\Storage\UserRegist.aspx.designer.cs">
<DependentUpon>UserRegist.aspx</DependentUpon>
</Compile>
<Compile Include="Areas\Storage\Views\Storage\WUTONGKucunList.aspx.cs">
<DependentUpon>WUTONGKucunList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Areas\Storage\Views\Storage\WUTONGKucunList.aspx.designer.cs">
<DependentUpon>WUTONGKucunList.aspx</DependentUpon>
</Compile>
<Compile Include="Areas\SysMng\Controllers\DBTableConnController.cs" />
<Compile Include="Areas\SysMng\Controllers\SysUserOPRangeController.cs" />
<Compile Include="Areas\SysMng\Controllers\SysUserController.cs" />

BIN
JobReqWebData/bin/Release/JobReqWebData.dll
View File

Binary file not shown.

BIN
JobReqWebData/bin/Release/JobReqWebData.pdb
View File

Binary file not shown.

BIN
JobReqWebData/bin/Release/Newtonsoft.Json.dll
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save