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
YingHang
ddlucky 7 months ago
parent 178d0dc805 787b81dacd
commit 01c2151e19
5 changed files with 17 additions and 12 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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

2
DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js
Unescape Escape View File

@ -1050,7 +1050,7 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
}
Ext.MessageBox.confirm(Zi.LAN.Prompt, Zi.LAN.suredelete, function (btn) {
Ext.MessageBox.confirm(Zi.LAN.Prompt, '确实要作废吗？', function (btn) {
if (btn == 'yes') {
Ext.Ajax.request({
waitMsg: Zi.LAN.nowdelete,

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

@ -1993,7 +1993,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var blUpSQL = " insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(NEWID(),'" + headData.BSNO + "','ETD更改','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + headData.ETD + '(' + ETD + ')' + "','" + userid + "')";
bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
}
var ACCDATE2 = T_ALL_DA.GetStrSQL("ACCDATE", "select MBLNO from OP_SEAE WHERE BSNO='" + headData.BSNO + "'");
var ACCDATE2 = T_ALL_DA.GetStrSQL("ACCDATE", "select ACCDATE from OP_SEAE WHERE BSNO='" + headData.BSNO + "'");
if (ACCDATE2 != headData.ACCDATE)
{
var blUpSQL = " insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(NEWID(),'" + headData.BSNO + "','会计期间更改','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + headData.ACCDATE + '(' + ACCDATE2 + ')' + "','" + userid + "')";
@ -2233,7 +2233,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
//则用ctnall的前两位填充size
//用ctnall的后两位填充ctn
foreach (var ctn in bodyList) {
if (bodyList != null)
{
foreach (var ctn in bodyList)
{
if (!string.IsNullOrWhiteSpace(ctn.CTNALL) && string.IsNullOrWhiteSpace(ctn.SIZE))
{
ctn.SIZE = ctn.CTNALL.Substring(0, 2);
@ -2243,6 +2247,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
ctn.SIZE = ctn.CTNALL.Substring(ctn.CTNALL.Length - 2, 2);
}
}
}
result = MsOpSeaeDAL.SaveDetail(BSNO, bodyList, userid, true);

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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Write Preview
Loading…
Cancel
Save