dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent 79dd52bd5a c3c2a3b7f4
commit 42a7bb6411
13 changed files with 115 additions and 3 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
Unescape Escape View File

@ -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);
}

2
DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs
Unescape Escape View File

@ -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);
}

13
DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs
Unescape Escape View File

@ -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);
}

2
DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs
Unescape Escape View File

@ -326,6 +326,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_do_detail
get { return _ORDERNO; }
set { _ORDERNO = value; }
}
public string UNIT { get; set; }
/// <summary>
/// 备注
/// </summary>

2
DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs
Unescape Escape View File

@ -569,6 +569,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
return ChInvoice_HangXin.CHECKER;
}
}
public string extensionNumber { get; set; }
#endregion
}

3
DSWeb/Areas/Account/Models/Chfee_payapplication/Chfee_Payapplication.cs
Unescape Escape View File

@ -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
{

39
DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs
Unescape Escape View File

@ -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<v_op_bs_mb>();
//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 };
}
/// <summary>
/// 付费发票审核
/// </summary>
@ -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 };
}

4
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -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;

6
DSWeb/Areas/MvcShipping/DAL/BillCheckOut/BillCheckOutDAL.cs
Unescape Escape View File

@ -335,6 +335,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))
{

14
DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
Unescape Escape View File

@ -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 ");
@ -483,6 +489,14 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
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

12
DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoClient.cs
Unescape Escape View File

@ -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

5
DSWeb/Areas/SoftMng/Controllers/ExportController.cs
Unescape Escape View File

@ -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
{
@ -3479,10 +3480,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)

11
DSWeb/Areas/Storage/Controllers/StorageController.cs
Unescape Escape View File

@ -201,6 +201,17 @@ namespace DSWeb.Areas.Storage.Controllers
resp.Total = dataList.Count;
return Json(resp, JsonRequestBehavior.AllowGet);
}
/// <summary>
/// 裕龙公众号 库存查询
/// </summary>
/// <param name="openid"></param>
/// <param name="mblno"></param>
/// <param name="goodsfeetype"></param>
/// <param name="goodsowner"></param>
/// <param name="page"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpPost]
public JsonResult StorageData2(string openid, string mblno, string goodsfeetype, string goodsowner, int page = 1, int pageSize = 10)
{

Write Preview
Loading…
Cancel
Save