Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

# Conflicts:
#	DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs
#	DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs
DS7_JingHan
hanxuntao 2 years ago
commit 32912e8973

File diff suppressed because it is too large Load Diff

@ -9505,37 +9505,54 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
string sqlLb = "select oplb from v_op_bs where bsno = " + item + "";
string oplb = db.ExecuteScalar(CommandType.Text, sqlLb).ToString();
var OPLBDic = new Dictionary<string, string>
{
{ "op_seae", "op_Seae" },
{ "op_seai","op_Seai"},
{ "op_airi","op_Airi"},
{ "op_aire","op_Aire"},
{ "op_appy","op_Apply"},
{ "OP_SuperVision_Truck","OP_SuperVision_Truck"},
{ "tMsWlPcHead","tMsWlPcHead"}
};
if (oplb == "" || oplb == null)
{
continue;
}
if (oplb != "op_seae" && oplb != "op_seai" && oplb != "op_airi" && oplb != "op_aire" && oplb != "op_other" && oplb != "op_apply")
//if (oplb != "op_seae" && oplb != "op_seai" && oplb != "op_airi" && oplb != "op_aire" && oplb != "op_other" && oplb != "op_apply")
//{
// continue;
//}
if (!OPLBDic.ContainsKey(oplb))
{
continue;
}
//费用提交
string condition = "BsNo=" + item;
string oplb2 = oplb;
switch (oplb)
{
case "op_seae":
oplb2 = "op_Seae";
break;
case "op_seai":
oplb2 = "op_Seai";
break;
case "op_airi":
oplb2 = "op_Airi";
break;
case "op_aire":
oplb2 = "op_Aire";
break;
case "op_appy":
oplb2 = "op_Apply";
break;
default:
break;
}
string oplb2 = OPLBDic[oplb];
//string oplb2 = oplb;
//switch (oplb)
//{
// case "op_seae":
// oplb2 = "op_Seae";
// break;
// case "op_seai":
// oplb2 = "op_Seai";
// break;
// case "op_airi":
// oplb2 = "op_Airi";
// break;
// case "op_aire":
// oplb2 = "op_Aire";
// break;
// case "op_appy":
// oplb2 = "op_Apply";
// break;
// default:
// break;
//}
DBResult result = new DBResult();
if (statusvalue != 0)
{

@ -1002,10 +1002,13 @@ namespace DSWeb.Areas.MvcShipping.DAL
//提取两个op_logicinfo中的json
var logic = BasicDataRefDAL.GetLogicInfo(TASKNO, "关贸云报关");
var json = logic["JSONSTR"];
var json = "";
if(logic.ContainsKey("JSONSTR")) json = logic["JSONSTR"];
var logic = BasicDataRefDAL.GetLogicInfo(TASKNO, "关贸云费用");
var json = logic["JSONSTR"];
var json = "";
if (logic.ContainsKey("JSONSTR")) json = logic["JSONSTR"];
var headinfo = JsonConvert.Deserialize<GuanMaoYun_Head>(json);

@ -491,7 +491,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
data.SJDH = Convert.ToString(reader["SJDH"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
data.TimeMark = Convert.ToDecimal(reader["TimeMark_int"]);
data.BillFeeStatus = Convert.ToString(reader["BillFeeStatus"]);
if (reader["BILLFEESTATUSTIME"] != DBNull.Value)
data.BILLFEESTATUSTIME = Convert.ToString(reader["BILLFEESTATUSTIME"]);
#endregion
headList.Add(data);
}

@ -92,18 +92,8 @@ namespace DSWeb.MvcShipping.Models.MsOp_SuperVision_Truck
public decimal? TimeMark{get;set;}
public string BillFeeStatus
{
get {
if (FEESTATUS == true) {
return "1";
}
else {
return "0";
}
}
}
public string BillFeeStatus{ get;set; }
public string BILLFEESTATUSTIME { get; set; }
#endregion
public OP_SuperVision_Truck_md()

@ -857,11 +857,17 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, {
handler: function (menu, event) {
_this.onFeeEditClick(menu, event);
}
}, { text: "批量费用提交",
handler: function (menu, event) {
_this.onPiLiangSubmitClick(menu, event, 1);
}
}, { text: "服务模板费用",
}
//, {
// text: "批量费用提交",
// handler: function (menu, event) {
// _this.onPiLiangSubmitClick(menu, event, 1);
// }
//}
, {
text: "服务模板费用",
handler: function (menu, event) {
_this.onPiLiangServiceFeeClick(menu, event);
}
@ -883,12 +889,19 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, {
// scope: this
//}
, {
text: '批量整票提交', //"批量整票提交",
handler: function (menu, event) {
_this.onPiLiangZhengPiaoTiJiaoClick();
}
}],
{
text: '批量请核', //"批量整票提交",
handler: function (menu, event) {
_this.onPiLiangZhengPiaoTiJiaoClick(menu, event, 1);
}
}, {
text: '批量撤销', //"批量整票提交",
handler: function (menu, event) {
_this.onCancelPiLiangZhengPiaoTiJiaoClick(menu, event, 0);
}
}
],
scope: this
}]
});
@ -1734,6 +1747,97 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, {
}
,
onCancelPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) {
var selections = this.GridCheckBoxModel.selected.items;
if (selections.length == 0) {
Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
return;
}
var BSNOStr = '';
var icount = 0;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
var isdelete = true;
if (rec.data.BillFeeStatus == '2') {
Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已财务审核,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
if (rec.data.BillFeeStatus == '4') {
Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已整票驳回,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
if (rec.data.BillFeeStatus == '1') {
if (rec.data.ISAPPLY != '1') {
Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已经理审核,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
}
if (isdelete) {
var BSNO = rec.data.BSNO;
if (BSNOStr == '')
BSNOStr = BSNO;
else {
BSNOStr = BSNOStr + ',' + BSNO;
}
icount = icount + 1;
}
}
if (BSNOStr == '') {
Ext.Msg.show({ title: "提示", msg: "没有需要处理的业务", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
} else {
var urlStr = '/Account/Chfee_Audit/CancelAuditBLList';
Ext.Ajax.request({
waitMsg: '正在查询主表数据...', //'正在添加数据...',
url: urlStr,
params: {
bsnos: BSNOStr
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
if (result.Message != '') {
Ext.Msg.show({
title: '提示',
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
}
return;
} else {
_this.storeList.reload();
}
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
},
scope: this
});
}
}
//#endregion
, GetCompanyInfo: function (CORPID) {

@ -535,7 +535,10 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS");
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(" ,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 ");
if (!string.IsNullOrEmpty(strCondition))
{
//strSql.Append(" where 1=1 AND " + strCondition);
@ -581,8 +584,16 @@ 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","**");
@ -619,8 +630,16 @@ 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","**");
@ -733,6 +752,9 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
data.SealNo = Convert.ToString(reader["SealNo"]);
data.SALECORP = Convert.ToString(reader["SALECORP"]);
data.SALECORPID = Convert.ToString(reader["SALECORPID"]);
data.BillFeeStatus = Convert.ToString(reader["BillFeeStatus"]);
#endregion
headList.Add(data);
}

@ -2376,8 +2376,12 @@ 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 ( )

@ -1377,10 +1377,22 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}, '-', {
text: '其他操作', //"拼箱操作",
menu: [
//{
// text: "批量费用提交", //"批量费用提交",
// handler: function (menu, event) {
// _this.onPiLiangSubmitClick(menu, event, 1);
// }
//},
{
text: "批量费用提交", //"批量费用提交",
text: '批量请核', //"批量整票提交",
handler: function (menu, event) {
_this.onPiLiangSubmitClick(menu, event, 1);
_this.onPiLiangZhengPiaoTiJiaoClick(menu, event, 1);
}
}, {
text: '批量撤销', //"批量整票提交",
handler: function (menu, event) {
_this.onCancelPiLiangZhengPiaoTiJiaoClick(menu, event, 0);
}
}],
scope: this
@ -2657,44 +2669,224 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
},
onPiLiangSubmitClick: function (menu, event, type) {
//onPiLiangSubmitClick: function (menu, event, type) {
// var selectedRecords = this.gridList.selModel.getSelection();
// this.storePLList.removeAll();
// for (var i = 0; i < selectedRecords.length; i++) {
// var rec = selectedRecords[i];
// var record = Ext.create('MsOpBill', {
// 'BSNO': rec.data.gId,
// 'PARENTID': rec.data.gId,
// 'BSSTATUS': rec.data.BillStatus,
// 'FEESTATUS': rec.data.FEESTATUS,
// 'BSSTATUSREF': '未锁定',
// 'FEESTATUSREF': rec.data.FEESTATUS,
// 'BSSOURCE': '',
// 'BSSOURCEDETAIL': '',
// 'ACCDATE': rec.data.ACCDATE,
// 'OPLB': 'tMsWlPcHead',
// 'OPTYPE': '普通货',
// 'OPLBNAME': '陆运派车单',
// 'MBLNO': rec.data.MblNo,
// 'HBLNO': '',
// 'CUSTNO': rec.data.BillNo,
// 'CUSTOMERNAME': rec.data.CustomerName,
// 'ETD': rec.data.ExpDate,
// 'PORTLOAD': rec.data.LoadPlace,
// 'PORTDISCHARGE': rec.data.DetiNation
// });
// this.storePLList.add(record);
// }
// if (this.storePLList.getCount()==0) {
// Ext.Msg.show({ title:'提示', msg:'没有要提交的业务', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
// return;
// } else {
// window.open('/Account/Chfee_Audit/PiLiangSubmit', "PILIANGSUBMIT", 'width=1200,height=600,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
// }
//},
onPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) {
var selections = this.GridCheckBoxModel.selected.items;
if (selections.length == 0) {
Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
return;
}
var BSNOStr = '';
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
if (rec.data.BillFeeStatus == '0' || rec.data.BillFeeStatus == '4') {
var BSNO = rec.data.BSNO;
if (BSNOStr == '')
BSNOStr = BSNO;
else {
BSNOStr = BSNOStr + ',' + BSNO;
}
}
}
if (BSNOStr == '') {
Ext.Msg.show({ title: "提示", msg: "没有需处理的业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
var selectedRecords = this.gridList.selModel.getSelection();
this.storePLList.removeAll();
for (var i = 0; i < selectedRecords.length; i++) {
var rec = selectedRecords[i];
var record = Ext.create('MsOpBill', {
'BSNO': rec.data.gId,
'PARENTID': rec.data.gId,
'BSSTATUS': rec.data.BillStatus,
'FEESTATUS': rec.data.FEESTATUS,
'BSSTATUSREF': '未锁定',
'FEESTATUSREF': rec.data.FEESTATUS,
'BSSOURCE': '',
'BSSOURCEDETAIL': '',
'ACCDATE': rec.data.ACCDATE,
'OPLB': 'tMsWlPcHead',
'OPTYPE': '普通货',
'OPLBNAME': '陆运派车单',
'MBLNO': rec.data.MblNo,
'HBLNO': '',
'CUSTNO': rec.data.BillNo,
'CUSTOMERNAME': rec.data.CustomerName,
'ETD': rec.data.ExpDate,
'PORTLOAD': rec.data.LoadPlace,
'PORTDISCHARGE': rec.data.DetiNation
} else {
var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL';
Ext.Ajax.request({
waitMsg: '正在查询主表数据...', //'正在添加数据...',
url: urlStr,
params: {
optype: 'op_seae',
bsnos: BSNOStr
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
if (result.Message != '') {
Ext.Msg.show({
title: '提示',
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
if (result.Message4 != '') {
_this.onDsQuery();
}
} else {
if (_this.winAccess) { _this.winAccess.close(); }
_this.winAccess = new Shipping.DsAudit({
});
_this.winAccess.Record = result.Data;
_this.winAccess.BsNo = result.Message2;
_this.winAccess.Mblno = result.Message3;
_this.winAccess.stroplb = 'op_seae';
_this.winAccess.Parentformname = 'op_seae';
_this.winAccess.show();
return;
}
return;
} else {
_this.onDsQuery();
if (result.Data != '' && result.Data != null) {
Ext.Msg.show({
title: '提示',
msg: '已提交审核,' + result.Data,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
}
}
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
},
scope: this
});
this.storePLList.add(record);
}
},
onCancelPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) {
if (this.storePLList.getCount()==0) {
Ext.Msg.show({ title:'提示', msg:'没有要提交的业务', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
var selections = this.GridCheckBoxModel.selected.items;
if (selections.length == 0) {
Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务!
return;
}
var BSNOStr = '';
var icount = 0;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
var isdelete = true;
if (rec.data.BillFeeStatus == '2') {
Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已财务审核,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
if (rec.data.BillFeeStatus == '4') {
Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已整票驳回,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
if (rec.data.BillFeeStatus == '1') {
if (rec.data.ISAPPLY != '1') {
Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已经理审核,不允许撤销请核!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
isdelete = false;
return;
}
}
if (isdelete) {
var BSNO = rec.data.BSNO;
if (BSNOStr == '')
BSNOStr = BSNO;
else {
BSNOStr = BSNOStr + ',' + BSNO;
}
icount = icount + 1;
}
}
if (BSNOStr == '') {
Ext.Msg.show({ title: "提示", msg: "没有需要处理的业务", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
} else {
window.open('/Account/Chfee_Audit/PiLiangSubmit', "PILIANGSUBMIT", 'width=1200,height=600,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
var urlStr = '/Account/Chfee_Audit/CancelAuditBLList';
Ext.Ajax.request({
waitMsg: '正在查询主表数据...', //'正在添加数据...',
url: urlStr,
params: {
bsnos: BSNOStr
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
if (result.Message != '') {
Ext.Msg.show({
title: '提示',
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
}
return;
} else {
_this.storeList.reload();
}
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
},
scope: this
});
}

Loading…
Cancel
Save