chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

费用提交和撤回 改为不使用ds7工作流

Browse Source
temp
dengyu 1 year ago
parent 616de271ba
commit 282a352051
2 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File

12
Vue.Net/VOL.System/Services/OP_WMS_APPPUSHINFO/Partial/OP_WMS_APPPUSHINFOService.cs
Unescape Escape View File

@ -150,12 +150,16 @@ namespace VOL.System.Services
foreach (var item in statekeyList) foreach (var item in statekeyList)
{ {
var sh = SendAppMessage.SendAPPHelp(item, execution); if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
{
var sh = SendAppMessage.SendAPPHelp(item, execution);
_r = sh.DoSend(); _r = sh.DoSend();
if (_r.Status == false) { if (_r.Status == false)
return _r; {
return _r;
}
} }
} }

87
Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs
Unescape Escape View File

@ -512,25 +512,25 @@ namespace VOL.WMS.Services
//} //}
//return _webResponseContent.Error(""); //return _webResponseContent.Error("");
if (AppSetting.CompanySetting.COMPANYNAME == "JGWL") //if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
{ //{
var FeeIDList = feelist.Select(s => s.GID).ToList(); // var FeeIDList = feelist.Select(s => s.GID).ToList();
var IDs = string.Join(",", FeeIDList); // var IDs = string.Join(",", FeeIDList);
JObject reqObj = new JObject // JObject reqObj = new JObject
{ // {
{ "IDs",IDs}, // { "IDs",IDs},
{ "optype","op_wms"} // { "optype","op_wms"}
//, // //,
// { "USERID", userid }, // // { "USERID", userid },
// { "COMPANYID", usercompanyid } // // { "COMPANYID", usercompanyid }
}; // };
var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/SubmitAuditNew_BYID"); // var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/SubmitAuditNew_BYID");
return ds7sender.DoPost(reqObj); // return ds7sender.DoPost(reqObj);
} //}
else //else
{ //{
//其它公司仍采用提交直接通过 撤回直接撤回的模式 //其它公司仍采用提交直接通过 撤回直接撤回的模式
////审核通过 将feestatus=1的设为0 ////审核通过 将feestatus=1的设为0
@ -540,7 +540,7 @@ namespace VOL.WMS.Services
Ch_feeRepository.Instance.Update(item, true); Ch_feeRepository.Instance.Update(item, true);
} }
return _webResponseContent.OK("提交完成"); return _webResponseContent.OK("提交完成");
} //}
} }
private WebResponseContent DoPostFeeCancelAudit(List<Ch_fee> feelist) private WebResponseContent DoPostFeeCancelAudit(List<Ch_fee> feelist)
@ -581,32 +581,37 @@ namespace VOL.WMS.Services
// _webResponseContent.Error(e.Message); // _webResponseContent.Error(e.Message);
//} //}
//return _webResponseContent.Error(""); //return _webResponseContent.Error("");
if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
//20230908 改为不走审核流程
//if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
//{
// var FeeIDList = feelist.Select(s => s.GID).ToList();
// var IDs = string.Join(",", FeeIDList);
// JObject reqObj = new JObject
// {
// { "IDs",IDs},
// { "optype","op_wms"}
// //,
// // { "USERID", userid },
// // { "COMPANYID", usercompanyid }
// };
// var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/CancelAudit_BYID");
// return ds7sender.DoPost(reqObj);
//}
//else {
//撤回 将feestatus=0的设为1
foreach (var item in feelist.Where(x => x.FEESTATUS == 0).ToList())
{ {
var FeeIDList = feelist.Select(s => s.GID).ToList(); if (!chfeeCanRecall(item)) continue;
var IDs = string.Join(",", FeeIDList); item.FEESTATUS = 1;
JObject reqObj = new JObject Ch_feeRepository.Instance.Update(item,true);
{
{ "IDs",IDs},
{ "optype","op_wms"}
//,
// { "USERID", userid },
// { "COMPANYID", usercompanyid }
};
var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/CancelAudit_BYID");
return ds7sender.DoPost(reqObj);
} }
else {
//撤回 将feestatus=0的设为1
foreach (var item in feelist.Where(x => x.FEESTATUS == 0).ToList())
{
item.FEESTATUS = 1;
Ch_feeRepository.Instance.Update(item,true);
}
//_msg = "撤回完成"; //_msg = "撤回完成";
return _webResponseContent.OK("撤回完成"); return _webResponseContent.OK("撤回完成");
} //}
} }
public override WebResponseContent Update(SaveModel saveModel) public override WebResponseContent Update(SaveModel saveModel)
{ {

Write Preview
Loading…
Cancel
Save