Skip to content

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

品质异常单根据异常类型获取订单类型

parent a9c43afa
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 38 deletions
huigou-xt/src/main/webapp/lib/jquery/jquery.attachment.js
View file @ f5e2150c
......@@ -898,7 +898,7 @@
},
afterUpload:function(data){
var div=$(_self.element).find('div.'+attachmentCode);
_self.addFile(data,div);
_self.addFile(data,div); alert(0);
if($.isFunction(afterUpload)){
afterUpload.call(window,data);
}
......@@ -1181,10 +1181,19 @@
this.disabled = true;
var $el=$(this.element);
$el.find('.ui-upload-button-span').hide();
var addEl=$(this);
if(!flag){//是否显示上传按钮
$el.find('.addFile').hide();
$el.find('.addFieldGroup').hide();
$el.find('.addBatchFile').hide();
if (addEl[0].options.bizCode=='exceptionStateInfo') {
if (addEl[0].options.readOnly==true){
$el.find('.addFile').hide();
$el.find('.addFieldGroup').hide();
$el.find('.addBatchFile').hide();
}
} else {
$el.find('.addFile').hide();
$el.find('.addFieldGroup').hide();
$el.find('.addBatchFile').hide();
}
}
$el.find('.delFile').hide();
this.bindContextMenu();
......
topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsDetail.js
View file @ f5e2150c
......@@ -141,8 +141,8 @@ function loadGrid() {
function setId(id) {
$("#id").val(id);
// var _grid=UICtrl.getGridManager('#maingrid');
// _grid.options.parms.componentSupplyId = id;
var _grid=UICtrl.getGridManager('#maingrid');
_grid.options.parms.clientMaterialsId = id;
$('#clientMaterialsInfoList').fileList({
bizId : id
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js
View file @ f5e2150c
......@@ -179,8 +179,9 @@ function initProduceGrid() {
return false
}
return {
werks: $('#werks').val(),
kunnr: $('#customerNo').val()
werks: $('#werks').val(),
kunnr: $('#customerNo').val(),
reasonType:$('#exceptionReasonType').val()
}
},
onChange: function (value, data) {
......@@ -260,7 +261,7 @@ function getGridColumns() {
{
display: "生产单号", name: "produceNo", width: "160", align: "left", type: "string",
editor: {
required: true, type: "select",
required: false, type: "select",
data: {
type: 'system',
name: "sapCustomerProduceNo",
......@@ -272,7 +273,7 @@ function getGridColumns() {
return {
werks: $("#werks").val(),
kunnr: $("#customerNo").val(),
vbeln: $("#customerOrderNo").val()
vbeln: $("#customerOrderNo").val(),
}
},
back: {
......@@ -288,29 +289,23 @@ function getGridColumns() {
}
}
},
{
display: "产品编码", name: "productCode", width: "160", align: "left", type: "string"
//,editor: {type: 'text'}
{display: "产品编码", name: "productCode", width: "160", align: "left", type: "string"
,editor: {type: 'text'}
},
{
display: "产品名称", name: "productName", width: "200", align: "left", type: "string"
//,editor: {type: 'text'}
{display: "产品名称", name: "productName", width: "200", align: "left", type: "string"
,editor: {type: 'text'}
},
{
display: "数量", name: "number", width: "100", align: "left", type: "string"
//,editor: {type: "text",mask: '9999999.999'}
{display: "数量", name: "number", width: "100", align: "left", type: "string"
,editor: {type: "text",mask: '9999999.999'}
},
{
display: "单位", name: "unitName", width: "80", align: "left", type: "string"
//editor: {type: "text"}
{display: "单位", name: "unitName", width: "80", align: "left", type: "string"
,editor: {type: "text"}
},
{
display: "币别", name: "currencyName", width: "100", align: "left", type: "string"
//editor: {type: "text"}
{display: "币别", name: "currencyName", width: "100", align: "left", type: "string"
,editor: {type: "text"}
},
{
display: "金额", name: "money", width: "100", align: "left", type: "string"
//editor: {type: "text",mask: '9999999.999'}
{display: "金额", name: "money", width: "100", align: "left", type: "string"
,editor: {type: "text",mask: '9999999.999'}
},
{
display: "折算金额", name: "rmbMoney", width: "100", align: "left", type: "string",
......@@ -319,9 +314,8 @@ function getGridColumns() {
// {
// display: "总金额", name: "totalMoney", width: "100", align: "left", type: "string"
// },
{
display: "出货日期", name: "sendDate", width: "140", align: "left", type: "date"
//editor: {type: "date"}
{display: "出货日期", name: "sendDate", width: "140", align: "left", type: "date"
,editor: {type: "date"}
}
]
return columns;
......
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.jsp
View file @ f5e2150c
......@@ -65,7 +65,7 @@
<div class="hg-form-cols" id="produceDiv">
<div class="hg-form-row">
<x:inputC name="customerNo" label="客户编号" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="customerOrderNo" label="生产订单号" labelCol="1" fieldCol="2" wrapper="select" required="false"/>
<x:inputC name="customerOrderNo" label="生产订单号/销售订单号" labelCol="2" fieldCol="4" wrapper="select" required="false"/>
<x:inputC name="customerName" label="客户名称" labelCol="1" fieldCol="2" required="false" readonly="true"/>
</div>
<x:title title="单号信息" name="group" hideTable="#info" />
......
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java
View file @ f5e2150c
......@@ -85,13 +85,24 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
vbelnList.add(signVo);
orderQueryVo.setVBELN(vbelnList);
}
if ("3".equals(queryRequest.getReasonType())){ //如果是客户异常
List <SignVo>auartList=new ArrayList<>();
signVo=new SignVo();
signVo.setLow("ZDO");
auartList.add(signVo);
SignVo signVo2=new SignVo();
signVo2.setLow("ZEO");
auartList.add(signVo2);
orderQueryVo.setAUART(auartList);
}
}
if (StringUtils.isNotBlank(queryRequest.getVbeln())) { //客户销售订单号
signVo=new SignVo();
signVo.setLow(queryRequest.getVbeln());
List <SignVo> vbelnList=new ArrayList<>();
vbelnList.add(signVo);
orderQueryVo.setVBELN(vbelnList);
signVo.setLow(queryRequest.getVbeln());
List <SignVo> vbelnList=new ArrayList<>();
vbelnList.add(signVo);
orderQueryVo.setVBELN(vbelnList);
}
Object obj = JSONObject.toJSON(orderQueryVo);
try {
......@@ -127,8 +138,8 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
} else if (StringUtils.isNotBlank(queryRequest.getKunnr())) { //查询订单号
for (Map map : mapList) {
Map newMap = new HashMap();
//newMap.put("VBELN", map.get("VBELN"));
newMap.put("VBELN", map.get("BSTNK")); //09.21冯朝阳要求改为BSTNK
// newMap.put("VBELN", map.get("VBELN")); //销售订单号
newMap.put("VBELN", map.get("BSTNK")); //09.21冯朝阳要求改为BSTNK 如果是客户异常需要 增加过滤条件"AUART"字段值是: "ZDO"或者"ZEO" 返回是BSTNK
newMap.put("KUNNR", map.get("KUNNR"));
newMap.put("NAME1", map.get("NAME1"));
sapOrderVoList.add(newMap);
......
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/domain/query/SapDialogOrderQuery.java
View file @ f5e2150c
......@@ -16,6 +16,9 @@ public class SapDialogOrderQuery {
private String werks; //工厂
private String reasonType; //异常原因类型
private String paramValue;
}
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/domain/vo/OrderQueryVo.java
View file @ f5e2150c
......@@ -14,4 +14,7 @@ public class OrderQueryVo {
@JSONField(name="VBELN")
private List<SignVo> VBELN;
@JSONField(name="AUART")
private List<SignVo> AUART;
}
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