Skip to content

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

采购订单撤审流程优化；物料主数据解决勾选了业务用途还提示没有勾选的问题

parent 076c487e
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 48 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @ 8e07f2a0
...@@ -198,21 +198,28 @@ function initializate() { ...@@ -198,21 +198,28 @@ function initializate() {
showBusiness($(this).val()); showBusiness($(this).val());
if ("S"== $(this).val() ){ if ("S"== $(this).val() ){
$("#businessUsageS").prop("checked",false);
if ($("#werks").val() == "1010"){ if ($("#werks").val() == "1010"){
Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图"); Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图");
$("#businessUsageS").prop("checked",false);
}else {
$("#businessUsageS").prop("checked",true);
} }
if ($("#mtart").val() == "ZGMB"){ if ($("#mtart").val() == "ZGMB"){
Public.tip("刀工模板具不维护仓库管理视图"); Public.tip("刀工模板具不维护仓库管理视图");
}else {
$("#businessUsageS").prop("checked",true);
} }
// if ($("#mtart").val() == "ZKGL"){ // if ($("#mtart").val() == "ZKGL"){
// Public.tip("客供料不维护仓库管理视图"); // Public.tip("客供料不维护仓库管理视图");
// } // }
} }
if ("B"== $(this).val() ){ if ("B"== $(this).val() ){
$("#businessUsageB").prop("checked",false);
if ($("#mtart").val() == "ZKGL"){ if ($("#mtart").val() == "ZKGL"){
Public.tip("客供料不维护财务核算视图"); Public.tip("客供料不维护财务核算视图");
$("#businessUsageB").prop("checked",false);
}else {
$("#businessUsageB").prop("checked",true);
} }
} }
if (coRowNum==dictUsage.length){ if (coRowNum==dictUsage.length){
...@@ -318,7 +325,8 @@ function saveForm(status) { ...@@ -318,7 +325,8 @@ function saveForm(status) {
// let extendedData = getExtendedData(); // let extendedData = getExtendedData();
// debugger // debugger
// if (!extendedData) return false; // if (!extendedData) return false;
if (status==1&&coRowNum<1){ var length = $('input[name="businessUsage"]:checked').length;
if (status==1 && length <= 0){
Public.errorTip("请选择业务用途！"); Public.errorTip("请选择业务用途！");
return false; return false;
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 8e07f2a0
...@@ -161,9 +161,9 @@ function initializate() { ...@@ -161,9 +161,9 @@ function initializate() {
showBusiness($(this).val()); showBusiness($(this).val());
if ("S"== $(this).val() ){ if ("S"== $(this).val() ){
$("#businessUsageS").prop("checked",false);
if ($("#werks").val() == "1010" || $("#mtart").val() == "ZGMB"){ if ($("#werks").val() == "1010" || $("#mtart").val() == "ZGMB"){
Public.tip("广州市宝绅科技有限公司RFID工厂或者刀工模板具不维护仓库管理视图"); Public.tip("广州市宝绅科技有限公司RFID工厂或者刀工模板具不维护仓库管理视图");
$("#businessUsageS").prop("checked",false);
} else { } else {
$("#businessUsageS").prop("checked",true); $("#businessUsageS").prop("checked",true);
} }
...@@ -749,7 +749,7 @@ function saveForm(status) { ...@@ -749,7 +749,7 @@ function saveForm(status) {
// let extendedData = getExtendedData(); // let extendedData = getExtendedData();
// debugger // debugger
// if (!extendedData) return false; // if (!extendedData) return false;
if (status==1&&coRowNum<1){ if (status==1 && $('input[name="businessUsage"]:checked').length <= 0){
Public.errorTip("请选择业务用途！"); Public.errorTip("请选择业务用途！");
return false; return false;
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.jsp
View file @ 8e07f2a0
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div id="revoke"> <div id="revoke">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="revokeType" required="true" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/> <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
<x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/> <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
View file @ 8e07f2a0
...@@ -13,42 +13,42 @@ function initUI() { ...@@ -13,42 +13,42 @@ function initUI() {
function initPurchaseListGrid() { function initPurchaseListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({ var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: addHandler, addHandler: addHandler,
revokeApproveHandler: { // revokeApproveHandler: {
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () { // id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
//
var row = purchaseGridManager.getSelectedRow(); // var row = purchaseGridManager.getSelectedRow();
if (row.status!=3){ // if (row.status!=3){
Public.tip("请选择一条已完成的数据！"); // Public.tip("请选择一条已完成的数据！");
return; // return;
} // }
var loginId = $("#loginId").val(); // var loginId = $("#loginId").val();
if (row.personMemberId != loginId) { // if (row.personMemberId != loginId) {
Public.tip("只能由创建人撤审！"); // Public.tip("只能由创建人撤审！");
return; // return;
} // }
UICtrl.showAjaxDialog({ // UICtrl.showAjaxDialog({
url: web_app.name + '/sapPurchase/showRevokeDetail.load', // url: web_app.name + '/sapPurchase/showRevokeDetail.load',
param:{id:row.id}, // param:{id:row.id},
title: "撤审", // title: "撤审",
width: 400, // width: 400,
ok: function () { // ok: function () {
Public.ajax(web_app.name + '/sapPurchase/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) { // Public.ajax(web_app.name + '/sapPurchase/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) {
purchaseGridManager.loadData(); // purchaseGridManager.loadData();
}); // });
} // }
}); // });
// UICtrl.confirm('确定要把当前单据撤销审批吗?',function(){ // // UICtrl.confirm('确定要把当前单据撤销审批吗?',function(){
// Public.ajax(web_app.name+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) { // // Public.ajax(web_app.name+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) {
// purchaseGridManager.loadData(); // // purchaseGridManager.loadData();
// }); // // });
// }); // // });
// var newRow = JSON.parse(JSON.stringify(row)); // // var newRow = JSON.parse(JSON.stringify(row));
// newRow.zepItemno = getZepItemNo(); // // newRow.zepItemno = getZepItemNo();
/// newRow.id = null; // /// newRow.id = null;
// UICtrl.addGridRow(item.gridManager, newRow); // // UICtrl.addGridRow(item.gridManager, newRow);
//
} // }
} // }
}); });
purchaseGridManager = UICtrl.grid('#purchaseGrid', { purchaseGridManager = UICtrl.grid('#purchaseGrid', {
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.jsp
View file @ 8e07f2a0
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div id="revoke"> <div id="revoke">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="revokeType" required="true" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/> <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
<x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/> <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.jsp
View file @ 8e07f2a0
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div id="revoke"> <div id="revoke">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="revokeType" required="true" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/> <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
<x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/> <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.jsp
View file @ 8e07f2a0
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
<div id="revoke"> <div id="revoke">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="revokeType" required="true" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/> <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
<x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/> <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp
View file @ 8e07f2a0
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<div id="revoke"> <div id="revoke">
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:selectC name="revokeType" required="true" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/> <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
<x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/> <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
</div> </div>
</div> </div>
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ 8e07f2a0
...@@ -180,7 +180,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa ...@@ -180,7 +180,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
//如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审 //如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审
sendSapData(sapPurchaseApproval,"Y",""); sendSapData(sapPurchaseApproval,"Y","");
}else { }else {
this.sendSapData(sapPurchaseApproval, "N","0"); this.sendSapData(sapPurchaseApproval, "N","3");
} }
} }
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ 8e07f2a0
...@@ -218,7 +218,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -218,7 +218,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
//如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审 //如果没有撤销原因，才去调用sap接口；撤审通知去sap主动撤审
this.sendSapDate(save, "Y",""); this.sendSapDate(save, "Y","");
}else { }else {
this.sendSapDate(save, "N","0"); this.sendSapDate(save, "N","3");
} }
// asyncWriteExecutor.execute(()-> // asyncWriteExecutor.execute(()->
// //创建放行条 // //创建放行条
...@@ -410,6 +410,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -410,6 +410,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
//如果是关单，传X //如果是关单，传X
if ("close".equals(sapPurchaseOrder.getRevokeType())){ if ("close".equals(sapPurchaseOrder.getRevokeType())){
paramItem.put("ELIKZ", "X"); paramItem.put("ELIKZ", "X");
paramItem.put("status", 0);
} }
List<Map<String, Object>> paramList = new ArrayList<>(); List<Map<String, Object>> paramList = new ArrayList<>();
paramList.add(paramItem); paramList.add(paramItem);
......
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