Skip to content

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

物料/产品接口数据修改 数据字典转EASYSEARCH控件

parent b33f1ed6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 44 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.js
View file @ 8da7ccbf
......@@ -184,7 +184,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
//_self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.js
View file @ 8da7ccbf
......@@ -185,7 +185,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
// _self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.js
View file @ 8da7ccbf
......@@ -201,7 +201,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
//_self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.js
View file @ 8da7ccbf
......@@ -237,7 +237,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
// _self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ 8da7ccbf
......@@ -91,7 +91,7 @@
<x:inputC name="bstmi" label="最小批量" labelCol="1" fieldCol="2"/>
<x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
<x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
<x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz"/>
<x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz" required="true"/>
<x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
<x:inputC name="lgproName" label="默认生产库存地" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgpro"/>
......@@ -102,7 +102,7 @@
<x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/>
<x:inputC name="plifz" label="外部采购交货时间" labelCol="1" fieldCol="2"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2"/>
<x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
<x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="true" dictionary="mtvfp"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMass.js
View file @ 8da7ccbf
......@@ -107,7 +107,7 @@ function loadGrid() {
$("#specifications").attr("disabled",true);
$("#materialUsage").attr("disabled",true);
UICtrl.disable($("#werks"));
UICtrl.disable($("#werksName"));
UICtrl.disable($("#materialUsage"));
UICtrl.disable($("#baseUnit"));
UICtrl.disable($("#itemAttributes"));
......@@ -184,7 +184,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
// _self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMass.jsp
View file @ 8da7ccbf
......@@ -78,7 +78,8 @@
<x:title title="维护质量信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:hidden name="werks"/>
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="kzdkz" label="文档要求" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="art" label="检验类型" labelCol="1" fieldCol="2" required="true"/>
<x:selectC name="aktiv" label="激活标识" labelCol="1" fieldCol="2" dictionary="suppliesType" required="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.js
View file @ 8da7ccbf
......@@ -188,6 +188,7 @@ function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
var _self = this;
$('#submitForm').ajaxSubmit({
......@@ -196,7 +197,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
//_self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.js
View file @ 8da7ccbf
......@@ -112,7 +112,8 @@ function loadGrid() {
UICtrl.disable($("#businessUsage"));
UICtrl.disable($("#baseUnit"));
UICtrl.disable($("#itemAttributes"));
let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1;
// let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1;
// let length = dept.length;
// let dept=$("#businessUsage").val().split(",");
// let a=(dept.length+1)*37.5;
......@@ -155,12 +156,12 @@ function loadGrid() {
],
dataAction: "server",
url: web_app.name + '/sapNonProdApplyNext/slicedDeptList.ajax',
parms: {dept: $("#businessUsage").val(), id: $("#applyDeptId").val()},
parms: {dept: $("#businessUsage").val(),deptId: $("#applyDeptId").val(),id:$("#id").val()},
pageSize: 20,
usePager: false,
enabledEdit: true,
width: "100%",
height: coRowNum * 37.5,
height: "80%",//coRowNum * 37.5,
heightDiff: -8,
fixedCellHeight: true,
selectRowButtonOnly: true,
......@@ -185,7 +186,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
// _self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.jsp
View file @ 8da7ccbf
......@@ -78,8 +78,8 @@
<x:title title="维护采购信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="werks"/>
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="bstmeName" label="采购计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="bstme"/>
<x:inputC name="umrenPurch" label="转换分母" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.js
View file @ 8da7ccbf
......@@ -216,7 +216,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
// _self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.js
View file @ 8da7ccbf
......@@ -211,7 +211,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
//_self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyWarehouse.js
View file @ 8da7ccbf
......@@ -190,7 +190,10 @@ function saveForm(status) {
success: function (data) {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
//_self.close();
if (status==1) {
$("#buttonBox").remove();
}
UICtrl.reloadTabById('homepage');
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ 8da7ccbf
......@@ -390,9 +390,9 @@ function loadSuppliersBankListGrid() {
required: true, type: "select",
data: {
type: 'system',
name: "countrySelect",
name: "dictionarySelect",
getParam: function (item) {
return {fieldName: "name"}
return {fieldName: "country",displayNames:"国家",displayLens:"180"}
},
// checkbox:true,
// checkboxIndex:'value',
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ 8da7ccbf
......@@ -155,15 +155,16 @@ public class ResourceSearchController {
return model;
}
@EasySearch(queryName = "countrySelect")
public Map<String, Object> countrySelect(SDO sdo) throws IOException {
@EasySearch(queryName = "dictionarySelect")
public Map<String, Object> dictionarySelect(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
String filterValue = sdo.getString("filterValue");
SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
queryRequest.setWerks(filterValue);
Map maps = dictionaryApplication.querySysDictionaryDetailsByCode("country");
// List<Map<String,String>> mapList =(List<Map<String,String>>)maps.get("Rows");
// List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest);
String fieldName = sdo.getString("fieldName");
String []displayName=sdo.getString("displayNames").split(",");
String []displayLen=sdo.getString("displayLens").split(",");
// SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
// queryRequest.setWerks(filterValue);
Map maps = dictionaryApplication.querySysDictionaryDetailsByCode(fieldName);
ObjectMapper objectMapper = SAPUtils.objectMapper();
List<Map<String,String>> mapList = objectMapper.readValue(JSONUtil.toString(maps.get("Rows")), new TypeReference<List<Map<String, String>>>() {});
......@@ -187,24 +188,20 @@ public class ResourceSearchController {
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("国家", "name", "string", 200L),
new QuerySchemeField("代码", "value", "string", 200L)
// new QuerySchemeField("物料名称", "MAKTX", "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)
);
List<QuerySchemeField> fields=new ArrayList<>();
fields.add(new QuerySchemeField(displayName[0], "name", "string", Long.valueOf(displayLen[0])));
if (displayName.length>1){
fields.add(new QuerySchemeField(displayName[1], "value", "string", Long.valueOf(displayLen[1])));
} else {
fields.add(new QuerySchemeField("", "value", "hidden", 0L));
}
Long widths=0L;
for (int u=0;u<displayLen.length;u++){
widths+=Long.valueOf(displayLen[u]);
}
easySearchParse.setFields(fields);
easySearchParse.setWidth(450L);
easySearchParse.setWidth(widths);
MemEasySearcher<Map<String, String>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model;
......
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