Skip to content

T
topsun-bpm
Commit f6d9030a authored by 1650842865's avatar 1650842865
Browse files
Options

物料主数据的创建，修改：当物料类型等于，ZMYP(贸易品），ZFBL（辅料与包材），ZYCL（原材料）时：BSTMI（最小批量），BSTRF（舍入值）设置为... 

物料主数据的创建，修改：当物料类型等于，ZMYP(贸易品），ZFBL（辅料与包材），ZYCL（原材料）时：BSTMI（最小批量），BSTRF（舍入值）设置为必输；采购信息记录标准采购订单数量、最小采购订单数量非必填；库存调拨行增加项目号
parent 916da820
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 38 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js
View file @ f6d9030a
......@@ -1083,11 +1083,11 @@ function getId() {
function setId(value) {
$("#id").val(value);
var _grid = UICtrl.getGridManager('#producegrid');
_grid.options.parms.exceptionReportId = value;
// var produce_grid = UICtrl.getGridManager('#producegrid');
// produce_grid.options.parms.exceptionReportId = value;
var _grid = UICtrl.getGridManager('#clientgrid');
_grid.options.parms.exceptionReportId = value;
var clientg_grid = UICtrl.getGridManager('#clientgrid');
clientg_grid.options.parms.exceptionReportId = value;
var _purchasegrid = UICtrl.getGridManager('#purchasegrid');
_purchasegrid.options.parms.exceptionReportId = value;
......@@ -1120,3 +1120,31 @@ function isNumber(val) {
return false;
}
}
function checkConstraints(){
var exceptionReasonType = $('#exceptionReasonType').val();
var grid ;
var msg ;
if (exceptionReasonType == "1") { //供应商材料问题
grid = UICtrl.getGridManager('#purchasegrid');
msg = "采购单号明细项必填";
}else {
//订单行项目信息
grid = UICtrl.getGridManager('#clientgrid');
msg = "生产单号明细项必填";
}
if (grid) {
var datas = DataUtil.getGridData({
gridManager: grid,
isAllData: true
});
if (!datas) {
return false;
}
if (isApplyProcUnit() && datas.length == 0 ){
Public.tip(msg);
return false;
}
}
return true;
}
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @ f6d9030a
......@@ -32,7 +32,7 @@ function initializate() {
}else {
$("#mtposMara").val("NORM");
}
bstmiChange(false);
//物料类型是：半成品、辅料与包材、免费客供/外部来源物品、贸易商品、原材料、产成品。批次管理：是
if (data.value == "ZBCP" || data.value == "ZZCP"){
$("#xchpf").val("X");
......@@ -44,6 +44,9 @@ function initializate() {
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_YCL");
//物料主数据的创建，修改：当物料类型等于，ZMYP(贸易品），ZFBL（辅料与包材），ZYCL（原材料）时：BSTMI（最小批量），BSTRF（舍入值）设置为必输
bstmiChange(true);
}else {
$("#xchpf").val("0");
}
......@@ -171,6 +174,11 @@ function initializate() {
});
}
function bstmiChange(flag){
UICtrl.setElRequiredFlag("#bstmi", flag);
UICtrl.setElRequiredFlag("#bstrf", flag);
}
function showBusiness(busiCode) {
if (busiCode=="E") { //采购
$("#purchaseDiv").show();
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ f6d9030a
......@@ -20,6 +20,7 @@ function initializate() {
coRowNum= $("#busiLens").val();
initKlart($("#mtart").val());
initRaube($("#mtart").val());
initbstmi($("#mtart").val());
//页面控制
UICtrl.enable($("#businessUsage"));
UICtrl.enable($("#matklName"));
......@@ -32,6 +33,7 @@ function initializate() {
getAwsls(data.value);
initSale(data.value);
initMRP(data.value);
initbstmi(data.value);
//物料主数据的创建，修改 物料类型为：ZGKL（客供料），字段mrp控制者（DISPO），改为默认并且只能是105
if (data.value == "ZKGL"){
$("#dispo").val("105");//MRP控制者
......@@ -197,6 +199,20 @@ function initMRP(mtart){
}
}
function initbstmi(mtart){
//物料主数据的创建，修改：当物料类型等于，ZMYP(贸易品），ZFBL（辅料与包材），ZYCL（原材料）时：BSTMI（最小批量），BSTRF（舍入值）设置为必输
if ((mtart == "ZFBL" || mtart == "ZMYP" || mtart == "ZYCL") && $("#businessUsageD").prop("checked")){
bstmiChange(true);
}else {
bstmiChange(false);
}
}
function bstmiChange(flag){
UICtrl.setElRequiredFlag("#bstmi", flag);
UICtrl.setElRequiredFlag("#bstrf", flag);
}
function saleAndMtartRequired(flag){
UICtrl.setElRequiredFlag("#mvgr1",flag);
UICtrl.setElRequiredFlag("#mvgr2",flag);
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
View file @ f6d9030a
......@@ -57,7 +57,7 @@
</div>
<div class="hg-form-row">
<x:hidden name="meins"/>
<x:inputC name="norbm" label="标准采购订单数量" labelCol="2" fieldCol="1" required="true" mask="99999999.99"/>
<x:inputC name="norbm" label="标准采购订单数量" labelCol="2" fieldCol="1" required="false" mask="99999999.99"/>
<x:inputC name="umren" label="订单单位转换分母" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
<x:inputC name="umrez" label="订单单位转换分子" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
......@@ -79,7 +79,7 @@
<x:selectC name="loekz" label="删除标志" labelCol="1" fieldCol="2" required="false" dictionary="loekz"/>
<x:inputC name="sortl" label="排序字段" labelCol="1" fieldCol="2" required="false" />
<x:inputC name="minbm" label="最小采购订单数量" labelCol="2" fieldCol="1" required="true" mask="9999999.99"/>
<x:inputC name="minbm" label="最小采购订单数量" labelCol="2" fieldCol="1" required="false" mask="9999999.99"/>
<x:inputC name="aplfz" label="计划交货时间(天)" labelCol="2" fieldCol="1" required="true" mask="9999999"/>
<x:selectC name="webre" label="基于收货的发票验证" labelCol="2" fieldCol="1" required="true" dictionary="webre"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
View file @ f6d9030a
......@@ -724,14 +724,14 @@ function checkInput() {
Public.errorTip("生效日期止必输！");
return false;
}
if ($("#norbm").val()==""){
Public.errorTip("标准采购订单数量必输！");
return false;
}
if ($("#minbm").val()==""){
Public.errorTip("最小采购订单数量必输！");
return false;
}
// if ($("#norbm").val()==""){
// Public.errorTip("标准采购订单数量必输！");
// return false;
// }
// if ($("#minbm").val()==""){
// Public.errorTip("最小采购订单数量必输！");
// return false;
// }
if ($("#aplfz").val()==""){
Public.errorTip("计划交货时间必输！");
return false;
......
topsun-xt/src/main/webapp/template/exceptionReport.ftl
View file @ f6d9030a
<html>
<html xmlns="http://www.w3.org/1999/html">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Style-Type" content="text/css"/>
......@@ -70,7 +70,11 @@
<p class="p1" style="width:90pt" ><span>${(head.customerOrderNo)!' '}</span></p>
</td>
<td class="td1">
<p class="p1"><span style="font-weight:bolder ">生产单号</span></p>
<#if head.exceptionReasonType == "1">
<p class="p1"><span style="font-weight:bolder ">采购单号</span></p>
<#else>
<p class="p1"><span style="font-weight:bolder ">生产单号</span></p>
</#if>
</td>
<td class="td2" style="width:90%">
<#if (itemList)?? && ((itemList)?size > 0)>
......@@ -88,9 +92,11 @@
</td>
<td class="td2" >
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span class="autoLine">${(list.productCode)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span class="autoLine">${(list.productCode)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
<td class="td1">
......@@ -98,9 +104,11 @@
</td>
<td class="td2" style="width:90%">
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:auto" ><span class="autoLine">${(list.productName)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:auto" ><span class="autoLine">${(list.productName)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
</tr>
......@@ -113,9 +121,11 @@
</td>
<td class="td2" >
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span>${(list.unitName)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span>${(list.unitName)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
<td class="td1">
......@@ -123,9 +133,11 @@
</td>
<td class="td2">
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:85pt" ><span>${(list.number)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:85pt" ><span>${(list.number)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
<td class="td1">
......@@ -133,9 +145,11 @@
</td>
<td class="td2" style="width:90%">
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:auto" ><span>${(list.currencyName)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:auto" ><span>${(list.currencyName)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
</tr>
......@@ -148,9 +162,11 @@
</td>
<td class="td2" >
<#if (itemList)?? && ((itemList)?size > 0)>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span>${(list.totalMoney)!' '}</span></p>
</#list>
<#list itemList as list>
<p class="p1" style="width:90pt" ><span>${(list.totalMoney)!' '}</span></p>
</#list>
<#else>
<p class="p1" style="width:90pt" ></p>
</#if>
</td>
<#-- <td class="td1">-->
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/application/impl/SapStockTransfersApplicationImpl.java
View file @ f6d9030a
......@@ -226,6 +226,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
sapStockTransfersItemVO.setEeind(sdf.format(item.getEeind()));
}
sapStockTransfersItemVO.setWerks(stockTransfers.getWerks());
sapStockTransfersItemVO.setBanfn(stockTransfers.getBanfn());//采购申请号放行项目
newItemList.add(sapStockTransfersItemVO);
}
sapStockTransfersVO.setItem(newItemList);
......@@ -298,7 +299,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
SapStockTransfersItem sapStockTransfersItem=new SapStockTransfersItem();
sapStockTransfersItem.setTransfersId(sapStockTransfers.getId());
sapStockTransfersItem.setEpstp("U");//项目类别
sapStockTransfersItem.setEbelp(i*10);//项目编号
sapStockTransfersItem.setEbelp(Integer.parseInt(sapPurchaseItem.getBnfpo()));//项目编号
sapStockTransfersItem.setMatnr(sapPurchaseItem.getMatnr());
sapStockTransfersItem.setMenge(sapPurchaseItem.getMenge().intValue());
sapStockTransfersItem.setMeins(sapPurchaseItem.getMeins());
......
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/vo/SapStockTransfersItemVO.java
View file @ f6d9030a
......@@ -43,4 +43,8 @@ public class SapStockTransfersItemVO {
private String werks;
@JsonProperty("BANFN")
private String banfn;
}
topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/vo/SapStockTransfersVO.java
View file @ f6d9030a
......@@ -37,8 +37,6 @@ public class SapStockTransfersVO {
@JsonProperty("BUKRS")
private String burks;
@JsonProperty("BANFN")
private String banfn;
@JsonProperty("ITEM")
......
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