Skip to content

T
topsun-bpm
Commit 17d72c63 authored by 1650842865's avatar 1650842865
Browse files
Options

返回给 sap的消息格式调整；供应商修改bug解决；取消首次登录修改密码提示

parent fb193cf1
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 77 deletions
huigou-xt/src/main/webapp/system/userPanel/UsercontrolPanel.js
View file @ 17d72c63
......@@ -8,13 +8,13 @@
}
});
function bindEvent(){
Public.ajax(web_app.name + '/check/checkPassword.ajax',{},
function(data) {
if (data.count <= 1) {
Public.tip("登录后请修改初始密码!");
return false;
}
});
// Public.ajax(web_app.name + '/check/checkPassword.ajax',{},
// function(data) {
// if (data.count <= 1) {
// Public.tip("登录后请修改初始密码!");
// return false;
// }
// });
}
function initEvent(){
......
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js
View file @ 17d72c63
......@@ -33,6 +33,7 @@ function loadGrid() {
{display: "序号", name: "changeNo", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "变更事项", name: "changeMatter", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "品牌名称", name: "brandName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "产品代号", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "变更类型", name: "reasonForChangeTextView", width: 150, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ 17d72c63
......@@ -43,12 +43,10 @@ function setId(bizId) {
_grid.options.parms.sId = bizId;
var _grid2 = UICtrl.getGridManager('#sapSuppliersBuyerGrid');
_grid2.options.parms.sId = bizId;
var _grid3 = UICtrl.getGridManager('#sapSuppliersBankGrid');
_grid3.options.parms.sId = bizId;
$("#sId").val(bizId);
sapSuppliersPayGridManager.loadData();
sapSuppliersBuyerGridManager.loadData();
sapSuppliersBankGridManager.loadData();
$('#supplierList').fileList({
bizId : bizId
......
topsun-xt/src/main/webapp/javaScript/HomePage.js
View file @ 17d72c63
......@@ -37,41 +37,15 @@
function bindEvent(){
Public.ajax(web_app.name + '/check/checkPassword.ajax',{},
function(data) {
if (data.count <= 1) {
var url=DataUtil.composeURLByParam('/personOwn/forwardUsercontrol.do?codeId=setUserPassword',{});
UICtrl.addTabItem({tabid:'personOwn', text:$.i18nProp('index.user.own.info'),url:url});
Public.tip("登录后请修改初始密码!");
return false;
}
});
$("#processReportType").combox({onChange:function(data){
var _processReportType=data.value;
if(_processReportType=="system"){//如果报表类型是专业组，则显示专业组名称字段
$("#systemName_text").parent().show();
$("#systemName_label").show();
}else{
$("#systemName_text").parent().hide();
$("#systemName_label").hide();
$("#systemCode").val("");
$("#systemName_text").val("");
}
}
});
//所属系统选择
$('#systemName').orgTree({
searchType: 'budget', searchName: 'systemSearch',
filter: "dpt", excludePos: 1, param: {orgKindId: "ogn,dpt",orgRoot:'E91C91A499F94FD6823D8098B4F3A5B2',showVirtualOrg:'1'},
onChange: function (value,data) {
$('#systemCode').val(data.code);
$('#systemName').val(data.name);
$("#queryMainForm #systemId").val(data.id);
}
});
// Public.ajax(web_app.name + '/check/checkPassword.ajax',{},
// function(data) {
// if (data.count <= 1) {
// var url=DataUtil.composeURLByParam('/personOwn/forwardUsercontrol.do?codeId=setUserPassword',{});
// UICtrl.addTabItem({tabid:'personOwn', text:$.i18nProp('index.user.own.info'),url:url});
// Public.tip("登录后请修改初始密码!");
// return false;
// }
// });
}
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
View file @ 17d72c63
......@@ -182,16 +182,16 @@ public class SapCostReimbursementController extends CommonController {
@ResponseBody
public HashMap<String, Object> paymentReceipt(@RequestBody PaymentReceiptVo paymentReceiptVo){
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
messageMap.put("ZEP_NO",paymentReceiptVo.getBillCode());
messageMap.put("CODE","S");
messageMap.put("MSG","成功");
messageMap.put("DATA",paymentReceiptVo.getBillCode());
LOG.info("SAP财务付款凭证数据=={}", JSONUtil.toString(paymentReceiptVo));
try {
this.costReimbursementApplication.savePaymentReceiptVo(paymentReceiptVo);
}catch (RuntimeException e){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",e.getMessage());
messageMap.put("ZEP_NO",paymentReceiptVo.getBillCode());
messageMap.put("CODE","E");
messageMap.put("MSG",e.getMessage());
messageMap.put("DATA",paymentReceiptVo.getBillCode());
}
return messageMap;
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 17d72c63
......@@ -245,8 +245,9 @@ public class NonProdApplyController extends CommonController {
//SDO sdo = this.getSDO();
LOG.info("接收SAP产品申请数据.................");
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
messageMap.put("CODE","S");
messageMap.put("MSG","成功");
messageMap.put("DATA","");
LOG.info("参数:=={}", JSONObject.toJSONString(prodApplyFromSapVO));
HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("TYPE", "S");
......@@ -261,8 +262,8 @@ public class NonProdApplyController extends CommonController {
SapNonProdApplyDept sapNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByMatnr(prodApplyFromSapVO.getMatnr());
if (sapNonProdApplyDept!=null){
message="产品编号"+prodApplyFromSapVO.getMatnr()+"已经存在！";
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",message);
messageMap.put("CODE","E");
messageMap.put("MSG",message);
resultMap.put("TYPE", "E");
} else {
message=nonProdApplyApplication.saveProdApplyFromSapVO(prodApplyFromSapVO);
......@@ -272,8 +273,8 @@ public class NonProdApplyController extends CommonController {
}
resultMap.put("MESSAGE",message);
}catch (Exception e){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",e);
messageMap.put("CODE","E");
messageMap.put("MSG",e);
resultMap.put("TYPE", "E");
resultMap.put("MESSAGE",e.getMessage());
}
......
topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/controller/ProductScrapApplyController.java
View file @ 17d72c63
......@@ -52,23 +52,24 @@ public class ProductScrapApplyController extends CommonController {
public HashMap<String, Object> getProductScrapApply(@RequestBody List<ProductScrapApplyVo> productScrapApplyVoListVo){
//SDO sdo = this.getSDO();
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
messageMap.put("CODE","S");
messageMap.put("MSG","成功");
messageMap.put("DATA","");
LOG.info("物品报废申请与过账平台数据=={}", JSONUtil.toString(productScrapApplyVoListVo));
String billCode = "";
try {
if (CollectionUtils.isEmpty(productScrapApplyVoListVo)){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text","未接收到数据，请检查");
messageMap.put("ZBPMID",billCode);
messageMap.put("CODE","E");
messageMap.put("MSG","未接收到数据，请检查");
messageMap.put("DATA",billCode);
}else {
billCode = this.productScrapApplyApplication.saveProductScrapApplyVo(productScrapApplyVoListVo);
}
messageMap.put("ZBPMID",billCode);
}catch (RuntimeException e){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",e.getMessage());
messageMap.put("ZBPMID",billCode);
messageMap.put("CODE","E");
messageMap.put("MSG",e.getMessage());
messageMap.put("DATA",billCode);
}
return messageMap;
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/controller/SapPurchaseApprovalController.java
View file @ 17d72c63
......@@ -47,16 +47,16 @@ public class SapPurchaseApprovalController extends CommonController {
public HashMap<String, Object> getSapPurchaseApproval(@RequestBody SapPurchaseApprovalDto sapPurchaseApprovalDto){
//SDO sdo = this.getSDO();
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
messageMap.put("NUMBER",sapPurchaseApprovalDto.getLsDeader().getBanfn());
messageMap.put("CODE","S");
messageMap.put("MSG","成功");
messageMap.put("DATA",sapPurchaseApprovalDto.getLsDeader().getBanfn());
LOG.info("SAP采购申请审批数据=={}",JSONUtil.toString(sapPurchaseApprovalDto));
try {
this.sapPurchaseApprovalApplication.saveSapPurchaseApprovalVo(sapPurchaseApprovalDto);
}catch (RuntimeException e){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",e.getMessage());
messageMap.put("NUMBER",sapPurchaseApprovalDto.getLsDeader().getBanfn());
messageMap.put("CODE","E");
messageMap.put("MSG",e.getMessage());
messageMap.put("DATA",sapPurchaseApprovalDto.getLsDeader().getBanfn());
}
return messageMap;
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java
View file @ 17d72c63
......@@ -49,15 +49,15 @@ public class SapPurchaseOrderController extends CommonController {
LOG.info("SAP采购订单审批数据=={}", JSONUtil.toString(sapPurchaseOrderDto));
//System.out.println(sapPurchaseOrderDto);
HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功");
messageMap.put("NUMBER",sapPurchaseOrderDto.getLsHeader().getEbeln());
messageMap.put("CODE","S");
messageMap.put("MSG","成功");
messageMap.put("DATA",sapPurchaseOrderDto.getLsHeader().getEbeln());
try {
this.sapPurchaseOrderApplication.saveSapPurchaseOrderDto(sapPurchaseOrderDto);
}catch (RuntimeException e){
messageMap.put("Message_Status","E");
messageMap.put("Message_Text",e.getMessage());
messageMap.put("NUMBER",sapPurchaseOrderDto.getLsHeader().getEbeln());
messageMap.put("CODE","E");
messageMap.put("MSG",e.getMessage());
messageMap.put("DATA",sapPurchaseOrderDto.getLsHeader().getEbeln());
}
return messageMap;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment