diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs index becd0514..69a96281 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs @@ -4559,16 +4559,16 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice Database userdb = DatabaseFactory.CreateDatabase(); using (IDataReader reader = userdb.ExecuteReader(CommandType.Text, userstr.ToString())) { - str = ""; + str = "("; while (reader.Read()) { - if (str == "") + if (str == "(") { - str = " COMPANYID='" + companyid + "' "; + str += " COMPANYID='" + companyid + "' "; } else { - str = str + " or COMPANYID='" + companyid + "' "; + str += " or COMPANYID='" + companyid + "' "; }; } str = str + ")"; diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index a19cc94c..713dde0d 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs @@ -2910,11 +2910,11 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement if (!string.IsNullOrEmpty(strCondition)) { - strCondition = strCondition + " and cm.ReplacePaymentStatus<>'未代付' "; + strCondition = strCondition + " and isnull(cm.ReplacePaymentStatus,'')<>'未代付' "; } else { - strCondition = " cm.ReplacePaymentStatus<>'未代付' "; + strCondition = " isnull(cm.ReplacePaymentStatus,'')<>'未代付' "; } var strSql = new StringBuilder(); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js index 679579f7..01cc3d5a 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js @@ -46,9 +46,15 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, { this.INVOICEPORT = ""; this.INVAPPPRINTAFTERAUDIT = 0; - parentWin = window.parent.opener; - mainWin = getMainForm(parentWin); - + //parentWin = window.parent.opener; + //mainWin = getMainForm(parentWin); + if (!this.bsCust) { + parentWin = window.parent.opener; + mainWin = getMainForm(parentWin); + } else { + parentWin = window.parent.opener.parent.opener; + mainWin = getMainForm(parentWin); + } //#region 枚举参照相关(编辑form) this.comboxPUSHMODE = getEnumcombox({ diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js index 18b0c015..52bf41e3 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js @@ -2149,7 +2149,7 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, { var ReplacePaymentStatus = form.findField('ReplacePaymentStatus').getRawValue(); sql = sql + getAndConSql(sql, ReplacePaymentStatus, "ReplacePaymentStatus ='" + ReplacePaymentStatus + "' "); - var ReplacePaymentCORPID = form.findField('ReplacePaymentCORPID').getRawValue(); + var ReplacePaymentCORPID = form.findField('ReplacePaymentCORPID').getValue(); sql = sql + getAndConSql(sql, ReplacePaymentCORPID, "ReplacePaymentCORPID ='" + ReplacePaymentCORPID + "' "); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js index 7ed707d3..2b80a030 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js @@ -43,8 +43,17 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, { this.bsnosql = getUrlParam('bsnosql'); this.bsCust = getUrlParam('bsCust'); - parentWin = window.parent.opener; - mainWin = getMainForm(parentWin); + //parentWin = window.parent.opener; + //mainWin = getMainForm(parentWin); + + if (!this.bsCust) { + parentWin = window.parent.opener; + mainWin = getMainForm(parentWin); + } else { + parentWin = window.parent.opener.parent.opener; + mainWin = getMainForm(parentWin); + } + Ext.define('DsShipping.ux.MsClientGroup', { extend: 'Ext.data.Model', diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js index e3d65df7..ff092563 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationIndex.js @@ -1400,11 +1400,9 @@ Ext.extend(Shipping.MsChPayapplicationIndex, Ext.Panel, { var ReplacePaymentStatus = form.findField('ReplacePaymentStatus').getRawValue(); sql = sql + getAndConSql(sql, ReplacePaymentStatus, "ReplacePaymentStatus ='" + ReplacePaymentStatus + "' "); - var ReplacePaymentCORPID = form.findField('ReplacePaymentCORPID').getRawValue(); + var ReplacePaymentCORPID = form.findField('ReplacePaymentCORPID').getValue(); sql = sql + getAndConSql(sql, ReplacePaymentCORPID, "ReplacePaymentCORPID ='" + ReplacePaymentCORPID + "' "); - - return sql; }, OprationSwap: function () { diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js index 634d222a..39184755 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js @@ -29,14 +29,22 @@ Ext.extend(Shipping.MsChRecvapplicationBLEdit, Ext.Panel, { this.canedit = false; this.selectfeesql = ''; - parentWin = window.parent.opener; - mainWin = getMainForm(parentWin); - this.formname = "MsChRecvapplicationBLEdit"; //页面名称 this.bsnosql = getUrlParam('bsnosql'); this.bsCust = getUrlParam('bsCust'); this.bsCustNo = getUrlParam('bsCustNo'); + //parentWin = window.parent.opener; + //mainWin = getMainForm(parentWin); + if (!this.bsCust) { + parentWin = window.parent.opener; + mainWin = getMainForm(parentWin); + } else { + parentWin = window.parent.opener.parent.opener; + mainWin = getMainForm(parentWin); + } + + Ext.define('DsShipping.ux.MsClientGroup', { extend: 'Ext.data.Model', diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js index 956980c4..5e53b80b 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js @@ -234,7 +234,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { // } //} - this.LoadDateCurr(); + this.LoadDateCurr(true); } } } @@ -422,7 +422,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { name: 'SETTLETIME', listeners: { change: function () { - _this.LoadDateCurr(); + _this.LoadDateCurr(true); } } }, { @@ -1189,7 +1189,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { }, selModel: this.AddGridCheckBoxModel, tbar: [{ - text: Zi.LAN.AddJSDetail, + text: Zi.LAN.AddJSDetail,//添加结算明细 tooltip: Zi.LAN.AddJSDetail, id: 'btnaddbill', iconCls: "btnadddetail", @@ -1460,7 +1460,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { }, selModel: this.AddFeeGridCheckBoxModel, tbar: [{ - text: Zi.LAN.AddSelFeeDetail , + text: Zi.LAN.AddSelFeeDetail ,//添加结算费用明细 tooltip: Zi.LAN.AddSelFeeDetail , iconCls: "btnadddetail", id: "btnadddetail", @@ -4834,7 +4834,7 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { SALECORP = rec.data.SALECORP; if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null)) this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust); - if ((CURR == '') || (CURR == null)) { + if (CURR != curr) { this.formEdit.getForm().findField('CURR').setValue(curr); if (curr == 'RMB') { this.formEdit.getForm().findField('RATE').setValue(1); @@ -4854,27 +4854,76 @@ Ext.extend(Shipping.MsChRecvSettlementBLEdit, Ext.Panel, { // this.formEdit.getForm().findField('RATE').setValue(1); // } //} - if (_this.StoreDateCurr.getCount() > 0) { + this.LoadDateCurr() + } + //this.LoadDateCurr(); + ////等待300毫秒后重新执行 + //_return = true; + //setTimeout(this.addDetail, 300); - for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) { - var member = _this.StoreDateCurr.getAt(i); - if (member.data.CURR == CURR) { - this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE); - } - } + } else { + + var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue(); + var recs = DsStoreQueryBy(this.storeCustCode, 'CustName', CUST); + var CUSTBANK = this.formEdit.getForm().findField('CUSTBANK'); + var CUSTACCOUNT = this.formEdit.getForm().findField('CUSTACCOUNT'); + var CURR = this.formEdit.getForm().findField('CURR').getValue(); + if (recs.getCount() > 0) { + var data = recs.getAt(0).data; + if (CURR == 'RMB') { + CUSTBANK.setValue(data.RMBBank); + CUSTACCOUNT.setValue(data.RMBAccount); + } else if (CURR == 'USD') { + CUSTBANK.setValue(data.USDBank); + CUSTACCOUNT.setValue(data.USDAccount); - } else { - var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR); - if (DFrecords.getCount() > 0) { - var dfdata = DFrecords.getAt(0).data; - var DEFRATE = dfdata.DEFRATE; - this.formEdit.getForm().findField('RATE').setValue(DEFRATE); - } else { - this.formEdit.getForm().findField('RATE').setValue(1); - } } + } else { + CUSTBANK.setValue(''); + CUSTACCOUNT.setValue(''); } } + //if ((CURR == '') || (CURR == null)) { + // this.formEdit.getForm().findField('CURR').setValue(curr); + // if (curr == 'RMB') { + // this.formEdit.getForm().findField('RATE').setValue(1); + // } else { + // //var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr); + // //if (FFrecords.getCount() > 0) { + // // var ffdata = FFrecords.getAt(0).data; + // // var DEFRATE = ffdata.DEFRATE; + // // this.formEdit.getForm().findField('RATE').setValue(DEFRATE); + // //} else { + // // var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', curr); + // // if (DFrecords.getCount() > 0) { + // // var dfdata = DFrecords.getAt(0).data; + // // var DEFRATE = dfdata.DEFRATE; + // // this.formEdit.getForm().findField('RATE').setValue(DEFRATE); + // // } else { + // // this.formEdit.getForm().findField('RATE').setValue(1); + // // } + // //} + // if (_this.StoreDateCurr.getCount() > 0) { + + // for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) { + // var member = _this.StoreDateCurr.getAt(i); + // if (member.data.CURR == CURR) { + // this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE); + // } + // } + + // } else { + // var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR); + // if (DFrecords.getCount() > 0) { + // var dfdata = DFrecords.getAt(0).data; + // var DEFRATE = dfdata.DEFRATE; + // this.formEdit.getForm().findField('RATE').setValue(DEFRATE); + // } else { + // this.formEdit.getForm().findField('RATE').setValue(1); + // } + // } + // } + //} var CUST = this.formEdit.getForm().findField('CUSTOMERNAME').getValue(); var recs = DsStoreQueryBy(this.storeCustCode, 'CustName', CUST); var CUSTBANK = this.formEdit.getForm().findField('CUSTBANK'); @@ -7215,15 +7264,15 @@ onSelectFee: function (button, event) { //#region 载入汇率信息 , - LoadDateCurr() { + async LoadDateCurr(needload=false) { + _this = this; - var CURR = this.formEdit.getForm().findField('CURR').getValue(); - if (CURR == 'RMB') { - this.formEdit.getForm().findField('RATE').setValue(1); - } else { - var DateStr = _this.formEdit.getForm().findField("SETTLETIME").getRawValue(); + var DateStr = _this.formEdit.getForm().findField("SETTLETIME").getRawValue(); + + if (needload) { this.StoreDateCurr.load({ + async:false, params: { DateStr: DateStr }, @@ -7252,6 +7301,78 @@ onSelectFee: function (button, event) { }, scope: this }); + } + + + var CURR = this.formEdit.getForm().findField('CURR').getValue(); + if (CURR == 'RMB') { + this.StoreDateCurr.load({ + params: { + DateStr: DateStr + }, + callback: function (r, options, success) { + if (success) { + //_this.LoadDateCurr(); + } + }, + scope: this + }); + this.formEdit.getForm().findField('RATE').setValue(1); + } else { + if (_this.StoreDateCurr.getCount() > 0) { + + for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) { + var member = _this.StoreDateCurr.getAt(i); + if (member.data.CURR == CURR) { + this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE); + } + } + return; + } else { + this.StoreDateCurr.load({ + async: false, + params: { + DateStr: DateStr + }, + callback: function (r, options, success) { + if (success) { + _this.LoadDateCurr(); + } + }, + scope: this + }); + } + + //await this.StoreDateCurr.load({ + // async:false, + // params: { + // DateStr: DateStr + // }, + // callback: function (r, options, success) { + // if (success) { + // if (_this.StoreDateCurr.getCount() > 0) { + + // for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) { + // var member = _this.StoreDateCurr.getAt(i); + // if (member.data.CURR == CURR) { + // this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE); + // } + // } + + // } else { + // var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR); + // if (DFrecords.getCount() > 0) { + // var dfdata = DFrecords.getAt(0).data; + // var DEFRATE = dfdata.DEFRATE; + // this.formEdit.getForm().findField('RATE').setValue(DEFRATE); + // } else { + // this.formEdit.getForm().findField('RATE').setValue(1); + // } + // } + // } + // }, + // scope: this + //}); diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs index 39083378..f5b8ba38 100644 --- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs @@ -5330,6 +5330,28 @@ namespace DSWeb.Areas.CommMng.DAL #endregion + #region 将datetime字段读取后进行判断 如==1900-01-01则返回空白"" + + public static string ReadDateTime(IDataReader reader, string Fieldname) + { + + var result = Convert.ToDateTime(reader[Fieldname]).ToString("yyyy-MM-dd") == "1900-01-01" ? "" : Convert.ToDateTime(reader[Fieldname]).ToString("yyyy-MM-dd"); + + return result; + //try + //{ + // var index = reader.GetOrdinal(Fieldname); + // if (index > -1) + // return true; + // else return false; + //} + //catch { + // return false; + //} + } + + #endregion + /// /// 将Excel单表转为Datatable diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index 78a5513f..b02ab532 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -937,7 +937,7 @@ namespace DSWeb.MvcShipping.Controllers var cdc = new CommonDataContext(); var FenList = cdc.crm_seaeorder_fen.Where(x => x.MASTERNO == head.BSNO).ToList(); var 贸易条款 = FOBorEXW.First(x => x.EnumValueID == head.TRADETERM); - if (FenList==null || FenList.Count>0 || FenList.Exists(x => x.CUSTOMERNAME == "" || x.CUSTOMERNAME == null)) + if (FenList==null || FenList.Count==0 || FenList.Exists(x => x.CUSTOMERNAME == "" || x.CUSTOMERNAME == null)) { result.AddError($"【贸易条款为{贸易条款.EnumValueName}】的业务，分单信息中委托单位为必填"); } @@ -3249,6 +3249,7 @@ namespace DSWeb.MvcShipping.Controllers if (headData.ETA == "") headData.ETA = null; if (headData.ETD == "") headData.ETD = null; + if (headData.STLDATE == "") headData.STLDATE = null; if (headData.ISSUEDATE == "") headData.ISSUEDATE = null; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs index c9acf1bc..3dad24c0 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs @@ -457,8 +457,8 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL if (reader["AUDITDATE"] != DBNull.Value) data.AUDITDATE = Convert.ToDateTime(reader["AUDITDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期 if (reader["CONFIRMDATE"] != DBNull.Value) - data.CONFIRMDATE = Convert.ToDateTime(reader["CONFIRMDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期 - + //data.CONFIRMDATE = Convert.ToDateTime(reader["CONFIRMDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//截港日期 + data.CONFIRMDATE = BasicDataRefDAL.ReadDateTime(reader,"CONFIRMDATE"); data.CONFIRMOP = Convert.ToString(reader["CONFIRMOP"]);//确认人 //data.OPERATORTEL = Convert.ToString(reader["SenderMobile"]);// @@ -487,7 +487,8 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL data.SALECORP = Convert.ToString(reader["SALECORP"]);// if (reader["ETD2"] != DBNull.Value) - data.ETD2 = Convert.ToDateTime(reader["ETD2"]).ToString("yyyy-MM-dd");//驳船到港日期 + //data.ETD2 = Convert.ToDateTime(reader["ETD2"]).ToString("yyyy-MM-dd")== "1900-01-01"?"": Convert.ToDateTime(reader["ETD2"]).ToString("yyyy-MM-dd");//驳船到港日期 + data.ETD2 = BasicDataRefDAL.ReadDateTime(reader, "ETD2"); data.AUDITOPERATOR2 = Convert.ToString(reader["AUDITOPERATOR2"]);//提单确认人 data.ISSUETYPE2 = Convert.ToString(reader["ISSUETYPE2"]);//H签单方式 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/1_系统问题10.5.docx b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/1_系统问题10.5.docx new file mode 100644 index 00000000..39868750 --- /dev/null +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/1_系统问题10.5.docx @@ -0,0 +1,61 @@ +系统操作问题： +1.万华产品入库一车多个交货单的，万华报表货物信息不能与交货单号一一相对应 + +可处理 + +2.万华产品入库计划完成以后，希望就能从系统中根据计划入库日期在万华化学入库统计报表中导出入库数据 +入库统计报表中的数据应当以入库执行完成后的实际值为准，而不应以入库计划为准。如按此修改，则【万华化学入库统计报表】就无法反映实际入库的数值。 + +3.万华化工产品入库计划时识别万华化学订单包装重有读数不对的情况 + + 实际PDF有时有变化，识别目前无法做到精确定位到名称当中规格的文本。 + +4.万华产品一车装多个出库交货单及订单的，但是货物是入库的同一个交货单单号项下的，在出库计划时不能引出或是拆分成多行出库计划明细，进行分行列出出库交货单号和订单号 + +另外在出库计划引上去之后修改件数重量等信息后合计数不能自动计算随之变动 +这两条应该都可以，我要再试一下 +5.万华产品出库受理时选中打托，托盘的地方按照实际托盘填写，但是在万华化学出库统计报表中还是显示此产品入库时的托盘登记记录 + +可修改 +6.万华出库时从系统直接发送闸口，信息能上传成功，但是车辆有出区不成功的情况，需要从分类监管系统删除之后重新从分类监管系统申报 +出库申报也许可以修改为允许做多次提交，稍后确定 + +7.出入库计划做完之后，在出入库受理时可以修改数量生成当车的受理单，但是当天有出入库完成的，计划也会随之消失，像大票入库的橡胶、纸浆、颗粒等一票货物分多天入库的情况很多 +可以改为一个入库计划不会因为所属入库执行都完成而自动完成的处理。但，如果有一个计划实际数量未取用完也不需要再继续执行的话，就必须手动点击入库计划中的【设为完成】 +8.保税区有不少一车同时装纽约路和莫斯科路两个仓库货物的情况，但是系统不能做在一个计划和受理单上，需要分仓库做计划和受理 +同一个出库计划当中安排不同库区的货物出库在之前的需求当中是没有的，增加这个部分会影响权限的按仓库分配 +9.入库单导出和打印时希望同货权转移后的存货凭证都带有仓库专用的电子章 +但是存货凭证一式五张是一样的，需要有仓库留存、货主留存以及供银行付汇 +而且在货权转移成功之后在库间管理货权转移计划和确认处查询不到货转记录 + +可修改 + +10.调整库位标识卡 +如A库位有20件，其中10件调至B ,原A库位还有10件，这个10件的新标识卡系统无打印的模块 +11.货物在库时，有保税区货物转非保税货物的情况，暂时在系统没有可以操作的窗口，目前保税区有这样的需求 +可修改，在【库存查询明细】列表的编辑按钮内增加对保税属性的修改； + +系统报表问题： +1.日周月年报表 无查询的地方只能刷新 但是不论选海关报表还是期初结存报表都是空白的 + + +需填写查询条件后点击 重新统计 + +2.叉车工作量统计 系统平均分，但是实际操作过程中，如一票20个柜，A卸3个柜，B卸5个柜，C卸卸12个柜，系统无法真实记录 +之前系统讨论需求时要求此数据按此方法处理，这里数据需求变更，需修改系统界面和一些报表逻辑。 +3.出入结报表无查询按钮，刷新后无论选择哪个仓库导出的内容一样，选择的日期与导出的报表也不符（导出的都是7月份的数据） + +需填写查询条件后点击 重新统计 + +4.系统在操作过程中常有下面提示 + + + +5.工作量统计表无导出按钮，无法查询指定哪个叉车的产量 + + +可修改 + + + + diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index 87f12a58..a68114e1 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -5162,7 +5162,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { Ext.getCmp("Audit_CONTRACTNO").setValue(this.AUDITDATA2.CONTRACTNO); Ext.getCmp("Audit_BCNO").setValue(this.AUDITDATA2.BCNO); Ext.getCmp("Audit_DIANSHANGORDERNO").setValue(this.AUDITDATA2.DIANSHANGORDERNO); - Ext.getCmp("Audit_OP").setValue(this.AUDITDATA2.OP); + Ext.getCmp("Audit_OP").setValue(this.AUDITDATA.OP); }, doAccAudit: function () { diff --git a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user index 92d28c3b..312670e6 100644 --- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>F:\DS7Deploy - True|2022-09-30T09:35:06.7888422Z;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00; + True|2022-10-09T02:19:46.2980229Z;True|2022-09-30T17:35:06.7888422+08:00;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00; @@ -612,7 +612,7 @@ 08/26/2022 20:31:11 - 09/29/2022 16:03:28 + 10/08/2022 15:45:38 09/30/2022 09:30:41 @@ -822,19 +822,19 @@ 08/26/2022 20:26:40 - 09/30/2022 17:32:26 + 10/08/2022 12:01:44 09/06/2022 13:49:00 - 09/29/2022 15:44:33 + 10/08/2022 15:44:26 09/29/2022 11:48:13 - 09/29/2022 15:44:33 + 10/08/2022 14:54:25 09/06/2022 11:53:29 @@ -882,7 +882,7 @@ 08/26/2022 20:26:40 - 09/29/2022 15:44:33 + 10/08/2022 15:46:07 09/29/2022 11:48:22 @@ -5556,7 +5556,7 @@ 08/26/2022 20:31:11 - 09/16/2022 17:44:55 + 10/08/2022 10:30:26 08/04/2022 17:58:46 @@ -5637,7 +5637,7 @@ 08/26/2022 20:26:42 - 09/01/2022 17:28:27 + 10/08/2022 15:42:20 08/26/2022 20:26:42 @@ -8409,7 +8409,7 @@ 08/26/2022 20:31:11 - 09/23/2022 15:09:34 + 10/08/2022 10:31:11 08/26/2022 20:31:11 @@ -8520,7 +8520,7 @@ 09/22/2022 13:36:04 - 09/22/2022 13:36:04 + 10/08/2022 11:35:38 08/26/2022 20:31:11 @@ -12822,10 +12822,10 @@ 08/26/2022 20:26:37 - 09/30/2022 17:34:07 + 10/09/2022 10:18:57 - 09/30/2022 17:34:07 + 10/09/2022 10:18:57 08/26/2022 20:26:48 @@ -12885,19 +12885,19 @@ 09/14/2022 18:07:40 - 09/30/2022 17:33:48 + 10/09/2022 10:18:37 - 09/30/2022 17:33:36 + 10/09/2022 10:18:27 - 09/30/2022 17:33:36 + 10/09/2022 10:18:27 - 09/30/2022 17:33:48 + 10/09/2022 10:18:37 - 09/30/2022 17:33:49 + 10/09/2022 10:18:38 08/28/2022 03:33:29 @@ -17529,7 +17529,7 @@ 08/26/2022 20:26:46 - 09/30/2022 17:34:01 + 10/09/2022 10:18:51 08/26/2022 20:26:46 @@ -24078,7 +24078,7 @@ 08/26/2022 20:26:48 - 09/02/2022 18:42:43 + 10/08/2022 10:32:01 08/26/2022 20:26:48 diff --git a/DSWeb/Web.config b/DSWeb/Web.config index 898e843b..12c2f627 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -90,10 +90,10 @@ --> - + --> diff --git a/DSWeb/bin/DSWeb.XmlSerializers.dll b/DSWeb/bin/DSWeb.XmlSerializers.dll index 7a5352be..fc1fc6e3 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 898e843b..12c2f627 100644 --- a/DSWeb/bin/DSWeb.dll.config +++ b/DSWeb/bin/DSWeb.dll.config @@ -90,10 +90,10 @@ --> - + --> diff --git a/DSWeb/bin/DSWebComponent.pdb b/DSWeb/bin/DSWebComponent.pdb index bdda1984..c0610935 100644 Binary files a/DSWeb/bin/DSWebComponent.pdb and b/DSWeb/bin/DSWebComponent.pdb differ diff --git a/DSWeb/bin/JsonHelper.dll b/DSWeb/bin/JsonHelper.dll index 07017b46..05ef3e2a 100644 Binary files a/DSWeb/bin/JsonHelper.dll and b/DSWeb/bin/JsonHelper.dll differ diff --git a/DSWeb/bin/JsonHelper.pdb b/DSWeb/bin/JsonHelper.pdb index 55f4236b..0a323573 100644 Binary files a/DSWeb/bin/JsonHelper.pdb and b/DSWeb/bin/JsonHelper.pdb differ diff --git a/DSWeb/bin/WebSqlHelper.dll b/DSWeb/bin/WebSqlHelper.dll index 5556771c..28eb5378 100644 Binary files a/DSWeb/bin/WebSqlHelper.dll and b/DSWeb/bin/WebSqlHelper.dll differ diff --git a/DSWeb/bin/WebSqlHelper.pdb b/DSWeb/bin/WebSqlHelper.pdb index faf51afb..87af2b42 100644 Binary files a/DSWeb/bin/WebSqlHelper.pdb and b/DSWeb/bin/WebSqlHelper.pdb differ