海运进口的[引入报关信息]功能，改为优先匹配报关单号，如无报关单号则匹配主提单号；付费发票核销查询语句除错；针对dswebapp的接口未完成

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

@@ -130,8 +130,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
             strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97008 and EnumValueID=i.INVOICECATEGORY) as INVOICECATEGORYREF");
             strSql.Append(",i.ADDRTEL,i.BANK,i.OP,i.OPDATE,i.INVAMOUNT,i.TAXRATE,i.TAX,i.BALBILLNO,i.YuanBiJinE,i.ISAPP,dbo.GetPayNoByInvHxNo(i.BILLNO) as PAYBILLNO,dbo.GetStlNoByInvHxNo(BILLNO) as STLBILLNO ");
             strSql.Append(",i.SALECORPID,(select [NAME] from [company] where GID=i.SALECORPID) as SALECORP,i.SUBMITOP");
-            strSql.Append(",AUDITUSER,AUDITTIME,(select ShowName from [user] where GID=cm.AUDITUSER) as AUDITUSERREF");
-            strSql.Append(",MODIFIEDUSER,MODIFIEDTIME,(select ShowName from [user] where GID=cm.MODIFIEDUSER) as MODIFIEDUSERREF");
+            strSql.Append(",AUDITUSER,AUDITTIME,(select ShowName from [user] where GID=i.AUDITUSER) as AUDITUSERREF");
+            strSql.Append(",MODIFIEDUSER,MODIFIEDTIME,(select ShowName from [user] where GID=i.MODIFIEDUSER) as MODIFIEDUSERREF");
 
             strSql.Append(" FROM ch_fee_invoicehexiao i left join workflow_using wu on wu.bsno=i.billno where 1=1 ");
             if (isaudit == "1")

DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs

@@ -141,6 +141,77 @@ namespace DSWeb.Areas.CommMng.Controllers
 
 
 
+            if (userlist == null || userlist.Count == 0)
+            {
+                var json0 = JsonConvert.Serialize(new { Success = false, Message = "没有找到用户" });
+                return new ContentResult() { Content = json0 };
+            }
+
+            var json = JsonConvert.Serialize(new { Success = true, Message = "未找到查询方法" });
+
+            var user = userlist[0];
+
+            if (formname == "查询列表")
+            {
+
+                var dataList = ChinvoicehexiaoDAL.GetAuditDataList(condition, user.USERID, isaudit, user.SHOWNAME, user.COMPANYID, null);
+                var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataList.ToList() });
+                return new ContentResult() { Content = json1 };
+            }
+            if (formname == "查询明细")
+            {
+                var dataList = ChinvoicehexiaoDAL.GetBodyList( condition, "");
+                var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataList.ToList() });
+                return new ContentResult() { Content = json1 };
+            }
+            if (formname == "审批通过")
+            {
+                var audithead = ChinvoicehexiaoDAL.GetData(condition);
+                var bodyList = new List<ChInvoicehexiao>() { audithead };
+
+                DBResult result = ChinvoicehexiaoDAL.AuditList(bodyList, user.USERID);
+
+                return BasicDataRefDAL.GetContentResult(result);
+            }
+            if (formname == "驳回")
+            {
+                var audithead = ChinvoicehexiaoDAL.GetData(condition);
+                var bodyList = new List<ChInvoicehexiao>() { audithead };
+
+                DBResult result = ChinvoicehexiaoDAL.AuditBackList(bodyList, user.USERID);
+
+                var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+            return new ContentResult() { Content = json };
+        }
+
+        /// <summary>
+        /// 付费发票审核
+        /// </summary>
+        /// <returns></returns>
+        public ContentResult InfoClientAuditInterface()
+        {
+            StreamReader sr = new StreamReader(Request.InputStream, Encoding.UTF8);
+            var strJson = new StringBuilder();
+            string line = null;
+            while (((line = sr.ReadLine())) != null)
+            {
+                strJson.Append(line);
+            }
+            var appparam = JsonConvert.Deserialize<AppParam>(strJson.ToString());
+
+            var cdc = new CommonDataContext();
+
+            string userid = appparam.userid;
+            string formname = appparam.formname;
+            string isaudit = appparam.isaudit;
+            string condition = appparam.condition;
+
+            var userlist = cdc.VW_user.Where(x => x.USERID == userid).ToList();
+
+
+
             if (userlist == null || userlist.Count == 0)
             {
                 var json0 = JsonConvert.Serialize(new { Success = false, Message = "没有找到用户" });

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js

@@ -3094,7 +3094,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
                         _this.SaveBG();
                       }
                     },'-', {
-                        text: Zi.LAN.YINRUBAOGUAN, //"生成报关业务",
+                        text: Zi.LAN.YINRUBAOGUAN, //"引入报关信息/从报关业务引入",
                         handler: function (menu, event) {
                             _this.onImportApplyClick();
                         }
@@ -4834,9 +4834,15 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
         var CUSTOMNO = this.formEdit.getForm().findField('CUSTOMNO').getValue();
 
         var condition = "";
-        if (MBLNO && CUSTOMNO) {
-            condition = "( (isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "') and (isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "'))";
-        } else if (CUSTOMNO) {
+        //if (MBLNO && CUSTOMNO) {
+        //    condition = "( (isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "') and (isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "'))";
+        //} else if (CUSTOMNO) {
+        //    condition = "(isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "'))";
+        //} else if (MBLNO) {
+        //    condition = "(isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "')";
+        //} else return;
+
+        if (CUSTOMNO) {
             condition = "(isnull(CUSTOMNO,'')<>'' and CUSTOMNO='" + CUSTOMNO + "'))";
         } else if (MBLNO) {
             condition = "(isnull(MBLNO,'')<>'' and MBLNO='" + MBLNO + "')";