Skip to content

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

物料主数据查询条件；采购申请审批查询条件；EP销售订单终止后发送审批不过的消息

parent 3820a852
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 68 deletions
huigou-xt/src/main/webapp/lib/jquery/jquery.combox.js
View file @ 943e01c6
......@@ -291,7 +291,7 @@
url : defUrl,
queryDelay:600000,
maxHeight:250,
emptyOption:false,
emptyOption:true,
onDefaultSelected:ComboxNamespace.defaultSelected
},op);
op['param']=param;
......
huigou-xt/src/main/webapp/system/opm/organization/Org.js
View file @ 943e01c6
......@@ -123,7 +123,7 @@ $(function () {
{ id: 'initPassword', text:'初始化密码', click: initPassword, img: "fa-wrench"},
{ id: "changePersonMainOrg", text: "设置主岗位", img: "fa-address-book" },
{ id: "quoteAuthorizationAndBizManagement", text: "引用权限", click: quoteAuthorizationAndBizManagement, img: "fa-gavel"},
{ id: "initPersonToSap", text: "初始化SAP员工客户", click: initPersonToSap, img: "fa-gavel"},
//{ id: "initPersonToSap", text: "初始化SAP员工客户", click: initPersonToSap, img: "fa-gavel"},
]
};
......@@ -862,6 +862,7 @@ function switchButtonsVisible(parentOrgKindId){
$("#toolbar_changePersonMainOrg").show();
$("#separator_assignLine").show();
$("#toolbar_initPassword").show();
$("#toolbar_updateOrg").hide();
break;
case OrgKind.Folder:
$("#toolbar_addProjectOrgFolder").show();
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 943e01c6
......@@ -93,7 +93,7 @@ function loadNonProdApplyListGrid() {
return type;
}
},
{display: "物料/产品编码", name: "matnr", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "物料/产品编码", name: "matnr", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceTypeTextView", width: 130, minWidth: 60, type: "string", align: "left",
render:function(item){
var result = item.maintenanceTypeTextView+"-待处理基本信息";
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ 943e01c6
......@@ -22,11 +22,13 @@
<x:inputC name="matnr" required="false" label="物料编码" labelCol="1"/>
<x:inputC name="genericName" required="false" label="通用品名" labelCol="1"/>
<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
<%--<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>--%>
<x:selectC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
<x:inputC name="startDate" label="开始日期" wrapper="date" labelCol="1" />
<x:inputC name="endDate" label="结束日期" wrapper="date" labelCol="1" />
<div class="hg-form-row">
<x:checkboxListC name="status" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
</div>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
View file @ 943e01c6
......@@ -57,10 +57,10 @@ function initPurchaseListGrid() {
toolbar: toolbarOptions,
width: '99.8%',
height: '100%',
pageSize: 100,
pageSize: 20,
heightDiff: -4,
//sortName: 'lastModifiedDate',
//sortOrder: 'desc',
sortName: 'fillinDate',
sortOrder: 'desc',
checkbox: true,
usePager: true,
rownumbers: true,
......@@ -102,7 +102,7 @@ function viewHandler(id) {
UICtrl.addTabItem({
tabid: 'viewPurchase' + id,
text: '查看采购申请',
url: web_app.name + '/sapPurchase/showSapPurchaseDetail.do?isReadOnly=true&bizId=' + id
url: web_app.name + '/sapPurchase/showSapPurchaseDetail.job?isReadOnly=true&bizId=' + id
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
View file @ 943e01c6
......@@ -37,7 +37,9 @@ function initItemGrid() {
bnfpo: (itemGridManager.getData().length + 1) * 10,
pstyp: pstyp,
badat: fillinDate,
erdat: fillinDate
erdat: fillinDate,
ernam: $("#personMemberName").val(),
afnam: $("#personMemberName").val(),
});
},
deleteHandler: function () {
......@@ -268,7 +270,7 @@ function getGridColumns() {
//editor: {type: 'text'}
},);
//财务部填写
if ("financeNode" == getSubProcUnitId()){
if (typeof(getSubProcUnitId) =='function'&&"financeNode" == getSubProcUnitId()){
columns.push({
display: "资产编号", name: "anln1", width: "200", align: "left", type: "string",
editor: {
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
View file @ 943e01c6
......@@ -482,7 +482,23 @@ function getGridColumns() {
// }
});
columns.push({
display: "总账科目", name: "sakto", width: "200", align: "left", type: "string",
display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {
fieldName: "SAKTO",
filterValue:'6600'
}
},
back: {
SAKNR:'sakto',
}
},
}
},);
columns.push({
display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js
View file @ 943e01c6
......@@ -39,7 +39,7 @@ function initPurchaseListGrid() {
, {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "center"}
, {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
, {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
, {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "center"}
],
dataAction: 'server',
url: web_app.name + '/sapPurchaseApproval/slicedSapPurchaseApprovalList.ajax?',
......@@ -47,10 +47,10 @@ function initPurchaseListGrid() {
toolbar: toolbarOptions,
width: '99.8%',
height: '100%',
pageSize: 100,
pageSize: 20,
heightDiff: -4,
//sortName: 'lastModifiedDate',
//sortOrder: 'desc',
sortName: 'fillinDate',
sortOrder: 'desc',
checkbox: true,
usePager: true,
rownumbers: true,
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.jsp
View file @ 943e01c6
......@@ -19,9 +19,26 @@
<x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
<x:inputC name="banfn" label="采购申请编号" labelCol="1"/>
</div>
<div class="hg-form-row">
<div class="col-xs-4 col-sm-1">
<label class="hg-form-label">申请日期起&nbsp;:</label>
</div>
<div class="col-xs-4 col-sm-2 col-white-bg">
<x:input name="fillinBeginDate" required="false" wrapper="date" />
</div>
<div class="col-xs-4 col-sm-1">
<label class="hg-form-label">申请日期止&nbsp;:</label>
</div>
<div class="col-xs-4 col-sm-2 col-white-bg">
<x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
</div>
</div>
<div class="hg-form-row">
<x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
</div>
<x:searchButtons/>
</form>
<x:title title="采购审批明细" hideTable="#purchaseApprovalGrid" name="list"/>
<x:title title="采购申请审批明细" hideTable="#purchaseApprovalGrid" name="list"/>
<div id="purchaseApprovalGrid" style="margin:2px;"></div>
</div>
</div>
......
topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderApplicationImpl.java
View file @ 943e01c6
......@@ -143,6 +143,8 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
EpSaleOrder epSaleOrder = epSaleOrderRepository.findOne(bizId);
epSaleOrder.setStatusId(BizBillStatus.ABORTED.getId());
epSaleOrderRepository.save(epSaleOrder);
this.feedBackSaleOrder(epSaleOrder,"0");
}
/**
......@@ -158,9 +160,9 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
epSaleOrder.setStatusId(BizBillStatus.APPLYING.getId());
epSaleOrderRepository.save(epSaleOrder);
//回退后终止流程
DelegateExecution execution = delegateTask.getExecution();
this.onAbortProcessInstance(execution);
this.feedBackSaleOrder(epSaleOrder,"0");
// DelegateExecution execution = delegateTask.getExecution();
// this.onAbortProcessInstance(execution);
// this.feedBackSaleOrder(epSaleOrder,"0");
}
}
......
topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java
View file @ 943e01c6
......@@ -142,6 +142,8 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
EpSaleOrderCancel epSaleOrderCancel = epSaleOrderCancelRepository.findOne(bizId);
epSaleOrderCancel.setStatusId(BizBillStatus.ABORTED.getId());
epSaleOrderCancelRepository.save(epSaleOrderCancel);
this.feedBackSaleOrderCancel(epSaleOrderCancel,"0");
}
/**
......@@ -157,8 +159,8 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
epSaleOrderCancel.setStatusId(BizBillStatus.APPLYING.getId());
epSaleOrderCancelRepository.save(epSaleOrderCancel);
//回退后终止流程
DelegateExecution execution = delegateTask.getExecution();
this.onAbortProcessInstance(execution);
// DelegateExecution execution = delegateTask.getExecution();
// this.onAbortProcessInstance(execution);
//this.feedBackSaleOrderCancel(epSaleOrderCancel,"0");
}
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ 943e01c6
......@@ -380,40 +380,40 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
public Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonProdApplyBaseInfoQuery");
QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
if (StringUtil.isNotBlank(query.getMatnr())) {
model.addCriteria(" and ad.matnr like:matnr");
model.putLikeParam("matnr", query.getMatnr());
}
if (query.getStatus() != null) {
model.addCriteria(" and t.status =:status");
model.putParam("status", query.getStatus());
}
if (query.getMaintenanceType() != null) {
model.addCriteria(" and t.maintenance_type =:maintenanceType");
model.putParam("maintenanceType", query.getMaintenanceType());
}
if (query.getGenericName() != null) {
model.addCriteria(" and t.generic_name =:genericName");
model.putParam("genericName", query.getGenericName());
}
if (query.getMaktx() != null) {
model.addCriteria(" and ad.maktx like:maktx");
model.putLikeParam("maktx", query.getMaktx());
}
if (query.getBillCode() != null) {
model.addCriteria(" and t.bill_code like:billCode");
model.putLikeParam("billCode", query.getBillCode());
}
if (query.getStartDate() != null&&!"".equals(query.getStartDate())) {
model.addCriteria(" and t.created_date >=:startDate");
model.putParam("startDate", query.getStartDate());
}
if (query.getEndDate() != null&&!"".equals(query.getEndDate())) {
model.addCriteria(" and t.created_date <=:endDate");
model.putParam("endDate", query.getEndDate());
}
// if (StringUtil.isNotBlank(query.getMatnr())) {
// model.addCriteria(" and ad.matnr like:matnr");
// model.putLikeParam("matnr", query.getMatnr());
// }
// if (query.getStatus() != null) {
// model.addCriteria(" and t.status =:status");
// model.putParam("status", query.getStatus());
// }
// if (query.getMaintenanceType() != null) {
// model.addCriteria(" and t.maintenance_type =:maintenanceType");
// model.putParam("maintenanceType", query.getMaintenanceType());
// }
// if (query.getGenericName() != null) {
// model.addCriteria(" and t.generic_name =:generic_name");
// model.putParam("genericName", query.getGenericName());
// }
//
// if (query.getMaktx() != null) {
// model.addCriteria(" and ad.maktx like:maktx");
// model.putLikeParam("maktx", query.getMaktx());
// }
// if (query.getBillCode() != null) {
// model.addCriteria(" and t.bill_code like:billCode");
// model.putLikeParam("billCode", query.getBillCode());
// }
// if (query.getStartDate() != null&&!"".equals(query.getStartDate())) {
// model.addCriteria(" and t.created_date >=:startDate");
// model.putParam("startDate", query.getStartDate());
// }
// if (query.getEndDate() != null&&!"".equals(query.getEndDate())) {
// model.addCriteria(" and t.created_date <=:endDate");
// model.putParam("endDate", query.getEndDate());
//
// }
model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 943e01c6
......@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.huigou.cache.DictUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.common.BillStatus;
import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
......@@ -48,6 +49,7 @@ public class NonProdApplyController extends CommonController {
private final static Logger LOG = LoggerFactory.getLogger(NonProdApplyController.class);
public String forwardNonProdApplyList(){
this.putAttribute("statusKindsList", BillStatus.getValidMap());
return forward("nonProdApplyList");
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ 943e01c6
......@@ -207,15 +207,6 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseApprovalList");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
queryModel.putDictionary("status", BizBillStatus.getMap());
if (queryRequest.getBillCode() != null) {
queryModel.addCriteria(" and t.bill_code like:billCode");
queryModel.putLikeParam("billCode", queryRequest.getBillCode());
}
if (queryRequest.getBanfn() != null) {
queryModel.addCriteria(" and t.banfn like:banfn");
queryModel.putLikeParam("banfn", queryRequest.getBanfn());
}
queryModel.addCriteria(" order by fillin_date desc ");
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/controller/SapPurchaseApprovalController.java
View file @ 943e01c6
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseApproval.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.common.BillStatus;
import com.huigou.topsun.sap.common.DefaultHttpClient;
import com.huigou.topsun.sap.purchaseApproval.application.SapPurchaseApprovalApplication;
import com.huigou.topsun.sap.purchaseApproval.domain.SapPurchaseApproval;
......@@ -61,6 +62,7 @@ public class SapPurchaseApprovalController extends CommonController {
}
public String forwardSapPurchaseApprovalList(){
this.putAttribute("statusKindsList", BillStatus.getValidMap());
return forward("sapPurchaseApprovalList");
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/domain/query/SapPurchaseApprovalQueryRequest.java
View file @ 943e01c6
......@@ -3,6 +3,8 @@ package com.huigou.topsun.sap.purchaseApproval.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import java.util.Date;
/**
* @Auther: xin.lu
* @Date: 2024/01/09/19:13
......@@ -27,4 +29,10 @@ public class SapPurchaseApprovalQueryRequest extends QueryAbstractRequest {
* 采购申请类型描述
*/
private String batxt;
protected Date fillinBeginDate;
protected Date fillinEndDate;
private String statusKind;
}
topsun/src/main/resources/config/topsun/base/function.xml
View file @ 943e01c6
......@@ -38,7 +38,7 @@
SELECT o.FULL_ID, o.FULL_NAME
FROM sa_oporg o WHERE o.PARENT_ID IN (
SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) )
AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ' );
AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR' );
</sql>
<!--根据业务主表id和业务表名查询对应申请人的二级部门领导-->
......
topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml
View file @ 943e01c6
......@@ -4,7 +4,14 @@
<sql-query>
select t.*,ad.matnr,ad.status as dept_status,ad.maktx from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id = ad.base_info_id where 1=1
</sql-query>
<!-- <condition column="stats_indicators_id" name="statsIndicatorsId" type="java.lang.String" symbol="=" alias="t"/>-->
<condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="ad"/>
<condition column="status" name="status" type="java.lang.String" symbol="in" alias="t"/>
<condition column="maintenance_type" name="maintenanceType" type="java.lang.String" symbol="=" alias="t"/>
<condition column="generic_name" name="generic_name" type="java.lang.String" symbol="like" alias="t"/>
<condition column="maktx" name="maktx" type="java.lang.String" symbol="like" alias="ad"/>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="created_date" name="startDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="created_date" name="endDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
</query>
<query name="slicedNonApplyBaseInfoByMatnr" label="按物料编号查询扩展前数据" table="sap_non_prod_apply_base_info">
<sql-query>
......
topsun/src/main/resources/config/topsun/sap/sapPurchaseApproval/sapPurchaseApproval.xml
View file @ 943e01c6
......@@ -2,9 +2,13 @@
<query-mappings>
<query name="sapPurchaseApprovalList" label="SAP采购审批" table="sap_purchase_approval">
<sql-query>
select t.* from sap_purchase_approval t
select t.* from sap_purchase_approval t where 1=1
</sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="banfn" name="banfn" type="java.lang.String" symbol="like" alias="t"/>
<condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
<condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
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