Skip to content

T
topsun-bpm
Commit a37ba538 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

固定资产相关修改；领料申请单修改；供应商修改

parent e78a891a
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 67 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ a37ba538
......@@ -266,15 +266,15 @@ var tableArray = [
}
},
{
display: "税码", name: "mwskzTextView", width: 120, minwidth: 120, type: "string", align: "left",
display: "税码", name: "mwskz", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'dictionary',
data: {name: 'mwskz'},
textField: 'mwskzTextView',
textField: 'mwskz',
valueField: 'mwskz',
required: false,
render: function (item) {
return item.mwskzTextView;
return item.mwskz;
}
},
},
......@@ -722,6 +722,8 @@ $(document).ready(function () {
function initialize() {
$('#fileList').fileList();
//获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {id: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集
......@@ -761,6 +763,7 @@ function bindQueryEvent() {
*/
function setId(id) {
$("#id").val(id);
$('#fileList').fileList({bizId: id});
}
/**
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.jsp
View file @ a37ba538
......@@ -63,6 +63,9 @@
</div>
</div>
</div>
<div style="padding-top: 15px;">
<x:fileList bizCode="costReimbursement" bizId="id" id="fileList" title="相关资料" />
</div>
<div class="blank_div clearfix"></div>
<x:title title="报销人填写" name="group"/>
<div id="reimbursementApplierGrid" style="margin: 2px;">
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssess/sapFixedAssessDetail.js
View file @ a37ba538
......@@ -60,18 +60,21 @@ function loadGrid() {
},
{
display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left",
/*editor: {
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "querySapFixedAssets",
name: "dictionary",
getParam: function (item) {
return {
fieldName: "ANLN1",
filterValue: item.bukrs
}
},
back: {
anln1: "anln1",
ANLN1: "anln1"
}
},
}*/
editor: {
type: "text"
}
},
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.js
View file @ a37ba538
......@@ -59,18 +59,21 @@ function loadGrid() {
},
{
display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left",
/*editor: {
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "querySapFixedAssets",
name: "dictionary",
getParam: function (item) {
return {
fieldName: "ANLN1",
filterValue: item.bukrs
}
},
back: {
anln1: "anln1",
ANLN1: "anln1"
}
},
}*/
editor: {
type: "text",required: true
}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedRetirement/sapFixedRetirementDetail.js
View file @ a37ba538
......@@ -59,31 +59,23 @@ function loadGrid() {
}
},
{ display: "主资产号", name: "anln1", width: 140, minWidth: 60, type: "string", align: "left",
/*editor: {
required: true, type: "select",
data: {
type: 'system',
name: "querySapFixedAssets",
back: {
anln1: "anln1",
}
},
}*/
editor: { type: "text" }
},
/*{
display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: false, type: "select",
required: true, type: "select",
data: {
type: 'system',
name: "queryCostCenter",
name: "dictionary",
getParam: function (item) {
return {
fieldName: "ANLN1",
filterValue: item.bukrs
}
},
back: {
kostl: "kostl",
ANLN1: "anln1"
}
},
}
}, */
},
{
display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "date", align: "left",
editor: {required: true, type: "date"}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.js
View file @ a37ba538
......@@ -16,7 +16,7 @@ $(document).ready(function () {
function initializate() {
//页面控制
$("#businessPersonnelList").hide();
$("#vprsv").val("2+V");
$("#vprsv").val("V");
var peinh = $("#peinh").val();
if (Public.isBlank(peinh)){
$("#peinh").val("1")
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js
View file @ a37ba538
......@@ -83,7 +83,7 @@ function loadGrid() {
name: "sapMaterialSelect",
getParam: function (item) {
return {
filterValue:item.werks
filterValue:$("#werks").val()
}
},
back: {
......@@ -157,6 +157,13 @@ function loadGrid() {
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onBeforeEdit: function (editParm) {
var c = editParm.column, data = editParm.record;
if (c.name == 'matnr' && Public.isBlank($("#werks").val())) {
Public.tip("请先选择工厂");
return false;
}
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.jsp
View file @ a37ba538
......@@ -7,7 +7,7 @@
<x:script src='/biz/topsun/sap/nonProducePick/nonProducePickDetail.js'/>
</head>
<body>
<x:billTitle title="非生产性领料申请与发料过账" needStatus="false" needPerson="true"/>
<x:billTitle title="创建领料申请" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="billCode"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
View file @ a37ba538
......@@ -56,7 +56,7 @@ function resetForm(obj) {
function addHandler() {
UICtrl.addTabItem({
tabid: 'epSaleOrder',
text: "新增销售订单",
text: "创建领料申请",
url: web_app.name + '/nonProducePick/forwardNonProducePickDetail.job'
});
}
......@@ -64,7 +64,7 @@ function addHandler() {
function doView(id) {
UICtrl.addTabItem({
tabid: 'epSaleOrder'+id,
text: "查看销售订单",
text: "查看领料申请",
url: web_app.name + '/nonProducePick/showNonProducePickDetail.job?bizId='+id+"&isReadOnly=true"
});
}
topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.js
View file @ a37ba538
......@@ -15,6 +15,32 @@ function initialize(){
function bindEvent(){
var code = $("#submitForm #billCode").val();
$("#bltxt").val(code);
//所属系统选择
// $('#kokrs').orgTree({
// searchType: 'bsn', searchName: 'pmHierarchy',
//
// onChange: function (value,data) {
// $('#kokrs').val(data.code);
// }
// });
$('#kokrs').treebox({
name:'sapOrgDpt',
searchName:'sapOrgDpt',
searchType:'bsn',
hasSearch :true,
minWidth:500,
param:{
treeViewMappingType:"bsn",
parentId:'ogn'
},
back:{
//text:$('#queryDataManageName')
},
onChange:function(node,data){
$('#kokrs').val(data.id);
}
});
}
function loadStatsIndicatorsDetailListGrid() {
......@@ -73,8 +99,17 @@ function loadStatsIndicatorsDetailListGrid() {
{
display: "统计指标", name: "stagr", width: 120, minWidth: 60, type: "string", align: "left",
editor: {
required: true,
type: 'text'
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "STAGR"}
},
back: {
STAGR: "stagr"
}
},
}
},
{
......@@ -82,7 +117,7 @@ function loadStatsIndicatorsDetailListGrid() {
editor: {
required: true,
type: 'text',
mask: 'nnnnnnnn.nn'
mask: 'nnnnnnnn'
}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.jsp
View file @ a37ba538
......@@ -3,12 +3,12 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,selectOrg"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="统计指标数据" needStatus="false" needPerson="true"/>
<x:billTitle title="统计指标指数过账" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="billCode"/>
......@@ -25,7 +25,7 @@
<x:hidden name="statusId"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="kokrs" required="true" readonly="true" label="成本控制范围" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="kokrs" required="true" label="成本控制范围" labelCol="2" maxLength="64" fieldCol="2" wrapper="select"/>
<x:inputC name="usnam" required="true" readonly="true" label="SAP用户名" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ a37ba538
......@@ -91,7 +91,7 @@ function loadSuppliersPayListGrid() {
columns: [
{
display: "行号", name: "sequence", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
//editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
},
{
display: "公司代码", name: "bukrs", width: 100, minWidth: 60, type: "String", align: "left",
......@@ -215,7 +215,7 @@ function loadSuppliersBuyerListGrid() {
columns: [
{
display: "行号", name: "sequence", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
//editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
},
{
display: "采购组织", name: "ekorgTextView", width: 200, minWidth: 60, type: "String", align: "left",
......@@ -358,15 +358,16 @@ function loadSuppliersBankListGrid() {
columns: [
{
display: "行号", name: "sequence", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
//editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
},
{
display: "银行所属国家", name: "banksTextView", width: 100, minWidth: 60, type: "String", align: "left",
display: "银行所属国家", name: "banksTextView", width: 150, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'country'},
emptyOption:true,
textField: 'banksTextView',
valueField: 'country',
valueField: 'banks',
required: true,
render: function (item) {
return item.banksTextView;
......@@ -374,20 +375,24 @@ function loadSuppliersBankListGrid() {
},
},
{
display: "银行代码", name: "bankl", width: 140, minWidth: 60, type: "String", align: "left",
display: "银行代码", name: "bankl", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},
{
display: "银行帐户号码", name: "bankn", width: 150, minWidth: 60, type: "String", align: "left",
display: "银行帐户号码", name: "bankn", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},
{
display: "银行细目的参考明细", name: "bkref", width: 140, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
},
{
display: "账户持有人姓名", name: "koinh", width: 120, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
editor: {type: 'text', required: false}
},
{
display: "银行控制代码", name: "bkont", width: 140, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
editor: {type: 'text', required: false}
},
{
display: "对方开户行类型", name: "bvtyp", width: 160, minWidth: 60, type: "String", align: "left",
......@@ -399,12 +404,8 @@ function loadSuppliersBankListGrid() {
},
{
display: "分行", name: "brnch", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},
{
display: "银行细目的参考明细", name: "bkref", width: 140, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
}
editor: {type: 'text', required: false}
}
],
dataAction: "server",
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp
View file @ a37ba538
......@@ -50,7 +50,7 @@
<x:inputC name="rltgr" label="业务伙伴角色" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:selectC name="buGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" required="true" dictionary="buGroup"/>
<x:inputC name="partner" label="供应商编码" labelCol="1" fieldCol="2" required="false" readonly="true"/>
<x:inputC name="title" label="称谓代码" labelCol="1" fieldCol="2"/>
<x:selectC name="title" label="称谓代码" labelCol="1" fieldCol="2" dictionary="title"/>
<x:inputC name="nameOrg1" label="供应商名称1" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="nameOrg2" label="供应商名称2" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="nameOrg3" label="组织名称3" labelCol="1" fieldCol="2"/>
......@@ -65,7 +65,7 @@
<x:hidden name="land1"/>
<x:inputC name="regionName" label="地区" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
<x:hidden name="region"/>
<x:inputC name="city1Name" label="城市" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
<x:inputC name="city1" label="城市" labelCol="1" fieldCol="2" required="true" />
<x:hidden name="city1"/>
<x:inputC name="street" label="街道地址" labelCol="1" fieldCol="2"/>
<x:inputC name="langu" label="语言关键字" labelCol="1" fieldCol="2"/>
......
topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java
View file @ a37ba538
......@@ -131,7 +131,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
EpSaleOrderCancel epSaleOrderCancel = epSaleOrderCancelRepository.findOne(bizId);
epSaleOrderCancel.setStatusId(status.getId());
epSaleOrderCancelRepository.save(epSaleOrderCancel);
//this.feedBackSaleOrderCancel(epSaleOrderCancel,"1");
this.feedBackSaleOrderCancel(epSaleOrderCancel,"1");
}
@Override
......
topsun/src/main/java/com/huigou/topsun/ep/order/domain/EpSaleOrderCancel.java
View file @ a37ba538
......@@ -47,7 +47,7 @@ public class EpSaleOrderCancel extends FlowBillAbstractEntity {
private String productType;
/**
* 原订单是否取消
* 原订单是否取消(1取消，2变更)
*/
@Column(name = "is_cancel")
private String isCancel;
......
topsun/src/main/java/com/huigou/topsun/ep/order/domain/vo/EpSaleOrderCancelVo.java
View file @ a37ba538
......@@ -45,7 +45,7 @@ public class EpSaleOrderCancelVo implements Serializable {
private String productType;
/**
* 原订单是否取消
* 原订单是否取消(1取消，2变更)
*/
@JsonProperty("isCancel")
private String isCancel;
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ a37ba538
......@@ -110,9 +110,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
}
//if (active == 1){//各部门提交后，隐藏消息
//bsnMessageApplication.submitTask(meId);
//}
if (active == 1){//各部门提交后，隐藏消息
bsnMessageApplication.submitTask(meId);
}
map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
return map;
}
......
topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java
View file @ a37ba538
......@@ -333,6 +333,13 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
for (SuppliersBank suppliersBank : bankList) {
SuppliersBankVo bankVo = new SuppliersBankVo();
ClassHelper.copyProperties(suppliersBank, bankVo);
//银行账户
if (bankVo.getBankn().length() > 18){
String bankn = bankVo.getBankn();
bankVo.setBankn(bankn.substring(0,18));
//账户明细放18位后的值
bankVo.setBkref(bankn.substring(18,bankn.length()));
}
bankVoList.add(bankVo);
}
suppliersInfoVo.setSuppliersBankList(bankVoList);
......@@ -434,6 +441,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
public Map<String, Object> loadSuppliersBankDatas(SuppliersBankQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersBankList");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
queryModel.putDictionary("banks",DictUtil.getDictionary("country"));
queryModel.addCriteria(" and t.s_id =:sId");
queryModel.putParam("sId", queryRequest.getSId());
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
......
topsun/src/main/resources/config/content/treeview/tree-view-ssrf.xml → topsun/src/main/resources/config/content/treeview/tree-view-bsn.xml
View file @ a37ba538
......@@ -112,6 +112,24 @@
<condition column="is_virtual" name="isVirtual" symbol="in"/>
</dataModel>
</tree>
<!-- 宝绅集团标准层次结构 -->
<tree name="sapOrgDpt" desc="SAP组织架构选择">
<ajax>true</ajax>
<dataModel>
<table>SAP_ORG_DEPT</table>
<primaryKey>ID</primaryKey>
<connectBy>PARENT_ID</connectBy>
<label>NAME</label>
<hiddenCol>ID,PARENT_ID
</hiddenCol>
<root>PARENT_ID =:parentId</root>
<!--<defaultCondition>org_kind_id='ogn' and status = 1</defaultCondition>
<orderby>FULL_SEQUENCE</orderby>-->
<condition column="name" name="name" symbol="="/>
</dataModel>
</tree>
</tree-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