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

委托结算增加反馈信息

Browse Source 
报关业务增加OPDATE默认当天
YingHang
ddlucky 7 months ago
parent 8c17ae8f2f
commit 178d0dc805
10 changed files with 330 additions and 212 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -3721,6 +3721,10 @@ namespace DSWeb.Common.DB
[NotMapped] [NotMapped]
public string OT4 { get; set; } public string OT4 { get; set; }
[NotMapped]
public string TIPS { get; set; }
public string CangDanShiJian { get; set; } public string CangDanShiJian { get; set; }
public string HaiFangShiJian { get; set; } public string HaiFangShiJian { get; set; }
public string TiHuo { get; set; } public string TiHuo { get; set; }

16
DSWeb/Areas/Account/Controllers/Chfee_invoice_HangXinController.cs
Unescape Escape View File

@ -1884,6 +1884,7 @@ namespace DSWeb.Areas.Account.Controllers
//被冲红的蓝票信息 //被冲红的蓝票信息
var BlueInvoice = ChinvoiceDAL.GetData(" cm.billno='" + bill + "'"); var BlueInvoice = ChinvoiceDAL.GetData(" cm.billno='" + bill + "'");
BlueInvoice.billUuid= BlueInvoice.GID.Replace("-", "");
if (BlueInvoice.ISNEEDFEE == "1") { if (BlueInvoice.ISNEEDFEE == "1") {
jsonRespose.Success = false; jsonRespose.Success = false;
@ -2163,10 +2164,14 @@ namespace DSWeb.Areas.Account.Controllers
if (!_r.Success) if (!_r.Success)
{ {
if (_r.Message != "红字确认单申请中" && _r.Message != "提交失败，请先完成扫脸身份认证后再试。") { if (_r.Message != "红字确认单申请中" && _r.Message != "提交失败，请先完成扫脸身份认证后再试。")
{
//head.billUuid = ""; //head.billUuid = "";
//modb.Save(head); //modb.Save(head);
} }
else {
modb.Save(head);
}
return BasicDataRefDAL.GetContentResult(_r); return BasicDataRefDAL.GetContentResult(_r);
} }
@ -2241,7 +2246,11 @@ namespace DSWeb.Areas.Account.Controllers
//获取红票信息并发出 //获取红票信息并发出
redhead.BILLNO = PubSysDAL.GetBillNo("0308"); redhead.BILLNO = PubSysDAL.GetBillNo("0308");
head.billUuid = redhead.GID.Replace("-",""); head.billUuid = head.GID.Replace("-","");
redhead.GID = head.billUuid;
//T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
//var blUpSQL = $" update ch_fee_invoice set billUuid='{head.billUuid}' where GID='{redhead.GID}'";
//bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
result = hx.PostRedConfirm(redhead, ref head, detailList,Session); result = hx.PostRedConfirm(redhead, ref head, detailList,Session);
@ -2249,6 +2258,9 @@ namespace DSWeb.Areas.Account.Controllers
{ {
} }
else {
returndate = (ChInvoice_HangXin)result.Data;
}
} }
//诺诺全电票根据红字申请单的结果读取确认单 //诺诺全电票根据红字申请单的结果读取确认单
} }

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

@ -1093,13 +1093,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
public string billId { public string billId {
get { get {
if (string.IsNullOrWhiteSpace(ChInvoice_HangXin.billUuid)) return ChInvoice_HangXin.billUuid;
{
return ChInvoice_HangXin.GID;
}
else {
return ChInvoice_HangXin.billUuid;
}
} }
} }
@ -2687,7 +2682,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
if (_return.code == "E0000") if (_return.code == "E0000")
{ {
//红字申请单提交成功 //红字申请单提交成功
head.GID = bluehead.GID.Replace("-", ""); head.billUuid = bluehead.GID.Replace("-", "");
//读取红字确认单 //读取红字确认单
var _r = ReadRedConfirm(ref head, detailList); var _r = ReadRedConfirm(ref head, detailList);
@ -2754,16 +2749,11 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
returndate = ChinvoiceDAL.GetData(" BILLNO='" + head.BILLNO + "'"); returndate = ChinvoiceDAL.GetData(" BILLNO='" + head.BILLNO + "'");
} }
result.Data = returndate; result.Data = returndate;
return result; return result;
} }
} }
//else if (_return.code == "070101" || _return.code == "070301") //else if (_return.code == "070101" || _return.code == "070301")
//{ //{

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

@ -5103,7 +5103,7 @@ namespace DSWeb.Areas.CommMng.DAL
#endregion #endregion
#region SaveLog #region SaveWorkLog
public static ContentResult SaveLog(List<FieldModel> data, string USERID, string NAME, string LOGTYPE) public static ContentResult SaveLog(List<FieldModel> data, string USERID, string NAME, string LOGTYPE)
{ {
var headData = new Sys_Logmd();//JsonConvert.Deserialize<WorkLogmb>(data); var headData = new Sys_Logmd();//JsonConvert.Deserialize<WorkLogmb>(data);

43
DSWeb/Areas/CommMng/DAL/PubSysDAL.cs
Unescape Escape View File

@ -35,6 +35,8 @@ using AlibabaCloud.SDK.Dingtalkstorage_1_0.Models;
using DSWeb.MvcShipping.DAL.OP_SERVICEBILLDAL; using DSWeb.MvcShipping.DAL.OP_SERVICEBILLDAL;
using com.sun.corba.se.spi.activation; using com.sun.corba.se.spi.activation;
using DSWeb.MvcShipping.DAL.MsCodeCtnEdi; using DSWeb.MvcShipping.DAL.MsCodeCtnEdi;
using DSWeb.Areas.OA.Models.WorkFlow;
using DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE;
namespace DSWeb.Areas.CommMng.DAL namespace DSWeb.Areas.CommMng.DAL
{ {
@ -3129,6 +3131,24 @@ namespace DSWeb.Areas.CommMng.DAL
currHead.FEE_1 = 0; currHead.FEE_1 = 0;
} }
if (AnnexIdList != null)
{
foreach (var id in AnnexIdList)
{
OP_SERVICEBILLDAL.下载附件(currHead, id, "账单");
}
}
//增加逻辑 向WorkLog中添加remark
if (!string.IsNullOrWhiteSpace(Remark))
{
var log = new WorkLogmb();
log.BSNO = currHead.BSNO;
log.ACTNAME = "反馈信息";
log.REMARK = Remark;
MsOp_BLISSUEDAL.SaveLog(log, "");
}
return SaveHead(); return SaveHead();
} }
@ -3136,6 +3156,7 @@ namespace DSWeb.Areas.CommMng.DAL
public class SERVICEBILL_MQ_账单附件信息 : SERVICEBILL_MQ public class SERVICEBILL_MQ_账单附件信息 : SERVICEBILL_MQ
{ {
public string Remark { get; set; }
public override DBResult DoSave() public override DBResult DoSave()
{ {
var result = new DBResult(); var result = new DBResult();
@ -3146,12 +3167,24 @@ namespace DSWeb.Areas.CommMng.DAL
} }
} }
//增加逻辑 向WorkLog中添加remark
if (!string.IsNullOrWhiteSpace(Remark))
{
var log = new WorkLogmb();
log.BSNO = currHead.BSNO;
log.ACTNAME = "账单反馈信息";
log.REMARK = Remark;
MsOp_BLISSUEDAL.SaveLog(log, "");
}
return SaveHead(); return SaveHead();
} }
} }
public class SERVICEBILL_MQ_发票附件信息 : SERVICEBILL_MQ_账单附件信息 public class SERVICEBILL_MQ_发票附件信息 : SERVICEBILL_MQ_账单附件信息
{ {
public string Remark { get; set; }
public bool? MailFlag { get; set; } public bool? MailFlag { get; set; }
public string MailBillNo { get; set; } public string MailBillNo { get; set; }
@ -3166,6 +3199,16 @@ namespace DSWeb.Areas.CommMng.DAL
OP_SERVICEBILLDAL.下载附件(currHead, id, "发票"); OP_SERVICEBILLDAL.下载附件(currHead, id, "发票");
} }
} }
//增加逻辑 向WorkLog中添加remark
if (!string.IsNullOrWhiteSpace(Remark))
{
var log = new WorkLogmb();
log.BSNO = currHead.BSNO;
log.ACTNAME = "发票反馈信息";
log.REMARK = Remark;
MsOp_BLISSUEDAL.SaveLog(log, "");
}
return SaveHead(); return SaveHead();
} }
} }

1
DSWeb/Areas/MvcShipping/Controllers/MsOpApplyController.cs
Unescape Escape View File

@ -171,6 +171,7 @@ namespace DSWeb.MvcShipping.Controllers
head.BSTYPE = "2"; head.BSTYPE = "2";
head.ETPS_CATEGORY = "A"; head.ETPS_CATEGORY = "A";
head.CDNTYPE = 0; head.CDNTYPE = 0;
head.OPDATE = DateTime.Now.ToString("yyy-MM-dd");
} }

23
DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs
Unescape Escape View File

@ -143,6 +143,8 @@ namespace DSWeb.MvcShipping.Controllers
if (resultlist != null && resultlist.Count > 0) if (resultlist != null && resultlist.Count > 0)
{ {
result = resultlist[0]; result = resultlist[0];
result.TIPS = GetTIPS(result.BSNO);
} }
} }
@ -150,6 +152,27 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json }; return new ContentResult() { Content = json };
} }
public string GetTIPS(string BSNO)
{
var result = "";
var cdc = new CommonDataContext();
var loglist = cdc.WorkLog.Where(x => x.BSNO == BSNO).ToList();
if (loglist == null || loglist.Count > 0)
{
foreach (var _log in loglist.OrderByDescending(o => o.OPDATE).ToList())
{
if(result!="") result += "\r\n";
result += _log.OPDATE+" "+ _log.REMARK;
}
}
return result;
}
public ContentResult GetData( string BSNO) public ContentResult GetData( string BSNO)
{ {

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -3740,7 +3740,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
] ]
} }
] ]
}, { }
, {
xtype: 'container', xtype: 'container',
layout: 'anchor', layout: 'anchor',
flex: 1, flex: 1,

432
DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js
Unescape Escape View File

@ -402,7 +402,7 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, {
//layout: "border", //layout: "border",
region: 'north', region: 'north',
// title:'委托结算服务', // title:'委托结算服务',
height:350, height:420,
//grow:true, //grow:true,
frame: true, frame: true,
bodyPadding: 5, bodyPadding: 5,
@ -419,220 +419,264 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, {
items: [ items: [
{ {
//第一格
xtype: 'container', xtype: 'container',
//title:'委托信息', layout: 'hbox', hidden: true,
defaultType: 'textfield', defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [ items: [
{ {
xtype: 'container', fieldLabel: 'BSNO',
layout: 'hbox', hidden: true, name: 'BSNO'
defaultType: 'textfield', }, {
items: [ fieldLabel: 'PARENTID',
{ name: 'PARENTID'
fieldLabel: 'BSNO', }, {
name: 'BSNO' fieldLabel: 'SALECORPID',
}, { name: 'SALECORPID'
fieldLabel: 'PARENTID', }, {
name: 'PARENTID' fieldLabel: 'DEPT',
}, { name: 'DEPT'
fieldLabel: 'SALECORPID', }, {
name: 'SALECORPID' fieldLabel: 'SALEDEPT',
}, { name: 'SALEDEPT'
fieldLabel: 'DEPT', }, {
name: 'DEPT' fieldLabel: 'SALE',
}, { name: 'SALE'
fieldLabel: 'SALEDEPT', }, {
name: 'SALEDEPT' fieldLabel: 'BILLSTATUS',
}, { name: 'BILLSTATUS'
fieldLabel: 'SALE', }, {
name: 'SALE' fieldLabel: 'BSSTATUS',
}, { name: 'BSSTATUS'
fieldLabel: 'BILLSTATUS', }, {
name: 'BILLSTATUS' fieldLabel: 'FEESTATS',
}, { name: 'FEESTATS'
fieldLabel: 'BSSTATUS', }, {
name: 'BSSTATUS' fieldLabel: 'CUSTNO',
}, { name: 'CUSTNO'
fieldLabel: 'FEESTATS', }, {
name: 'FEESTATS' fieldLabel: 'CUSTOMNO',
}, { name: 'CUSTOMNO'
fieldLabel: 'CUSTNO', }, {
name: 'CUSTNO' fieldLabel: 'CONTRACTNO',
}, { name: 'CONTRACTNO'
fieldLabel: 'CUSTOMNO', }, {
name: 'CUSTOMNO' fieldLabel: 'SERVICETYPE',
}, { name: 'SERVICETYPE'
fieldLabel: 'CONTRACTNO', }, {
name: 'CONTRACTNO' fieldLabel: 'ACCDATE',
}, { name: 'ACCDATE'
fieldLabel: 'SERVICETYPE', }, {
name: 'SERVICETYPE' fieldLabel: 'BSDATE',
}, { name: 'BSDATE'
fieldLabel: 'ACCDATE', }, {
name: 'ACCDATE' fieldLabel: 'MODIFIEDUSER',
}, { name: 'MODIFIEDUSER'
fieldLabel: 'BSDATE', }, {
name: 'BSDATE' fieldLabel: 'MODIFIEDTIME',
}, { name: 'MODIFIEDTIME'
fieldLabel: 'MODIFIEDUSER', }, {
name: 'MODIFIEDUSER' fieldLabel: 'ATA',
}, { name: 'ATA'
fieldLabel: 'MODIFIEDTIME', }, {
name: 'MODIFIEDTIME' fieldLabel: 'FORWARDER',
}, { name: 'FORWARDER'
fieldLabel: 'ATA', }, {
name: 'ATA' fieldLabel: 'CUSTOMERNAME',
}, { name: 'CUSTOMERNAME'
fieldLabel: 'FORWARDER', }, {
name: 'FORWARDER' fieldLabel: 'FEE_1',
}, { name: 'FEE_1'
fieldLabel: 'CUSTOMERNAME', }, {
name: 'CUSTOMERNAME' fieldLabel: 'FEE_2',
}, { name: 'FEE_2'
fieldLabel: 'FEE_1', }, {
name: 'FEE_1' fieldLabel: 'DJYID',
}, { name: 'DJYID'
fieldLabel: 'FEE_2', }, {
name: 'FEE_2' fieldLabel: 'CangDanShiJian',
}, { name: 'CangDanShiJian'
fieldLabel: 'DJYID', }, {
name: 'DJYID' fieldLabel: 'HaiFangShiJian',
}, { name: 'HaiFangShiJian'
fieldLabel: 'CangDanShiJian', }, {
name: 'CangDanShiJian' fieldLabel: 'TiHuo',
}, { name: 'TiHuo'
fieldLabel: 'HaiFangShiJian', }, {
name: 'HaiFangShiJian' fieldLabel: 'TiHuoInfo',
}, { name: 'TiHuoInfo'
fieldLabel: 'TiHuo', }, {
name: 'TiHuo' fieldLabel: 'FanKong',
}, { name: 'FanKong'
fieldLabel: 'TiHuoInfo', }, {
name: 'TiHuoInfo' fieldLabel: 'FanKongInfo',
}, { name: 'FanKongInfo'
fieldLabel: 'FanKong',
name: 'FanKong'
}, {
fieldLabel: 'FanKongInfo',
name: 'FanKongInfo'
}
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
this.comboxCompany//所属公司
]
} }
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
this.comboxCompany//所属公司
]
}
, { , {
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [ items: [
this.comboxOP//联系人 this.comboxOP//联系人
] ]
} }
, { , {
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [ items: [
{ {
fieldLabel: "<a><font color='#FF0000'>*</font></a>" +Zi.LAN.TEL, fieldLabel: "<a><font color='#FF0000'>*</font></a>" + Zi.LAN.TEL,
allowBlank: false, allowBlank: false,
name: 'TEL' name: 'TEL'
}
]
} }
, { ]
xtype: 'container', }
layout: 'hbox', , {
defaultType: 'textfield', xtype: 'container',
items: [ layout: 'hbox',
{ defaultType: 'textfield',
fieldLabel: "<a><font color='#FF0000'>*</font></a>" +Zi.LAN.MBLNO, items: [
allowBlank: false, {
name: 'MBLNO' fieldLabel: "<a><font color='#FF0000'>*</font></a>" + Zi.LAN.MBLNO,
} allowBlank: false,
, this.comboxCARRIER name: 'MBLNO'
] }
, this.comboxCARRIER
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
{
fieldLabel: Zi.LAN.VESSEL,
allowBlank: true,
name: 'VESSEL'
} }
, { , {
fieldLabel: Zi.LAN.VOYNO,
allowBlank: true,
name: 'VOYNO'
}
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
{
fieldLabel: Zi.LAN.ETA,
format: 'Y-m-d',
xtype: 'datefield',
allowBlank: true,
name: 'ETA'
}
//, {
// fieldLabel: Zi.LAN.SHIPAGENCY,
// allowBlank: true,
// name: 'SHIPAGENCY'
//}
, this.comboxSHIPAGENCY
]
}
, {
id: 'ServiceGroup',
xtype: 'checkboxgroup',
fieldLabel: "<a><font color='#FF0000'>*</font></a>" + Zi.LAN.SERVICEBILLService, //'费用项目',
allowBlank: false,
columns: 4,
name: 'SERVICE',
items: []
}
,{
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
flex: 1,
//defaults: {
// anchor: '100%'
//},
items: [
{
xtype: 'container', xtype: 'container',
layout: 'hbox', //title:'委托信息',
defaultType: 'textfield', defaultType: 'textfield',
layout: 'anchor',
flex: 1,
defaults: {
anchor: '100%'
},
items: [ items: [
{ {
fieldLabel: Zi.LAN.VESSEL, xtype: 'textareafield',
allowBlank: true, name: 'REMARK',
name: 'VESSEL' id: "REMARK",
height: 120,
grow: false,
fieldLabel: '下单备注' //'备注',
} }
, { , {
fieldLabel: Zi.LAN.VOYNO, xtype: 'textareafield',
allowBlank: true, name: 'REMARK2',
name: 'VOYNO' id: "REMARK2",
height: 60,
hidden: true,
grow: false,
fieldLabel: '补充备注',
},{
xtype: 'textareafield',
name: 'TIPS',
id: "TIPS",
readOnly: true,
height: 60,
grow: false,
fieldStyle: {
color: 'red'
},
fieldLabel: '反馈信息',
} }
] ]
} }
, { //, {
xtype: 'container',
layout: 'hbox', // xtype: 'container',
defaultType: 'textfield', // //title:'委托信息',
items: [ // defaultType: 'textfield',
{ // layout: 'anchor',
fieldLabel: Zi.LAN.ETA, // flex: 1,
format: 'Y-m-d', // defaults: {
xtype: 'datefield', // anchor: '100%'
allowBlank: true, // },
name: 'ETA' // items: [
}
//, { // ]
// fieldLabel: Zi.LAN.SHIPAGENCY, //}
// allowBlank: true,
// name: 'SHIPAGENCY'
//}
, this.comboxSHIPAGENCY
]
}
, {
id: 'ServiceGroup',
xtype: 'checkboxgroup',
fieldLabel: "<a><font color='#FF0000'>*</font></a>" + Zi.LAN.SERVICEBILLService, //'费用项目',
allowBlank:false,
columns: 4,
name: 'SERVICE',
items: []
}
, {
xtype: 'textareafield',
name: 'REMARK',
id:"REMARK",
height:120,
//grow: true,
fieldLabel: Zi.LAN.REMARK //'备注',
}
, {
xtype: 'textareafield',
name: 'REMARK2',
id: "REMARK2",
height: 40,
hidden: true,
fieldLabel: '补充备注',
}
] ]
} }
]//end items(fieldset 1) ]//end items(fieldset 1)
}); //end this.formHead }); //end this.formHead
@ -1600,7 +1644,7 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, {
basicForm.findField('REMARK').readOnly = true; basicForm.findField('REMARK').readOnly = true;
Ext.getCmp('REMARK').height = 75; Ext.getCmp('REMARK').height = 60;
Ext.getCmp('REMARK2').show(); Ext.getCmp('REMARK2').show();
Ext.getCmp('btnESave').hide(); Ext.getCmp('btnESave').hide();

2
DSWeb/Global.asax.cs
Unescape Escape View File

@ -391,7 +391,7 @@ namespace DSWeb
} }
#endregion #endregion
#region 接收委托结算业务的回退消息队列 #region 接收委托结算业务的回推消息队列
private void DoReceiveSERVICEBILL() private void DoReceiveSERVICEBILL()
{ {

Write Preview
Loading…
Cancel
Save