Skip to content

T
topsun-bpm
Commit 3820a852 authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents a734948c 779749e9
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 219 deletions
huigou-xt/src/main/webapp/system/opm/organization/Org.js
View file @ 3820a852
...@@ -123,6 +123,7 @@ $(function () { ...@@ -123,6 +123,7 @@ $(function () {
{ id: 'initPassword', text:'初始化密码', click: initPassword, img: "fa-wrench"}, { id: 'initPassword', text:'初始化密码', click: initPassword, img: "fa-wrench"},
{ id: "changePersonMainOrg", text: "设置主岗位", img: "fa-address-book" }, { id: "changePersonMainOrg", text: "设置主岗位", img: "fa-address-book" },
{ id: "quoteAuthorizationAndBizManagement", text: "引用权限", click: quoteAuthorizationAndBizManagement, img: "fa-gavel"}, { id: "quoteAuthorizationAndBizManagement", text: "引用权限", click: quoteAuthorizationAndBizManagement, img: "fa-gavel"},
{ id: "initPersonToSap", text: "初始化SAP员工客户", click: initPersonToSap, img: "fa-gavel"},
] ]
}; };
...@@ -157,7 +158,7 @@ $(function () { ...@@ -157,7 +158,7 @@ $(function () {
} }
}, },
{ display: "消息类型", name: "typeTextView", width: 100, minWidth: 60, type: "string", align: "left" }, { display: "消息类型", name: "typeTextView", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "left" }, { display: "消息文本", name: "message", width: 300, minWidth: 60, type: "string", align: "left" },
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + "/org/slicedQueryOrgs.ajax", url: web_app.name + "/org/slicedQueryOrgs.ajax",
...@@ -622,6 +623,12 @@ function doSavePerson() { ...@@ -622,6 +623,12 @@ function doSavePerson() {
}); });
} }
function initPersonToSap() {
Public.ajax(web_app.name + "/syncOrg/initAllPersonToSap.ajax",{},function () {
reloadGrid();
})
}
function onDialogCloseHandler() { function onDialogCloseHandler() {
propteryGridManager = null; propteryGridManager = null;
if (refreshFlag) { if (refreshFlag) {
......
huigou-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp
View file @ 3820a852
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<x:inputC name="name" id="name" required="true" label="姓名" maxlength="30" labelCol="2" fieldCol="4" /> <x:inputC name="name" id="name" required="true" label="姓名" maxlength="30" labelCol="2" fieldCol="4" />
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="loginName" id="loginName" label="登录名" labelCol="2" fieldCol="4" maxlength="16"/> <x:inputC name="loginName" id="loginName" required="true" label="登录名" labelCol="2" fieldCol="4" maxlength="16"/>
<x:inputC name="englishName" id="englishName" label="英文名称" labelCol="2" fieldCol="4" maxlength="60"/> <x:inputC name="englishName" id="englishName" label="英文名称" labelCol="2" fieldCol="4" maxlength="60"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
View file @ 3820a852
...@@ -44,6 +44,16 @@ function initAufnr(knttp){ ...@@ -44,6 +44,16 @@ function initAufnr(knttp){
} }
return false; return false;
}) })
columns.some(column => {
if (column.name == "kostlName"){
//column.hide = knttp == 'F'? false:true;
if (isApplyProcUnit()){
column.editor.required = knttp == 'K'? true:false;
}
return true;
}
return false;
})
if ("K" == knttp){ if ("K" == knttp){
if (Public.isNotBlank(itemGridManager.currentData)){ if (Public.isNotBlank(itemGridManager.currentData)){
var rows = itemGridManager.currentData.Rows; var rows = itemGridManager.currentData.Rows;
...@@ -142,7 +152,7 @@ function getGridColumns() { ...@@ -142,7 +152,7 @@ function getGridColumns() {
var columns = []; var columns = [];
columns.push({ columns.push({
display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string", display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",
editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'} //editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'}
},); },);
columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},); columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},);
// columns.push({ // columns.push({
...@@ -183,34 +193,34 @@ function getGridColumns() { ...@@ -183,34 +193,34 @@ function getGridColumns() {
display: "工厂名称", name: "name1", width: "200", align: "left", type: "string", display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"} editor: {required: false, type: "text"}
}); });
columns.push({ // columns.push({
display: "物料编号", name: "matnr", width: "300", align: "left", type: "string", // display: "物料编号", name: "matnr", width: "300", align: "left", type: "string",
editor: { // editor: {
required: false, type: "select", // required: false, type: "select",
data: { // data: {
type: 'system', // type: 'system',
name: "sapMaterialSelect", // name: "sapMaterialSelect",
getParam: function (item) { // getParam: function (item) {
return { // return {
filterValue: item.werks // filterValue: item.werks
} // }
}, // },
back: { // back: {
MATNR: "matnr", // MATNR: "matnr",
MAKTX: "txz01", // MAKTX: "txz01",
MATKL: "matkl", // MATKL: "matkl",
WGBEZ: "matklName", // WGBEZ: "matklName",
EKGRP: "ekgrp", // EKGRP: "ekgrp",
EKNAM: "ekgrpName", // EKNAM: "ekgrpName",
PEINH: "peinh", // PEINH: "peinh",
MEINS: "meins", // MEINS: "meins",
MSEHL: "meinsName", // MSEHL: "meinsName",
LGFSB: "lgort", // LGFSB: "lgort",
LGOBE: "lgobe" // LGOBE: "lgobe"
} // }
}, // },
} // }
}); // });
columns.push({ columns.push({
display: "库存地点", name: "lgort", width: "100", align: "left", type: "string", display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",
editor: { editor: {
...@@ -244,7 +254,10 @@ function getGridColumns() { ...@@ -244,7 +254,10 @@ function getGridColumns() {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
getParam: function (item) { getParam: function (item) {
return {fieldName: "MATKL"} return {
fieldName: "MATKL",
filterValue: "C00"
}
}, },
back: { back: {
MATKL: "matkl", MATKL: "matkl",
...@@ -343,49 +356,10 @@ function getGridColumns() { ...@@ -343,49 +356,10 @@ function getGridColumns() {
} }
//editor: {type: 'text'} //editor: {type: 'text'}
},); },);
// columns.push({
// display: "会计分配序号", name: "zebkn", width: "100", align: "left", type: "string",
// editor: {type: 'text'},
// render: function (item) {
// //申购项次为消耗性采购时，从1开始步长为1自动编号，最大99
// // if (item.knttp != ''){
// // ZEBKN_NUM = ZEBKN_NUM + 1;
// // }
// return item.zebkn = item.menge;
// }
// },);
// columns.push({
// display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
// //editor: {type: 'text'},
// // render: function (item) {
// // //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// // if (item.knttp == "A" && item.menge > 1) {
// // return item.vrtkz = 1;
// // }
// // }
// },);
// columns.push({
// display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
// editor: {type: 'text'},
// // render: function (item) {
// // //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// // if (item.knttp == "A" && item.menge > 1) {
// // return item.twrkz = 1;
// // }
// // }
// },);
// columns.push({
// display: "PR分解数量", name: "ekbnMenge", width: "100", align: "left", type: "string",
// editor: {type: 'text'}
// },);
// columns.push({
// display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
// editor: {type: 'text', required: true}
// },);
columns.push({ columns.push({
display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string", display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string",
editor: { editor: {
required: true, type: "select", required: false, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
View file @ 3820a852
...@@ -16,7 +16,8 @@ function initializeCommonUI() { ...@@ -16,7 +16,8 @@ function initializeCommonUI() {
function bindEvent() { function bindEvent() {
fillinDate = $("#fillinDate").val(); fillinDate = $("#fillinDate").val();
$('#knttp').searchbox({ $('#knttp').val("A");
/*$('#knttp').searchbox({
type: "system", name: "knttp", type: "system", name: "knttp",
getParam: function (item) { getParam: function (item) {
return { return {
...@@ -26,7 +27,7 @@ function bindEvent() { ...@@ -26,7 +27,7 @@ function bindEvent() {
onChange: function (value, data) { onChange: function (value, data) {
$('#knttp').val(data.knttp); $('#knttp').val(data.knttp);
} }
}); });*/
} }
function initItemGrid() { function initItemGrid() {
...@@ -110,25 +111,9 @@ function getGridColumns() { ...@@ -110,25 +111,9 @@ function getGridColumns() {
var columns = []; var columns = [];
columns.push({ columns.push({
display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string", display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",
editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'} //editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'}
},); },);
columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},); columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},);
// columns.push({
// display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string",
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "knttp",
// getParam: function (item) {
// return {filterValue: $("#bsart").val()}
// },
// back: {
// knttp: "knttp"
// }
// },
// }
// },);
columns.push({ columns.push({
display: "工厂", name: "werks", width: "100", align: "left", type: "string", display: "工厂", name: "werks", width: "100", align: "left", type: "string",
editor: { editor: {
...@@ -149,7 +134,7 @@ function getGridColumns() { ...@@ -149,7 +134,7 @@ function getGridColumns() {
},); },);
columns.push({ columns.push({
display: "工厂名称", name: "name1", width: "200", align: "left", type: "string", display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"} //editor: {required: false, type: "text"}
}); });
columns.push({ columns.push({
display: "库存地点", name: "lgort", width: "100", align: "left", type: "string", display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",
...@@ -282,45 +267,8 @@ function getGridColumns() { ...@@ -282,45 +267,8 @@ function getGridColumns() {
} }
//editor: {type: 'text'} //editor: {type: 'text'}
},); },);
// columns.push({ //财务部填写
// display: "会计分配序号", name: "zebkn", width: "100", align: "left", type: "string", if ("financeNode" == getSubProcUnitId()){
// editor: {type: 'text'},
// render: function (item) {
// //申购项次为消耗性采购时，从1开始步长为1自动编号，最大99
// // if (item.knttp != ''){
// // ZEBKN_NUM = ZEBKN_NUM + 1;
// // }
// return item.zebkn = item.menge;
// }
// },);
// columns.push({
// display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
// //editor: {type: 'text'},
// // render: function (item) {
// // //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// // if (item.knttp == "A" && item.menge > 1) {
// // return item.vrtkz = 1;
// // }
// // }
// },);
// columns.push({
// display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
// editor: {type: 'text'},
// render: function (item) {
// //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// if (item.knttp == "A" && item.menge > 1) {
// return item.twrkz = 1;
// }
// }
// },);
// columns.push({
// display: "PR分解数量", name: "ekbnMenge", width: "100", align: "left", type: "string",
// editor: {type: 'text'}
// },);
// columns.push({
// display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
// editor: {type: 'text', required: false}
// },);
columns.push({ columns.push({
display: "资产编号", name: "anln1", width: "200", align: "left", type: "string", display: "资产编号", name: "anln1", width: "200", align: "left", type: "string",
editor: { editor: {
...@@ -340,10 +288,7 @@ function getGridColumns() { ...@@ -340,10 +288,7 @@ function getGridColumns() {
}, },
} }
},); },);
// columns.push({ }
// display: "审批处理状态", name: "banpr", width: "100", align: "left", type: "string",
// //editor: {type: 'text'}
// },);
columns.push({ columns.push({
display: "申请日期", name: "badat", width: "100", align: "left", type: "string", display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
editor: {required: false, type: "date"} editor: {required: false, type: "date"}
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.jsp
View file @ 3820a852
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="bsart" label="pr类型" disabled="true" labelCol="1" fieldCol="2" required="true"/> <x:selectC name="bsart" label="pr类型" disabled="true" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="knttp" label="科目分配类别" labelCol="1" fieldCol="2" required="true" wrapper="select"/> <x:inputC name="knttp" label="科目分配类别" readonly="true" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="banfn" label="采购申请编号" readonly="true" labelCol="1" fieldCol="2" required="false"/> <x:inputC name="banfn" label="采购申请编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
View file @ 3820a852
...@@ -44,9 +44,19 @@ function initAufnr(knttp){ ...@@ -44,9 +44,19 @@ function initAufnr(knttp){
} }
return true; return true;
} }
return false; return false;
}) })
columns.some(column => {
if (column.name == "kostlName"){
//column.hide = knttp == 'F'? false:true;
if (isApplyProcUnit()){
column.editor.required = knttp == 'K'? true:false;
}
return true;
}
return false;
})
if ("K" == knttp){ if ("K" == knttp){
if (Public.isNotBlank(itemGridManager.currentData)){ if (Public.isNotBlank(itemGridManager.currentData)){
var rows = itemGridManager.currentData.Rows; var rows = itemGridManager.currentData.Rows;
...@@ -165,9 +175,9 @@ function getGridColumns() { ...@@ -165,9 +175,9 @@ function getGridColumns() {
columns.push({ columns.push({
display: "工厂名称", name: "name1", width: "200", align: "left", type: "string", display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",
}); });
columns.push({ // columns.push({
display: "物料编号", name: "matnr", width: "300", align: "left", type: "string", // display: "物料编号", name: "matnr", width: "300", align: "left", type: "string",
}); // });
columns.push({ columns.push({
display: "库存地点", name: "lgort", width: "100", align: "left", type: "string", display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",
},); },);
...@@ -246,7 +256,7 @@ function getGridColumns() { ...@@ -246,7 +256,7 @@ function getGridColumns() {
}else { }else {
columns.push({ columns.push({
display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string", display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",
editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'} //editor: {type: 'spinner', min: 10, max: 200, mask: 'nnn'}
},); },);
columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},); columns.push({display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string", hide: true},);
columns.push({ columns.push({
...@@ -271,34 +281,34 @@ function getGridColumns() { ...@@ -271,34 +281,34 @@ function getGridColumns() {
display: "工厂名称", name: "name1", width: "200", align: "left", type: "string", display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"} editor: {required: false, type: "text"}
}); });
columns.push({ // columns.push({
display: "物料编号", name: "matnr", width: "300", align: "left", type: "string", // display: "物料编号", name: "matnr", width: "300", align: "left", type: "string",
editor: { // editor: {
required: false, type: "select", // required: false, type: "select",
data: { // data: {
type: 'system', // type: 'system',
name: "sapMaterialSelect", // name: "sapMaterialSelect",
getParam: function (item) { // getParam: function (item) {
return { // return {
filterValue: item.werks // filterValue: item.werks
} // }
}, // },
back: { // back: {
MATNR: "matnr", // MATNR: "matnr",
MAKTX: "txz01", // MAKTX: "txz01",
MATKL: "matkl", // MATKL: "matkl",
WGBEZ: "matklName", // WGBEZ: "matklName",
EKGRP: "ekgrp", // EKGRP: "ekgrp",
EKNAM: "ekgrpName", // EKNAM: "ekgrpName",
PEINH: "peinh", // PEINH: "peinh",
MEINS: "meins", // MEINS: "meins",
MSEHL: "meinsName", // MSEHL: "meinsName",
LGFSB: "lgort", // LGFSB: "lgort",
LGOBE: "lgobe" // LGOBE: "lgobe"
} // }
}, // },
} // }
}); // });
columns.push({ columns.push({
display: "库存地点", name: "lgort", width: "100", align: "left", type: "string", display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",
editor: { editor: {
...@@ -332,7 +342,10 @@ function getGridColumns() { ...@@ -332,7 +342,10 @@ function getGridColumns() {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
getParam: function (item) { getParam: function (item) {
return {fieldName: "MATKL"} return {
fieldName: "MATKL",
noContain: "C00"
}
}, },
back: { back: {
MATKL: "matkl", MATKL: "matkl",
...@@ -434,7 +447,7 @@ function getGridColumns() { ...@@ -434,7 +447,7 @@ function getGridColumns() {
columns.push({ columns.push({
display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string", display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string",
editor: { editor: {
required: true, type: "select", required: false, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js
View file @ 3820a852
...@@ -11,24 +11,24 @@ function initUI() { ...@@ -11,24 +11,24 @@ function initUI() {
function initPurchaseListGrid() { function initPurchaseListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({ var toolbarOptions = UICtrl.getDefaultToolbarOptions({
revokeApproveHandler: { // revokeApproveHandler: {
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () { // id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
var rows = purchaseApprovalGridManager.getSelectedRows(); // var rows = purchaseApprovalGridManager.getSelectedRows();
if (rows.length == 0 || rows.length > 1) { // if (rows.length == 0 || rows.length > 1) {
Public.tip("请选择一条已完成的数据！"); // Public.tip("请选择一条已完成的数据！");
return; // return;
} // }
if (rows[0].status != 3) { // if (rows[0].status != 3) {
Public.tip("请选择一条已完成的数据！"); // Public.tip("请选择一条已完成的数据！");
return; // return;
} // }
UICtrl.confirm('确定要把当前单据撤销审批吗?', function () { // UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: rows[0].id}, function (msg) { // Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
purchaseApprovalGridManager.loadData(); // purchaseApprovalGridManager.loadData();
}); // });
}); // });
} // }
} // }
}); });
purchaseApprovalGridManager = UICtrl.grid('#purchaseApprovalGrid', { purchaseApprovalGridManager = UICtrl.grid('#purchaseApprovalGrid', {
columns: [ columns: [
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js
View file @ 3820a852
...@@ -11,24 +11,24 @@ function initUI() { ...@@ -11,24 +11,24 @@ function initUI() {
function loadGrid() { function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({ var toolbarOptions = UICtrl.getDefaultToolbarOptions({
revokeApproveHandler: { // revokeApproveHandler: {
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () { // id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
var rows = purchaseOrderGridManager.getSelectedRows(); // var rows = purchaseOrderGridManager.getSelectedRows();
if (rows.length == 0 || rows.length > 1) { // if (rows.length == 0 || rows.length > 1) {
Public.tip("请选择一条已完成的数据！"); // Public.tip("请选择一条已完成的数据！");
return; // return;
} // }
if (rows[0].status != 3) { // if (rows[0].status != 3) {
Public.tip("请选择一条已完成的数据！"); // Public.tip("请选择一条已完成的数据！");
return; // return;
} // }
UICtrl.confirm('确定要把当前单据撤销审批吗?', function () { // UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: rows[0].id}, function (msg) { // Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
purchaseOrderGridManager.loadData(); // purchaseOrderGridManager.loadData();
}); // });
}); // });
} // }
} // }
}); });
//debugger //debugger
purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', { purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ 3820a852
...@@ -57,7 +57,8 @@ public class ResourceSearchController { ...@@ -57,7 +57,8 @@ public class ResourceSearchController {
Integer pageSize = sdo.getInteger("pageSize",10); Integer pageSize = sdo.getInteger("pageSize",10);
PageRequest pageRequest = new PageRequest(intPage - 1, pageSize); PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);
List<QuerySchemeField> fields = List<QuerySchemeField> fields =
Arrays.asList(new QuerySchemeField("科目分配类别", "knttp", "string", 100L)); Arrays.asList(new QuerySchemeField("科目分配类别", "knttp", "string", 100L),
new QuerySchemeField("科目分配类别描述", "text", "string", 100L));
EasySearchParse easySearchParse = new EasySearchParse(); EasySearchParse easySearchParse = new EasySearchParse();
easySearchParse.setFields(fields); easySearchParse.setFields(fields);
easySearchParse.setWidth(450L); easySearchParse.setWidth(450L);
...@@ -67,6 +68,12 @@ public class ResourceSearchController { ...@@ -67,6 +68,12 @@ public class ResourceSearchController {
knttp.forEach((key, value) -> { knttp.forEach((key, value) -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("knttp", value); map.put("knttp", value);
if ("F".equals(key)){
map.put("text","内部订单");
}
if ("K".equals(key)){
map.put("text","成本中心");
}
if ("ZFW".equals(filterValue)) { if ("ZFW".equals(filterValue)) {
if ("F".equals(key) || "K".equals(key)) { if ("F".equals(key) || "K".equals(key)) {
mapList.add(map); mapList.add(map);
...@@ -266,6 +273,7 @@ public class ResourceSearchController { ...@@ -266,6 +273,7 @@ public class ResourceSearchController {
String param = sdo.getString("paramValue"); String param = sdo.getString("paramValue");
String fieldName = sdo.getString("fieldName"); String fieldName = sdo.getString("fieldName");
String filterValue = sdo.getString("filterValue"); String filterValue = sdo.getString("filterValue");
String noContain = sdo.getString("noContain");
List<Map<String, String>> mapList = new ArrayList<>(); List<Map<String, String>> mapList = new ArrayList<>();
mapList = sapDictionaryApplication.getSapDictionary(fieldName); mapList = sapDictionaryApplication.getSapDictionary(fieldName);
List<QuerySchemeField> fields = new ArrayList<>(); List<QuerySchemeField> fields = new ArrayList<>();
...@@ -281,6 +289,16 @@ public class ResourceSearchController { ...@@ -281,6 +289,16 @@ public class ResourceSearchController {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }
if (StringUtil.isNotBlank(noContain)){//固定条件过滤，不包含
String[] split = noContain.split(",");
for (String s : split) {
mapList = mapList
.stream()
.filter(map -> map.values().stream().noneMatch(value->value.contains(s)))
//.filter(map -> map.containsValue(filterValue))
.collect(Collectors.toList());
}
}
if (StringUtil.isNotBlank(param)){//输入查询条件过滤 if (StringUtil.isNotBlank(param)){//输入查询条件过滤
mapList = mapList mapList = mapList
.stream() .stream()
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ 3820a852
...@@ -196,7 +196,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -196,7 +196,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId); SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);
sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId()); sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId());
sapPurchaseApprovalRepository.save(sapPurchaseApproval); sapPurchaseApprovalRepository.save(sapPurchaseApproval);
sendSapData(sapPurchaseApproval,"N"); //sendSapData(sapPurchaseApproval,"N");
//终止 //终止
//workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId()); //workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId());
} }
...@@ -235,6 +235,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -235,6 +235,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
//根据SAP传过来的创建人编码，映射流程发起人 //根据SAP传过来的创建人编码，映射流程发起人
String ernam = purchaseApprovalVo.getErnam(); String ernam = purchaseApprovalVo.getErnam();
Org org = orgApplication.loadMainOrgByLoginName(ernam); Org org = orgApplication.loadMainOrgByLoginName(ernam);
String acceptPersonCode = SystemCache.getParameter("acceptPersonCode", String.class);
if (ObjectUtil.isNull(org)){
org = orgApplication.loadMainOrgByLoginName(acceptPersonCode);
}
if (ObjectUtil.isNotNull(org)){ if (ObjectUtil.isNotNull(org)){
Operator operator = operatorApplication.createOperatorByPersonMemberId(org.getId()); Operator operator = operatorApplication.createOperatorByPersonMemberId(org.getId());
ThreadLocalUtil.putOperator(operator); ThreadLocalUtil.putOperator(operator);
...@@ -279,6 +283,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -279,6 +283,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
sapPurchaseApprovalItems.add(sapPurchaseApprovalItem); sapPurchaseApprovalItems.add(sapPurchaseApprovalItem);
sapPurchaseApproval.setKnttp(approvalItemVo.getKnttp());//科目分配类别 sapPurchaseApproval.setKnttp(approvalItemVo.getKnttp());//科目分配类别
sapPurchaseApproval.setEkgrp(approvalItemVo.getEkgrp());//采购组 sapPurchaseApproval.setEkgrp(approvalItemVo.getEkgrp());//采购组
}
//knttp审批要素没有值时，赋值0，防止发起流程时报错
if (StringUtil.isBlank(sapPurchaseApproval.getKnttp())){
sapPurchaseApproval.setKnttp("0");
} }
// String nextCode = codeGenerator.getNextCode("sapPurchaseApproval"); // String nextCode = codeGenerator.getNextCode("sapPurchaseApproval");
// sapPurchaseApproval.setBillCode(nextCode); // sapPurchaseApproval.setBillCode(nextCode);
...@@ -300,7 +308,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -300,7 +308,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
} }
//在审批中，更新明细数据的（先删除，再新增） //在审批中，更新明细数据的（先删除，再新增）
if (purchaseApproval.getStatusId() == BizBillStatus.APPROVING.getId()){ if (purchaseApproval.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseApproval.getStatusId() == BizBillStatus.APPLYING.getId()){
List<SapPurchaseApprovalItem> itemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(purchaseApproval.getId()); List<SapPurchaseApprovalItem> itemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(purchaseApproval.getId());
List<String> collect = itemList.stream().map(SapPurchaseApprovalItem::getId).collect(Collectors.toList()); List<String> collect = itemList.stream().map(SapPurchaseApprovalItem::getId).collect(Collectors.toList());
sapPurchaseApprovalItemApplication.deleteByIds(collect); sapPurchaseApprovalItemApplication.deleteByIds(collect);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ 3820a852
...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.cache.SystemCache;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.context.ThreadLocalUtil; import com.huigou.context.ThreadLocalUtil;
...@@ -34,10 +35,7 @@ import com.huigou.uasp.bpm.FlowBroker; ...@@ -34,10 +35,7 @@ import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.uasp.bpm.ProcessAction; import com.huigou.uasp.bpm.ProcessAction;
import com.huigou.uasp.bpm.ProcessStartModel; import com.huigou.uasp.bpm.ProcessStartModel;
import com.huigou.uasp.bpm.engine.application.WorkflowApplication; import com.huigou.uasp.bpm.engine.application.WorkflowApplication;
import com.huigou.util.ApplicationContextWrapper; import com.huigou.util.*;
import com.huigou.util.ClassHelper;
import com.huigou.util.Constants;
import com.huigou.util.SDO;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity; import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
...@@ -173,7 +171,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -173,7 +171,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId); SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId()); sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId());
SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder); SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
this.sendSapDate(save, "N"); //this.sendSapDate(save, "N");
// 调用 onEnd 方法 // 调用 onEnd 方法
// DelegateExecution execution = delegateTask.getExecution(); // DelegateExecution execution = delegateTask.getExecution();
// onEnd(execution); // onEnd(execution);
...@@ -213,6 +211,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -213,6 +211,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
BeanUtil.copyProperties(sapPurchaseOrderVo, sapPurchaseOrder); BeanUtil.copyProperties(sapPurchaseOrderVo, sapPurchaseOrder);
String ernam = sapPurchaseOrderVo.getErnam(); String ernam = sapPurchaseOrderVo.getErnam();
Org org = orgApplication.loadMainOrgByLoginName(ernam); Org org = orgApplication.loadMainOrgByLoginName(ernam);
String acceptPersonCode = SystemCache.getParameter("acceptPersonCode", String.class);
if (ObjectUtil.isNull(org)){
org = orgApplication.loadMainOrgByLoginName(acceptPersonCode);
}
if (ObjectUtil.isNotNull(org)){ if (ObjectUtil.isNotNull(org)){
Operator operator = operatorApplication.createOperatorByPersonMemberId(org.getId()); Operator operator = operatorApplication.createOperatorByPersonMemberId(org.getId());
ThreadLocalUtil.putOperator(operator); ThreadLocalUtil.putOperator(operator);
...@@ -229,6 +231,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -229,6 +231,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
purchaseOrderItems.add(sapPurchaseApprovalItem); purchaseOrderItems.add(sapPurchaseApprovalItem);
if ("X".equals(approvalItemVo.getRetpo())){ if ("X".equals(approvalItemVo.getRetpo())){
retpo = "X"; retpo = "X";
}else {
//审批要素不能为空，赋值E
retpo = "E";
} }
} }
sapPurchaseOrder.setRetpo(retpo); sapPurchaseOrder.setRetpo(retpo);
...@@ -262,7 +267,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -262,7 +267,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
purchaseOrderId=mannualStartWorkApplication.startWorkflow(sapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder"); purchaseOrderId=mannualStartWorkApplication.startWorkflow(sapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
} }
//在审批中，更新明细数据的（先删除，再新增） //在审批中，更新明细数据的（先删除，再新增）
if (purchaseOrder.getStatusId() == BizBillStatus.APPROVING.getId()){ if (purchaseOrder.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseOrder.getStatusId() == BizBillStatus.APPLYING.getId()){
List<SapPurchaseOrderItem> itemList = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId()); List<SapPurchaseOrderItem> itemList = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId());
sapPurchaseOrderItemApplication.deletePurchaseOrderItems(itemList); sapPurchaseOrderItemApplication.deletePurchaseOrderItems(itemList);
purchaseOrderId = purchaseOrder.getId(); purchaseOrderId = purchaseOrder.getId();
......
topsun/src/main/java/com/huigou/topsun/syncOrg/application/OrgSyncApplication.java
View file @ 3820a852
...@@ -70,4 +70,6 @@ public interface OrgSyncApplication { ...@@ -70,4 +70,6 @@ public interface OrgSyncApplication {
List<SapPersonVo> querySapPersonVoByFullId(String fullId); List<SapPersonVo> querySapPersonVoByFullId(String fullId);
void syncAllPersonToSap();
} }
topsun/src/main/java/com/huigou/topsun/syncOrg/application/impl/OrgSyncApplicationImpl.java
View file @ 3820a852
...@@ -183,10 +183,10 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp ...@@ -183,10 +183,10 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
//银行账户 //银行账户
if (sapPersonVo.getBankAccountNumber().length() > 18){ if (sapPersonVo.getBankAccountNumber().length() > 18){
String bankn = sapPersonVo.getBankAccountNumber(); String bankn = sapPersonVo.getBankAccountNumber();
// bankVo.setBankn(bankn.substring(0,18)); bankVo.setBankn(bankn.substring(0,18));
bankVo.setBankn(bankn); //bankVo.setBankn(bankn);
//账户明细放18位后的值 //账户明细放18位后的值
// bankVo.setBkref(bankn.substring(18,bankn.length())); bankVo.setBkref(bankn.substring(18,bankn.length()));
}else { }else {
bankVo.setBankn(sapPersonVo.getBankAccountNumber()); bankVo.setBankn(sapPersonVo.getBankAccountNumber());
} }
...@@ -275,6 +275,13 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp ...@@ -275,6 +275,13 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
return this.sqlExecutorDao.queryToList(queryDescriptor.getSql(),SapPersonVo.class, append.toString()); return this.sqlExecutorDao.queryToList(queryDescriptor.getSql(),SapPersonVo.class, append.toString());
} }
@Override
public void syncAllPersonToSap() {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedAllSapPersonVo");
List<SapPersonVo> sapPersonVos = this.sqlExecutorDao.queryToList(queryDescriptor.getSql(), SapPersonVo.class);
this.buildSapPerson("I",sapPersonVos);
}
/** /**
* 字符串转hashcode * 字符串转hashcode
* @param value * @param value
......
topsun/src/main/java/com/huigou/topsun/syncOrg/controller/SyncOrgController.java
View file @ 3820a852
...@@ -53,6 +53,12 @@ public class SyncOrgController extends CommonController { ...@@ -53,6 +53,12 @@ public class SyncOrgController extends CommonController {
return success(); return success();
} }
public String initAllPersonToSap(){
SDO sdo = this.getSDO();
orgSyncApplication.syncAllPersonToSap();
return success();
}
public String enableOrDisablePerson(){ public String enableOrDisablePerson(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String id = sdo.getId(); String id = sdo.getId();
......
topsun/src/main/resources/config/topsun/base/syncOrg.xml
View file @ 3820a852
...@@ -64,6 +64,36 @@ ...@@ -64,6 +64,36 @@
</sql-query> </sql-query>
</query> </query>
<query name="slicedAllSapPersonVo" label="构建SAP人员结构">
<sql-query>
SELECT
o.FULL_NAME AS PARENT_FULL_NAME,
p.CODE,
p.ID,
p.NAME,
p.EMAIL,
p.ENGLISH_NAME,
p.sex,
p.OFFICE_PHONE,
p.MOBILE_PHONE,
p.ZIP,
p.FAMILY_ADDRESS,
p.COUNTRY,
p.BANK_COUNTRY,
p.BANK_CODE,
p.BANK_ACCOUNT_NUMBER,
p.COMPANY_CODE,
p.REGION,
p.LANGU,
op.PROPERTY_VALUE AS KOSTL,
'I' AS flag
FROM sa_opperson p
LEFT JOIN sa_oporg o ON p.MAIN_ORG_ID = o.id
LEFT JOIN sa_oporgproperty op ON o.DEPT_ID = op.ORG_ID
where (p.type = '' or p.type is null) and p.is_sap_person = '1'
</sql-query>
</query>
<query name="queryCodeByFullId" label="查询组织下人员"> <query name="queryCodeByFullId" label="查询组织下人员">
<sql-query> <sql-query>
SELECT p.* FROM SELECT p.* FROM
......
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