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

'20220722三个小问题'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent 8a63c5c6de
commit b86a018f95
8 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File

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

@ -186,7 +186,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.ETD == "") headData.ETD = null;
if (headData.ETD2 == "") headData.ETD2 = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
if (headData.STLDATE == "") headData.STLDATE = null;
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
@ -610,7 +610,7 @@ namespace DSWeb.MvcShipping.Controllers
if (OrderData.CBM == "") OrderData.CBM = "0";
if (OrderData.ETD == "") OrderData.ETD = null;
if (OrderData.ETD2 == "") OrderData.ETD2 = null;
if (OrderData.SUBMITDATE == "") OrderData.SUBMITDATE = null;
//if (OrderData.SUBMITDATE == "") OrderData.SUBMITDATE = null;
if (OrderData.STLDATE == "") OrderData.STLDATE = null;
if (OrderData.ISSUEDATE == "") OrderData.ISSUEDATE = null;
@ -919,7 +919,7 @@ namespace DSWeb.MvcShipping.Controllers
OrderData.ModelUIStatus = "E";
if (OrderData.ETD == "") OrderData.ETD = null;
if (OrderData.ETD2 == "") OrderData.ETD2 = null;
if (OrderData.SUBMITDATE == "") OrderData.SUBMITDATE = null;
//if (OrderData.SUBMITDATE == "") OrderData.SUBMITDATE = null;
if (OrderData.STLDATE == "") OrderData.STLDATE = null;
if (OrderData.CONFIRMDATE == "") OrderData.CONFIRMDATE = null;
if (OrderData.AUDITDATE == "") OrderData.AUDITDATE = null;
@ -1069,7 +1069,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.STLDATE == "") headData.STLDATE = null;
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
// if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//var cntr = "";
//if (bodyList != null)
//{
@ -1268,7 +1268,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.STLDATE == "") headData.STLDATE = null;
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
var cntr = "";
if (bodyList != null)
{
@ -1436,7 +1436,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.ETD == "") headData.ETD = null;
if (headData.ETD2 == "") headData.ETD2 = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
if (headData.STLDATE == "") headData.STLDATE = null;
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
@ -1465,7 +1465,7 @@ namespace DSWeb.MvcShipping.Controllers
{
var headData = JsonConvert.Deserialize<MsSeaeOrder>(data);
//if (!string.IsNullOrEmpty(headData.AUDITOPERATOR))
headData.AUDITOPERATOR = Convert.ToString(Session["SHOWNAME"]);
headData.AUDITOPERATOR = Convert.ToString(Session["SHOWNAME"]);
headData.AUDITDATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
headData.ORSTATUS = "0";
headData.DbOperationType = DbOperationType.DbotUpd;
@ -1477,7 +1477,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.ETD == "") headData.ETD = null;
if (headData.ETD2 == "") headData.ETD2 = null;
if (headData.STLDATE == "") headData.STLDATE = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
if (headData.CONFIRMDATE == "") headData.CONFIRMDATE = null;
@ -1584,23 +1584,21 @@ namespace DSWeb.MvcShipping.Controllers
var headData = JsonConvert.Deserialize<MsSeaeOrder>(data);
DBResult result = null;
if (headData.AUDITOPERATOR == "" || headData.AUDITOPERATOR == null)
if (string.IsNullOrWhiteSpace( headData.AUDITOPERATOR ) || string.IsNullOrWhiteSpace(headData.AUDITOPERATOR2))
{
var ORDERAUDITMUSTBE = MsSysParamSetDAL.GetData("PARAMNAME='ORDERAUDITMUSTBE'");
if (ORDERAUDITMUSTBE.PARAMVALUE == "1")
{
//var ORDERAUDITMUSTBE = MsSysParamSetDAL.GetData("PARAMNAME='ORDERAUDITMUSTBE'");
//if (ORDERAUDITMUSTBE.PARAMVALUE == "1")
//{
var jsonRespose2 = new JsonResponse
{
Success = false,
Message = "审核人不能为空！",
Message = "审核人、订单确认人，均不能为空！",
Data = ""
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
//}
}
T_ALL_DA T_ALL_DA = new T_ALL_DA();
var CUSTSERVICEID = T_ALL_DA.GetStrSQL("GID", "select top 1 GID from [user] where SHOWNAME='" + headData.CUSTSERVICE + "'");
@ -1635,7 +1633,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.AUDITDATE == "") headData.AUDITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//提交审核日期
headData.SUBMITDATE = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
headData.SUBMITDATE = DateTime.Now;
var modb = new ModelObjectDB();
result = modb.Save(headData);
@ -1781,7 +1779,7 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.CONFIRMDATE == "") headData.CONFIRMDATE = null;
if (headData.AUDITDATE == "") headData.AUDITDATE = null;
if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
//if (headData.SUBMITDATE == "") headData.SUBMITDATE = null;
var modb = new ModelObjectDB();
DBResult result = modb.Save(headData);

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

@ -461,7 +461,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
data.TIDANLEIXING = Convert.ToString(reader["TIDANLEIXING"]);//提单类型
if (reader["SUBMITDATE"] != DBNull.Value)
data.SUBMITDATE = Convert.ToDateTime(reader["SUBMITDATE"]).ToString("yyyy-MM-dd");//提交审核日期
data.SUBMITDATE = Convert.ToDateTime(reader["SUBMITDATE"]);//提交审核日期
#endregion
headList.Add(data);
}
@ -1313,27 +1313,27 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
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);
}
//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();
//}
//cdc.SaveChanges();
}
}

4
DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs
Unescape Escape View File

@ -1415,12 +1415,12 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
set { _TIDANLEIXING = value; }
}
private string _SUBMITDATE = "";
private DateTime? _SUBMITDATE = null;
/// <summary>
/// 提交审核日期
/// </summary>
[ModelDB]
public string SUBMITDATE
public DateTime? SUBMITDATE
{
get { return _SUBMITDATE; }
set { _SUBMITDATE = value; }

7
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -3066,6 +3066,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
text: "复制新建",
handler: function (button, event) {
var basicForm = this.formHead.getForm();
//var editForm = this.formEdit.getForm();
this.opStatus = 'add';
basicForm.findField('BSNO').setDisabled(false);
var field = basicForm.findField('BSNO');
@ -3084,6 +3085,8 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
//field = basicForm.findField('MBLNO');
//field.setValue('');
this.panelFee.strBSNO = BSNO;
for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
@ -3541,8 +3544,10 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
data = result.data;
if (this.opStatus == 'copyadd') {
//复制新建时不保留主提单号
//复制新建时不保留主提单号,审核日期 确认日期
data.MBLNO = "";
data.AUDITDATE = "";
data.CONFIRMDATE = "";
}

20
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -8480,7 +8480,7 @@
<publishTime>07/20/2022 15:22:27</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js">
<publishTime>07/20/2022 17:26:42</publishTime>
<publishTime>07/22/2022 09:20:51</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js">
<publishTime>07/20/2022 15:22:48</publishTime>
@ -12776,10 +12776,10 @@
<publishTime>07/01/2022 11:51:45</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>07/20/2022 17:28:34</publishTime>
<publishTime>07/22/2022 09:37:39</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>07/20/2022 17:28:34</publishTime>
<publishTime>07/22/2022 09:37:39</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>07/19/2022 10:25:07</publishTime>
@ -12839,19 +12839,19 @@
<publishTime>07/20/2022 17:27:56</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>07/20/2022 17:28:09</publishTime>
<publishTime>07/22/2022 09:37:09</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>07/20/2022 17:27:56</publishTime>
<publishTime>07/22/2022 09:36:54</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>07/20/2022 17:27:56</publishTime>
<publishTime>07/22/2022 09:36:54</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>07/20/2022 17:28:09</publishTime>
<publishTime>07/22/2022 09:37:09</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>07/20/2022 17:28:10</publishTime>
<publishTime>07/22/2022 09:37:10</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>07/19/2022 10:25:08</publishTime>
@ -17483,7 +17483,7 @@
<publishTime>07/01/2022 11:51:55</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>07/20/2022 17:28:27</publishTime>
<publishTime>07/22/2022 09:37:31</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>07/01/2022 11:51:55</publishTime>
@ -24032,7 +24032,7 @@
<publishTime>07/01/2022 11:51:57</publishTime>
</File>
<File Include="Web.config">
<publishTime>07/20/2022 15:00:06</publishTime>
<publishTime>07/22/2022 09:01:13</publishTime>
</File>
<File Include="WebSearchEngine/SearchEngineAdapter.aspx">
<publishTime>07/01/2022 11:51:57</publishTime>

2
DSWeb/Web.config
Unescape Escape View File

@ -101,7 +101,7 @@
<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" />

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

Binary file not shown.

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

@ -101,7 +101,7 @@
<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" />

Write Preview
Loading…
Cancel
Save