Skip to content

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

物料主数据优化

parent a4081d00
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 20 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.jsp
View file @ 6a8c8a42
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<div class="hg-form-row"> <div class="hg-form-row">
<x:hidden name="werks"/> <x:hidden name="werks"/>
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/> <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
<x:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas"/> <x:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas" required="true"/>
<x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="true"/> <x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" required="true" /> <x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" required="true" />
<x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2" required="true"/> <x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2" required="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ 6a8c8a42
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
<div class="hg-form-row"> <div class="hg-form-row">
<x:hidden name="werks"/> <x:hidden name="werks"/>
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/> <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
<x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/> <x:selectC name="disgr" label="MRP组" labelCol="1" required="true" fieldCol="2" dictionary="disgr"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/> <x:selectC name="dismm" label="MRP类型" labelCol="1" required="true" fieldCol="2" dictionary="dismm"/>
<x:hidden name="minbe"/> <x:hidden name="minbe"/>
<x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="false" wrapper="select"/> <x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
<x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="true" dictionary="dispo"/> <x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="true" dictionary="dispo"/>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<x:inputC name="lgfsbName" label="默认采购收货库存地" labelCol="2" fieldCol="3" wrapper="select"/> <x:inputC name="lgfsbName" label="默认采购收货库存地" labelCol="2" fieldCol="3" wrapper="select"/>
<x:hidden name="lgfsb"/> <x:hidden name="lgfsb"/>
<x:selectC name="rgekz" label="倒冲标志" labelCol="1" fieldCol="2" dictionary="rgekz"/> <x:selectC name="rgekz" label="倒冲标志" labelCol="1" fieldCol="2" dictionary="rgekz" required="true"/>
<x:inputC name="webaz" label="收货处理天数" labelCol="1" fieldCol="2"/> <x:inputC name="webaz" label="收货处理天数" labelCol="1" fieldCol="2"/>
<x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/> <x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="false"/> <x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="false"/>
...@@ -107,15 +107,15 @@ ...@@ -107,15 +107,15 @@
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/> <x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
<x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="true" dictionary="mtvfp"/> <x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="true" dictionary="mtvfp"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/> <x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr" required="true"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="1" mask="999"/> <x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="1" mask="999"/>
<x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2" dictionary="sbdkz"/> <x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2" dictionary="sbdkz" required="true"/>
<x:selectC name="diskz" label="库存地MRP标识" labelCol="2" fieldCol="2" dictionary="diskz"/> <x:selectC name="diskz" label="库存地MRP标识" labelCol="2" fieldCol="2" dictionary="diskz"/>
<x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/> <x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod" required="true"/>
<x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/> <x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999" required="true"/>
<x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/> <x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999" required="true"/>
<x:selectC name="miskz" label="综合MRP" labelCol="1" fieldCol="2" dictionary="MISKZ"/> <x:selectC name="miskz" label="综合MRP" labelCol="1" fieldCol="2" dictionary="MISKZ"/>
<x:selectC name="perkz" label="期间标识" labelCol="1" fieldCol="2" dictionary="perkz"/> <x:selectC name="perkz" label="期间标识" labelCol="1" fieldCol="2" dictionary="perkz"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.jsp
View file @ 6a8c8a42
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
<x:hidden name="ausme"/> <x:hidden name="ausme"/>
<x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/> <x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/>
<x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/> <x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/>
<x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf"/> <x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf" required="true"/>
<x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2" wrapper="select"/> <x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.js
View file @ 6a8c8a42
...@@ -11,6 +11,7 @@ $(document).ready(function () { ...@@ -11,6 +11,7 @@ $(document).ready(function () {
// initAssistantGrid(); // initAssistantGrid();
loadRejectReasonBox(); loadRejectReasonBox();
bindEvent() bindEvent()
UICtrl.setElRequiredFlag()
}) })
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.jsp
View file @ 6a8c8a42
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="true"/> <x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="true"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/> <x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="sledBbd" label="过期日期" wrapper="date" labelCol="1" fieldCol="2"/> <x:selectC name="sledBbd" label="过期日期" labelCol="1" fieldCol="2" dictionary="sledBbd"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyWarehouse.jsp
View file @ 6a8c8a42
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<x:title title="维护仓库信息" name="group"/> <x:title title="维护仓库信息" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/> <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
<x:hidden name="werks"/> <x:hidden name="werks"/>
<x:inputC name="lgortProfitName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/> <x:inputC name="lgortProfitName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
<x:hidden name="lgortProfit"/> <x:hidden name="lgortProfit"/>
<x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/> <x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum" required="true"/>
<x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/> <x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
<x:hidden name="lgtyp"/> <x:hidden name="lgtyp"/>
<x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2" required="true" wrapper="select"/> <x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2" required="true" wrapper="select"/>
<x:hidden name="ltkza"/> <x:hidden name="ltkza"/>
...@@ -88,10 +88,10 @@ ...@@ -88,10 +88,10 @@
<x:hidden name="ltkze"/> <x:hidden name="ltkze"/>
<%-- <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/>--%> <%-- <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/>--%>
<x:hidden name="lgbkz" value="001"/> <x:hidden name="lgbkz" value="001"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="false" mask="99999999"/> <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="true" mask="99999999"/>
<x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="false" wrapper="select"/> <x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="true" wrapper="select"/>
<x:hidden name="lhme1"/> <x:hidden name="lhme1"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2" required="false" readonly="true"/> <x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2" required="true" readonly="true"/>
</div> </div>
</div> </div>
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ 6a8c8a42
...@@ -399,6 +399,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -399,6 +399,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
sapVO.setMaktxRemZh(baseInfo.getMaktxRemZh()); sapVO.setMaktxRemZh(baseInfo.getMaktxRemZh());
sapVO.setMaktxRemEn(baseInfo.getMaktxRemEn()); sapVO.setMaktxRemEn(baseInfo.getMaktxRemEn());
//中英文语言代码
if (StringUtil.isNotBlank(sapVO.getMaktx())){ if (StringUtil.isNotBlank(sapVO.getMaktx())){
sapVO.setSpars("1"); sapVO.setSpars("1");
} }
...@@ -420,6 +421,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -420,6 +421,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}else { }else {
sapVO.setPstat("K,"+baseInfo.getBusinessUsage()); sapVO.setPstat("K,"+baseInfo.getBusinessUsage());
} }
if (baseInfo.getBusinessUsage().contains("B")){
sapVO.setPstat("G,"+sapVO.getPstat());
}
sapVO.setUpdkz("I"); sapVO.setUpdkz("I");
if ("0".equals(sapVO.getInsmk())){ if ("0".equals(sapVO.getInsmk())){
sapVO.setInsmk(""); sapVO.setInsmk("");
...@@ -467,7 +471,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -467,7 +471,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() { List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
}); });
Map<String, Object> returnMap = resultList.get(0); Map<String, Object> returnMap = resultList.get(0);
if ("S".equals(returnMap.get("TYPE"))){ if ("S".equals(returnMap.get("TYPE")) && resultList.size()>1){
returnMap = resultList.get(1); returnMap = resultList.get(1);
} }
mapCopy(backMap,returnMap); mapCopy(backMap,returnMap);
......
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