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

2

Browse Source
DS7_JingHan
hanxuntao 2 years ago
parent 32912e8973
commit ecfa05df54
9 changed files with 212 additions and 214 deletions
Show Stats Download Patch File Download Diff File

1
DSWeb/Areas/Account/Models/ChFee_do_Sum/BSNOLB.cs
Unescape Escape View File

@ -41,6 +41,7 @@ namespace DSWeb.Areas.Account.Models.BSNOLB
}
public string ACCDATE { get; set; }
public string MBLNO { get; set; }
#endregion

3
DSWeb/Areas/MvcShipping/DAL/MsChDui/MsChDuiDAL.cs
Unescape Escape View File

@ -1801,6 +1801,7 @@ namespace DSWeb.MvcShipping.DAL.MsChDui
data.OPLB = feedo.BILLTYPE;
data.BSNO = feedo.BILLNO;
data.CUSTNO =feedo.BILLUSER;
data.MBLNO = feedo.MBLNO;
#endregion
bodyList.Add(data);
@ -1842,7 +1843,7 @@ namespace DSWeb.MvcShipping.DAL.MsChDui
var duipanylist = GetDuiPayBodyList(duino);
if (duipanylist != null && duipanylist.Count!=0) {
foreach (var duipay in duipanylist) {
{ error = error + "<br />已做"+duipay.OPLB+" 单号:"+duipay.BSNO+" 操作人："+ duipay.CUSTNO; }
{ error = error + "<br />提单号："+duipay.MBLNO+" 已做"+duipay.OPLB+" 单号:"+duipay.BSNO+" 操作人："+ duipay.CUSTNO; }
}
}

21
DSWeb/Areas/MvcShipping/DAL/MsOpBill/MsOpBillDAL.cs
Unescape Escape View File

@ -229,7 +229,7 @@ namespace DSWeb.Areas.MvcShipping.DAL
var strSql = new StringBuilder();
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'' BILLTYPE ");
strSql.Append(",'' BILLTYPE,'' MBLNO ");
if (dotype == "1") {
strSql.Append(",'' INVNO,b.SETTLETIME BILLDATE,(select ShowName from [user] where GID=b.SETTLEUSER) as BILLUSER,(select STLNAME from [code_stlmode] where STLCODE=b.SETTLETYPE) as SETTLETYPEREF,'' as CREATEUSER");
}
@ -301,9 +301,10 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'' INVNO,b.SETTLETIME BILLDATE,(select ShowName from [user] where GID=b.SETTLEUSER) as BILLUSER,(select STLNAME from [code_stlmode] where STLCODE=b.SETTLETYPE) as SETTLETYPEREF,'' as CREATEUSER");
strSql.Append(",'结算单' BILLTYPE ");
strSql.Append(",'结算单' BILLTYPE,bs.MBLNO ");
strSql.Append(" FROM ch_fee_do c ");
strSql.Append(" left join ch_fee_settlement b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" left join v_op_bill bs on (bs.BSNO=c.BSNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -315,9 +316,10 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'' INVNO,b.APPLYTIME BILLDATE,(select ShowName from [user] where GID=b.APPLICANT) as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER");
strSql.Append(",'收费申请' BILLTYPE ");
strSql.Append(",'收费申请' BILLTYPE,bs.MBLNO ");
strSql.Append(" FROM ch_fee_do c ");
strSql.Append(" left join ch_fee_recvapplication b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" left join v_op_bill bs on (bs.BSNO=c.BSNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -329,9 +331,10 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'' INVNO,b.APPLYTIME BILLDATE,(select ShowName from [user] where GID=b.APPLICANT) as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER");
strSql.Append(",'付费申请' BILLTYPE ");
strSql.Append(",'付费申请' BILLTYPE,bs.MBLNO ");
strSql.Append(" FROM ch_fee_do c ");
strSql.Append(" left join ch_fee_payapplication b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" left join v_op_bill bs on (bs.BSNO=c.BSNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -343,9 +346,10 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'' INVNO,b.APPLYTIME BILLDATE,(select ShowName from [user] where GID=b.APPLICANT) as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER");
strSql.Append(",'发票申请' BILLTYPE ");
strSql.Append(",'发票申请' BILLTYPE,bs.MBLNO ");
strSql.Append(" FROM ch_fee_do c ");
strSql.Append(" left join ch_fee_invoiceapplication b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" left join v_op_bill bs on (bs.BSNO=c.BSNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -357,9 +361,10 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BSNO,c.BILLNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",b.INVOICENO INVNO,b.INVOICEMAKETIME BILLDATE,(select ShowName from [user] where GID=b.APPLICANT) as BILLUSER,(select ShowName from [user] where GID=b.OPERATOR) as CREATEUSER,'' SETTLETYPEREF");
strSql.Append(",'发票' BILLTYPE ");
strSql.Append(",'发票' BILLTYPE,bs.MBLNO ");
strSql.Append(" FROM ch_fee_do c ");
strSql.Append(" left join ch_fee_invoice b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" left join v_op_bill bs on (bs.BSNO=c.BSNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
if (!string.IsNullOrEmpty(strCondition))
{
@ -376,7 +381,7 @@ namespace DSWeb.Areas.MvcShipping.DAL
strSql.Append(" SELECT c.GID,c.BILLNO,c.BSNO,c.CUSTOMERNAME,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,c.EXCHANGERATE ");
strSql.Append(",c.FEETYPE,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF");
strSql.Append(",'发票' BILLTYPE ");
strSql.Append(",b.INVNO,b.INVDATE BILLDATE,b.OP as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER");
strSql.Append(",b.INVNO,b.INVDATE BILLDATE,b.OP as BILLUSER,'' SETTLETYPEREF,'' as CREATEUSER,'' MBLNO");
strSql.Append(" FROM ch_fee_do_invoice c ");
strSql.Append(" left join ch_fee_invoicehexiao b on (b.BILLNO=c.BILLNO) ");
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) ");
@ -421,7 +426,7 @@ namespace DSWeb.Areas.MvcShipping.DAL
data.SETTLETYPEREF = Convert.ToString(reader["SETTLETYPEREF"]);
data.CREATEUSER = Convert.ToString(reader["CREATEUSER"]);
data.BILLTYPE = Convert.ToString(reader["BILLTYPE"]);
data.MBLNO = Convert.ToString(reader["MBLNO"]);
#endregion
headList.Add(data);

5
DSWeb/Areas/MvcShipping/Viewsjs/MsChDui/MsChDuiIndex.js
Unescape Escape View File

@ -991,12 +991,7 @@ Ext.extend(Shipping.MsChDuiIndex, Ext.Panel, {
var record = selections[0];
if (record.data.BILLSTATUS == '1') {
//提示', msg: '当前状态无法删除此单据!
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.nodelete, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
var duino = record.data.DUINO; //提示', '确定删除该记录吗？
Ext.MessageBox.confirm(Zi.LAN.Prompt,'确定要生成付费申请吗？', function (btn) {

269
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
Unescape Escape View File

@ -1459,44 +1459,16 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
],
scope: this
}, '-', {
text: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
tooltip: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
id: 'btnFeeAuditDr',
menu:
[
//{ text: Zi.LAN.FEE.SetFeeIsOpen, //"应收提交",
// id:'DrSetFeeIsOpen',
// handler: function (menu, event) {
// _thisfee.onSetFeeIsOpenClick(menu, event, 1);
// }
// },
},
{
'-', {
text: '应收帐单', //"提交审核",
id: 'DrSubmitAudit',
handler: function (menu, event) {
_thisfee.onSubmitAuditClick(menu, event, 1);
}
},
{
text: '删除帐单', //"撤销提交",
id: 'DrCancelSubmitAudit',
handler: function (menu, event) {
_thisfee.onCancelAuditNewClick(menu, event, 1);
}
}
// , {
// text: Zi.LAN.FEE.SubmitAuditDr, //"应收提交",
// id: 'DrSubmitAuditAll',
//handler: function (menu, event) {
// _thisfee.onSubmitAuditAllClick(menu, event, 1);
//}
// }
, {
}, {
text: Zi.LAN.FEE.SubmitAuditBill, //"整票提交",
id: 'DrSubmitAuditBill',
handler: function (menu, event) {
@ -1507,49 +1479,21 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
handler: function (menu, event) {
_thisfee.onCancelSubmitAuditBillClick();
}
},
{ text: Zi.LAN.FEE.ShenIvoice, //"申请开票",
handler: function (menu, event) {
_thisfee.onShenIvoiceClick(menu, event, 1);
}
},
{ text: Zi.LAN.FEE.NewCustNameShow, //"批量修改费用对象",
handler: function (menu, event) {
_thisfee.onCreateNewCustNameClick(menu, event, 1);
}
},{
text: '禁开发票',
tooltip: '禁开发票',
handler: function (button, event) {
this.onNoIvoiceClick(button, event, 1);
},
scope: this
}
],
scope: this
},
'-', {
text: Zi.LAN.FEE.ViewDetail, //'查看信息',
tooltip: Zi.LAN.FEE.ViewDetail, //查看信息',
handler: function (button, event) {
this.onViewDetailClick(button, event, 1);
},
scope: this
}, '-', {
}, {
text: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
tooltip: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
id: 'btnFeeImpAddDr',
menu:
[
{ text: Zi.LAN.FEE.TemplateAddDetail, //"引入费用模板",
{
text: Zi.LAN.FEE.TemplateAddDetail, //"引入费用模板",
handler: function (menu, event) {
_thisfee.onTemplateAddDetailClick(menu, event, 1);
}
},
{ text: Zi.LAN.FEE.SaveFeeTemplate, //"保存为费用模板",
{
text: Zi.LAN.FEE.SaveFeeTemplate, //"保存为费用模板",
handler: function (menu, event) {
_thisfee.onSaveFeeTemplateClick(menu, event, 1);
}
@ -1581,6 +1525,66 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
}
}
]
}, '-', {
text: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
tooltip: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
id: 'btnFeeAuditDr',
menu:
[
//{ text: Zi.LAN.FEE.SetFeeIsOpen, //"应收提交",
// id:'DrSetFeeIsOpen',
// handler: function (menu, event) {
// _thisfee.onSetFeeIsOpenClick(menu, event, 1);
// }
// },
{
text: '删除帐单', //"撤销提交",
id: 'DrCancelSubmitAudit',
handler: function (menu, event) {
_thisfee.onCancelAuditNewClick(menu, event, 1);
}
}
// , {
// text: Zi.LAN.FEE.SubmitAuditDr, //"应收提交",
// id: 'DrSubmitAuditAll',
//handler: function (menu, event) {
// _thisfee.onSubmitAuditAllClick(menu, event, 1);
//}
// }
,
{
text: Zi.LAN.FEE.ShenIvoice, //"申请开票",
handler: function (menu, event) {
_thisfee.onShenIvoiceClick(menu, event, 1);
}
},
{
text: Zi.LAN.FEE.NewCustNameShow, //"批量修改费用对象",
handler: function (menu, event) {
_thisfee.onCreateNewCustNameClick(menu, event, 1);
}
}, {
text: '禁开发票',
tooltip: '禁开发票',
handler: function (button, event) {
this.onNoIvoiceClick(button, event, 1);
},
scope: this
}
],
scope: this
}, '-', {
text: Zi.LAN.FEE.ViewDetail, //'查看信息',
tooltip: Zi.LAN.FEE.ViewDetail, //查看信息',
handler: function (button, event) {
this.onViewDetailClick(button, event, 1);
},
scope: this
}, '-', {
text: Zi.LAN.FEE.btntest, //"保存列表样式",
menu: [
@ -2466,6 +2470,69 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
],
scope: this
}, '-', {
text: '应付帐单', //"提交审核",
id: 'CrSubmitAudit',
handler: function (menu, event) {
_thisfee.onSubmitAuditClick(menu, event, 2);
}
}, {
text: Zi.LAN.FEE.SubmitAuditBill, //"整票提交",
handler: function (menu, event) {
_thisfee.onSubmitAuditBillClick(menu, event, 2);
}
},
{
text: Zi.LAN.FEE.ShenPay, //"申请开票",
handler: function (menu, event) {
_thisfee.onShenPayClick(menu, event, 2);
}
},
'-', '-', {
text: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
tooltip: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
id: 'btnFeeImpAddCr',
menu:
[
{ text: Zi.LAN.FEE.TemplateAddDetail, //"引入费用模板",
handler: function (menu, event) {
_thisfee.onTemplateAddDetailClick(menu, event, 2);
}
},
{ text: Zi.LAN.FEE.SaveFeeTemplate, //"保存为费用模板",
handler: function (menu, event) {
_thisfee.onSaveFeeTemplateClick(menu, event, 2);
}
}, {
text: Zi.LAN.FEE.HistryAddDetail, //"历史引入",
handler: function (menu, event) {
_thisfee.onHistryAddDetailClick(menu, event, 2);
}
},
],
scope: this
},
{
text: Zi.LAN.FEE.ShengChengYingShou, //"生成应收",
menu:
[
{
text: Zi.LAN.FEE.AddSelectDetailDr, //"所选生成应收",
handler: function (menu, event) {
_thisfee.onAddSelectDetailClick(menu, event, 1);
}
},
{
text: Zi.LAN.FEE.AddAllDetailDr, //"所有生成应收",
handler: function (menu, event) {
_thisfee.onAddAllDetailClick(menu, event, 1);
}
}
]
}, '-', {
text: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
tooltip: Zi.LAN.FEE.btnFeeAuditDr, //'提交审核',
@ -2479,13 +2546,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
// }
// },
{
text: '应付帐单', //"提交审核",
id: 'CrSubmitAudit',
handler: function (menu, event) {
_thisfee.onSubmitAuditClick(menu, event, 2);
}
},
{
text: '删除帐单', //"撤销提交",
id: 'CrCancelSubmitAudit',
@ -2500,19 +2561,9 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
// _thisfee.onSubmitAuditAllClick(menu, event, 2);
//}
// }
, {
text: Zi.LAN.FEE.SubmitAuditBill, //"整票提交",
handler: function (menu, event) {
_thisfee.onSubmitAuditBillClick(menu, event, 2);
}
},
{ text: Zi.LAN.FEE.ShenPay, //"申请开票",
handler: function (menu, event) {
_thisfee.onShenPayClick(menu, event, 2);
}
},
{ text: Zi.LAN.FEE.ViewWorkFlow, //"查看工作流",
,
{
text: Zi.LAN.FEE.ViewWorkFlow, //"查看工作流",
handler: function (menu, event) {
_thisfee.onViewWorkFlowDetailClick(menu, event, 2);
}
@ -2526,7 +2577,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
}
,
{ text: Zi.LAN.FEE.NewCustNameShow, //"批量修改费用对象",
{
text: Zi.LAN.FEE.NewCustNameShow, //"批量修改费用对象",
handler: function (menu, event) {
_thisfee.onCreateNewCustNameClick(menu, event, 2);
}
@ -2541,59 +2593,14 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
],
scope: this
},
'-', {
}, {
text: Zi.LAN.FEE.ViewDetail, //'查看信息',
tooltip: Zi.LAN.FEE.ViewDetail, //查看信息',
handler: function (button, event) {
this.onViewDetailClick(button, event, 2);
},
scope: this
}, '-', {
text: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
tooltip: Zi.LAN.FEE.btnFeeImpAddDr, //'引入费用',
id: 'btnFeeImpAddCr',
menu:
[
{ text: Zi.LAN.FEE.TemplateAddDetail, //"引入费用模板",
handler: function (menu, event) {
_thisfee.onTemplateAddDetailClick(menu, event, 2);
}
},
{ text: Zi.LAN.FEE.SaveFeeTemplate, //"保存为费用模板",
handler: function (menu, event) {
_thisfee.onSaveFeeTemplateClick(menu, event, 2);
}
}, {
text: Zi.LAN.FEE.HistryAddDetail, //"历史引入",
handler: function (menu, event) {
_thisfee.onHistryAddDetailClick(menu, event, 2);
}
},
],
scope: this
},
{
text: Zi.LAN.FEE.ShengChengYingShou, //"生成应收",
menu:
[
{
text: Zi.LAN.FEE.AddSelectDetailDr, //"所选生成应收",
handler: function (menu, event) {
_thisfee.onAddSelectDetailClick(menu, event, 1);
}
},
{
text: Zi.LAN.FEE.AddAllDetailDr, //"所有生成应收",
handler: function (menu, event) {
_thisfee.onAddAllDetailClick(menu, event, 1);
}
}
]
}, '-', {
text: Zi.LAN.FEE.btntest, //"保存列表样式",
menu: [
{ text: Zi.LAN.FEE.SaveGridPanel, //"保存",

2
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js
Unescape Escape View File

@ -81,7 +81,7 @@ Zi.LAN.FEE.AddAllDetailCr = "所有生成应付";
Zi.LAN.FEE.AddAmend = "添加更改单";
Zi.LAN.FEE.AddSelectDetailCr = "所选生成应付";
Zi.LAN.FEE.AddSelectDetailDr = "所选生成应收";
Zi.LAN.FEE.btnFeeAuditDr = "提交审核";
Zi.LAN.FEE.btnFeeAuditDr = "更多操作";
Zi.LAN.FEE.btnFeeAuditOpDr = "提交审核(主管)"; //提交审核
Zi.LAN.FEE.btnFeeImpAddDr = "引入费用";
Zi.LAN.FEE.btntest = "保存列表样式";

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js
Unescape Escape View File

@ -5400,9 +5400,9 @@ GetFeeCustNoStatus:function(){
//field.setValue('普通货');
var myDate = new Date();
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
field = basicForm.findField('BSDATE');
field.setValue(mydatestr);
//var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
//field = basicForm.findField('BSDATE');
//field.setValue(mydatestr);
var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
field = basicForm.findField('ACCDATE');
field.setValue(mydatestr);

12
DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs
Unescape Escape View File

@ -584,16 +584,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
strSql.Append(" ,ContainerType,LinkTel,YardName,LinkManSe,LinkTelSe,RtnYardName,BsType,CustName,CustLikeManName,CustTel,ChangedReson,DispatchName,RoadFee,FactoryAddr,ContainerNo,SealNo");
strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS");
<<<<<<< HEAD
strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP,BillFeeStatus");
strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF from tMsWlPcHead t ");
=======
strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP");
strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF ");
strSql.Append(" ,isnull(BillFeeStatus,0) BillFeeStatus ");
strSql.Append(" from tMsWlPcHead t ");
>>>>>>> eecdfa4c2d184f45cf1b653390cc03f60c70f45d
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where " + strCondition.Replace("~", ""));//str.Replace("b","**");
@ -630,16 +626,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
strSql.Append(" ,ContainerType,ContainerTypeSe,LinkTel,YardName,LinkManSe,LinkTelSe,RtnYardName,BsType,CustName,CustLikeManName,CustTel,ChangedReson,DispatchName,RoadFee,FactoryAddr,ContainerNo,SealNo");
strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS");
<<<<<<< HEAD
strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP,BillFeeStatus");
strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF from tMsWlPcHead t ");
=======
strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP");
strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF ");
strSql.Append(" ,isnull(BillFeeStatus,0) BillFeeStatus ");
strSql.Append(" from tMsWlPcHead t ");
>>>>>>> eecdfa4c2d184f45cf1b653390cc03f60c70f45d
if (!string.IsNullOrEmpty(condition))
{
strSql.Append(" where " + condition.Replace("~", ""));//str.Replace("b","**");

5
DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs
Unescape Escape View File

@ -2376,12 +2376,9 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
set { _accdate = value; }
}
<<<<<<< HEAD
public string BillFeeStatus {get;set;}
=======
public string BillFeeStatus { set; get; }
>>>>>>> eecdfa4c2d184f45cf1b653390cc03f60c70f45d
#endregion
public MsWlPcHead_WFSDEdit ( )

Write Preview
Loading…
Cancel
Save