Skip to content

T
topsun-bpm
Commit 1f624f31 authored by 1650842865's avatar 1650842865
Browse files
Options

供应商子范围隐藏工厂字段

parent ddd9bf79
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 64 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js
View file @ 1f624f31
......@@ -106,7 +106,7 @@ function bindEvent(){
getParam: function (item) {
return {
partner: $('#lifnr').val(),
werks: $('#werks').val()
// werks: $('#werks').val()
}
},
onChange: function (value, data) {
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ 1f624f31
......@@ -332,27 +332,27 @@ function getItemPeriodColumns(){
display: "供应商子范围描述", name: "ltsbz", width: 120, minWidth: 60, type: "String", align: "left",
//editor: {type: 'text', required: true}
},)
columns.push({
display: "工厂", name: "werks", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
back: {
WERKS: "werks",
NAME1: "name1"
},
},
}
},)
columns.push({
display: "工厂名称", name: "name1", width: 200, minWidth: 60, type: "String", align: "left",
},)
// columns.push({
// display: "工厂", name: "werks", width: 100, minWidth: 60, type: "String", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "WERKS"}
// },
// back: {
// WERKS: "werks",
// NAME1: "name1"
// },
//
// },
// }
// },)
// columns.push({
// display: "工厂名称", name: "name1", width: 200, minWidth: 60, type: "String", align: "left",
// },)
columns.push({
display: "货币码", name: "waersTextView", width: 140, minWidth: 60, type: "String", align: "left",
editor: {
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.js
View file @ 1f624f31
......@@ -286,27 +286,27 @@ function getItemPeriodColumns(){
display: "供应商子范围描述", name: "ltsbz", width: 120, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},)
columns.push({
display: "工厂", name: "werks", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
back: {
WERKS: "werks",
NAME1: "name1"
},
},
}
},)
columns.push({
display: "工厂名称", name: "name1", width: 200, minWidth: 60, type: "String", align: "left",
},)
// columns.push({
// display: "工厂", name: "werks", width: 100, minWidth: 60, type: "String", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "WERKS"}
// },
// back: {
// WERKS: "werks",
// NAME1: "name1"
// },
//
// },
// }
// },)
// columns.push({
// display: "工厂名称", name: "name1", width: 200, minWidth: 60, type: "String", align: "left",
// },)
columns.push({
display: "货币码", name: "waersTextView", width: 140, minWidth: 60, type: "String", align: "left",
editor: {
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ 1f624f31
......@@ -825,7 +825,7 @@ public class ResourceSearchController {
@EasySearch(queryName = "selectSupplierWaers")
public Map<String, Object> selectSupplierWaers(SDO sdo) {
String param = sdo.getString("partner");
String werks = sdo.getString("werks");
//String werks = sdo.getString("werks");
List<Map<String, String>> mapList = new ArrayList<>();
List<Map<String, Object>> maps = suppliersDataApplication.selectSupplierWaers(param);
String result = JSONUtil.toString(maps);
......@@ -835,19 +835,19 @@ public class ResourceSearchController {
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
if (StringUtil.isNotBlank(werks)){
mapList = mapList
.stream()
.filter(map -> (map.get("werks").equals(werks) || StringUtil.isBlank(map.get("werks"))))
.collect(Collectors.toList());
}
// if (StringUtil.isNotBlank(werks)){
// mapList = mapList
// .stream()
// .filter(map -> (map.get("werks").equals(werks) || StringUtil.isBlank(map.get("werks"))))
// .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", 100L),
//new QuerySchemeField("工厂", "werks", "string", 100L),
new QuerySchemeField("供应商子范围", "ltsnr", "string", 150L),
new QuerySchemeField("供应商子范围描述", "ltsbz", "string", 150L),
new QuerySchemeField("货币码", "waers", "string", 100L),
......
topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java
View file @ 1f624f31
......@@ -484,7 +484,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
@Override
public List<Map<String, Object>> selectSupplierWaers(String partner) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "selectSupplierWaers");
return this.sqlExecutorDao.queryToListMap(queryDescriptor.getSql(),partner);
return this.sqlExecutorDao.queryToListMap(queryDescriptor.getSql(),partner,partner,partner,partner,partner, partner,partner);
}
//删除数据
......
topsun/src/main/resources/config/topsun/sap/sapSuppliersData/suppliersData.xml
View file @ 1f624f31
......@@ -52,18 +52,38 @@
<query name="selectSupplierWaers" label="根据供应商编码查询货币码" table="sap_suppliers_item_period">
<sql-query>
select * from (
SELECT DISTINCT i.partner, '' AS ltsbz, '' AS ltsnr, b.waers, d1.`NAME` as waers_name,'' as werks
SELECT * FROM
( SELECT DISTINCT i.partner, '' AS ltsbz, '' AS ltsnr, b.waers, d1.`NAME` AS waers_name, '' AS werks
FROM sap_suppliers_buyer b
LEFT JOIN sap_suppliers_info i ON i.id = b.s_id
LEFT JOIN sa_dictionarydetail d1 ON d1.`VALUE` = b.waers AND d1.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
where i.STATUS = 3 AND i.apply_type != - 1
UNION
SELECT DISTINCT i.partner, p.ltsbz, p.ltsnr, p.waers, d2.`NAME` as waers_name,p.werks
LEFT JOIN ( SELECT id, partner FROM sap_suppliers_info WHERE STATUS = 3 AND partner LIKE concat('%',?,'%')
AND ( apply_type = 2 OR ID =
<!--获取原数据ID：优先取type=1，否则取type=0的最新记录-->
( SELECT COALESCE
(
( SELECT ID FROM sap_suppliers_info WHERE partner LIKE concat('%',?,'%') AND apply_type = 1 ORDER BY ID DESC LIMIT 1 ),
( SELECT ID FROM sap_suppliers_info WHERE partner LIKE concat('%',?,'%') AND apply_type = 0 ORDER BY ID DESC LIMIT 1 )
)
)
)
ORDER BY apply_type
) i ON i.id = b.s_id
LEFT JOIN sa_dictionarydetail d1 ON d1.`VALUE` = b.waers AND d1.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003' UNION
SELECT DISTINCT i.partner, p.ltsbz, p.ltsnr, p.waers, d2.`NAME` AS waers_name, p.werks
FROM sap_suppliers_item_period p
LEFT JOIN sap_suppliers_info i ON i.id = p.s_id
LEFT JOIN ( SELECT id, partner FROM sap_suppliers_info WHERE STATUS = 3 AND partner LIKE concat('%',?,'%')
AND ( apply_type = 2 OR ID =
<!--获取原数据ID：优先取type=1，否则取type=0的最新记录-->
( SELECT COALESCE
(
( SELECT ID FROM sap_suppliers_info WHERE partner LIKE concat('%',?,'%') AND apply_type = 1 ORDER BY ID DESC LIMIT 1 ),
( SELECT ID FROM sap_suppliers_info WHERE partner LIKE concat('%',?,'%') AND apply_type = 0 ORDER BY ID DESC LIMIT 1 )
)
)
)
ORDER BY apply_type
) i ON i.id = p.s_id
LEFT JOIN sa_dictionarydetail d2 ON d2.`VALUE` = p.waers AND d2.DICTIONARY_ID = 'b1d786efdd2911eea8a50242ac110003'
where i.STATUS = 3 AND i.apply_type != - 1 ) i where 1=1 and i.partner like concat('%',?,'%')
) i WHERE i.partner like concat('%',?,'%')
</sql-query>
</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