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

委托结算增加反馈信息

Browse Source 
报关业务增加OPDATE默认当天
dev
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]
public string OT4 { get; set; }
[NotMapped]
public string TIPS { get; set; }
public string CangDanShiJian { get; set; }
public string HaiFangShiJian { 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 + "'");
BlueInvoice.billUuid= BlueInvoice.GID.Replace("-", "");
if (BlueInvoice.ISNEEDFEE == "1") {
jsonRespose.Success = false;
@ -2163,10 +2164,14 @@ namespace DSWeb.Areas.Account.Controllers
if (!_r.Success)
{
if (_r.Message != "红字确认单申请中" && _r.Message != "提交失败，请先完成扫脸身份认证后再试。") {
if (_r.Message != "红字确认单申请中" && _r.Message != "提交失败，请先完成扫脸身份认证后再试。")
{
//head.billUuid = "";
//modb.Save(head);
}
else {
modb.Save(head);
}
return BasicDataRefDAL.GetContentResult(_r);
}
@ -2241,7 +2246,11 @@ namespace DSWeb.Areas.Account.Controllers
//获取红票信息并发出
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);
@ -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 {
get {
if (string.IsNullOrWhiteSpace(ChInvoice_HangXin.billUuid))
{
return ChInvoice_HangXin.GID;
}
else {
return ChInvoice_HangXin.billUuid;
}
return ChInvoice_HangXin.billUuid;
}
}
@ -2687,7 +2682,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
if (_return.code == "E0000")
{
//红字申请单提交成功
head.GID = bluehead.GID.Replace("-", "");
head.billUuid = bluehead.GID.Replace("-", "");
//读取红字确认单
var _r = ReadRedConfirm(ref head, detailList);
@ -2754,16 +2749,11 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
returndate = ChinvoiceDAL.GetData(" BILLNO='" + head.BILLNO + "'");
}
result.Data = returndate;
return result;
}
}
//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
#region SaveLog
#region SaveWorkLog
public static ContentResult SaveLog(List<FieldModel> data, string USERID, string NAME, string LOGTYPE)
{
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 com.sun.corba.se.spi.activation;
using DSWeb.MvcShipping.DAL.MsCodeCtnEdi;
using DSWeb.Areas.OA.Models.WorkFlow;
using DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE;
namespace DSWeb.Areas.CommMng.DAL
{
@ -3129,6 +3131,24 @@ namespace DSWeb.Areas.CommMng.DAL
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();
}
@ -3136,6 +3156,7 @@ namespace DSWeb.Areas.CommMng.DAL
public class SERVICEBILL_MQ_账单附件信息 : SERVICEBILL_MQ
{
public string Remark { get; set; }
public override DBResult DoSave()
{
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();
}
}
public class SERVICEBILL_MQ_发票附件信息 : SERVICEBILL_MQ_账单附件信息
{
public string Remark { get; set; }
public bool? MailFlag { get; set; }
public string MailBillNo { get; set; }
@ -3166,6 +3199,16 @@ namespace DSWeb.Areas.CommMng.DAL
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();
}
}

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

@ -171,6 +171,7 @@ namespace DSWeb.MvcShipping.Controllers
head.BSTYPE = "2";
head.ETPS_CATEGORY = "A";
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)
{
result = resultlist[0];
result.TIPS = GetTIPS(result.BSNO);
}
}
@ -150,6 +152,27 @@ namespace DSWeb.MvcShipping.Controllers
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)
{

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

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

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

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

Write Preview
Loading…
Cancel
Save