Skip to content

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

物料/产品接口数据的修改

parent bb4e8c4b
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 20 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.js
View file @ a155cac0
......@@ -111,7 +111,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"));
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.jsp
View file @ a155cac0
......@@ -77,7 +77,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:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas"/>
<x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" required="true" readonly="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ a155cac0
......@@ -105,7 +105,7 @@ function loadNonProdApplyListGrid() {
{display: "是否分发", name: "distribute", width: 80, minWidth: 60, type: "string", align: "left",
render:function(item){
var result = "未分发";
if (item.distribute === "1"){
if (item.distribute == "1"){
result="已分发";
}
return result;
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.js
View file @ a155cac0
......@@ -108,7 +108,7 @@ function loadGrid() {
$("#materialUsage").attr("disabled",true);
$("#werks").attr("disabled",true);
$("#lgort").attr("disabled",true);
// $("#lgort").attr("disabled",true);
UICtrl.disable($("#businessUsage"));
UICtrl.disable($("#baseUnit"));
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ a155cac0
......@@ -78,10 +78,11 @@
<x:title title="维护MRP信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:hidden name="werks"/>
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
<x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
<x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
<x:inputC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="true"/>
<x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" required="true" dictionary="disls"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ a155cac0
......@@ -270,6 +270,18 @@ function bindEvent() {
$('#meinsName').val(data.MSEH3);
}
});
$('#raubeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "RAUBE"}
},
onChange: function (value, data) {
$('#raube').val(data.WERKS);
$('#raubeName').val(data.NAME1);
}
});
$('#werksName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -283,7 +295,7 @@ function bindEvent() {
$('#lgortName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGORT"}
return {fieldName: "LGORT", filterValue: $('#werks').val()}
},
onChange: function (value, data) {
$('#lgort').val(data.LGORT);
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ a155cac0
......@@ -97,7 +97,8 @@
<x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
<x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="meins"/>
<x:inputC name="raube" label="存储条件" required="true" labelCol="1" fieldCol="2"/>
<x:hidden name="raube"/>
<x:inputC name="raubeName" label="存储条件" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="brgew" label="毛重" labelCol="1" fieldCol="2"/>
<x:selectC name="gewei" label="重量单位" labelCol="1" fieldCol="2" dictionary="gewei"/>
<x:inputC name="volum" label="体积" labelCol="1" fieldCol="2"/>
......@@ -197,7 +198,8 @@
<x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2"/>
<x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/>
<x:inputC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false"/>
<x:selectC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false" dictionary="ladgr"/>
</div>
</div>
<x:title title="采购" name="group"/>
......@@ -214,7 +216,7 @@
<x:title title="MRP" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
<!--x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/-->
<x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
<x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.js
View file @ a155cac0
......@@ -16,6 +16,7 @@ $(document).ready(function () {
function initializate() {
$("#businessPersonnelList").hide();
// alert($("#active").val());
//页面控制
switch ($("#active").val()) {
case '0'://已分发未完成
......@@ -28,6 +29,9 @@ function initializate() {
break;
case '1'://完成/审核
// $("#auditForm").show();
// alert($("#deptCode").val());
$("#buttonBox").show();
$("#showChart").remove();
break;
case '2'://保存未分发
$("#buttonBox").show();
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.jsp
View file @ a155cac0
......@@ -78,6 +78,7 @@
<x:title title="维护销售信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:hidden name="vkorg"/>
<x:inputC name="vkorgName" required="false" label="销售组织" labelCol="1" disabled="true" fieldCol="2"/>
<x:inputC name="vtwegName" required="false" label="分销渠道" labelCol="1" fieldCol="2" disabled="true"/>
<x:hidden name="vtweg"/>
......@@ -100,7 +101,7 @@
<x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false"/>
<x:selectC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false" dictionary="ladgr"/>
</div>
</div>
......
topsun/src/main/java/com/huigou/topsun/sap/common/application/impl/SapMutualEpLogApplicationImpl.java
View file @ a155cac0
......@@ -28,8 +28,8 @@ public class SapMutualEpLogApplicationImpl implements SapMutualEpLogApplication
public SapMutualEpLog saveSapMutualEpLog(Map<String, Object> map){
SapMutualEpLog sapMutualEpLog = new SapMutualEpLog();
try {
sapMutualEpLog.setBusinessId(map.get("businessId").toString());
sapMutualEpLog.setBusinessType(map.get("businessType").toString());
sapMutualEpLog.setBusinessId(map.get("businessId")!=null?map.get("businessId").toString():"");
sapMutualEpLog.setBusinessType(map.get("businessType")!=null?map.get("businessType").toString():"");
sapMutualEpLog = ClassHelper.fromMap(SapMutualEpLog.class, map);
//BeanUtil.mapToBean(map, ClassHelpersapMutualEpLog);
Date date = new Date();
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ a155cac0
......@@ -262,7 +262,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
}
@Transactional
private void updateStatus(String bizId, BizBillStatus status) {
protected void updateStatus(String bizId, BizBillStatus status) {
Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
this.commonDomainService.updateStatus(NonProdApplyBaseInfo.class, bizId, status.getId());
}
......@@ -360,7 +360,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
if (bsnMessageSponsor!=null){
List<BsnMessageExecute> bsnMsgList = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList) {
if (bsnMessageExecute.getActive() == 0) {
if (!"system".equals(bsnMessageExecute.getBusinessCode())&&bsnMessageExecute.getActive() == 0) {
canSended=false;
break;
}
......@@ -378,18 +378,24 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
List<Map<String,Object>> unitMapList = new ArrayList<>();
//销售单位转换
unitsaleMap.put("MEINH",sapVO.getVrkme());
unitsaleMap.put("UMREZ",sapVO.getUmrezSale());
unitsaleMap.put("UMREN",sapVO.getUmrenSale());
unitsaleMap.put("UMREZ",sapVO.getUmrez());
unitsaleMap.put("UMREN",sapVO.getUmren()); //去掉sale lxh 03.29
unitsaleMap.put("MEINS",sapVO.getMeins());
unitMapList.add(unitsaleMap);
sapVO.setMapList(unitMapList);
ObjectMapper objectMapper = new ObjectMapper();
String url = "bd_mastdata/material";
String busiType="物料主数据推送SAP";
if ("product".equals(prodApplyBaseInfo.getKind())){
url = "bd_mastdata/material02";
busiType="产品主数据推送SAP";
}
List<ProdApplyToSapVO> mapList = new ArrayList<>();
mapList.add(sapVO);
//日志记录
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("businessType", "nonProdApplyBaseInfo");
resultMap.put("businessType", busiType);
resultMap.put("businessId", prodApplyBaseInfo.getId());
resultMap.put("parameter", JSON.toJSONString(map));
resultMap.put("sequence", resultMap.get("row"));
......@@ -398,9 +404,11 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
});
resultMap = resultList.get(0);
resultMap.put("businessType", busiType);
resultMap.put("businessId", prodApplyBaseInfo.getId());
if ("S".equals(resultMap.get("TYPE"))) {
resultMap.put("type", "S");
resultMap.put("message", resultMap.get("MESSAGE"));
resultMap.put("message", applyDept.getMatnr()+resultMap.get("MESSAGE"));
applyDept.setMatnr((String) map.get("MESSAGE_V1"));
nonProdApplyDeptApplication.save(applyDept);
} else {
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @ a155cac0
......@@ -826,6 +826,8 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "ekgrp_name")
private String ekgrpName;
@Column(name = "raube_name")
private String raubeName;
@Transient
private String billCode;
@Transient
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyMRPVo.java
View file @ a155cac0
......@@ -10,8 +10,8 @@ public class NonProdApplyMRPVo extends NonProdApplyDeptVo {
private String werks; //工厂
private String werksName; //工厂
private String lgort; //库存地点
private String lgortName; //库存地点
// private String lgort; //库存地点
// private String lgortName; //库存地点
//private String werks; //MRP组
/**
......
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