Skip to content

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

供应商主数据创建接口调试完成；固定资产；成本中心选择

parent 601d9e32
Hide whitespace changes
Inline Side-by-side
Showing with 340 additions and 110 deletions
huigou-xt/src/main/webapp/system/opm/organization/Org.js
View file @ ecd23e26
......@@ -214,7 +214,7 @@ $(function () {
propteryGridManager = UICtrl.grid('#propertyGrid', {
columns: [
{ display: "属性名", name: "description", width: 150, minWidth: 60, type: "string", align: "left" },
{ display: "属性值", name: "propertyDisplay", width: 150, minWidth: 60, type: "string", align: "left",
{ display: "属性值", name: "propertyDisplay", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
type: "dynamic", getEditor: function (row) {
var dataSource = row['dataSource'] || "";
......
huigou-xt/src/main/webapp/system/taskCenter/TasksTracking.jsp
View file @ ecd23e26
......@@ -16,7 +16,7 @@
</div>
<div class="date-view">
<a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>">
<c:out value="${task.createDate}" />
<c:out value="${task.updateDate}" />
</a>
</div>
</div>
......
topsun-xt/src/main/webapp/HomePage.jsp
View file @ ecd23e26
......@@ -45,9 +45,9 @@
<div class="col-sm-6 col-xs-12">
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">专项任务</h3>
<h3 class="box-title">非产品/非本成品类物料任务</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadGrid()"><i class="fa fa-repeat"></i></button>
<button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadSpecialTaskGrid()"><i class="fa fa-repeat"></i></button>
<button type="button" class="btn btn-box-tool" title="更多" onclick="showTask(1)"><i class="fa fa-bars"></i></button>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ ecd23e26
......@@ -43,26 +43,25 @@ var tableArray = [
},
{
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
name: "getCusAndSuppliers",
getParam: function (item) {
return {fieldName: "PARTNER"}
return {
ZEP_BPTYPE: item.zepBptype,
BUKRS:$("#bukrs").val()
}
},
back: {
PARTNER: "partner",
KOINH: "koinh",
NAME_ORG1: "koinh",
BANKL: "bankl",
BANKN: "bankn",
SWIFT: "swift",
}
},
}*/
editor: {
type: 'text'
}
},
{
......@@ -73,14 +72,28 @@ var tableArray = [
}
},
{
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
required: true, type: "select",
data: {
type: 'system',
name: "getCusAndBanks",
getParam: function (item) {
return {
ZEP_BPTYPE: item.zepBptype,
PARTNER:item.partner
}
},
back: {
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
}
},
}
},
{
display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
......@@ -95,35 +108,35 @@ var tableArray = [
},
{
display: "采购订单号", name: "ebeln", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
},
{
display: "采购订单行", name: "ebelp", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
name: "getPurchaseOrders",
getParam: function (item) {
return {fieldName: "EBELN"}
return {
ZEP_FTYPE: $("#zepFtype").val(),
BUKRS:$("#bukrs").val(),
PARTNER:item.partner,
}
},
back: {
EBELN: "ebeln",
EBELP: "ebelp",
ZEKPO_ITEM: "zekpoItem"
ZEKPO_ITEM: "zekpoItem",
WAERS: "waers",
KURSF: "kursf",
KZWI1: "kzwi1",
KZWI11: "kzwi11",
}
},
}*/
editor: {
type: 'text'
}
},
{
display: "采购订单行", name: "ebelp", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
{
display: "采购订单行信息", name: "zekpoItem", width: 200, minwidth: 120, type: "string", align: "left",
display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
......@@ -330,23 +343,21 @@ var tableArray = [
{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: true, type: "select",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {fieldName: "BANKN1"}
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
ZT012K_TEXT1: "zt012kText1",
TEXT1: "zt012kText1",
}
},
}*/
editor: {
type: 'text'
}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ ecd23e26
......@@ -33,22 +33,38 @@ var tableArray = [
},
{
display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
/*editor: {
type: 'text'
}
}*/
},
{
display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
/*editor: {
type: 'text'
}
}*/
},
{
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
required: true, type: "select",
data: {
type: 'system',
name: "getCusAndSuppliers",
getParam: function (item) {
return {
ZEP_BPTYPE: item.zepBptype,
BUKRS:$("#bukrs").val()
}
},
back: {
PARTNER: "partner",
NAME_ORG1: "koinh",
BANKL: "bankl",
BANKN: "bankn",
SWIFT: "swift",
}
},
}
},
{
......@@ -59,14 +75,28 @@ var tableArray = [
}
},
{
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
required: true, type: "select",
data: {
type: 'system',
name: "getCusAndBanks",
getParam: function (item) {
return {
ZEP_BPTYPE: item.zepBptype,
PARTNER:item.partner
}
},
back: {
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
}
},
}
},
{
display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
......@@ -225,8 +255,20 @@ var tableArray = [
{
display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyAndBankInfos",
getParam: function (item) {
return {
BUKRS: $("#bukrs").val()
}
},
back: {
BANKN1: "bankn1",
TEXT1: "zt012kText1",
}
},
}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.js
View file @ ecd23e26
......@@ -11,13 +11,13 @@ function initializateUI() {
function bindQueryEvent() {
$('#kostl').searchbox({
type: "costCenter", name: "costCenterCode",
type: "system", name: "queryCostCenter",
onChange: function (value, data) {
$('#kostl').val(data.kostl);
}
});
$('#kostlv').searchbox({
type: "costCenter", name: "costCenterCode",
type: "system", name: "queryCostCenter",
onChange: function (value, data) {
$('#kostlv').val(data.kostl);
}
......@@ -25,7 +25,7 @@ function bindQueryEvent() {
$('#anlkl').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {paramValue: "ANLKL"}
return {fieldName: "ANLKL"}
},
onChange: function (value, data) {
$('#anlkl').val(data.ANLKL);
......@@ -34,7 +34,7 @@ function bindQueryEvent() {
$('#bukrs').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {paramValue: "BUKRS"}
return {fieldName: "BUKRS"}
},
onChange: function (value, data) {
$('#bukrs').val(data.BUKRS);
......@@ -43,7 +43,7 @@ function bindQueryEvent() {
$('#meins').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {paramValue: "MEINS"}
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#meins').val(data.MSEHI);
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.js
View file @ ecd23e26
......@@ -57,7 +57,7 @@ function loadGrid() {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {paramValue: "BUKRS"}
return {fieldName: "BUKRS"}
},
back: {
BUKRS: "bukrs",
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ ecd23e26
......@@ -12,7 +12,7 @@ $(document).ready(function () {
});
function initialize(){
UICtrl.layout("#layout", {leftWidth: 3});
$("#buGroup").val("Z00001X");
$("#rltgr").val("Z00001X");
// let isDetailPage = ($("#isDetailPage").val() === "true");
// if (isDetailPage) {
// $("#jobPageTop").hide();
......@@ -94,11 +94,32 @@ function loadSuppliersPayListGrid() {
},
{
display: "公司代码", name: "bukrs", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "BUKRS"}
},
back: {
BUKRS: "bukrs",
}
},
}
},
{
display: "统驭科目", name: "akont", width: 140, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
display: "统驭科目", name: "akontTextView", width: 140, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'akont'},
textField: 'akontTextView',
valueField: 'akont',
required: true,
render: function (item) {
return item.akontTextView;
}
},
},
{
display: "根据分配号排序代码", name: "zuawa", width: 150, minWidth: 60, type: "String", align: "left",
......@@ -107,8 +128,17 @@ function loadSuppliersPayListGrid() {
}
},
{
display: "付款条件", name: "zterm", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
display: "付款条件", name: "ztermTextView", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'zterm'},
textField: 'ztermTextView',
valueField: 'zterm',
required: true,
render: function (item) {
return item.ztermTextView;
}
},
},
{
display: "考虑的付款方式清单", name: "zwels", width: 140, minWidth: 60, type: "String", align: "left",
......@@ -187,20 +217,56 @@ function loadSuppliersBuyerListGrid() {
editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
},
{
display: "采购组织", name: "ekorg", width: 100, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
display: "采购组织", name: "ekorgTextView", width: 200, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'ekorg'},
textField: 'ekorgTextView',
valueField: 'ekorg',
required: true,
render: function (item) {
return item.ekorgTextView;
}
},
},
{
display: "货币码", name: "waers", width: 140, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
display: "货币码", name: "waersTextView", width: 140, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'waers'},
textField: 'waersTextView',
valueField: 'waers',
required: true,
render: function (item) {
return item.waersTextView;
}
},
},
{
display: "付款条件", name: "zterm", width: 150, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
display: "付款条件", name: "ztermTextView", width: 150, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'zterm'},
textField: 'ztermTextView',
valueField: 'zterm',
required: true,
render: function (item) {
return item.ztermTextView;
}
},
},
{
display: "国际贸易条款", name: "inco1", width: 10, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
display: "国际贸易条款", name: "inco1TextView", width: 200, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'inco1'},
textField: 'inco1TextView',
valueField: 'inco1',
required: false,
render: function (item) {
return item.inco1TextView;
}
},
},
{
display: "国际贸易条款位置1", name: "inco2L", width: 140, minWidth: 60, type: "String", align: "left",
......@@ -318,11 +384,11 @@ function loadSuppliersBankListGrid() {
editor: {type: 'text', required: false}
},
{
display: "财务机构名称", name: "banka", width: 100, minWidth: 60, type: "String", align: "left",
display: "银行名称", name: "banka", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
},
{
display: "分行", name: "brnch", width: 140, minWidth: 60, type: "String", align: "left",
display: "分行", name: "brnch", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp
View file @ ecd23e26
......@@ -47,48 +47,37 @@
<x:title title="供应商主数据" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="rltgr" label="BP角色" labelCol="1" fieldCol="2" required="true"/>
<c:if test="${applyType==0}">
<x:inputC name="buGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="partner" label="业务伙伴编号" labelCol="1" fieldCol="2" required="true"/>
</c:if>
<c:if test="${applyType==1||applyType==-1}">
<x:inputC name="buGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="partner" label="业务伙伴编号" labelCol="1" fieldCol="2" readonly="true"/>
</c:if>
<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: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"/>
<x:inputC name="nameOrg4" label="组织名称4" labelCol="1" fieldCol="2"/>
<x:inputC name="buSort1" label="业务伙伴的搜索词1" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="buSort2" label="业务伙伴的搜索词2" labelCol="1" fieldCol="2"/>
<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"/>
<x:inputC name="nameOrg4" label="组织名称4" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="buSort1" label="搜索词1" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="buSort2" label="搜索词2" labelCol="1" fieldCol="2"/>
<x:inputC name="street" label="街道" labelCol="1" fieldCol="2"/>
<x:inputC name="strSuppl1" label="街道2" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="strSuppl1" label="街道2" labelCol="1" fieldCol="2"/>
<x:inputC name="strSuppl2" label="街道3" labelCol="1" fieldCol="2"/>
<x:inputC name="strSuppl3" label="街道4" labelCol="1" fieldCol="2"/>
<x:inputC name="land1" label="国家/地区代码" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="strSuppl3" label="街道4" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="land1" label="国家" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="region" label="地区" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="langu" label="语言关键字" labelCol="1" fieldCol="2"/>
<x:inputC name="city1" label="城市" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2"/>
<x:inputC name="telNumber" label="第一个电话号码" labelCol="1" fieldCol="2"/>
<x:inputC name="telExtens" label="第一个电话号码分机" labelCol="1" fieldCol="2"/>
<x:inputC name="mobNumber" label="第一个移动电话号码" labelCol="1" fieldCol="2"/>
<x:inputC name="mobExtens" label="第一个移动电话号码分机" labelCol="1" fieldCol="2"/>
<x:inputC name="faxNumber" label="第一个传真号" labelCol="1" fieldCol="2"/>
<x:inputC name="faxExtens" label="第一个传真号分机号" labelCol="1" fieldCol="2"/>
<x:inputC name="street" label="街道地址" labelCol="1" fieldCol="2"/>
<x:inputC name="langu" label="语言关键字" labelCol="1" fieldCol="2"/>
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="telExtens" label="第一个电话号码分机" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="mobExtens" label="第一个移动电话号码分机" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="faxExtens" label="第一个传真号分机号" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="ktokk" label="供应商帐户组" labelCol="1" fieldCol="2"/>
<x:inputC name="sperm" label="集中设置的采购冻结" labelCol="1" fieldCol="2"/>
<x:inputC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2"/>
<x:inputC name="vbund" label="贸易合作伙伴的公司标识" labelCol="1" fieldCol="2"/>
<x:inputC name="vbund" label="贸易伙伴" labelCol="1" fieldCol="2"/>
<x:inputC name="kunnr" label="客户编号" labelCol="1" fieldCol="2"/>
<x:inputC name="stenr" label="责任税务部门的税收编号" labelCol="1" fieldCol="2" required="true"/>
......
topsun-xt/src/main/webapp/javaScript/HomePage.js
View file @ ecd23e26
......@@ -84,6 +84,40 @@ function reloadGrid(){
reloadExecuteTasks();
}
function reloadSpecialTaskGrid(){
Public.ajax(web_app.name + "/homePage/queryAllTasks.ajax", {}, function (data) {
parseSpecialTaskHtml('#trackTaskContent',data['trackingTasks']);
$('span.trackingTaskCount').html(data['trackingTaskCount']);
});
}
function parseSpecialTaskHtml(container,taskList){
if(!taskList) return;
var html=[];
$.each(taskList, function (i, o) {
html.push('<div id="task_',o.id,'"');
if(o.statusId=='ready'){
html.push(' class="ready_task"');
}
html.push(' catalogId="',o.catalogId,'"');
html.push(' taskKindId="',o.kindId,'"');
html.push(' bizId="',o.businessId,'"');
html.push(' taskId="',o.id,'"');
html.push(' statusId="',o.statusId,'"');
html.push(' name="',o.title,'"');
html.push(' url="',o.executorUrl,'"');
html.push('>');
html.push('<div class="title-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.title + ':' + o.taskDescribe,'</a>');
html.push('</div>');
html.push('<div class="date-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.updateDate,'</a>');
html.push('</div>');
html.push('</div>');
});
$(container).html(html.join(''));
}
function reloadAllGrid(){
Public.ajax(web_app.name + "/homePage/queryTasksByViewKind.ajax", {viewTaskKind:'1,2,7,8'}, function (data) {
parseTaskHtml('#waitTaskContent',data['tasks1']);
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ ecd23e26
......@@ -2,6 +2,7 @@ package com.huigou.topsun.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.huigou.cache.DictUtil;
import com.huigou.topsun.sap.costCenter.application.CostCenterApplication;
import com.huigou.topsun.sap.sapApplication.application.SapDictionaryApplication;
import com.huigou.topsun.sap.sapApplication.application.SapPaymentApplication;
import com.huigou.uasp.annotation.ControllerMapping;
......@@ -32,6 +33,8 @@ public class ResourceSearchController {
private SapDictionaryApplication sapDictionaryApplication;
@Resource
private SapPaymentApplication sapPaymentApplication;
@Resource
private CostCenterApplication costCenterApplication;
@EasySearch(queryName = "knttp")
public Map<String, Object> knttpSelect(SDO sdo){
......@@ -66,6 +69,27 @@ public class ResourceSearchController {
return model;
}
@EasySearch(queryName = "costCenter")
public Map<String, Object> costCenterSelect(SDO sdo){
Integer intPage = sdo.getInteger("intPage", 1);
Integer pageSize = sdo.getInteger("pageSize",10);
PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);
List<QuerySchemeField> fields =
Arrays.asList(
new QuerySchemeField("编码", "code", "string", 100L),
new QuerySchemeField("名称", "code", "string", 100L)
);
EasySearchParse easySearchParse = new EasySearchParse();
easySearchParse.setFields(fields);
easySearchParse.setWidth(450L);
List<Map<String,Object>> mapList = new ArrayList<>();
String paramValue = sdo.getString("paramValue");
MemEasySearcher<Map<String, Object>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model;
}
@EasySearch(queryName = "sapMaterialSelect")
public Map<String, Object> sapMaterialSelect(SDO sdo) throws IOException {
String fieldName = sdo.getString("paramValue");
......@@ -149,6 +173,17 @@ public class ResourceSearchController {
return this.initEasySearchModel( mapList, param, sdo);
}
@EasySearch(queryName = "getPurchaseOrders")
public Map<String, Object> getPurchaseOrders(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
String BUKRS = sdo.getString("BUKRS");
String PARTNER = sdo.getString("PARTNER");
String ZEP_FTYPE = sdo.getString("ZEP_FTYPE");
List<Map<String, Object>> mapList = new ArrayList<>();
mapList = sapPaymentApplication.getPurchaseOrders(BUKRS,PARTNER,ZEP_FTYPE);
return this.initEasySearchModel( mapList, param, sdo);
}
public Map<String,Object> initEasySearchModel(List<Map<String, Object>> mapList,String param,SDO sdo){
List<QuerySchemeField> fields = new ArrayList<>();
if (CollectionUtil.isNotEmpty(mapList)){
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/controller/CostCenterController.java
View file @ ecd23e26
......@@ -171,6 +171,7 @@ public class CostCenterController extends CommonController {
String ktext = sdo.getString("ktext");
CostCenterQueryRequest queryRequest = sdo.toQueryRequest(CostCenterQueryRequest.class);
queryRequest.setKtext(ktext);
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<>();
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/domain/query/CostCenterQueryRequest.java
View file @ ecd23e26
......@@ -100,4 +100,6 @@ public class CostCenterQueryRequest extends QueryAbstractRequest {
private String personMemberName;
private String telePhone;
private Date nowDate;
}
topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java
View file @ ecd23e26
......@@ -85,7 +85,6 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
SapPurchase sapPurchase = sapPurchaseRepository.findOne(bizId);
sapPurchase.setStatusId(status.getId());
sapPurchase.setFrgdt(new Date());
sapPurchaseRepository.save(sapPurchase);
SapPurchaseVo sapPurchaseVo = this.getSapPurchaseVoJson(sapPurchase);
try {
......@@ -96,7 +95,8 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
if (!"S".equals(sapResult.getTYPE())){
throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
}
System.out.println("返回结果："+execute);
sapPurchase.setBanfn(sapResult.getMESSAGE_V1());//SAP采购申请编号
sapPurchaseRepository.save(sapPurchase);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java
View file @ ecd23e26
......@@ -36,6 +36,12 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
*/
@Column(name = "LIFNR")
private String lifnr;
/**
* 供应商物料编码
*/
@Column(name = "IDNLF")
private String idnlf;
/**
* 名称 1
*/
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapResult.java
View file @ ecd23e26
......@@ -22,4 +22,9 @@ public class SapResult implements Serializable {
*/
private String MESSAGE;
/**
* 申请编号
*/
private String MESSAGE_V1;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/SapPaymentApplication.java
View file @ ecd23e26
......@@ -42,4 +42,14 @@ public interface SapPaymentApplication {
* @throws IOException
*/
List<Map<String,Object>> getCompanyOrders(String BUKRS) throws IOException;
/**
* 根据公司代码、BP(合作伙伴）、付款申请类别查询订单
* @param BUKRS
* @param PARTNER
* @param ZEP_FTYPE
* @return
* @throws IOException
*/
List<Map<String,Object>> getPurchaseOrders(String BUKRS,String PARTNER,String ZEP_FTYPE) throws IOException;
}
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapPaymentApplicationImpl.java
View file @ ecd23e26
......@@ -110,4 +110,27 @@ public class SapPaymentApplicationImpl implements SapPaymentApplication {
}
return mapList;
}
@Override
public List<Map<String, Object>> getPurchaseOrders(String BUKRS, String PARTNER, String ZEP_FTYPE) throws IOException {
Map<String,Object> param = new HashMap<>();
param.put("BUKRS",BUKRS);
param.put("PARTNER",PARTNER);
param.put("ZEP_FTYPE",ZEP_FTYPE);
String execute = null;
List<Map<String,Object>> mapList = new ArrayList<>();
try {
execute = httpClient.execute(param, "search/sch_partner_pur");
Map<String, Object> map = JSONObject.parseObject(execute, Map.class);
SapResult sapResult = JSONObject.parseObject(JSONUtil.toJsonStr(map.get("MSG")), SapResult.class);
if ("S".equals(sapResult.getTYPE())) {
mapList = (List<Map<String,Object>>)JSONArray.parse(JSONUtil.toJsonStr(map.get("RDATA")));
} else {
throw new RuntimeException("查询供应商采购订单信息失败：" + sapResult.getMESSAGE());
}
} catch (IOException e) {
throw new RuntimeException("查询供应商采购订单信息出错”。");
}
return mapList;
}
}
topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java
View file @ ecd23e26
......@@ -299,6 +299,8 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
resultMap.put("sequence", resultMap.get("row"));
sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
if ("S".equals(resultMap.get("TYPE"))) {
suppliersInfo.setPartner((String) resultMap.get("MESSAGE_V1"));
suppliersInfoRepository.save(suppliersInfo);
} else {
throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));
}
......
topsun/src/main/resources/config/topsun/sap/costCenter/costCenter.xml
View file @ ecd23e26
......@@ -11,9 +11,13 @@
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="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>
</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