Skip to content

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

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

parents e4a31b50 42d055e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 803 additions and 420 deletions
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelList.js
View file @ cc37dda0
......@@ -10,7 +10,7 @@ function initUI() {
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
//addHandler: addHandler,
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
......
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderList.js
View file @ cc37dda0
......@@ -10,7 +10,7 @@ function initUI() {
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
//addHandler: addHandler,
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ cc37dda0
......@@ -5,6 +5,8 @@ var tableArray = [
gridManager: null,
data: null,
columns: [
{display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "计划内外付款标识", name: "zepPlan", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -202,12 +204,14 @@ var tableArray = [
}
},
]
}, {
},
{
parms: {},
node: "financialAuditGrid",
gridManager: null,
data: null,
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -328,54 +332,54 @@ var tableArray = [
{display: "返回消息", name: "msgtx", width: 300, minwidth: 120, type: "string", align: "left"},
]
},
{
parms: {},
node: "capitalPostGrid",
gridManager: null,
data: null,
columns: [
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
TEXT1: "zt012kText1",
}
},
}
},
{
display: "付款银行账号名称",
name: "zt012kText1",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
type: 'text'
}
},
{
display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
]
}
, {
// {
// parms: {},
// node: "capitalPostGrid",
// gridManager: null,
// data: null,
// columns: [
// {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
// {
// display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyAndBankInfos",
// getParam: function (item) {
// return {
// BUKRS: $("#bukrs").val()
// }
// },
// back: {
// BANKN1: "bankn1",
// TEXT1: "zt012kText1",
// }
// },
// }
// },
// {
// display: "付款银行账号名称",
// name: "zt012kText1",
// width: 120,
// minwidth: 120,
// type: "string",
// align: "left",
// editor: {
//
// type: 'text'
// }
// },
// {
// display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
//
// type: 'text'
// }
// },
// ]
// }
{
parms: {},
node: "paymentAccomplish_sapReturnGrid",
gridManager: null,
......@@ -387,8 +391,7 @@ var tableArray = [
{display: "付款状态", name: "zpayStaus", width: 120, minwidth: 120, type: "string", align: "left"}
]
}
]
];
//创建表格（参数、列、插入的节点、数据源）
function loadGrid(obj) {
......@@ -399,7 +402,9 @@ function loadGrid(obj) {
if (isApply){
if (obj.node==="reimbursementApplierGrid"){
canEdit = true;
}else if (obj.node==="financialAuditGrid" || obj.node==="capitalPostGrid"){
}else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay = true;
}
}
......@@ -408,16 +413,17 @@ function loadGrid(obj) {
if ("financeNode" === subProcUnitId){
if (obj.node==="financialAuditGrid"){
canEdit = true;
}else if (obj.node==="capitalPostGrid"){
canDelay = true;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
//资金岗
if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
canEdit = true;
}
if(obj.node==="reimbursementApplierGrid") {//只有第一个表格含工具栏
// if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
// canEdit = true;
// }
if(obj.node==="reimbursementApplierGrid" && isApply) {//只有第一个表格含工具栏
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
......@@ -425,8 +431,18 @@ function loadGrid(obj) {
});
},
deleteHandler: function () {
tableArray.forEach((item) => {
item.gridManager.deleteSelectedRow();
// tableArray.forEach((item) => {
//
// });
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
DataUtil.delSelectedRows({
action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax',
param: {},
gridManager: _grid,
idFieldName: 'reimbursementDetailId',
onSuccess: function () {
reloadGrid();
}
});
}
});
......@@ -518,11 +534,11 @@ $(document).ready(function () {
function initialize() {
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {id: getId()}, function (data) {
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.map(item => {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
......@@ -548,6 +564,17 @@ function bindQueryEvent() {
$('#butxt').val(data.BUTXT);
}
});
$('#bankn1').searchbox({
type: "system", name: "getCompanyAndBankInfos",
getParam: function (item) {
return {BUKRS: $("#bukrs").val()}
},
onChange: function (value, data) {
$('#bankn1').val(data.BANKN1);
$('#zt012kText1').val(data.TEXT1);
}
});
}
......@@ -568,9 +595,6 @@ function getId() {
}
function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
......@@ -641,6 +665,11 @@ function businessJudgmentUnit() {
}else {
UICtrl.setDisable($("#submitForm"));
}
//资金岗
if ("fundNode" === getSubProcUnitId()){
UICtrl.enable("#bankn1");
UICtrl.enable("#zepTxt1");
}
return true;
}
......@@ -713,4 +742,27 @@ function totalFinancialAuditGrid(data){
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
});
}
function reloadGrid(){
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
row[col.name] = item[col.name];
}
});
return row;
})
};
var gridManager = UICtrl.getGridManager("#"+obj.node);
gridManager.setData(obj.data);
Public.successTip("数据操作成功")
});
})
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.jsp
View file @ cc37dda0
......@@ -43,6 +43,13 @@
<x:inputC name="zepDepartname" required="false" readonly="true" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" readonly="true" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
</div>
<div id="capitalPost">
<div class="hg-form-row">
<x:inputC name="bankn1" required="false" label="付款银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zt012kText1" required="false" readonly="true" label="付款银行账号名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt1" required="false" label="付款附言" labelCol="2" fieldCol="2"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
......@@ -75,11 +82,11 @@
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="capitalPost">
<x:title title="资金岗填写" name="group"/>
<div id="capitalPostGrid" style="margin: 2px;">
</div>
</div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div id="paymentAccomplish_sapReturn">
<x:title title="付款完成、sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.jsp
View file @ cc37dda0
......@@ -42,6 +42,14 @@
<div class="hg-form-row">
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
<x:inputC name="employeeLoanBillCode" required="false" label="员工借款编号" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
<div id="capitalPost">
<div class="hg-form-row">
<x:inputC name="bankn1" required="false" label="付款银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zt012kText1" required="false" readonly="true" label="付款银行账号名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt1" required="false" label="付款附言" labelCol="2" fieldCol="2"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
......@@ -83,11 +91,11 @@
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="capitalPost">
<x:title title="资金岗填写" name="group"/>
<div id="capitalPostGrid" style="margin: 2px;">
</div>
</div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div id="paymentAccomplish_sapReturn">
<x:title title="付款完成、sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursementList.js
View file @ cc37dda0
......@@ -38,6 +38,8 @@ function loadGrid() {
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
sortName:'fillinDate',
sortOrder: 'desc',
width: "100%",
height: "100%",
heightDiff: -8,
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ cc37dda0
......@@ -5,6 +5,8 @@ var tableArray = [
gridManager: null,
data: null,
columns: [
{display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "计划内外付款标识", name: "zepPlan", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -189,12 +191,14 @@ var tableArray = [
}
},
]
}, {
},
{
parms: {},
node: "financialAuditGrid",
gridManager: null,
data: null,
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -303,50 +307,51 @@ var tableArray = [
}
},
]
}, {
parms: {},
node: "capitalPostGrid",
gridManager: null,
data: null,
columns: [
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "付款银行账号", name: "bankn1", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
TEXT1: "zt012kText1",
}
},
}
},
{
display: "付款银行账号名称",
name: "zt012kText1",
width: 200,
minwidth: 120,
type: "string",
align: "left",
},
{
display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
]
}
, {
},
// {
// parms: {},
// node: "capitalPostGrid",
// gridManager: null,
// data: null,
// columns: [
// {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
// {
// display: "付款银行账号", name: "bankn1", width: 200, minwidth: 120, type: "string", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyAndBankInfos",
// getParam: function (item) {
// return {
// BUKRS: $("#bukrs").val()
// }
// },
// back: {
// BANKN1: "bankn1",
// TEXT1: "zt012kText1",
// }
// },
// }
// },
// {
// display: "付款银行账号名称",
// name: "zt012kText1",
// width: 200,
// minwidth: 120,
// type: "string",
// align: "left",
// },
// {
// display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
//
// type: 'text'
// }
// },
// ]
// }
{
parms: {},
node: "financialAudit_sapReturnGrid",
gridManager: null,
......@@ -385,25 +390,27 @@ function loadGrid(obj) {
if (isApply){
if (obj.node==="reimbursementApplierGrid" || obj.node === "financialAuditGrid"){
canEdit = true;
}else if (obj.node==="capitalPostGrid"){
canDelay = true;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
var subProcUnitId = getSubProcUnitId();
//财务审核
if ("financeNode" === subProcUnitId){
if (obj.node==="financialAuditGrid"){
canEdit = false;
}else if (obj.node==="capitalPostGrid"){
canDelay = true;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
//资金岗
if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
canEdit = true;
}
if(obj.node==="reimbursementApplierGrid" || obj.no === "financialAuditGrid") {//只有第一个表格含工具栏
// if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
// canEdit = true;
// }
if((obj.node==="reimbursementApplierGrid" || obj.no === "financialAuditGrid") && isApply) {//只有第一个表格含工具栏
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
......@@ -411,8 +418,18 @@ function loadGrid(obj) {
});
},
deleteHandler: function () {
tableArray.forEach((item) => {
item.gridManager.deleteSelectedRow();
// tableArray.forEach((item) => {
// item.gridManager.deleteSelectedRow();
// });
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
DataUtil.delSelectedRows({
action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax',
param: {},
gridManager: _grid,
idFieldName: 'reimbursementDetailId',
onSuccess: function () {
reloadGrid();
}
});
}
});
......@@ -491,11 +508,11 @@ $(document).ready(function () {
function initialize() {
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {id: getId()}, function (data) {
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.map(item => {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
......@@ -521,6 +538,17 @@ function bindQueryEvent() {
$('#butxt').val(data.BUTXT);
}
});
$('#bankn1').searchbox({
type: "system", name: "getCompanyAndBankInfos",
getParam: function (item) {
return {BUKRS: $("#bukrs").val()}
},
onChange: function (value, data) {
$('#bankn1').val(data.BANKN1);
$('#zt012kText1').val(data.TEXT1);
}
});
}
......@@ -541,9 +569,6 @@ function getId() {
}
function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
......@@ -613,6 +638,11 @@ function businessJudgmentUnit() {
}else {
UICtrl.setDisable($("#submitForm"));
}
//资金岗
if ("fundNode" === getSubProcUnitId()){
UICtrl.enable("#bankn1");
UICtrl.enable("#zepTxt1");
}
return true;
}
......@@ -666,3 +696,26 @@ function totalGrid(money) {
}
}
function reloadGrid(){
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
row[col.name] = item[col.name];
}
});
return row;
})
};
var gridManager = UICtrl.getGridManager("#"+obj.node);
gridManager.setData(obj.data);
Public.successTip("数据操作成功")
});
})
}
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.jsp
View file @ cc37dda0
......@@ -40,6 +40,13 @@
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="6"/>
</div>
<div id="capitalPost">
<div class="hg-form-row">
<x:inputC name="bankn1" required="false" label="付款银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zt012kText1" required="false" readonly="true" label="付款银行账号名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt1" required="false" label="付款附言" labelCol="2" fieldCol="2"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
......@@ -65,11 +72,11 @@
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="capitalPost">
<x:title title="资金岗填写" name="group"/>
<div id="capitalPostGrid" style="margin: 2px;">
</div>
</div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div id="paymentAccomplish_sapReturn">
<x:title title="付款完成、sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ cc37dda0
......@@ -5,6 +5,9 @@ var tableArray = [
gridManager: null,
data: null,
columns: [
{display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "计划内外付款标识", name: "zepPlan", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -189,12 +192,14 @@ var tableArray = [
}
}
]
}, {
},
{
parms: {},
node: "financialAuditGrid",
gridManager: null,
data: null,
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -285,54 +290,55 @@ var tableArray = [
}
}
]
}, {
parms: {},
node: "capitalPostGrid",
gridManager: null,
data: null,
columns: [
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
TEXT1: "zt012kText1",
}
},
}
},
{
display: "付款银行账号名称",
name: "zt012kText1",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
type: 'text'
}
},
{
display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
]
}
, {
},
// {
// parms: {},
// node: "capitalPostGrid",
// gridManager: null,
// data: null,
// columns: [
// {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
// {
// display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyAndBankInfos",
// getParam: function (item) {
// return {
// BUKRS: $("#bukrs").val()
// }
// },
// back: {
// BANKN1: "bankn1",
// TEXT1: "zt012kText1",
// }
// },
// }
// },
// {
// display: "付款银行账号名称",
// name: "zt012kText1",
// width: 120,
// minwidth: 120,
// type: "string",
// align: "left",
// editor: {
//
// type: 'text'
// }
// },
// {
// display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
//
// type: 'text'
// }
// },
// ]
// }
{
parms: {},
node: "financialAudit_sapReturnGrid",
gridManager: null,
......@@ -370,7 +376,9 @@ function loadGrid(obj) {
if (isApply){
if (obj.node==="reimbursementApplierGrid"){
canEdit = true;
}else if (obj.node==="financialAuditGrid" || obj.node==="capitalPostGrid"){
}else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay = true;
}
}
......@@ -379,16 +387,17 @@ function loadGrid(obj) {
if ("financeNode" === subProcUnitId){
if (obj.node==="financialAuditGrid"){
canEdit = true;
}else if (obj.node==="capitalPostGrid"){
canDelay = true;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
//资金岗
if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
canEdit = true;
}
if(obj.node==="reimbursementApplierGrid") {//只有第一个表格含工具栏
// if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
// canEdit = true;
// }
if(obj.node==="reimbursementApplierGrid" && isApply) {//只有第一个表格含工具栏
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
......@@ -396,8 +405,18 @@ function loadGrid(obj) {
});
},
deleteHandler: function () {
tableArray.forEach((item) => {
item.gridManager.deleteSelectedRow();
// tableArray.forEach((item) => {
// item.gridManager.deleteSelectedRow();
// });
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
DataUtil.delSelectedRows({
action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax',
param: {},
gridManager: _grid,
idFieldName: 'reimbursementDetailId',
onSuccess: function () {
reloadGrid();
}
});
}
});
......@@ -507,11 +526,11 @@ $(document).ready(function () {
function initialize() {
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {id: getId()}, function (data) {
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.map(item => {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
......@@ -542,6 +561,17 @@ function bindQueryEvent() {
$('#butxt').val(data.BUTXT);
}
});
$('#bankn1').searchbox({
type: "system", name: "getCompanyAndBankInfos",
getParam: function (item) {
return {BUKRS: $("#bukrs").val()}
},
onChange: function (value, data) {
$('#bankn1').val(data.BANKN1);
$('#zt012kText1').val(data.TEXT1);
}
});
}
/**
......@@ -561,9 +591,6 @@ function getId() {
}
function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
......@@ -632,6 +659,11 @@ function businessJudgmentUnit() {
}else {
UICtrl.setDisable($("#submitForm"));
}
//资金岗
if ("fundNode" === getSubProcUnitId()){
UICtrl.enable("#bankn1");
UICtrl.enable("#zepTxt1");
}
return true;
}
......@@ -704,4 +736,27 @@ function totalFinancialAuditGrid(data){
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
});
}
function reloadGrid(){
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
row[col.name] = item[col.name];
}
});
return row;
})
};
var gridManager = UICtrl.getGridManager("#"+obj.node);
gridManager.setData(obj.data);
Public.successTip("数据操作成功")
});
})
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @ cc37dda0
......@@ -45,6 +45,13 @@
<x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
</div>
<div id="capitalPost">
<div class="hg-form-row">
<x:inputC name="bankn1" required="false" label="付款银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zt012kText1" required="false" readonly="true" label="付款银行账号名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt1" required="false" label="付款附言" labelCol="2" fieldCol="2"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
......@@ -72,11 +79,11 @@
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="capitalPost">
<x:title title="资金岗填写" name="group"/>
<div id="capitalPostGrid" style="margin: 2px;">
</div>
</div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div id="paymentAccomplish_sapReturn">
<x:title title="付款完成、sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ cc37dda0
......@@ -5,6 +5,9 @@ var tableArray = [
gridManager: null,
data: null,
columns: [
{display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "计划内外付款标识", name: "zepPlan", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -136,12 +139,14 @@ var tableArray = [
}
},
]
}, {
},
{
parms: {},
node: "financialAuditGrid",
gridManager: null,
data: null,
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
......@@ -232,54 +237,55 @@ var tableArray = [
}
},
]
}, {
parms: {},
node: "capitalPostGrid",
gridManager: null,
data: null,
columns: [
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
TEXT1: "zt012kText1",
}
},
}
},
{
display: "付款银行账号名称",
name: "zt012kText1",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
type: 'text'
}
},
{
display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
]
}
, {
},
// {
// parms: {},
// node: "capitalPostGrid",
// gridManager: null,
// data: null,
// columns: [
// {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
// {
// display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyAndBankInfos",
// getParam: function (item) {
// return {
// BUKRS: $("#bukrs").val()
// }
// },
// back: {
// BANKN1: "bankn1",
// TEXT1: "zt012kText1",
// }
// },
// }
// },
// {
// display: "付款银行账号名称",
// name: "zt012kText1",
// width: 120,
// minwidth: 120,
// type: "string",
// align: "left",
// editor: {
//
// type: 'text'
// }
// },
// {
// display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
//
// type: 'text'
// }
// },
// ]
// }
{
parms: {},
node: "financialAudit_sapReturnGrid",
gridManager: null,
......@@ -317,7 +323,9 @@ function loadGrid(obj) {
if (isApply){
if (obj.node==="reimbursementApplierGrid"){
canEdit = true;
}else if (obj.node==="financialAuditGrid" || obj.node==="capitalPostGrid"){
}else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay = true;
}
}
......@@ -326,16 +334,17 @@ function loadGrid(obj) {
if ("financeNode" === subProcUnitId){
if (obj.node==="financialAuditGrid"){
canEdit = true;
}else if (obj.node==="capitalPostGrid"){
canDelay = true;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
//资金岗
if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
canEdit = true;
}
if(obj.node==="reimbursementApplierGrid") {//只有第一个表格含工具栏
// if ("fundNode" === subProcUnitId && obj.node==="capitalPostGrid"){
// canEdit = true;
// }
if(obj.node==="reimbursementApplierGrid" && isApply) {//只有第一个表格含工具栏
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
......@@ -343,8 +352,18 @@ function loadGrid(obj) {
});
},
deleteHandler: function () {
tableArray.forEach((item) => {
item.gridManager.deleteSelectedRow();
// tableArray.forEach((item) => {
// item.gridManager.deleteSelectedRow();
// });
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
DataUtil.delSelectedRows({
action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax',
param: {},
gridManager: _grid,
idFieldName: 'reimbursementDetailId',
onSuccess: function () {
reloadGrid();
}
});
}
});
......@@ -452,11 +471,11 @@ $(document).ready(function () {
function initialize() {
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {id: getId()}, function (data) {
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.map(item => {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
......@@ -486,6 +505,17 @@ function bindQueryEvent() {
$('#butxt').val(data.BUTXT);
}
});
$('#bankn1').searchbox({
type: "system", name: "getCompanyAndBankInfos",
getParam: function (item) {
return {BUKRS: $("#bukrs").val()}
},
onChange: function (value, data) {
$('#bankn1').val(data.BANKN1);
$('#zt012kText1').val(data.TEXT1);
}
});
}
......@@ -506,9 +536,7 @@ function getId() {
}
function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
......@@ -578,6 +606,11 @@ function businessJudgmentUnit() {
}else {
UICtrl.setDisable($("#submitForm"));
}
//资金岗
if ("fundNode" === getSubProcUnitId()){
UICtrl.enable("#bankn1");
UICtrl.enable("#zepTxt1");
}
return true;
}
......@@ -650,4 +683,27 @@ function totalFinancialAuditGrid(data){
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
});
}
function reloadGrid(){
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
tableArray.forEach(obj => {
obj.data = {
Rows: data.Rows.map(item => {
let row = {};
obj.columns.forEach(col => {
if (item.hasOwnProperty(col.name)) {
row[col.name] = item[col.name];
}
});
return row;
})
};
var gridManager = UICtrl.getGridManager("#"+obj.node);
gridManager.setData(obj.data);
Public.successTip("数据操作成功")
});
})
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.jsp
View file @ cc37dda0
......@@ -44,6 +44,13 @@
<x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
</div>
<div id="capitalPost">
<div class="hg-form-row">
<x:inputC name="bankn1" required="false" label="付款银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zt012kText1" required="false" readonly="true" label="付款银行账号名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt1" required="false" label="付款附言" labelCol="2" fieldCol="2"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
......@@ -71,11 +78,11 @@
</div>
</div>
<div class="blank_div clearfix"></div>
<div id="capitalPost">
<x:title title="资金岗填写" name="group"/>
<div id="capitalPostGrid" style="margin: 2px;">
</div>
</div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div id="paymentAccomplish_sapReturn">
<x:title title="付款完成、sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js
View file @ cc37dda0
......@@ -90,9 +90,9 @@ function updateHandler(row) {
}
}
UICtrl.addTabItem({
tabid: 'FixedAssetsDetail',
text: "修改固定资产",
url: web_app.name + '/sapFixedAssets/showFixedAssetsDetail.do?id='+row.id
tabid: 'FixedAssetsDetail'+ row.id,
text: "查看固定资产",
url: web_app.name + '/sapFixedAssets/showFixedAssetsDetail.do?isReadOnly=true&id='+row.id
})
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js
View file @ cc37dda0
......@@ -17,7 +17,10 @@ function initialize(){
}
function bindEvent(){
//各级审批附件上传
if(!Public.isReadOnly){
setTimeout(function(){$('#sapRetirementInfoList').addClass('ui-not-allow-disable').fileList('enable');},10);
}
}
function loadGrid() {
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.js
View file @ cc37dda0
......@@ -56,21 +56,16 @@ function bindEvent(){
$('#burksName').val(data.BUTXT);
}
});
/* $("#applyPersonName").orgTree({
filter: "ogn,dpt,pos,psm",
excludePos: 1, param: {orgKindId: "ogn,dpt,pos,psm"},
back: {text: "#applyPersonName",value :'#applyPerson'},
manageType: 'taskQuery,admin',
onChange:function(value,data){ //alert(data.name);
// $("#applyPerson").val(data.fullId);
// $("#applyPersonName").val(data.name);
$('#werksName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
onChange: function (value, data) {
$('#werks').val(data.WERKS);
$('#werksName').val(data.NAME1);
}
});
*/
}
function loadGrid() {
......@@ -177,25 +172,25 @@ function loadGrid() {
}
},
{display: "库存地点名称", name: "lgortName", width: "200", align: "left", type: "string"},
{display: "收货工厂", name: "werks", width: "100", align: "left", type: "string",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
back: {
WERKS: "werks",
NAME1: "werksName"
}
},
}
},
{display: "工厂名称", name: "werksName", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"}
},
// {display: "收货工厂", name: "werks", width: "100", align: "left", type: "string",
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "WERKS"}
// },
// back: {
// WERKS: "werks",
// NAME1: "werksName"
// }
// },
// }
// },
// {display: "工厂名称", name: "werksName", width: "200", align: "left", type: "string",
// editor: {required: false, type: "text"}
// },
],
dataAction: "server",
url: web_app.name + '/sapStockTransfersItem/querySapStockTransfersItems.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.jsp
View file @ cc37dda0
......@@ -39,6 +39,9 @@
<x:hidden name="burks"/>
<x:inputC name="burksName" required="false" label="公司代码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:hidden name="werks"/>
<x:inputC name="werksName" required="false" label="收货工厂" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
</div>
<div class="blank_div clearfix"></div>
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/controller/CostCenterController.java
View file @ cc37dda0
package com.huigou.topsun.sap.costCenter.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.costCenter.application.CostCenterApplication;
......@@ -16,6 +17,7 @@ import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.DateUtil;
import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Controller;
......@@ -24,6 +26,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Auther: xin.lu
......@@ -170,13 +173,22 @@ public class CostCenterController extends CommonController {
EasySearchParse easySearchParse = new EasySearchParse();
easySearchParse.setFields(fields);
easySearchParse.setWidth(400L);
String ktext = sdo.getString("ktext");
String param = sdo.getString("paramValue");
CostCenterQueryRequest queryRequest = sdo.toQueryRequest(CostCenterQueryRequest.class);
queryRequest.setKtext(ktext);
//queryRequest.setKtext(param);
//queryRequest.setKostl(param);
queryRequest.setNowDate(new Date());
Map<String, Object> map = costCenterApplication.slicedCostCenterList(queryRequest);
List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("Rows");
MemEasySearcher<Map<String, Object>> memEasySearcher = new MemEasySearcherImpl<>();
List<Map<String, String>> mapList = (List<Map<String, String>>) map.get("Rows");
if (CollectionUtil.isNotEmpty(mapList)){
if (StringUtil.isNotBlank(param)){//模糊条件过滤
mapList = mapList
.stream()
.filter(mapObj -> mapObj.values().stream().anyMatch(value->value.contains(param)))
.collect(Collectors.toList());
}
}
MemEasySearcher<Map<String, String>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model;
}
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/SapCostReimbursementDetailApplication.java
View file @ cc37dda0
package com.huigou.topsun.sap.costReimbursement.application;
import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursementDetail;
import com.huigou.topsun.sap.costReimbursement.domain.query.SapCostReimbursementQueryRequest;
import java.util.List;
import java.util.Map;
public interface SapCostReimbursementDetailApplication {
// String QUERY_XML_FILE_PATH="config/topsun/sap/statsIndicators/statsIndicators.xml";
String QUERY_XML_FILE_PATH="config/topsun/sap/costReimbursement/costReimbursement.xml";
// Map<String, Object> slicedStatsIndicatorsDetailQuery(SapStatsIndicatorsDetailQueryRequest query);
Map<String, Object> slicedSapCostReimbursementDetail(SapCostReimbursementQueryRequest query);
List<SapCostReimbursementDetail> getAllByCRId(String CRId);
void deleteSapCostReimbursementDetails(List<String> ids);
}
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java
View file @ cc37dda0
......@@ -3,7 +3,6 @@ package com.huigou.topsun.sap.costReimbursement.application.impl;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.data.domain.model.CommonDomainConstants;
import com.huigou.data.query.model.QueryDescriptor;
......@@ -67,18 +66,19 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
sapCostReimbursement = costReimbursementRepository.save(sapCostReimbursement);
String CRDetailJSON = sdo.getString("CRDetail");
ObjectMapper objectMapper = new ObjectMapper();
List<SapCostReimbursementDetail> CRDetailAll = costReimbursementDetailRepository.findAllByReimbursementBaseInfoId(sapCostReimbursement.getId());
if (!CRDetailAll.isEmpty()) {
costReimbursementDetailRepository.delete(CRDetailAll);
}
List<SapCostReimbursementDetail> CRDetailList = objectMapper.readValue(CRDetailJSON, new TypeReference<List<SapCostReimbursementDetail>>() {
});
for (SapCostReimbursementDetail item : CRDetailList) {
// String CRDetailJSON = sdo.getString("CRDetail");
// ObjectMapper objectMapper = new ObjectMapper();
// List<SapCostReimbursementDetail> CRDetailAll = costReimbursementDetailRepository.findAllByReimbursementBaseInfoId(sapCostReimbursement.getId());
// if (!CRDetailAll.isEmpty()) {
// costReimbursementDetailRepository.delete(CRDetailAll);
// }
// List<SapCostReimbursementDetail> CRDetailList = objectMapper.readValue(CRDetailJSON, new TypeReference<List<SapCostReimbursementDetail>>() {
// });
List<SapCostReimbursementDetail> CRDetailAll = getBizEntities(SapCostReimbursementDetail.class, "CRDetail");
for (SapCostReimbursementDetail item : CRDetailAll) {
item.setReimbursementBaseInfoId(sapCostReimbursement.getId());
costReimbursementDetailRepository.save(item);
}
costReimbursementDetailRepository.save(CRDetailList);
return sapCostReimbursement.getId();
}
......@@ -255,6 +255,9 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
itemList.add(detailMap);
costReimbursementDetail.setBudat(new Date());
costReimbursementDetail.setBldat(new Date());
costReimbursementDetail.setBankn1(sapCostReimbursement.getBankn1());
costReimbursementDetail.setZepTxt1(sapCostReimbursement.getZepTxt1());
costReimbursementDetail.setZt012kText1(sapCostReimbursement.getZt012kText1());
costReimbursementDetailRepository.save(costReimbursementDetail);
}
paramMap.put("ITEM", itemList);
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementDetailApplicationImpl.java
View file @ cc37dda0
package com.huigou.topsun.sap.costReimbursement.application.impl;
import com.huigou.cache.DictUtil;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementDetailApplication;
import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursementDetail;
import com.huigou.topsun.sap.costReimbursement.domain.query.SapCostReimbursementQueryRequest;
import com.huigou.topsun.sap.costReimbursement.repostiory.SapCostReimbursementDetailRepository;
import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsDetailApplication;
import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsDetailQueryRequest;
......@@ -16,11 +19,13 @@ import java.util.Map;
@Service
public class SapCostReimbursementDetailApplicationImpl extends BaseApplication implements SapCostReimbursementDetailApplication {
// @Override
// public Map<String, Object> slicedStatsIndicatorsDetailQuery(SapStatsIndicatorsDetailQueryRequest query) {
// QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedStatsIndicatorsDetailQuery");
// return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
// }
@Override
public Map<String, Object> slicedSapCostReimbursementDetail(SapCostReimbursementQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSapCostReimbursementDetail");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
queryModel.putDictionary("mwskz", DictUtil.getDictionary("mwskz"));
return this.sqlExecutorDao.executeQuery(queryModel);
}
@Autowired
SapCostReimbursementDetailRepository costReimbursementDetailRepository;
......@@ -28,4 +33,11 @@ public class SapCostReimbursementDetailApplicationImpl extends BaseApplication i
public List<SapCostReimbursementDetail> getAllByCRId(String CRId) {
return costReimbursementDetailRepository.findAllByReimbursementBaseInfoId(CRId);
}
@Override
public void deleteSapCostReimbursementDetails(List<String> ids) {
for (String id : ids) {
costReimbursementDetailRepository.delete(id);
}
}
}
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
View file @ cc37dda0
......@@ -21,9 +21,7 @@ import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
@Controller
......@@ -112,8 +110,14 @@ public class SapCostReimbursementController extends CommonController {
public String slicedSapCostReimbursementDetailList(){
SDO sdo = this.getSDO();
List<SapCostReimbursementDetail> CRDetailAll = costReimbursementDetailApplication.getAllByCRId(sdo.getId());
return toResult(CRDetailAll);
SapCostReimbursementQueryRequest queryRequest = sdo.toQueryRequest(SapCostReimbursementQueryRequest.class);
Map<String, Object> map = new HashMap<>();
if (StringUtil.isNotBlank(queryRequest.getReimbursementBaseInfoId())){
map = costReimbursementDetailApplication.slicedSapCostReimbursementDetail(queryRequest);
}else {
map.put("Rows",new ArrayList<>());
}
return toResult(map);
}
/**
......@@ -142,10 +146,10 @@ public class SapCostReimbursementController extends CommonController {
return null;
}
public String deleteStatsIndicators(){
public String deleteSapCostReimbursementDetails(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
costReimbursementApplication.deleteSapCostReimbursementByIds(ids);
costReimbursementDetailApplication.deleteSapCostReimbursementDetails(ids);
return success();
}
//
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursement.java
View file @ cc37dda0
......@@ -195,6 +195,30 @@ public class SapCostReimbursement extends FlowBillAbstractEntity {
@Column(name = "MESSAGE_V4")
private String messageV4;
/**
* 员工借款单据编号
*/
@Column(name = "employee_loan_bill_code")
private String employeeLoanBillCode;
/**
* 付款附言
*/
@Column(name = "ZEP_TXT1")
private String zepTxt1;
/**
* 付款银行账号
*/
@Column(name = "BANKN1")
private String bankn1;
/**
* 付款银行账号名称
*/
@Column(name = "ZT012K_TEXT1")
private String zt012kText1;
@Override
protected String getCodeRuleId() {
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/query/SapCostReimbursementQueryRequest.java
View file @ cc37dda0
......@@ -116,4 +116,6 @@ public class SapCostReimbursementQueryRequest extends QueryAbstractRequest {
*/
private Date fillinDate;
private String reimbursementBaseInfoId;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/permit/application/SapPermitItemApplication.java
View file @ cc37dda0
......@@ -13,7 +13,7 @@ import java.util.Map;
* @Description:
*/
public interface SapPermitItemApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/permit/permitItem.xml";
public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/permit/permit.xml";
void saveSapPermitItems(String sapRetirementId, List<SapPermitItem> items);
Map<String,Object> querySapPermitItems(SapPermitQueryRequest queryRequest);
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/SapStockTransfers.java
View file @ cc37dda0
......@@ -61,6 +61,15 @@ public class SapStockTransfers extends FlowBillAbstractEntity {
@Column(name = "lifnr_name")
private String lifnrName;
/**
* 收货工厂
*/
@Column(name = "werks")
private String werks;
@Column(name = "werks_name")
private String werksName;
@Override
protected String getCodeRuleId() {
return "sapStockTransfers";
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/SapStockTransfersItem.java
View file @ cc37dda0
......@@ -57,15 +57,6 @@ public class SapStockTransfersItem extends AbstractEntity {
*/
@Column(name = "eeind")
private Date eeind;
/**
* 收货工厂
*/
@Column(name = "werks")
private String werks;
@Column(name = "werks_name")
private String werksName;
/**
* 库存地点
*/
......
topsun/src/main/resources/config/content/easysearch/easy-search-costReimbursement.xml 0 → 100644
View file @ cc37dda0
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="employeeLoanBillCode" desc="员工借款编号">
<sql>
SELECT
t.bill_code,
t.person_member_id
FROM
sap_cost_reimbursement_base_info t
WHERE t.ZEP_FTYPE = 'B' and t.status = 3
</sql>
<field name="员工借款编号" title="员工借款编号" code="billCode" width="200"/>
<condition column="bill_code" name="billCode" symbol="like" alias="t"/>
<condition column="person_member_id" name="personMemberId" symbol="=" alias="t"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/costCenter/costCenter.xml
View file @ cc37dda0
......@@ -15,12 +15,11 @@
select
t.id,
t.ktext,
t.datbi,
t.datab,
t.kostl
from sap_cost_center t where t.is_delete = 0 and t.is_enable = 1
</sql-query>
<condition column="ktext" name="ktext" type="java.lang.String" symbol="like" alias="t"/>
<condition column="kostl" name="kostl" type="java.lang.String" symbol="like" alias="t"/>
<condition column="datbi" name="nowDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
<condition column="datab" name="nowDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
</query>
......
topsun/src/main/resources/config/topsun/sap/costReimbursement/costReimbursement.xml
View file @ cc37dda0
......@@ -11,4 +11,13 @@
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="zep_ftype" name="zepFtype" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedSapCostReimbursementDetail" table="sap_cost_reimbursement_detail">
<sql-query>
select t.*
from sap_cost_reimbursement_detail t
where 1=1
</sql-query>
<condition column="reimbursement_base_info_id" name="reimbursementBaseInfoId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/permit/permit.xml 0 → 100644
View file @ cc37dda0
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="sapPermit" label="SAP放行条" table="sap_permit">
<sql-query>
select t.* from sap_permit t
</sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
</query>
<query name="sapPermitItems" label="SAP放行条明细" table="sap_permit_item">
<sql-query>
select t.* from sap_permit_item t
</sql-query>
<condition column="sap_permit_id" name="sapPermitId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
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