1

DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs

@@ -1074,7 +1074,7 @@ namespace DSWeb.Areas.Account.Controllers
         {
             #region 
 
-            var billlist = Chfee_AuditDAL.GetBillDataList("MASTERNO='" + bsno + "'", Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), null, true);
+            var billlist = Chfee_AuditDAL.GetBillDataList("v_op_bill.BSNO='" + bsno + "'", Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), null, true);
             foreach (var bill in billlist)
             {
                 if (bill.BillFeeStatus == "2" || bill.BillFeeStatus == "1")

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

@@ -3499,7 +3499,11 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
 
         var mblNo = form.findField('PS_MBLNO').getValue();
 //        sql = sql + getAndConSql(sql, mblNo, "(MblNo  like '%" + mblNo + "%' or hblNo  like '%" + mblNo + "%' OR CUSTNO  like '%" + mblNo + "%' OR CUSTOMNO  like '%" + mblNo + "%' OR ORDERNO  like '%" + mblNo + "%')");
-        sql = sql + getAndConSql(sql, mblNo, "  (CUSTNO+' '+MBLNO+' '+HBLNO+' '+CUSTOMNO+' '+ORDERNO  like '%" + mblNo + "%')");
+        sql = sql + getAndConSql(sql, mblNo, "  (MBLNO+' '+HBLNO like '%" + mblNo + "%')");
+
+        var PS_CUSTNO = form.findField('PS_CUSTNO').getValue();
+        //        sql = sql + getAndConSql(sql, mblNo, "(MblNo  like '%" + mblNo + "%' or hblNo  like '%" + mblNo + "%' OR CUSTNO  like '%" + mblNo + "%' OR CUSTOMNO  like '%" + mblNo + "%' OR ORDERNO  like '%" + mblNo + "%')");
+        sql = sql + getAndConSql(sql, PS_CUSTNO, "  (CUSTNO like '%" + PS_CUSTNO + "%')");
 
 
         var expDate_Min = form.findField('PS_EXPDATEBGN').getRawValue();

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

@@ -3607,15 +3607,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
                     _this.formEdit.getForm().findField('SETTLEUSERREF').setDisabled(true);
                     _this.GetEditStatus();
                     _this.LoadPeriod(this.opStatus);
-                    this.StoreBANK.load({
+
-                        params: { condition: "" },
-                        callback: function (r, options, success) {
-                            if (success) {
-                                this.formEdit.getForm().findField('ACCOUNT').setValue(data.ACCOUNT);
-                            }
-                        },
-                        scope: this
-                    });
                     _this.storeChfeeFile.load({ params: { start: 0, limit: 9999, BillNo: data.BILLNO } });
 
                 } else {
@@ -3639,11 +3631,11 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
             callback: function (r, options, success) {
                 if (success) {
                     if (this.storeBodyList.getCount() > 0) {
-                        this.comboxCurr.setReadOnly(true);
+                        this.comboxBILLTYPE.setReadOnly(true);
                         this.comboxCustCode.setReadOnly(true);
                     }
                     else {
-                        this.comboxCurr.setReadOnly(false);
+                        this.comboxBILLTYPE.setReadOnly(false);
                         this.comboxCustCode.setReadOnly(false);
                     }
                 }
@@ -5579,16 +5571,24 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
     },
     GetBank: function () {
         if (this.StoreBANK.getCount() == 0) return;
-        var ACCOUNT = this.formEdit.getForm().findField('ACCOUNT').getValue();
+        var ACCOUNT = this.formEdit.getForm().findField('ACCOUNTRMB').getValue();
-        var CURR = this.formEdit.getForm().findField('CURR').getValue();
         var SETTLETYPE = this.formEdit.getForm().findField('SETTLETYPE').getRawValue();
         if (SETTLETYPE == '现金') return;
-        if (ACCOUNT != '') return;
+        if (ACCOUNT == '') {
-        if (CURR == '') return;
+            for (var j = 0; j < this.StoreBANK.getCount(); j += 1) {
-        for (var j = 0; j < this.StoreBANK.getCount() ; j += 1) {
                 var memberbody = this.StoreBANK.getAt(j);
-            if (memberbody.data.CURRENCY == CURR && memberbody.data.ISDEF=='True') {
+                if (memberbody.data.CURRENCY == 'RMB' && memberbody.data.ISDEF == 'True') {
-                this.formEdit.getForm().findField('ACCOUNT').setValue(memberbody.data.GID);
+                    this.formEdit.getForm().findField('ACCOUNTRMB').setValue(memberbody.data.GID);
+                }
+            }
+        }
+        var ACCOUNTUSD = this.formEdit.getForm().findField('ACCOUNTUSD').getValue();
+        if (ACCOUNTUSD == '') {
+            for (var j = 0; j < this.StoreBANKUSD.getCount(); j += 1) {
+                var memberbody = this.StoreBANKUSD.getAt(j);
+                if (memberbody.data.CURRENCY == 'USD' && memberbody.data.ISDEF == 'True') {
+                    this.formEdit.getForm().findField('ACCOUNTUSD').setValue(memberbody.data.GID);
+                }
             }
         }
 

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -6670,6 +6670,10 @@ namespace DSWeb.MvcShipping.Controllers
                     var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='PIL'", Convert.ToString(Session["COMPANYID"]));
 
                     var filename = "";
+                    if (portload == "CNDLC") {
+                        filename = MsOpSeaeEdiPortDAL.CreateEdiPILDL(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filetype, ftpset, portload, agent, cagent, forward, contractno);
+                    }
+                    else 
                      filename = MsOpSeaeEdiPortDAL.CreateEdiPIL2(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filetype, ftpset, portload, agent, cagent, forward, contractno);
 
                     if (ftpset.RECEIVEEMAIL != "" && ftpset.RECEIVESIEMAIL != null && ftpset.SENDEMAIL != "" && ftpset.SENDEMAIL != null && !string.IsNullOrEmpty(ftpset.SENDEMAILSERVER) && !string.IsNullOrEmpty(ftpset.SENDEMAILPASS) && !string.IsNullOrEmpty(ftpset.SENDEMAILPORT))
@@ -6869,6 +6873,11 @@ namespace DSWeb.MvcShipping.Controllers
                 {
                     var filename = "";
                     if (carrier != "PILMELL")
+                        if (portload == "CNDLC")
+                        {
+                            filename = MsOpSeaeEdiPortDAL.CreateEdiPILDL(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filetype, ftpset, portload, agent, cagent, forward, contractno);
+                        }
+                        else
                             filename = MsOpSeaeEdiPortDAL.CreateEdiPIL2(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filetype, ftpset, portload, agent, cagent, forward, contractno);
                     else filename = MsOpSeaeEdiPortDAL.CreateEdiPILMELL(headList, Convert.ToString(Session["USERCODE"]), path, mblno,"9", ftpset,0, filetype);
                     filename = Path.GetFileName(filename);

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

@@ -5830,7 +5830,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
     
         var store = this.storeAmendBill;
         var newbsno = NewGuid();
-
+        var n = store.getCount();
         this.strAmendBSNO = newbsno;
 
         var record = null;
@@ -5838,6 +5838,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
             GID: NewGuid(),
             BSNO: newbsno,
             PARENTID: this.strBSNO,
+            SLNO:n,
             FEESTATUS: "false",
             FEESTATUSREF: '未锁定',
             ACCDATE: accdate,
@@ -7557,7 +7558,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                             _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({