Skip to content

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

财务客户：付款条件查询SAP数据字典

parent fedc777a
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 23 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.js
View file @ 0b669f8f
......@@ -134,34 +134,41 @@ function loadFinaCustomerPayListGrid() {
},
{
display: "根据分配号排序代码", name: "zuawaName", width: 150, minWidth: 60, type: "String", align: "left",
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "ZUAWA"}
// },
// back: {
// ZUAWA: "zuawa",
// TTEXT: "zuawaName"
// },
//
// },
// }
},
{
display: "付款条件", name: "zterm", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
required: true, type: "select",
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZUAWA"}
return {fieldName: "ZTERM"}
},
back: {
ZUAWA: "zuawa",
TTEXT: "zuawaName"
},
ZTERM: "zterm",
TEXT1: "ztermName",
}
},
}
},
{
display: "付款条件", name: "ztermTextView", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
type: 'dictionary',
data: {name: 'zterm'},
textField: 'ztermTextView',
valueField: 'zterm',
required: false,
render: function (item) {
return item.ztermTextView;
}
},
display: "付款条件描述", name: "ztermName", width: 100, minWidth: 60, type: "String", align: "left"
},
{
display: "考虑的付款方式清单", name: "zwelsTextView", width: 140, minWidth: 60, type: "String", align: "left",
......@@ -375,7 +382,7 @@ function checkConstraints(){
if (!datas) {
return false;
}
if (isApproveProcUnit() && datas.length == 0 && "2" != getHandleResult()){
if (isApplyProcUnit() && datas.length == 0 ){
Public.tip("财务客户银行信息必填");
return false;
}
......@@ -390,8 +397,8 @@ function checkConstraints(){
if (!datas) {
return false;
}
if (isApproveProcUnit() && datas.length == 0 && "2" != getHandleResult()){
Public.tip("财务客户付款信息必填");
if (isApplyProcUnit() && datas.length == 0){
Public.tip("财务客户公司信息必填");
return false;
}
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.jsp
View file @ 0b669f8f
......@@ -72,7 +72,7 @@
<x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2" maxLength="30"/>
</div>
<div class="hg-form-row">
<x:inputC name="lifnr" label="供应商" labelCol="1" fieldCol="2" maxLength="30"/>
<%--<x:inputC name="lifnr" label="供应商" labelCol="1" fieldCol="2" maxLength="30"/>--%>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" maxLength="30"/>
<x:hidden name="taxType"/>
<x:inputC name="taxTypeName" label="税号类型" labelCol="1" fieldCol="2" maxLength="30" wrapper="select"/>
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ 0b669f8f
......@@ -219,6 +219,74 @@ public class ResourceSearchController {
return model;
}
@EasySearch(queryName = "sapMaterialSelect2")
public Map<String, Object> sapMaterialSelect2(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
String filterValue = sdo.getString("filterValue");
String filterValue2 = sdo.getString("filterValue2");
SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
queryRequest.setWerks(filterValue);
List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest);
queryRequest.setWerks(filterValue2);
List<Map<String,String>> mapList2 = sapMaterialApplication.getSapMaterial(queryRequest);
if (CollectionUtil.isNotEmpty(mapList)){
if (StringUtil.isNotBlank(param)){//模糊条件过滤
mapList = mapList
.stream()
.filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
.collect(Collectors.toList());
}
}
if (CollectionUtil.isNotEmpty(mapList2)){
if (StringUtil.isNotBlank(param)){//模糊条件过滤
mapList2 = mapList2
.stream()
.filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
.collect(Collectors.toList());
}
}
Set<String> matnrSet = mapList.stream().map(map -> {
return map.get("MATNR");
}).collect(Collectors.toSet());
Set<String> matnrSet2 = mapList2.stream().map(map -> {
return map.get("MATNR");
}).collect(Collectors.toSet());
List<String> collect = matnrSet.stream().filter(matnrSet2::contains).collect(Collectors.toList());
mapList = mapList.stream().filter(map -> collect.contains(map.get("MATNR"))).collect(Collectors.toList());
Integer intPage = sdo.getInteger("intPage", 1);
Integer pageSize = sdo.getInteger("pageSize",10);
PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);
EasySearchParse easySearchParse = new EasySearchParse();
List<QuerySchemeField> fields =
Arrays.asList(
//new QuerySchemeField("工厂", "WERKS", "string", 60L),
//new QuerySchemeField("工厂名称", "NAME1", "string", 160L),
new QuerySchemeField("物料编码", "MATNR", "string", 140L),
new QuerySchemeField("物料名称", "MAKTX", "string", 200L),
new QuerySchemeField("物料分类", "MTART", "string", 100L),
new QuerySchemeField("物料分类描述", "MTBEZ", "string", 200L),
new QuerySchemeField("库存地点", "LGFSB", "string", 100L),
new QuerySchemeField("库存地点名称", "LGOBE", "string", 200L),
new QuerySchemeField("物料组", "MATKL", "string", 100L),
new QuerySchemeField("物料组名称", "WGBEZ", "string", 200L),
new QuerySchemeField("基本计量单位", "MEINS", "string", 100L),
new QuerySchemeField("基本计量单位名称", "MSEHL", "string", 100L),
new QuerySchemeField("采购组", "EKGRP", "string", 100L),
new QuerySchemeField("采购组名称", "EKNAM", "string", 200L),
new QuerySchemeField("价格基数", "PEINH", "string", 100L)
);
easySearchParse.setFields(fields);
easySearchParse.setWidth(500L);
MemEasySearcher<Map<String, String>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model;
}
@EasySearch(queryName = "sapCustomerOrderSelect")
public Map<String, Object> sapCustomerOrderSelect(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
......
topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/domain/FinaCustomerPay.java
View file @ 0b669f8f
......@@ -64,6 +64,12 @@ public class FinaCustomerPay implements Serializable {
@Column(name = "zterm")
private String zterm;
/**
* 付款条件描述
*/
@Column(name = "zterm_name")
private String ztermName;
/**
* 对公司代码过帐冻结
*/
......
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java
View file @ 0b669f8f
......@@ -50,9 +50,10 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
ObjectMapper objectMapper = SAPUtils.objectMapper();
sapMaterialVoList = objectMapper.readValue(JSONUtil.toString(map.get("RDATA")), new TypeReference<List<Map<String, String>>>() {});
//sapMaterialVoList = (List<Map<String,String>>) JSONArray.parse(JSONUtil.toString(map.get("RDATA")));
}else {
throw new RuntimeException("查询物料失败："+sapResult.getMESSAGE());
}
// else {
// throw new RuntimeException("查询物料失败："+sapResult.getMESSAGE());
// }
return sapMaterialVoList;
}
......
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