diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index 84c4c890..630ae72b 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -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(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(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); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs index 4f95871f..be92334f 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs @@ -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(); } } diff --git a/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs b/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs index 1ee05958..9722ccef 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs @@ -1415,12 +1415,12 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder set { _TIDANLEIXING = value; } } - private string _SUBMITDATE = ""; + private DateTime? _SUBMITDATE = null; /// /// 提交审核日期 /// [ModelDB] - public string SUBMITDATE + public DateTime? SUBMITDATE { get { return _SUBMITDATE; } set { _SUBMITDATE = value; } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index 3298353e..725e360d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -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 = ""; } diff --git a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user index 3410ae82..a40065b7 100644 --- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -8480,7 +8480,7 @@ 07/20/2022 15:22:27 - 07/20/2022 17:26:42 + 07/22/2022 09:20:51 07/20/2022 15:22:48 @@ -12776,10 +12776,10 @@ 07/01/2022 11:51:45 - 07/20/2022 17:28:34 + 07/22/2022 09:37:39 - 07/20/2022 17:28:34 + 07/22/2022 09:37:39 07/19/2022 10:25:07 @@ -12839,19 +12839,19 @@ 07/20/2022 17:27:56 - 07/20/2022 17:28:09 + 07/22/2022 09:37:09 - 07/20/2022 17:27:56 + 07/22/2022 09:36:54 - 07/20/2022 17:27:56 + 07/22/2022 09:36:54 - 07/20/2022 17:28:09 + 07/22/2022 09:37:09 - 07/20/2022 17:28:10 + 07/22/2022 09:37:10 07/19/2022 10:25:08 @@ -17483,7 +17483,7 @@ 07/01/2022 11:51:55 - 07/20/2022 17:28:27 + 07/22/2022 09:37:31 07/01/2022 11:51:55 @@ -24032,7 +24032,7 @@ 07/01/2022 11:51:57 - 07/20/2022 15:00:06 + 07/22/2022 09:01:13 07/01/2022 11:51:57 diff --git a/DSWeb/Web.config b/DSWeb/Web.config index b1d66dea..137f7feb 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -101,7 +101,7 @@ --> - + diff --git a/DSWeb/bin/DSWeb.XmlSerializers.dll b/DSWeb/bin/DSWeb.XmlSerializers.dll index 380b6274..93ea12bb 100644 Binary files a/DSWeb/bin/DSWeb.XmlSerializers.dll and b/DSWeb/bin/DSWeb.XmlSerializers.dll differ diff --git a/DSWeb/bin/DSWeb.dll.config b/DSWeb/bin/DSWeb.dll.config index b1d66dea..137f7feb 100644 --- a/DSWeb/bin/DSWeb.dll.config +++ b/DSWeb/bin/DSWeb.dll.config @@ -101,7 +101,7 @@ --> - +