1

DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs

@@ -2152,7 +2152,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
                    data.PAYAPPID = Convert.ToString(reader["PAYAPPID"]);
                    data.CHEQUENUMREMARK = Convert.ToString(reader["CHEQUENUMREMARK"]);
                    data.INVNO = Convert.ToString(reader["INVNO"]);
-                   if (reader["INVDATE"] != DBNull.Value)
+                    if (reader["INVDATE"] != DBNull.Value && reader["INVDATE"].ToString() != "")
                         data.INVDATE = Convert.ToDateTime(reader["INVDATE"]).ToString("yyyy-MM-dd");
                     data.CUSTACCOUNTGID = Convert.ToString(reader["CUSTACCOUNTGID"]);
                    data.CUSTBANKNAME = Convert.ToString(reader["CUSTBANKNAME"]);

DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs

@@ -303,7 +303,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
                     data.PAYAPPID = Convert.ToString(reader["PAYAPPID"]);
                     data.CHEQUENUMREMARK = Convert.ToString(reader["CHEQUENUMREMARK"]);
                     data.INVNO = Convert.ToString(reader["INVNO"]);
-                    if (reader["INVDATE"] != DBNull.Value)
+                    if (reader["INVDATE"] != DBNull.Value&& reader["INVDATE"].ToString() != "")
                         data.INVDATE = Convert.ToDateTime(reader["INVDATE"]).ToString("yyyy-MM-dd");
                     data.INVOICEAMOUNT = Convert.ToString(reader["INVOICEAMOUNT"]);
                     //if (reader["INVDATE"] != DBNull.Value)

DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js

@@ -347,6 +347,21 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
                 dataIndex: 'BILLDATE',
                 header: Zi.LAN.BILLDATE,
                 width: 100
+            }, {
+                sortable: true,
+                dataIndex: 'INVOICENO',
+                header: Zi.LAN.InvoiceNumber,
+                width: 160
+            }, {
+                sortable: true,
+                dataIndex: 'INVOICEDATE',
+                header: Zi.LAN.INVOICEDATE,
+                width: 160
+            }, {
+                sortable: true,
+                dataIndex: 'INVOICEAMOUNT',
+                header: Zi.LAN.INVOICEAMOUNT,
+                width: 160
             }];
 
         this.girdcolums = this.initgirdcolums;

DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs

@@ -663,6 +663,7 @@ namespace DSWeb.MvcShipping.Controllers
             headShen.ENTERTIME = DateTime.Now;
             headShen.DbOperationType = DbOperationType.DbotIns;
             headShen.PAYABLETIME = DateTime.Now.ToString("yyyy-MM-dd");
+            headShen.INVDATE = null;
             var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='付费申请'", Convert.ToString(Session["COMPANYID"]));
             if (billnoset.BILLTYPE != "")
                 headShen.BILLNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headShen.PAYABLETIME.ToString().Trim(), headShen.APPLYTIME.ToString());

DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs

@@ -328,7 +328,7 @@ namespace DSWeb.MvcShipping.Controllers
 
                 strSql.Append(" FROM CH_FEE F WITH (NOLOCK) ");
                 strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO)  ");
-                strSql.Append("LEFT JOIN v_op_gain_sum G  ON (G.BSNO=B.BSNO)  ");
+                strSql.Append(" LEFT JOIN v_op_gain_sum G  ON (G.BSNO=B.BSNO)  ");
                 strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME)  ");
                 strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO)  ");
                 if (!string.IsNullOrEmpty(condition))

DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

@@ -2850,6 +2850,9 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                         var cbmdata = new MsFeeUnit();
                         cbmdata.SUNIT = "C-尺码";
                         cbmdata.UNIT = "尺码";
+                        if (CBM<1)
+                            cbmdata.QUANTITY =1;
+                        else 
                           cbmdata.QUANTITY = CBM;
                         bodyList.Add(cbmdata);
                         var pkgsdata = new MsFeeUnit();

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridLR.js

@@ -4574,6 +4574,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                         if (isEmptyObject(recchange)) memberyf.commit();
 
                     };
+                    var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
+                    DRSELECTSTR.setText('', false);
                 } else {
                     var rec = selections[0];
                     var custname = rec.data.CustomerName;
@@ -4585,6 +4587,39 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                         DESCRIPTION: custname
                     });
                     _thisfee.storeCustomerNameRefDr.add(recordCustCode);
+                    var storeSelect = Ext.create('DsExt.ux.RefTableStore', {
+                        model: 'MsSelectFee',
+                        proxy: { url: '/MvcShipping/MsCompanys/GetNoPicDataList' }
+                    });
+
+                    for (var i = 0; i < selections.length; i++) {
+                        var memberyf = selections[i];
+                        var records = DsStoreQueryBy(storeSelect, 'CURR', memberyf.data.Currency)
+                        if (records.getCount() > 0) {
+                            var rec = records.getAt(0);
+                            var AMOUNT = Add(rec.data.AMOUNT, memberyf.data.Amount);
+                            rec.set('AMOUNT', AMOUNT);
+                        } else {
+                            var rec = Ext.create('MsSelectFee', {
+                                CURR: memberyf.data.Currency,
+                                AMOUNT: memberyf.data.Amount
+                            });
+                            storeSelect.add(rec);
+                        }
+                    }
+                    if (storeSelect.getCount() > 0) {
+                        str = '选中费用合计[';
+                        for (i = 0; i < storeSelect.getCount(); i += 1) {
+                            var memberyf = storeSelect.getAt(i);
+                            str = str + memberyf.data.CURR + ':' + memberyf.data.AMOUNT + ';';
+                        }
+                        str = str + ']';
+                        var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
+                        DRSELECTSTR.setText(str, false);
+                    } else {
+                        var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
+                        DRSELECTSTR.setText('', false);
+                    }
                 }
             }
         });
@@ -4598,6 +4633,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                         if (isEmptyObject(recchange)) memberyf.commit();
 
                     };
+                    var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
+                    DRSELECTSTR.setText('', false);
                 } else {
                     var rec = selections[0];
                     var custname = rec.data.CustomerName;
@@ -4609,6 +4646,39 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                         DESCRIPTION: custname
                     });
                     _thisfee.storeCustomerNameRefCr.add(recordCustCode);
+                    var storeSelect = Ext.create('DsExt.ux.RefTableStore', {
+                        model: 'MsSelectFee',
+                        proxy: { url: '/MvcShipping/MsCompanys/GetNoPicDataList' }
+                    });
+
+                    for (var i = 0; i < selections.length; i++) {
+                        var memberyf = selections[i];
+                        var records = DsStoreQueryBy(storeSelect, 'CURR', memberyf.data.Currency)
+                        if (records.getCount() > 0) {
+                            var rec = records.getAt(0);
+                            var AMOUNT = Add(rec.data.AMOUNT, memberyf.data.Amount);
+                            rec.set('AMOUNT', AMOUNT);
+                        } else {
+                            var rec = Ext.create('MsSelectFee', {
+                                CURR: memberyf.data.Currency,
+                                AMOUNT: memberyf.data.Amount
+                            });
+                            storeSelect.add(rec);
+                        }
+                    }
+                    if (storeSelect.getCount() > 0) {
+                        str = '选中费用合计[';
+                        for (i = 0; i < storeSelect.getCount(); i += 1) {
+                            var memberyf = storeSelect.getAt(i);
+                            str = str + memberyf.data.CURR + ':' + memberyf.data.AMOUNT + ' ';
+                        }
+                        str = str + ']';
+                        var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
+                        DRSELECTSTR.setText(str, false);
+                    } else {
+                        var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
+                        DRSELECTSTR.setText('', false);
+                    }
 
                 }
             }

DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterTruckEdit.js

@@ -599,6 +599,15 @@ Ext.extend(Shipping.MsOpLetterTruckEdit, Ext.Panel, {
                             this.LoadinitData();
                     },
                     scope: this
+                }, '-', {
+                    id: 'btnEHistryCopy',
+                    text: "历史引入",
+                    handler: function (button, event) {
+
+                        DsOpenEditWin('/MvcShipping/MsOpLetter/HistryTruckIndex', "派车通知历史引入", "600", "940", "10", "10");
+
+                    },
+                    scope: this
                 }, '-',
             {
                 text: "生成派车单", menu: menu1, scope: this

DSWeb/Areas/TruckMng/Viewsjs/MsOpTruckBulk/MsRptTruckBulkCtnProfitIndex.js

@@ -1229,6 +1229,8 @@ Ext.extend(Shipping.MsRptTruckBulkCtnProfitIndex, Ext.Panel, {
         var ORDERNO = form.findField('ORDERNO').getValue();
         sql = sql + getAndConSql(sql, ORDERNO, "B.ORDERNO like '%" + ORDERNO + "%'");
 
+        var MBLNO = form.findField('MBLNO').getValue();
+        sql = sql + getAndConSql(sql, MBLNO, "B.MBLNO like '%" + MBLNO + "%'");
 
         var PAYNO = form.findField('PAYNO').getValue();
         sql = sql + getAndConSql(sql, PAYNO, "P.BSNO IN (SELECT DISTINCT BSNO FROM CH_FEE_DO WHERE BILLNO='" + PAYNO + "')");
@@ -1244,9 +1246,9 @@ Ext.extend(Shipping.MsRptTruckBulkCtnProfitIndex, Ext.Panel, {
 
 
         var ETDBgn = form.findField('ETDBgn').getRawValue();
-        sql = sql + getAndConSql(sql, ETDBgn, "CONVERT(char(10), P.ETD, 20) >='" + ETDBgn + "'");
+        sql = sql + getAndConSql(sql, ETDBgn, "CONVERT(char(10), P.ETA, 20) >='" + ETDBgn + "'");
         var ETDEnd = form.findField('ETDEnd').getRawValue();
-        sql = sql + getAndConSql(sql, ETDEnd, "CONVERT(char(10), P.ETD, 20) <='" + ETDEnd + "'");
+        sql = sql + getAndConSql(sql, ETDEnd, "CONVERT(char(10), P.ETA, 20) <='" + ETDEnd + "'");
 
         var TRUCKER = form.findField('TRUCKER').getValue();
         sql = sql + getAndConSql(sql, TRUCKER, "P.TRUCKER='" + TRUCKER + "'");