From c3c2a3b7f4b0afb6f2e991330b838c9b092bbfb4 Mon Sep 17 00:00:00 2001 From: dengyu Date: Tue, 25 Jul 2023 09:21:23 +0800 Subject: [PATCH] 20230724 --- .../Chfee_InvoicehexiaoDAL.cs | 3 ++ .../Chfee_InvoiceapplicationDAL.cs | 2 + .../Chfee_PayapplicationDAL.cs | 13 ++++++- .../Models/Chfee_do_detail/Chfee_do_detail.cs | 2 + .../Chfee_invoice_HangXin/Chfee_Invoice.cs | 2 + .../Chfee_Payapplication.cs | 3 ++ .../DSWEBAPPInterfaceController.cs | 39 ++++++++++++++++++- DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs | 4 ++ .../DAL/BillCheckOut/BillCheckOutDAL.cs | 6 +++ .../DAL/MsInfoClient/MsInfoClientDAL.cs | 16 +++++++- .../Models/MsInfoClient/MsInfoClient.cs | 12 ++++++ .../SoftMng/Controllers/ExportController.cs | 5 +++ .../Storage/Controllers/StorageController.cs | 11 ++++++ 13 files changed, 115 insertions(+), 3 deletions(-) diff --git a/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs index 5703c666..85e3dadc 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs @@ -240,6 +240,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD"); strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE"); strSql.Append(",b.DOC,b.SALE,f.TaxUnitPrice,f.Quantity,f.taxrate,f.amount-f.notaxamount TAX"); + strSql.Append(",f.UNIT UNIT"); strSql.Append(" FROM ch_fee_do_invoice c"); strSql.Append(" left join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" left join ch_fee f on (f.gid=c.feeid) "); @@ -315,6 +316,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao data.TaxRate = Convert.ToDecimal(reader["TaxRate"]); if (reader["Tax"] != DBNull.Value) data.Tax = Convert.ToDecimal(reader["Tax"]); + + data.UNIT = Convert.ToString(reader["UNIT"]); #endregion headList.Add(data); } diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs index e2d5b229..119304e6 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs @@ -403,6 +403,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE"); strSql.Append(",b.DOC,b.SALE,b.ENTERP,(select [NAME] FROM company where GID=B.SALECORPID) BSSALECORP"); strSql.Append(",f.Remark Remark,f.INPUTMODE,f.AUDITDATE,f.SALECORP,f.TaxUnitPrice,f.Quantity,f.taxrate,f.amount-f.notaxamount TAX"); + strSql.Append(",f.UNIT UNIT"); strSql.Append(" FROM ch_fee_do c"); strSql.Append(" left join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" left join ch_fee f on (f.gid=c.feeid) "); @@ -495,6 +496,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication if (reader["Tax"] != DBNull.Value) data.Tax = Convert.ToDecimal(reader["Tax"]); + data.UNIT = Convert.ToString(reader["UNIT"]); #endregion headList.Add(data); } diff --git a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs index 36e68b63..ffa0577a 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs @@ -99,6 +99,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",cm.BS_CUSTOMERNAME,0 IsAudit,PREAMOUNTRMB,PREAMOUNTUSD,PREAMOUNTOT "); strSql.Append(",dbo.GetStlByPayNo(cm.BILLNO) as BALBILLNO,cm.ISPRINT,cm.PRINTCOUNT,wxpush,STLRATE,STLAMOUNT,STLCURR,ISREVINV "); strSql.Append(",cm.SALECORPID,(select [NAME] from [company] where GID=cm.SALECORPID) as SALECORP"); + + + strSql.Append(",(select DESCRIPTION from info_client where SHORTNAME=cm.CUSTOMERNAME) as CUSTOMERFULLNAME"); strSql.Append(" FROM ch_fee_payapplication cm where 1=1 "); if (!string.IsNullOrEmpty(strCondition)) @@ -189,6 +192,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",i.PREAMOUNTRMB,i.PREAMOUNTUSD,i.PREAMOUNTOT "); strSql.Append(",dbo.GetBalNoByPayNo(i.BILLNO) as BALBILLNO,i.ISPRINT,i.PRINTCOUNT,i.wxpush,i.STLRATE,i.STLAMOUNT,i.STLCURR "); strSql.Append(",i.SALECORPID,(select [NAME] from [company] where GID=i.SALECORPID) as SALECORP,i.ISREVINV"); + + strSql.Append(",(select DESCRIPTION from info_client where SHORTNAME=i.CUSTOMERNAME) as CUSTOMERFULLNAME"); strSql.Append(" FROM ch_fee_payapplication i left join workflow_using wu on wu.bsno=i.billno where 1=1 "); if (isaudit == "3") { @@ -270,6 +275,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",i.PREAMOUNTRMB,i.PREAMOUNTUSD,i.PREAMOUNTOT "); strSql.Append(",dbo.GetBalNoByPayNo(i.BILLNO) as BALBILLNO,i.ISPRINT,i.PRINTCOUNT,i.wxpush,i.STLRATE,i.STLAMOUNT,i.STLCURR "); strSql.Append(",i.SALECORPID,(select [NAME] from [company] where GID=i.SALECORPID) as SALECORP,i.ISREVINV"); + strSql.Append(",(select DESCRIPTION from info_client where SHORTNAME=i.CUSTOMERNAME) as CUSTOMERFULLNAME"); strSql.Append(" FROM ch_fee_payapplication i left join workflow_using wu on wu.bsno=i.billno where 1=1 "); if (!string.IsNullOrEmpty(strCondition)) @@ -319,6 +325,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication data.BILLSTATUSREF = Convert.ToString(reader["BILLSTATUSREF"]); data.PAYTYPE = Convert.ToString(reader["PAYTYPE"]); data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]); + data.CUSTOMERFULLNAME = Convert.ToString(reader["CUSTOMERFULLNAME"]); if (reader["CURR"] != DBNull.Value) data.CURR = Convert.ToString(reader["CURR"]); data.CHEQUEPAYABLE = Convert.ToString(reader["CHEQUEPAYABLE"]); @@ -449,6 +456,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,b.BSTYPE,b.FORWARDER"); strSql.Append(",b.DOC,b.SALE,(select top 1 INVNO from ch_fee_invoicehexiao where EXISTS (SELECT 1 FROM ch_fee_do_invoice WHERE ch_fee_do_invoice.BILLNO=ch_fee_invoicehexiao.BILLNO AND FEEID=c.FEEID)) INVOICENO "); strSql.Append(",f.Remark Remark,f.INPUTMODE,C.CREATETIME,0 TTLNODR "); + strSql.Append(",f.UNIT UNIT "); strSql.Append(" FROM ch_fee_do c"); strSql.Append(" join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" left join ch_fee f on (f.gid=c.feeid) "); @@ -476,6 +484,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,b.BSTYPE,b.FORWARDER"); strSql.Append(",b.DOC,b.SALE,(select top 1 INVNO from ch_fee_invoicehexiao where EXISTS (SELECT 1 FROM ch_fee_do_invoice WHERE ch_fee_do_invoice.BILLNO=ch_fee_invoicehexiao.BILLNO AND FEEID=c.FEEID)) INVOICENO "); strSql.Append(",f.Remark Remark,f.INPUTMODE,C.CREATETIME,0 TTLNODR "); + strSql.Append(",f.UNIT UNIT "); strSql.Append(" FROM ch_fee_do c"); strSql.Append(" join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" left join ch_fee f on (f.gid=c.feeid) "); @@ -550,6 +559,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,b.BSTYPE,b.FORWARDER"); strSql.Append(",b.DOC,b.SALE,(select top 1 INVNO from ch_fee_invoicehexiao where EXISTS (SELECT 1 FROM ch_fee_do_invoice WHERE ch_fee_do_invoice.BILLNO=ch_fee_invoicehexiao.BILLNO AND FEEID=c.FEEID)) INVOICENO "); strSql.Append(",f.Remark Remark,f.INPUTMODE,C.CREATETIME,0 TTLNODR "); + strSql.Append(",f.UNIT UNIT "); strSql.Append(" FROM ch_fee_do c"); strSql.Append(" join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" left join ch_fee f on (f.gid=c.feeid) "); @@ -783,6 +793,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,b.BSTYPE,b.FORWARDER"); strSql.Append(",b.DOC,b.SALE,(select top 1 INVNO from ch_fee_invoicehexiao where EXISTS (SELECT 1 FROM ch_fee_do_invoice WHERE ch_fee_do_invoice.BILLNO=ch_fee_invoicehexiao.BILLNO AND FEEID=c.FEEID)) INVOICENO "); strSql.Append(",f.Remark Remark,f.INPUTMODE,(g.TTLDR-g.STLTTLDR) TTLNODR "); + strSql.Append(",f.UNIT UNIT "); strSql.Append(" FROM ch_fee_do c"); strSql.Append(" join v_op_bill b on (b.bsno=c.bsno)"); strSql.Append(" join ch_fee f on (f.gid=c.feeid) "); @@ -870,7 +881,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication data.BSTYPE = Convert.ToString(reader["BSTYPE"]); data.FORWARDER = Convert.ToString(reader["FORWARDER"]); data.ORDERNO = Convert.ToString(reader["ORDERNO"]); - + data.UNIT = Convert.ToString(reader["UNIT"]); #endregion headList.Add(data); } diff --git a/DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs b/DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs index 1395e632..6d20d5d5 100644 --- a/DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs +++ b/DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs @@ -326,6 +326,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_do_detail get { return _ORDERNO; } set { _ORDERNO = value; } } + + public string UNIT { get; set; } /// /// 备注 /// diff --git a/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs b/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs index 8524e3f9..f20c71fc 100644 --- a/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs +++ b/DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs @@ -569,6 +569,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin return ChInvoice_HangXin.CHECKER; } } + + public string extensionNumber { get; set; } #endregion } diff --git a/DSWeb/Areas/Account/Models/Chfee_payapplication/Chfee_Payapplication.cs b/DSWeb/Areas/Account/Models/Chfee_payapplication/Chfee_Payapplication.cs index d010e607..c6870794 100644 --- a/DSWeb/Areas/Account/Models/Chfee_payapplication/Chfee_Payapplication.cs +++ b/DSWeb/Areas/Account/Models/Chfee_payapplication/Chfee_Payapplication.cs @@ -170,6 +170,9 @@ namespace DSWeb.Areas.Account.Models.Chfee_Payapplication get { return _customername; } set { _customername = value; } } + + public string CUSTOMERFULLNAME { get; set; } + [ModelDB] public string CURR { diff --git a/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs b/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs index da83e98f..92e6615a 100644 --- a/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs +++ b/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs @@ -117,9 +117,31 @@ namespace DSWeb.Areas.CommMng.Controllers var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + + if (formname == "查询业务") + { + //var dataList = ChpayapplicationDAL.GetBodyAuditList(0, 9999, condition, ""); + //var billList = new List(); + //if (dataList != null && dataList.Count > 0) { + // var bsnoList= dataList.Select(s=>s.BSNO).Distinct().ToList(); + + // billList = cdc.v_op_bs.Where(x => bsnoList.Contains(x.BSNO)).ToList(); + + //} + + return GetVOPBS(condition); + } return new ContentResult() { Content = json }; } + public static ContentResult GetVOPBS(string BSNO) { + var cdc = new CommonDataContext(); + var billList = cdc.v_op_bs.Where(x => x.BSNO == BSNO).ToList(); + + var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = billList.ToList() }); + return new ContentResult() { Content = json1 }; + } + /// /// 付费发票审核 /// @@ -188,6 +210,12 @@ namespace DSWeb.Areas.CommMng.Controllers var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + + + if (formname == "查询业务") + { + return GetVOPBS(condition); + } return new ContentResult() { Content = json }; } @@ -295,7 +323,10 @@ namespace DSWeb.Areas.CommMng.Controllers if (formname == "查询列表") { var total = 0; - var dataList = ChinvoiceapplicationDAL.GetDataList(0,50,condition,out total, user.USERID, user.SHOWNAME, user.COMPANYID, null); + //var dataList = ChinvoiceapplicationDAL.GetDataList(0,50,condition,out total, user.USERID, user.SHOWNAME, user.COMPANYID, null); + + var dataList = ChinvoiceapplicationDAL.GetAuditDataList(0, 50, condition, user.USERID, isaudit, user.COMPANYID, null); + var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataList.ToList() }); return new ContentResult() { Content = json1 }; } @@ -332,6 +363,12 @@ namespace DSWeb.Areas.CommMng.Controllers return BasicDataRefDAL.GetContentResult(result); } + + if (formname == "查询业务") + { + return GetVOPBS(condition); + } + return new ContentResult() { Content = json }; } diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs index c0fb5e88..ca6010c2 100644 --- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs @@ -6266,7 +6266,11 @@ namespace DSWeb.Areas.CommMng.DAL PagedQuaryParam pp = new PagedQuaryParam(); + pp.strSql = $" select * from v_op_bs where 1=1 "; + + if(!string.IsNullOrWhiteSpace(OPLB)) pp.strSql = $" select * from v_op_bs where OPLB='{OPLB}' "; + pp.start = start; pp.limit = limit; pp.strCondition = condition; diff --git a/DSWeb/Areas/MvcShipping/DAL/BillCheckOut/BillCheckOutDAL.cs b/DSWeb/Areas/MvcShipping/DAL/BillCheckOut/BillCheckOutDAL.cs index c8534489..4afd71f7 100644 --- a/DSWeb/Areas/MvcShipping/DAL/BillCheckOut/BillCheckOutDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/BillCheckOut/BillCheckOutDAL.cs @@ -334,6 +334,12 @@ namespace DSWeb.MvcShipping.DAL.BillCheckOut DBResult 判断能否发邮件(BillCheckOut_md head) { var _result = new DBResult(); + + var 客户info = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == head.CUSTOMERNAME); + + if (客户info.ISSP == true) { + return _result.OK(); + } if (客户账期和欠费.Exists(x => x.CUSTOMERNAME == head.CUSTOMERNAME)) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs index 779f44d8..12bbdb57 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs @@ -88,6 +88,9 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient strSql.Append(",case WHEN BLSTATUS=0 THEN '合作客户' else '潜在客户' end CUSTPROP"); strSql.Append(",(select showname from [user] where gid=info_client.MODIFIEDUSER) MODIFIEDUSERREF,ESHORTNAME,WMSFEERATETYPE "); + strSql.Append(",(select top 1 name from company where gid=CORPID)[CORPNAME] "); + + strSql.Append(" from info_client where 1=1 "); @@ -174,6 +177,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient strSql.Append(",(SELECT TOP 1 ALLOWAMOUNT FROM Info_Client_ACCDATE WHERE LINKGID=info_client.GID ORDER BY MODIFIEDTIME DESC) ALLOWAMOUNT"); strSql.Append(",case WHEN BLSTATUS=0 THEN '合作客户' else '潜在客户' end CUSTPROP"); strSql.Append(",(select showname from [user] where gid=info_client.MODIFIEDUSER) MODIFIEDUSERREF,ESHORTNAME,WMSFEERATETYPE "); + strSql.Append(",(select top 1 name from company where gid=CORPID)[CORPNAME] "); strSql.Append(" from info_client where 1=1 "); @@ -266,6 +270,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient strSql.Append(",(SELECT TOP 1 ALLOWAMOUNT FROM Info_Client_ACCDATE WHERE LINKGID=info_client.GID ORDER BY MODIFIEDTIME DESC) ALLOWAMOUNT"); strSql.Append(",case WHEN BLSTATUS=0 THEN '合作客户' else '潜在客户' end CUSTPROP"); strSql.Append(",(select showname from [user] where gid=info_client.MODIFIEDUSER) MODIFIEDUSERREF,ESHORTNAME,WMSFEERATETYPE "); + strSql.Append(",(select top 1 name from company where gid=CORPID)[CORPNAME] "); strSql.Append(" from info_client where 1=1 "); @@ -305,6 +310,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient strSql.Append(",[CUSTTYPE],[CUSTGUIMO],[CUSTCLASS],[QUALIFICATION],[REGDATE],[CARGOL],[PRODUCT],[EXPREGION],[CARRIERLIST],[CTNTYPE],[CUSTNUM],[NATURE]"); strSql.Append(",case WHEN BLSTATUS=0 THEN '合作客户' else '潜在客户' end CUSTPROP"); strSql.Append(",(select showname from [user] where gid=info_client.MODIFIEDUSER) MODIFIEDUSERREF,ESHORTNAME,WMSFEERATETYPE "); + strSql.Append(",(select top 1 name from company where gid=CORPID)[CORPNAME] "); strSql.Append(" from info_client where 1=1 "); @@ -482,7 +488,15 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient data.ESHORTNAME = Convert.ToString(reader["ESHORTNAME"]);//客户属性 data.WMSFEERATETYPE = Convert.ToString(reader["WMSFEERATETYPE"]); - + + data.CORPNAME = Convert.ToString(reader["CORPNAME"]); + + + if (reader["ISSHIPPINGAGENT"] != DBNull.Value) + data.ISSHIPPINGAGENT = Convert.ToBoolean(reader["ISSHIPPINGAGENT"]);//船代 + if (reader["ISWHARF"] != DBNull.Value) + data.ISWHARF = Convert.ToBoolean(reader["ISWHARF"]);//码头 + #endregion diff --git a/DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoClient.cs b/DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoClient.cs index bd5f1f60..52a6d752 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoClient.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoClient.cs @@ -1082,6 +1082,18 @@ namespace DSWeb.MvcShipping.Models.MsInfoClient [ModelDB] public string WMSFEERATETYPE { get; set; } + + + public string CORPNAME { get; set; } + + [ModelDB] + public bool? ISSHIPPINGAGENT { get; set; } + + [ModelDB] + public bool? ISWHARF { get; set; } + + + #endregion diff --git a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs index 18ce4393..010a2058 100644 --- a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs +++ b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs @@ -44,6 +44,7 @@ using DSWeb.MvcShipping.Models.MsCodeSgAuditRule; using sun.net.idn; using DSWeb.MvcShipping.Models.MsOpSeai; using System.Data.Entity.Migrations; +using DSWeb.EntityDA; namespace DSWeb.SoftMng.Controllers { @@ -3478,10 +3479,14 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64" //20230612 增加逻辑 如果是 preDecHeadVo.AgentStatus='查验通知' //则增加一条业务状态 + // + if (preDecHeadVo.cusDecStatusName == "查验通知") { opapplyhead.InspectionNotice = "查验通知"; BasicDataRefDAL.OP_STATUSHelper.查验通知(opapplyhead.BSNO, username); } + opapplyhead.CUSTOMDATE = preDecHeadVo.dDate;//报关日期=申报日期 + //写入海运进口业务 if (updateseai) diff --git a/DSWeb/Areas/Storage/Controllers/StorageController.cs b/DSWeb/Areas/Storage/Controllers/StorageController.cs index 1acdafe3..b40c1270 100644 --- a/DSWeb/Areas/Storage/Controllers/StorageController.cs +++ b/DSWeb/Areas/Storage/Controllers/StorageController.cs @@ -201,6 +201,17 @@ namespace DSWeb.Areas.Storage.Controllers resp.Total = dataList.Count; return Json(resp, JsonRequestBehavior.AllowGet); } + + /// + /// 裕龙公众号 库存查询 + /// + /// + /// + /// + /// + /// + /// + /// [HttpPost] public JsonResult StorageData2(string openid, string mblno, string goodsfeetype, string goodsowner, int page = 1, int pageSize = 10) {