Commit 28b62171 authored by 1650842865's avatar 1650842865

领料申请增加物料组

parent ca2b3d05
...@@ -98,6 +98,26 @@ function loadGrid() { ...@@ -98,6 +98,26 @@ function loadGrid() {
{ {
display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left", display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",
}, },
{
display: "物料组", name: "wgbez", width: 160, align: "left", type: "string",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {
fieldName: "MATKL",
//filterValue: $("#werks").val()
}
},
back: {
MATKL: "matkl",
WGBEZ: "wgbez",
}
},
}
},
{ {
display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left", display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left",
editor: { editor: {
...@@ -108,6 +128,7 @@ function loadGrid() { ...@@ -108,6 +128,7 @@ function loadGrid() {
getParam: function (item) { getParam: function (item) {
return { return {
filterValue:$("#werks").val(), filterValue:$("#werks").val(),
matkl:item.matkl,
mtart:"ZGMB" mtart:"ZGMB"
} }
}, },
......
...@@ -34,6 +34,8 @@ function loadGrid() { ...@@ -34,6 +34,8 @@ function loadGrid() {
{display: "内部订单编号", name: "aufnr", width: 100, minWidth: 60, type: "string", align: "left"}, {display: "内部订单编号", name: "aufnr", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"}, {display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",}, {display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",},
{display: "物料组编码", name: "matkl", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "物料组描述", name: "wgbez", width: 160, minWidth: 60, type: "string", align: "left"},
{display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left"}, {display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left"},
{display: "SAP物料名称", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",}, {display: "SAP物料名称", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
{display: "物料要求描述", name: "matxt", width: 300, minWidth: 60, type: "string", align: "left",}, {display: "物料要求描述", name: "matxt", width: 300, minWidth: 60, type: "string", align: "left",},
......
...@@ -133,8 +133,10 @@ public class ResourceSearchController { ...@@ -133,8 +133,10 @@ public class ResourceSearchController {
String param = sdo.getString("paramValue"); String param = sdo.getString("paramValue");
String filterValue = sdo.getString("filterValue"); String filterValue = sdo.getString("filterValue");
String mtart = sdo.getString("mtart");//如果传了刀模板具,就排除掉 String mtart = sdo.getString("mtart");//如果传了刀模板具,就排除掉
String matkl = sdo.getString("matkl");//物料组
SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class); SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
queryRequest.setWerks(filterValue); queryRequest.setWerks(filterValue);
queryRequest.setMatkl(matkl);
List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest); List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest);
// if (CollectionUtil.isNotEmpty(mapList)){ // if (CollectionUtil.isNotEmpty(mapList)){
// mapList = mapList // mapList = mapList
......
...@@ -30,6 +30,17 @@ public class NonProducePickItem extends AbstractEntity { ...@@ -30,6 +30,17 @@ public class NonProducePickItem extends AbstractEntity {
*/ */
@Column(name = "RSPOS") @Column(name = "RSPOS")
private String rspos; private String rspos;
/**
* 物料组
*/
@Column(name = "MATKL")
private String matkl;
/**
* 物料组描述
*/
@Column(name = "WGBEZ")
private String wgbez;
/** /**
*物料 *物料
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
t.message, t.message,
pi.id as item_id, pi.id as item_id,
pi.rspos, pi.rspos,
pi.matkl,
pi.wgbez,
pi.matnr, pi.matnr,
pi.maktx, pi.maktx,
pi.lgort, pi.lgort,
......
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