Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs

@@ -79,9 +79,9 @@ namespace DSWeb.Areas.Account.Controllers
             var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataListStr });
             return new ContentResult() { Content = json };
         }
-        public ContentResult GetBLListData2(int start, int limit, string sort, string condition)
+        public ContentResult GetBLListData2(int start, int limit, string sort, string condition, bool IsOver = false)
         {
-            var dataList = Chfee_AuditDAL.GetBillDataList(condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort);
+            var dataList = Chfee_AuditDAL.GetBillDataList(condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort,false,true);
             //            int count = Chfee_AuditDAL.getTotalCount(condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]));
 
             var list = dataList.Skip(start).Take(limit);

DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs

@@ -602,7 +602,7 @@ namespace DSWeb.Areas.Account.Controllers
             {
                 var modb = new ModelObjectDB();
                 DBResult result = ChinvoiceapplicationDAL.AddDetail(bill, duino, bodyList, curr, Convert.ToString(Session["COMPANYID"]), islist, GID, headData);
-                if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(bill, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"])); }
+                if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(bill, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]).ToString().Trim()); }
 
 
                 var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
@@ -654,7 +654,7 @@ namespace DSWeb.Areas.Account.Controllers
                 {
                     var modb = new ModelObjectDB();
                     DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, custgroup, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]));
-                    if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"])); }
+                    if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]),Convert.ToString(Session["USERID"]).ToString().Trim()); }
 
                     var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
                     return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
@@ -698,7 +698,7 @@ namespace DSWeb.Areas.Account.Controllers
                 var modb = new ModelObjectDB();
 
                 DBResult result = ChinvoiceapplicationDAL.AddBill(billno, duino, billcust, billcurr, feesql, exrateList, Convert.ToString(Session["COMPANYID"]), islist, GID, headData, false, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]));
-                if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"])); }
+                if (result.Success) { ChinvoiceapplicationDAL.p_update_AmountNew(billno, GID, Convert.ToString(Session["DEPTNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]).ToString().Trim()); }
 
                 var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };

DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs

@@ -302,7 +302,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
 
         #region Inquery BillDataList
 
-        static public List<MsOpBill> GetBillDataList(string strCondition, string userid, string username, string companyid,string sort = null,bool all=false)
+        static public List<MsOpBill> GetBillDataList(string strCondition, string userid, string username, string companyid,string sort = null,bool all=false, bool IsOver = false)
         {
 
             var strSql = new StringBuilder();
@@ -351,14 +351,21 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
             }
             var sortstring = DatasetSort.Getsortstring(sort);
 
-
-            if (!string.IsNullOrEmpty(sortstring))
+            if (IsOver)
             {
-                strSql.Append(" order by " + sortstring);
+                strSql.Append(" order by case when op_audit.AUDITUSER='" + username + "' then op_audit.AUDITTIME else op_audit.AUDITTIME2 end  desc");
+
             }
             else
-            {     
-                //strSql.Append(" order by ETD,MBLNO");
+            {
+                if (!string.IsNullOrEmpty(sortstring))
+                {
+                    strSql.Append(" order by " + sortstring);
+                }
+                else
+                {
+                    //strSql.Append(" order by ETD,MBLNO");
+                }
             }
             return SetBillData(strSql);
         }
@@ -4650,7 +4657,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
                                             _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=2,BSSTATUS=1 WHERE MASTERNO=@BSNO";
                                         }
                                     }
-                                    _feeComm = "update ch_fee set FEESTATUS=0 where FEESTATUS=2 AND BSNO in (select bsno from v_op_bill where MASTERNO=@BSNO)";
+                                    _feeComm = "update ch_fee set FEESTATUS=0 where FEESTATUS=2 AND BSNO in (select bsno from v_op_bill where MASTERNO=@BSNO or BSNO=@BSNO)";
                                 }
                                 else
                                 {
@@ -4687,7 +4694,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
                                             else _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE() WHERE MASTERNO=@BSNO";
                                         }
                                     }
-                                    _feeComm = "update ch_fee set FEESTATUS=2 where (FEESTATUS=1 or FEESTATUS=6 or FEESTATUS=7) AND BSNO in (select bsno from v_op_bs where MASTERNO=@BSNO)";
+                                    _feeComm = "update ch_fee set FEESTATUS=2 where (FEESTATUS=1 or FEESTATUS=6 or FEESTATUS=7) AND BSNO in (select bsno from v_op_BILL where MASTERNO=@BSNO or BSNO=@BSNO)";
 
                                 }
                                 var cmdupdate = db.GetSqlStringCommand(_Comm);

DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs

@@ -4481,7 +4481,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
             db.ExecuteNonQuery(cmd);
             return 0;
         }
-        public static int p_update_AmountNew(string billno, string GID,string deptname,string companyid)
+        public static int p_update_AmountNew(string billno, string GID,string deptname,string companyid,string userid)
         {
             Database db = DatabaseFactory.CreateDatabase();
 
@@ -4498,7 +4498,12 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
             T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
             var GOODSNAME = T_ALL_DA.GetStrSQL("GOODSNAME", "select top 1 GOODSNAME from SYS_DEPT_ARREARS where DEPT='"+deptname+"' AND OPLBNAME IN (select top 1 OPLBNAME from v_op_bill where BSNO IN (SELECT BSNO FROM CH_FEE_DO WHERE BILLNO='" + headData.BILLNO+ "'))");
 
+            var EMAIL = headData.PUSHEMAIL;
+            if (deptname != "海运部" && deptname != "财务部") {
+                var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.GID='" + userid + "'", companyid);
+                EMAIL=OPUSER.Email;
 
+            }
 
             var bankList = MsInfoClientDAL.GetBankList(" LINKID in (SELECT GID FROM INFO_CLIENT WHERE SHORTNAME='" + headData.CUSTOMERNAME + "' and CORPID='" + companyid + "')", "0");
 
@@ -4553,7 +4558,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
                             else
                                 detail.CUSTBANK = headData.CUSTBANK;
                         }
-                        detail.EMAIL = headData.PUSHEMAIL;
+                        detail.EMAIL = EMAIL;
                         detail.GOODSNAME = GOODSNAME;
 
 
@@ -4598,7 +4603,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
                             else
                                 detail.CUSTBANK = headData.CUSTBANK;
                         }
-                        detail.EMAIL = headData.PUSHEMAIL;
+                        detail.EMAIL = EMAIL;
                         detail.GOODSNAME = GOODSNAME;
 
                         dataList.Add(detail);
@@ -4646,7 +4651,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
                             else
                                 detail.CUSTBANK = headData.CUSTBANK;
                         }
-                        detail.EMAIL = headData.PUSHEMAIL;
+                        detail.EMAIL = EMAIL;
                         detail.GOODSNAME = GOODSNAME;
 
                         dataList.Add(detail);
@@ -4694,7 +4699,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
                             else
                                 detail.CUSTBANK = headData.CUSTBANK;
                         }
-                        detail.EMAIL = headData.PUSHEMAIL;
+                        detail.EMAIL = EMAIL;
                         detail.GOODSNAME = GOODSNAME;
 
                         dataList.Add(detail);

DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js

@@ -2358,17 +2358,17 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
                 }, {
                     sortable: true,
                     dataIndex: 'EXCHANGERATE',
-                    text: 'EXCHANGE RATE',
+                    text: 'EXRATE',
                     renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
                     align: 'right',
-                    width: 180
+                    width: 90
                 }, {
                     sortable: true,
                     dataIndex: 'POFITRATE',
                     text: 'GROSS PROFIT RATE',
                     renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
                     align: 'right',
-                    width: 180
+                    width: 120
                 }
             ]
         });
@@ -2449,8 +2449,9 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
         _this = this;
         this.storeBillList.on('beforeload', function (store) {
             var sql = this.sqlcontext;
-
-            Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext });
+            var IsOver = false;
+            if (this.CheckOver.checked) IsOver = true;
+            Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext,IsOver: IsOver });
         }, this);
 
         this.CheckAll.addListener('change', function (field, newValue, oldValue, eOpts) {
@@ -2519,9 +2520,10 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
                         _thisblaudit.storeAuditDetailList.load({ params: { condition: "BSNO='" + bsno + "'" } });
                         _thisblaudit.storeBLChFee.load({ params: { bsno: _thisblaudit.strMBSNO, SLNO, SLNO, bltype: bltype, optype: _thisblaudit.strOPTYPE } });
                         var bstextall = "";
-                        bstextall = bstextall + '集装箱：' + record.data.CNTRTOTAL;
-                        bstextall = bstextall + ' 场站：' + record.data.YARD;
-                        bstextall = bstextall + ' 船公司：' + record.data.CARRIER;
+                        bstextall = bstextall + '箱量：' + record.data.CNTRTOTAL;
+                        bstextall = bstextall + '\xa0' + '\xa0' + '\xa0' + '\xa0'+ '提交人：' + record.data.BILLFEEOP;
+                        bstextall = bstextall + '\xa0' + '\xa0' + '\xa0' + '\xa0'+'主提单号：' + record.data.MBLNO;
+                        bstextall = bstextall + '\xa0' + '\xa0' + '\xa0' + '\xa0'+ '委托编号：' + record.data.CUSTNO;
                         Ext.getCmp("bstextall").setText(bstextall);
 
                         //_thisblaudit.formHead.getForm().reset();

DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js

@@ -608,13 +608,12 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
                     },
                     scope: this
 
-                },
-                '-', {
+                }, '-', {
                     text: "申请开票",
                     iconCls: "btnadd",
                     handler: function (button, event) {
                         this.OprationStatus = 'add';
-                        DsOpenEditWin('/Account/Chfee_invoice/AppEdit', '新建申请发票');
+                        DsOpenEditWin('/Account/Chfee_invoice_HangXin/AppAdd', '新建申请发票');
                     },
                     scope: this
 

DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js

@@ -1224,7 +1224,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
                                                 xtype: 'button',
                                                 text: "模板1",
                                                 handler: function (button, event) {
-                                                    this.ImportRemarks('发票备注1');
+                                                    this.ImportRemarks('发票备注');
                                                 },
                                                 scope: this
                                             }]

DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js

@@ -629,6 +629,13 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
                             }
                         }],
                     scope: this
+                }, '-',
+                {
+                    text: "打印",
+                    handler: function (button, event) {
+                        this.PrintSelect();
+                    },
+                    scope: this
                 }
             ]
         });
@@ -1990,6 +1997,40 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
 
     },
 
+    PrintSelect: function () {
+
+        var selections = this.gridList.getSelectionModel().getSelection();
+        if (selections.length == 0) {
+            Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
+        }
+
+        var feeGidSql = '';
+        for (var i = 0; i < selections.length; i++) {
+            var record = selections[i];
+            var feeGId = "'" + record.get('BILLNO') + "'";
+            if (feeGidSql == '') {
+                feeGidSql = feeGId;
+            } else {
+                feeGidSql = feeGidSql + "," + feeGId;
+            }
+        };
+
+        var record = selections[0];
+        var billNo = record.data.BILLNO;
+
+        var printType = 'MSCHFEEINVOICEAPPLICATIONSEL';
+        var sql1 = "SELECT p.*,(select ShowName from [user] where GID=p.APPLICANT) as APPLICANTNAME FROM ch_fee_invoiceapplication p WHERE p.BILLNO IN (" + feeGidSql + ") ";
+        var sql2 = "";
+
+        var sql3 = "";
+        var sql4 = "";
+        var sql5 = "";
+        var sql6 = "";
+
+        PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6);
+    },
+
     getCondition: function () {
         var form = this.formSearch.getForm();
         if (!form.isValid()) {

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -20650,7 +20650,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 OpAms = GetAmsData("BSNO='" + bill.BSNO + "'");
 
                 var contractno = bill.CONTRACTNO;
-                if (string.IsNullOrEmpty(contractno)) contractno = "081546";
+                if (string.IsNullOrEmpty(contractno) && ftpset.SENDCODE == "QJM") contractno = "081546";
 
                 //提单号
                 r.WriteLine("02:" + bill.CUSTNO.Trim() + ":" + bill.MBLNO.Trim() + ":" + bill.SERVICE + ":" + ftpset.SENDCODE + ":HMM::::::::"+ contractno + "::" + bill.SERVICECONTRACTNO + "::'");
@@ -20991,7 +20991,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 }
                 OpAms = GetAmsData("BSNO='" + bill.BSNO + "'");
                 var contractno = bill.CONTRACTNO;
-                if (string.IsNullOrEmpty(contractno)) contractno = "081546";
+                if (string.IsNullOrEmpty(contractno)&&ftpset.SENDCODE== "QJM") contractno = "081546";
 
                 //提单号
                 r.WriteLine("02:" + bill.MBLNO.Trim() + ":" + bill.MBLNO.Trim() + ":" + bill.SERVICE + ":" + ftpset.SENDCODE + ":HMM::::::::" + contractno + "::" + bill.SERVICECONTRACTNO + "::'");

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

@@ -217,7 +217,8 @@ Ext.extend(Shipping.DsAudit, Ext.Window, {
                         } if (_thisDsAudit.Parentformname == 'ch_fee_amemd') {
                             parentWin.LoadDrChFee();
                             parentWin.LoadCrChFee();
-                            parentWin.EditRecord.set('BillFeeStatus', '1');
+                            parentWin.storeAmendBill.reload();
+                            //parentWin.EditRecord.set('BillFeeStatus', '1');
                         }else if (_thisDsAudit.Parentformname == 'op_seae') {
                             parentWin.onDsQuery();
                         }

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

@@ -7507,31 +7507,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                                 });
                             }
 
-                            Ext.Ajax.request({
-                                waitMsg: Zi.LAN.FEE.ZhengZaiChaXunShuJu, //'正在组织数据...',
-                                url: '/MvcShipping/MsChFee/GetFeeLock',
-                                scope: this,
-                                params: {
-                                    bsno: _thisAmendfee.strBSNO
-                                },
-                                callback: function (options, success, response) {
-                                    if (success) {
-                                        Ext.MessageBox.hide();
-                                        var jsonresult = Ext.JSON.decode(response.responseText);
-                                        if (jsonresult.Success) {
-                                            _thisAmendfee.EditRecord.set('FEESTATUS', true);
 
-                                        } else {
-                                        }
-                                    } else {
-                                        Ext.Msg.show({
-                                            title: Zi.LAN.FEE.TiShi,
-                                            msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo,
-                                            icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
-                                        });
-                                    }
-                                }
-                            });
 
 
 
@@ -7572,7 +7548,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                     } else {
                         _thisAmendfee.storeDrChFee.load({ params: { billno: _thisAmendfee.strAmendBSNO, type: 1, optype: _thisAmendfee.stroplb } });
                         _thisAmendfee.storeCrChFee.load({ params: { billno: _thisAmendfee.strAmendBSNO, type: 2, optype: _thisAmendfee.stroplb } });
-
+                        _thisAmendfee.storeAmendBill.reload();
 
                         if (result.Data != '' && result.Data != null) {
                             Ext.Msg.show({

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js

@@ -341,24 +341,44 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
             model: 'DsShipping.ux.CodeDisportModel',
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
+        this.storeCodeDisport.on('beforeload', function (store) {
+            var carrier = this.MainEditRecord.data.CARRIER;
+            Ext.apply(store.proxy.extraParams, { CARRIER: carrier });
+        }, this);
+
         //this.storeCodeDisport.load();
 
         this.storeCodeDisport2 = Ext.create('DsExt.ux.RefTableStore', {
             model: 'DsShipping.ux.CodeDisportModel',
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
+
+        this.storeCodeDisport2.on('beforeload', function (store) {
+            var carrier = this.MainEditRecord.data.CARRIER;
+            Ext.apply(store.proxy.extraParams, { CARRIER: carrier });
+        }, this);
         //this.storeCodeDisport2.load();
 
         this.storeCodeDisport3 = Ext.create('DsExt.ux.RefTableStore', {
             model: 'DsShipping.ux.CodeDisportModel',
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
+
+        this.storeCodeDisport3.on('beforeload', function (store) {
+            var carrier = this.MainEditRecord.data.CARRIER;
+            Ext.apply(store.proxy.extraParams, { CARRIER: carrier });
+        }, this);
         //this.storeCodeDisport3.load();
 
         this.storeCodeDisport4 = Ext.create('DsExt.ux.RefTableStore', {
             model: 'DsShipping.ux.CodeDisportModel',
             proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
         });
+
+        this.storeCodeDisport4.on('beforeload', function (store) {
+            var carrier = this.MainEditRecord.data.CARRIER;
+            Ext.apply(store.proxy.extraParams, { CARRIER: carrier });
+        }, this);
         //this.storeCodeDisport4.load();
 
         //国内港口（出口装货港、进口卸货港）
@@ -404,9 +424,23 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
             listeners: {
                 scope: this,
                 blur: function (field, The, eOpts) {
-                    field.setRawValue(field.value);
+                    var selectrecords = DsStoreQueryBy(_this.storeCodeDisport, 'CodeAndName', _this.comboxPORTDISCHARGE.rawValue);
+                    if (selectrecords.getCount() > 0) {
+                        var selectdata = selectrecords.getAt(0).data;
+                        var PORTDISCHARGE = this.formEdit.getForm().findField('PORTDISCHARGE').getValue();
+                        if (PORTDISCHARGE.trim() == "") {
+                            this.formEdit.getForm().findField('PORTDISCHARGE').setValue(selectdata.PORT);
+                        }
+
+                    }
 
                 },
+                beforequery: function (e) {
+                    var port = this.formEdit.getForm().findField('PORTDISCHARGEID').getValue();
+                    if (port != '')
+                        e.query = port;
+                    //return FilterCombox(e, 2);//在beforequery使用此方法
+                },
                 'select': function (combo, records, eOpts) {
                     if (records.length > 0) {
                         this.formEdit.getForm().findField('PORTDISCHARGE').setValue(records[0].data.PORT);
@@ -435,6 +469,23 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
             displayField: 'CodeAndName',
             listeners: {
                 scope: this,
+                blur: function (field, The, eOpts) {
+                    var selectrecords = DsStoreQueryBy(_this.storeCodeDisport2, 'CodeAndName', _this.comboxDESTINATION.rawValue);
+                    if (selectrecords.getCount() > 0) {
+                        var selectdata = selectrecords.getAt(0).data;
+                        var DESTINATION = this.formEdit.getForm().findField('DESTINATION').getValue();
+                        if (DESTINATION.trim() == "") {
+                            this.formEdit.getForm().findField('DESTINATION').setValue(selectdata.PORT);
+                        }
+
+                    }
+
+                },
+                beforequery: function (e) {
+                    var port = this.formEdit.getForm().findField('DESTINATIONID').getValue();
+                    if (port != '')
+                        e.query = port;
+                },
                 'select': function (combo, records, eOpts) {
                     if (records.length > 0) {
                         this.formEdit.getForm().findField('DESTINATION').setValue(records[0].data.PORT);
@@ -465,6 +516,23 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
             displayField: 'CodeAndName',
             listeners: {
                 scope: this,
+                blur: function (field, The, eOpts) {
+                    var selectrecords = DsStoreQueryBy(_this.storeCodeDisport3, 'CodeAndName', _this.comboxPLACEDELIVERY.rawValue);
+                    if (selectrecords.getCount() > 0) {
+                        var selectdata = selectrecords.getAt(0).data;
+                        var PLACEDELIVERY = this.formEdit.getForm().findField('PLACEDELIVERY').getValue();
+                        if (PLACEDELIVERY.trim() == "") {
+                            this.formEdit.getForm().findField('PLACEDELIVERY').setValue(selectdata.PORT);
+                        }
+
+                    }
+
+                },
+                beforequery: function (e) {
+                    var port = this.formEdit.getForm().findField('PLACEDELIVERYID').getValue();
+                    if (port != '')
+                        e.query = port;
+                },
                 'select': function (combo, records, eOpts) {
                     if (records.length > 0) {
                         this.formEdit.getForm().findField('PLACEDELIVERY').setValue(records[0].data.PORT);
@@ -486,6 +554,25 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
             displayField: 'CodeAndName',
             listeners: {
                 scope: this,
+                blur: function (field, The, eOpts) {
+                    var selectrecords = DsStoreQueryBy(_this.storeCodeDisport4, 'CodeAndName', _this.comboxPLACERECEIPT.rawValue);
+                    if (selectrecords.getCount() > 0) {
+                        var selectdata = selectrecords.getAt(0).data;
+                        var PLACERECEIPT = this.formEdit.getForm().findField('PLACERECEIPT').getValue();
+                        if (PLACERECEIPT.trim() == "") {
+                            this.formEdit.getForm().findField('PLACERECEIPT').setValue(selectdata.PORT);
+                        }
+
+                    }
+
+                },
+                beforequery: function (e) {
+                    var port = this.formEdit.getForm().findField('PLACERECEIPTID').getValue();
+                    if (port != '')
+                        e.query = port;
+
+                    //return FilterCombox(e, 2);//在beforequery使用此方法
+                },
                 'select': function (combo, records, eOpts) {
                     if (records.length > 0) {
                         this.formEdit.getForm().findField('PLACERECEIPT').setValue(records[0].data.PORT);
@@ -5378,7 +5465,19 @@ this.storeConsignee.on('beforeload', function (store) {
             scope: this
         });
 
+        if (data.PORTDISCHARGEID != '') {
+            this.storeCodeDisport.load({ params: { PORT: data.PORTDISCHARGEID, CARRIER: this.MainEditRecord.data.CARRIER } });
+        }
 
+        if (data.DESTINATIONID != '') {
+            this.storeCodeDisport2.load({ params: { PORT: data.DESTINATIONID, CARRIER: this.MainEditRecord.data.CARRIER } });
+        }
+        if (data.PLACEDELIVERYID != '') {
+            this.storeCodeDisport3.load({ params: { PORT: data.PLACEDELIVERYID, CARRIER: this.MainEditRecord.data.CARRIER } });
+        }
+        if (data.PLACERECEIPTID != '') {
+            this.storeCodeDisport4.load({ params: { PORT: data.PLACERECEIPTID, CARRIER: this.MainEditRecord.data.CARRIER } });
+        }
 
     },
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js

@@ -15789,19 +15789,33 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             dCBM2 = Add(dCBM2, parseFloat(ctncbm).toFixed(4));
 
         }
-        
+        var errostr = '';
         if (PKGS != iPKGS2) {
-            Ext.Msg.show({ title: '错误', msg: "集装箱件数总和和总件数不一致！", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
-            return;
+            errostr = errostr + '件数总和和总件数';
+
         }
         if (KGS != dKGS2) {
-            Ext.Msg.show({ title: '错误', msg: "集装箱重量总和和总重量不一致！", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
-            return;
+            if (errostr != '') {
+                errostr = errostr + ',重量总和和总重量';
+            } else {
+                errostr = errostr + '重量总和和总重量';
+            }
+
+
         }
         if (CBM != dCBM2) {
-            Ext.Msg.show({ title: '错误', msg: "集装箱尺码总和和总尺码不一致！", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+            if (errostr != '') {
+                errostr = errostr + ',尺码总和和总尺码';
+            } else {
+                errostr = errostr + '尺码总和和总尺码';
+            }
+        }
+        if (errostr != '') {
+            Ext.Msg.show({ title: '错误', msg: "集装箱" + errostr+"不一致！", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
             return;
+
         }
+
         Ext.Msg.show({ title: '提示', msg: "校验一致！", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
     },