Skip to content

T
topsun-bpm
Commit 26b601c4 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

公司内跨工厂存货调拨申请单接口调试

parent 6446174d
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 54 deletions
huigou-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp
View file @ 26b601c4
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<div class="col-md-8"> <div class="col-md-8">
<x:inputC name="email" id="email" label="电子邮件" required="true" labelCol="2" fieldCol="4" maxlength="64" match="email"/> <x:inputC name="email" id="email" label="电子邮件" required="false" labelCol="2" fieldCol="4" maxlength="64" match="email"/>
<x:inputC name="qq" id="qq" label="QQ" labelCol="2" fieldCol="4" match="qq" maxlength="20"/> <x:inputC name="qq" id="qq" label="QQ" labelCol="2" fieldCol="4" match="qq" maxlength="20"/>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.js
View file @ 26b601c4
...@@ -98,14 +98,7 @@ function loadGrid() { ...@@ -98,14 +98,7 @@ function loadGrid() {
columns: [ columns: [
{ {
display: "行号", name: "ebelp", width: 100, minWidth: 60, type: "String", align: "left" display: "行号", name: "ebelp", width: 100, minWidth: 60, type: "String", align: "left"
// editor: {type: 'spinner', min: 1, max: 100, mask: 'nn'}
}, },
// { display: "项目类别", name: "epstp", width: 380, minWidth: 200, type: "string", align: "left",
// editor: { type: "text",required: true }
// },
// { display: "物料", name: "matnr", width: 140, minWidth: 60, type: "string", align: "left",
// editor: { type: "text",required: true }
// },
{display: "物料", name: "matnr", width: "160", align: "left", type: "string", {display: "物料", name: "matnr", width: "160", align: "left", type: "string",
editor: { editor: {
required: true, type: "select", required: true, type: "select",
...@@ -119,18 +112,9 @@ function loadGrid() { ...@@ -119,18 +112,9 @@ function loadGrid() {
}, },
back: { back: {
MATNR: "matnr", MATNR: "matnr",
// MAKTX: "maktx", MAKTX: "matnrName",
MAKTX: "matnrName" MEINS: "meins",
// MATKL: "matkl" MSEHL: "meinsName"
// WGBEZ: "matklName"
// EKGRP: "ekgrp",
// EKNAM: "ekgrpName",
// PEINH: "peinh",
// MEINS: "meins",
// MSEHL: "meinsName",
// LGORT: "lgort",
// LGOBE: "lgobe"
} }
}, },
} }
...@@ -176,25 +160,6 @@ function loadGrid() { ...@@ -176,25 +160,6 @@ function loadGrid() {
} }
}, },
{display: "库存地点名称", name: "lgortName", width: "200", align: "left", type: "string"}, {display: "库存地点名称", name: "lgortName", width: "200", align: "left", type: "string"},
// {display: "收货工厂", name: "werks", width: "100", align: "left", type: "string",
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "WERKS"}
// },
// back: {
// WERKS: "werks",
// NAME1: "werksName"
// }
// },
// }
// },
// {display: "工厂名称", name: "werksName", width: "200", align: "left", type: "string",
// editor: {required: false, type: "text"}
// },
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/sapStockTransfersItem/querySapStockTransfersItems.ajax', url: web_app.name + '/sapStockTransfersItem/querySapStockTransfersItems.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.jsp
View file @ 26b601c4
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<x:script src='/biz/topsun/sap/transfers/sapStockTransfersDetail.js'/> <x:script src='/biz/topsun/sap/transfers/sapStockTransfersDetail.js'/>
</head> </head>
<body> <body>
<x:billTitle title="存货转移单" needStatus="false" needPerson="true"/> <x:billTitle title="公司内跨工厂存货调拨申请单" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/> <x:hidden name="id"/>
<x:hidden name="billCode"/> <x:hidden name="billCode"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersList.js
View file @ 26b601c4
...@@ -30,6 +30,8 @@ function loadGrid() { ...@@ -30,6 +30,8 @@ function loadGrid() {
{display: "采购组织", name: "ekorgName", width: 200, minWidth: 60, type: "string", align: "left"}, {display: "采购组织", name: "ekorgName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "采购组", name: "ekgrpName", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "采购组", name: "ekgrpName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "公司代码", name: "burksName", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "公司代码", name: "burksName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "凭证编号", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/sapStockTransfers/slicedSapStockTransfersList.ajax', url: web_app.name + '/sapStockTransfers/slicedSapStockTransfersList.ajax',
...@@ -86,7 +88,7 @@ function deleteHandler() { ...@@ -86,7 +88,7 @@ function deleteHandler() {
function addHandler() { function addHandler() {
UICtrl.addTabItem({ UICtrl.addTabItem({
tabid: 'addSapStockTransfers', tabid: 'addSapStockTransfers',
text: "新增存货转移单", text: "新增公司内跨工厂存货调拨申请单",
url: web_app.name + '/sapStockTransfers/forwardSapStockTransfersDetail.job' url: web_app.name + '/sapStockTransfers/forwardSapStockTransfersDetail.job'
}); });
} }
...@@ -95,7 +97,7 @@ function addHandler() { ...@@ -95,7 +97,7 @@ function addHandler() {
function doView(id) { function doView(id) {
UICtrl.addTabItem({ UICtrl.addTabItem({
tabid: 'viewSapTransfers'+id, tabid: 'viewSapTransfers'+id,
text: "存货转移单", text: "公司内跨工厂存货调拨申请单",
url: web_app.name + '/sapStockTransfers/showStockTransfers.job?bizId='+id+"&isReadOnly=true" url: web_app.name + '/sapStockTransfers/showStockTransfers.job?bizId='+id+"&isReadOnly=true"
}); });
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersList.jsp
View file @ 26b601c4
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="ui-hide"> <div class="ui-hide">
</div> </div>
<div id="layout"> <div id="layout">
<div position="center" title="存货转移申请单"> <div position="center" title="公司内跨工厂存货调拨申请单">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/> <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm"> <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:hidden name="templetId" value="sapFixedRetirementData"/> <x:hidden name="templetId" value="sapFixedRetirementData"/>
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/application/impl/SapStockTransfersApplicationImpl.java
View file @ 26b601c4
...@@ -130,7 +130,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS ...@@ -130,7 +130,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
SapStockTransfersVO sapStockTransfersVO=new SapStockTransfersVO(); SapStockTransfersVO sapStockTransfersVO=new SapStockTransfersVO();
BeanUtil.copyProperties(stockTransfers, sapStockTransfersVO); BeanUtil.copyProperties(stockTransfers, sapStockTransfersVO);
List <SapStockTransfersItemVO> newItemList=new ArrayList<>(); List <SapStockTransfersItemVO> newItemList=new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
for (SapStockTransfersItem item:itemList){ for (SapStockTransfersItem item:itemList){
SapStockTransfersItemVO sapStockTransfersItemVO=new SapStockTransfersItemVO(); SapStockTransfersItemVO sapStockTransfersItemVO=new SapStockTransfersItemVO();
BeanUtil.copyProperties(item, sapStockTransfersItemVO); BeanUtil.copyProperties(item, sapStockTransfersItemVO);
...@@ -217,10 +217,13 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS ...@@ -217,10 +217,13 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
SapResult sapResult = sapResultList.get(0); SapResult sapResult = sapResultList.get(0);
resultMap.put("sequence", resultMap.get("row")); resultMap.put("sequence", resultMap.get("row"));
if ("S".equals(sapResult.getTYPE())) { if ("S".equals(sapResult.getTYPE())) {
SapStockTransfers sapStockTransfers = this.getStockTransfersById(id);
// suppliersInfo.setPartner(sapResult.getMESSAGE_V1()); // suppliersInfo.setPartner(sapResult.getMESSAGE_V1());
resultMap.put("type", sapResult.getTYPE()); resultMap.put("type", sapResult.getTYPE());
resultMap.put("MESSAGE", sapResult.getMESSAGE()); resultMap.put("MESSAGE", sapResult.getMESSAGE());
// suppliersInfoRepository.save(suppliersInfo); sapStockTransfers.setType(sapResult.getTYPE());
sapStockTransfers.setMessage(sapResult.getMESSAGE_V1());
sapStockTransfersRepository.save(sapStockTransfers);
} else { } else {
throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE()); throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE());
} }
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/SapStockTransfers.java
View file @ 26b601c4
...@@ -70,6 +70,12 @@ public class SapStockTransfers extends FlowBillAbstractEntity { ...@@ -70,6 +70,12 @@ public class SapStockTransfers extends FlowBillAbstractEntity {
@Column(name = "werks_name") @Column(name = "werks_name")
private String werksName; private String werksName;
@Column(name = "type")
private String type;
@Column(name = "message")
private String message;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "sapStockTransfers"; return "sapStockTransfers";
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/vo/SapStockTransfersItemVO.java
View file @ 26b601c4
...@@ -3,8 +3,6 @@ package com.huigou.topsun.sap.transfers.domain.vo; ...@@ -3,8 +3,6 @@ package com.huigou.topsun.sap.transfers.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
@Data @Data
public class SapStockTransfersItemVO { public class SapStockTransfersItemVO {
...@@ -18,30 +16,30 @@ public class SapStockTransfersItemVO { ...@@ -18,30 +16,30 @@ public class SapStockTransfersItemVO {
private String epstp; private String epstp;
//物料编码 //物料编码
@Column(name = "MATNR") @JsonProperty("MATNR")
private String matnr; private String matnr;
//数量 //数量
@Column(name = "MENGE") @JsonProperty("MENGE")
private Integer menge; private Integer menge;
//基本计量单位 //基本计量单位
@Column(name = "MEINS") @JsonProperty("MEINS")
private String meins; private String meins;
/** /**
* 交货日期 * 交货日期
*/ */
@Column(name = "EEIND") @JsonProperty("EEIND")
private String eeind; private String eeind;
//存储地点 //存储地点
@Column(name = "LOGORT") @JsonProperty("LOGORT")
private String lgort; private String lgort;
//工厂 //工厂
@Column(name = "WERKS") @JsonProperty("WERKS")
private String werks; private String werks;
......
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