Skip to content

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

非生产性领料接口调试

parent eaa6cf04
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 113 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js
View file @ b6afb014
......@@ -105,7 +105,7 @@ function loadGrid() {
{
display: "库存地点", name: "lgobe", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
required: false, type: "select",
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
......@@ -122,7 +122,7 @@ function loadGrid() {
{
display: "数量", name: "erfmg", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
type: "text",mask: '9999999.99'
type: "text",mask: '9999999.99',required: true
}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
View file @ b6afb014
......@@ -22,8 +22,9 @@ function loadGrid() {
{display: "成本中心", name: "kostlName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "内部订单编号", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "消息类型", name: "typeTextView", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "预留/相关需求的编号", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/nonProducePick/slicedNonProducePickList.ajax',
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java
View file @ b6afb014
......@@ -69,22 +69,25 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
public Map<String, Object> slicedNonProducePickList(NonProducePickQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "nonProducePick");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
queryModel.putDictionary("status",BizBillStatus.getMap());
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
}
@Override
public void sendNonProducePickData(NonProducePick nonProducePick) {
List<NonProducePickVo> nonProducePickVoList = new ArrayList<>();
//List<NonProducePickVo> nonProducePickVoList = new ArrayList<>();
NonProducePickVo nonProducePickVo = new NonProducePickVo();
nonProducePickVo.setBudat(DateUtil.getDateFormat("yyyyMMdd",new Date()));
nonProducePickVo.setBldat(DateUtil.getDateFormat("yyyyMMdd",new Date()));
nonProducePickVo.setLfsnr(nonProducePick.getAufnr());
nonProducePickVo.setBster(DateUtil.getDateFormat("yyyyMMdd",nonProducePick.getFillinDate()));
nonProducePickVo.setWerks(nonProducePick.getWerks());
nonProducePickVo.setUsnam(nonProducePick.getPersonMemberName());
nonProducePickVo.setKostl(nonProducePick.getKostl());
nonProducePickVo.setAufnr(nonProducePick.getAufnr());
//若填写了成本中心，领料采用移动类型201；填写了内部订单，领料采用移动类型261，两者不可并存，SAP发起的刀工模板具领料采用移动类型Z01
if (StringUtil.isNotBlank(nonProducePick.getKostl())){
nonProducePickVo.setZencode("201");
nonProducePickVo.setBwart("201");
} else if (StringUtil.isNotBlank(nonProducePick.getAufnr())) {
nonProducePickVo.setZencode("261");
nonProducePickVo.setBwart("261");
}
List<NonProducePickItem> pickItemList = nonProducePickItemApplication.findByNonProducePickId(nonProducePick.getId());
......@@ -92,19 +95,20 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
NonProducePickItemVo nonProducePickItemVo = new NonProducePickItemVo();
BeanUtils.copyProperties(pickItem, nonProducePickItemVo);
nonProducePickItemVo.setWerks(nonProducePick.getWerks());
nonProducePickItemVo.setErfme(pickItem.getMeins());
return nonProducePickItemVo;
}).collect(Collectors.toList());
nonProducePickVo.setItems(pickItemVoList);
nonProducePickVoList.add(nonProducePickVo);
//nonProducePickVoList.add(nonProducePickVo);
try {
String execute = httpClient.execute(nonProducePickVoList, "cud_MM_rrm/rrm");
String execute = httpClient.execute(nonProducePickVo, "cud_ro/cud_ro");
List<SapResult> resultList = JSONObject.parseArray(execute, SapResult.class);
SapResult sapResult = resultList.get(0);
if (!"S".equals(sapResult.getTYPE())){
throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
}
nonProducePick.setType(sapResult.getTYPE());
nonProducePick.setMessage(sapResult.getMESSAGE());
nonProducePick.setMessage(sapResult.getMESSAGE_V1());
nonProducePickRepository.save(nonProducePick);
} catch (IOException e) {
throw new RuntimeException(e);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/NonProducePickItemVo.java
View file @ b6afb014
......@@ -13,116 +13,49 @@ import java.math.BigDecimal;
*/
@Data
public class NonProducePickItemVo implements Serializable {
@JsonProperty("PLNR")
private String plnr;
@JsonProperty("AUFNR")
private String aufnr;
@JsonProperty("MATNR")
private String matnr;
/**
* 工厂
*/
@JsonProperty("WERKS")
private String werks;
/**
* 存储地点
*/
@JsonProperty("LGORT")
private String lgort;
/**
* 批次编号
*/
@JsonProperty("CHARG")
private String charg;
@JsonProperty("PACKNR")
private String packnr;
@JsonProperty("PAZEIL")
private String pazeil;
@JsonProperty("INSNAM")
private String insnam;
@JsonProperty("ZINSTNUM")
private String zinstnum;
@JsonProperty("ZSIZE")
private String zsize;
@JsonProperty("ZMNGO")
private String zmngo;
@JsonProperty("ZMNGL")
private String zmngl;
/**
* 录入单位
*/
@JsonProperty("ERFME")
private String erfme;
@JsonProperty("BRGEW")
private String brgew;
@JsonProperty("NTGEW")
private String ntgew;
@JsonProperty("GEWEI")
private String gewei;
@JsonProperty("LGNUM")
private String lgnum;
@JsonProperty("NLTYP")
private String nltyp;
@JsonProperty("NLBER")
private String nlber;
@JsonProperty("NLPLA")
private String nlpla;
@JsonProperty("PACMG")
private String pacmg;
/**
* 以录入项单位表示的数量
*/
@JsonProperty("ERFMG")
private BigDecimal erfmg;
@JsonProperty("MIGO_INSMK")
private String migoInsmk;
@JsonProperty("HSDAT")
private String hsdat;
@JsonProperty("EBELN")
private String ebeln;
@JsonProperty("EBELP")
private String ebelp;
@JsonProperty("GERNR")
private String gernr;
@JsonProperty("LGTYP")
private String lgtyp;
@JsonProperty("LGPLA")
private String lgpla;
@JsonProperty("UMLGO")
private String umlgo;
@JsonProperty("UMCHA")
private String umcha;
@JsonProperty("MBLNR")
private String mblnr;
@JsonProperty("MJAHR")
private String mjahr;
@JsonProperty("MENGE")
private String menge;
@JsonProperty("MEINS")
private String meins;
/**
* 组件的需求日期
*/
@JsonProperty("BDTER")
private String bdter;
@JsonProperty("KOSTL")
private String kostl;
/**
* 收货方
*/
@JsonProperty("WEMPF")
private String wempf;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/NonProducePickVo.java
View file @ b6afb014
......@@ -13,18 +13,53 @@ import java.util.List;
*/
@Data
public class NonProducePickVo implements Serializable {
@JsonProperty("LFSNR")
private String lfsnr;
/**
* 预留/相关需求的编号
*/
@JsonProperty("RSNUM")
private String rsnum;
/**
* 工厂
*/
@JsonProperty("WERKS")
private String werks;
@JsonProperty("BLDAT")
private String bldat;
/**
* 用户名
*/
@JsonProperty("USNAM")
private String usnam;
@JsonProperty("BUDAT")
private String budat;
/**
* 成本中心
*/
@JsonProperty("KOSTL")
private String kostl;
@JsonProperty("ZENCODE")
private String zencode;
/**
* 移动类型(库存管理)
*/
@JsonProperty("BWART")
private String bwart;
/**
* 收货方
*/
@JsonProperty("WEMPF")
private String wempf;
/**
* 订单编号
*/
@JsonProperty("AUFNR")
private String aufnr;
/**
*预订基准日期
*/
@JsonProperty("BSTER")
private String bster;
@JsonProperty("ITEM")
private List<NonProducePickItemVo> items;
......
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