Skip to content

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

采购申请单是工程部打样的需要增加一个样品单号，带出打样单号，方便后续查询采购记录。打样组的采购申请审批改为工程部经理申批;付款申请/预付款 查询条件需要增加供应商编码/名称/日期

parent fe3adbd6
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 23 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @ f7957cd9
......@@ -26,22 +26,22 @@
<x:hidden name="personMemberName"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepNo" required="false" readonly="true" label="流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" readonly="true" wrapper="date" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="EP付款申请类别" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="付款申请类别" labelCol="2" maxLength="64" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtypename" required="false" readonly="true" label="EP付款申请类别名称" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFtypename" required="false" readonly="true" label="付款申请类别名称" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="bukrs" required="true" label="公司代码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="butxt" required="false" readonly="true" label="公司代码名称" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepDepart" required="false" readonly="true" label="EP部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" readonly="true" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" readonly="true" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepart" required="false" readonly="true" label="部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" readonly="true" label="部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" readonly="true" label="流程申请人代码" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppliname" required="false" readonly="true" label="流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="true" label="付款申请内容" labelCol="2" fieldCol="2"/>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyList.js
View file @ f7957cd9
......@@ -18,18 +18,31 @@ function loadGrid() {
});
gridManager = UICtrl.grid("#payApplyListGrid", {
columns: [
{display: "EP付款申请类别", name: "zepFtype", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "EP付款申请类别名称", name: "zepFtypename", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "审批状态", name: "statusTextView", width: "100", align: "left", type: "string"},
{display: "付款申请类别", name: "zepFtype", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "付款申请类别名称", name: "zepFtypename", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "公司代码", name: "bukrs", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "公司代码名称", name: "butxt", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "EP部门代码", name: "zepDepart", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "EP部门名称", name: "zepDepartname", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "EP流程申请人代码", name: "zepAppli", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "EP流程申请人", name: "zepAppliname", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款申请创建日期", name: "zepFcrdate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "EP流程单号", name: "zepNo", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款申请内容", name: "zepTxt", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "BP(合作伙伴)", name: "partner", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "BP账号名称", name: "koinh", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "BP银行账号", name: "bankn", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "BP联行号", name: "bankl", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款银行账号", name: "bankn1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款银行账号名称", name: "zt012kText1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "结算方式", name: "text1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请总金额（本位币）", name: "zepFtamount", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请总金额", name: "zepFtamount1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "审批总金额（本位币）", name: "zepPtamount", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "审批总金额", name: "zepPtamount1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款状态", name: "zpayStaus", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "部门代码", name: "zepDepart", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "部门名称", name: "zepDepartname", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "流程申请人代码", name: "zepAppli", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "流程申请人", name: "zepAppliname", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款申请创建日期", name: "zepFcrdate", width: 140, minWidth: 60, type: "date", align: "left"},
{display: "流程单号", name: "zepNo", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "left"},
],
dataAction: "server",
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyList.jsp
View file @ f7957cd9
......@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/costReimbursement/payApplyList.js'/>
</head>
<body>
......@@ -12,7 +12,27 @@
<div position="center" title="付款申请查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<div class="hg-form-row">
<x:inputC name="billCode" required="false" label="付款申请单号" labelCol="1"/>
<x:inputC name="partner" required="false" label="供应商编码" labelCol="1"/>
<x:inputC name="koinh" required="false" label="供应商名称" labelCol="1"/>
<x:inputC name="zpayStaus" required="false" 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="fillinDateBegin" 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="fillinDatetEnd" label="至" required="false" wrapper="date" />
</div>
</div>
<x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
View file @ f7957cd9
......@@ -88,6 +88,7 @@ function initPurchaseListGrid() {
{display: "订单号", name: "aufnr", width: "200", align: "left", type: "string",},
{display: "申请日期", name: "badat", width: "100", align: "left", type: "string",},
{display: "创建日期", name: "erdat", width: "100", align: "left", type: "string",},
{display: "打样单号", name: "prototypeCode", width: "100", align: "left", type: "string",},
{display: "撤审类型", name: "revokeTypeTextView", width: 100, minWidth: 60, type: "date", align: "center"},
{display: "撤审原因", name: "revokeReason", width: 300, minWidth: 60, type: "date", align: "center"}
],
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.jsp
View file @ f7957cd9
......@@ -67,6 +67,7 @@
<div class="hg-form-row">
<x:inputC name="lgort" label="库存编码" labelCol="1"/>
<x:inputC name="lgobe" label="库存名称" labelCol="1"/>
<x:inputC name="prototypeCode" label="打样单号" labelCol="1"/>
</div>
<div class="hg-form-row">
<x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.jsp
View file @ f7957cd9
......@@ -26,6 +26,8 @@
<x:hidden name="personMemberName"/>
<x:hidden name="statusId"/>
<x:hidden name="frgdt"/>
<x:hidden name="prototypeCode"/>
<x:hidden name="kostl"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:selectC name="bsart" label="pr类型" disabled="true" labelCol="1" fieldCol="2" required="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ f7957cd9
......@@ -72,6 +72,7 @@ function getGridColumns() {
{display: "采购订单数量", name: "menge", width: "100", align: "left", type: "string"},
{display: "采购订单计量单位", name: "meins", width: "100", align: "left", type: "string"},
{display: "单位描述", name: "msehl", width: "100", align: "left", type: "string"},
{display: "序列号", name: "sernr", width: "200", align: "left", type: "string"},
{display: "要求交货日期", name: "eindt", width: "100", align: "left", type: "string"},
{display: "工厂", name: "werks", width: "100", align: "left", type: "string"},
{display: "名称", name: "name1", width: "200", align: "left", type: "string"},
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
View file @ f7957cd9
......@@ -63,6 +63,7 @@ public class SapCostReimbursementController extends CommonController {
}
public String forwardPayApplyList(){
this.putAttribute("statusKindsList", BillStatus.getValidMap());
return forward("payApplyList");
}
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/query/SapCostReimbursementQueryRequest.java
View file @ f7957cd9
......@@ -5,6 +5,7 @@ import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
/**
......@@ -143,5 +144,27 @@ public class SapCostReimbursementQueryRequest extends QueryAbstractRequest {
private String partner;
public Date getFillinDateBegin() {
return fillinDateBegin;
}
public void setFillinDateBegin(Date fillinDateBegin) {
this.fillinDateBegin = fillinDateBegin;
}
public Date getFillinDateEnd() {
return fillinDateEnd;
}
public void setFillinDateEnd(Date fillinDateEnd) {
if (fillinDateEnd != null) {
// 使用Calendar类给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(fillinDateEnd);
calendar.add(Calendar.DATE, 1); // 给日期加上一天
// 获取新的Date对象
fillinDateEnd = calendar.getTime();
}
this.fillinDateEnd = fillinDateEnd;
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java
View file @ f7957cd9
......@@ -404,6 +404,8 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
newSapPurchase.setBillCode("");
newSapPurchase.setRevokeReason(revokeReason);
newSapPurchase.setRevokeType(revokeType);
newSapPurchase.setType(null);
newSapPurchase.setMessage(null);
String pId=mannualStartWorkApplication.startWorkflow(newSapPurchase,PROCESS_DEFINITION_KEY,"sapPurchase");
newSapPurchase=this.sapPurchaseRepository.findOne(pId);
......@@ -437,6 +439,8 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
//设置默认值，并保存
sapPurchase.setBsart("ZNE2");
sapPurchase.setKnttp("K");
sapPurchase.setPrototypeCode(sapPurchaseItemDto.getPrototypeCode());
sapPurchase.setKostl(sapPurchaseItemDto.getKostl());
String id = mannualStartWorkApplication.startWorkflow(sapPurchase,PROCESS_DEFINITION_KEY,"sapPurchase");
SDO sdo = (SDO)ThreadLocalUtil.getVariable("sdo");
String billCode = sdo.getString("billCode");
......
topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/SapPurchase.java
View file @ f7957cd9
......@@ -63,6 +63,17 @@ public class SapPurchase extends FlowBillAbstractEntity {
*/
@Column(name = "MESSAGE")
private String message;
/**
* 打样单号
*/
@Column(name = "prototype_code")
private String prototypeCode;
/**
* 成本中心
*/
@Column(name = "kostl")
private String kostl;
private static final long serialVersionUID = 1L;
......
topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/query/SapPurchaseQueryRequest.java
View file @ f7957cd9
......@@ -94,4 +94,5 @@ public class SapPurchaseQueryRequest extends QueryAbstractRequest {
* 申购人部门ID
*/
private String afnamDeptId;
private String prototypeCode;
}
topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/vo/SapPurchaseItemDto.java
View file @ f7957cd9
......@@ -3,7 +3,6 @@ package com.huigou.topsun.sap.purchase.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
......@@ -135,4 +134,10 @@ public class SapPurchaseItemDto implements Serializable {
@JsonProperty("WAERS_NAME")
private String waersName;
/**
* 打样单号
*/
@JsonProperty("prototypeCode")
private String prototypeCode;
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ f7957cd9
......@@ -548,6 +548,8 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
newSapPurchaseApproval.setRevokeReason(revokeReason);
newSapPurchaseApproval.setRevokeType(revokeType);
newSapPurchaseApproval.setBillCode("");
newSapPurchaseApproval.setType(null);
newSapPurchaseApproval.setMessage(null);
String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseApproval,PROCESS_DEFINITION_KEY,"sapPurchaseApproval");
newSapPurchaseApproval=this.sapPurchaseApprovalRepository.findOne(pId);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ f7957cd9
......@@ -493,6 +493,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
newSapPurchaseOrder.setBillCode("");
newSapPurchaseOrder.setRevokeReason(revokeReason);//撤审原因
newSapPurchaseOrder.setOrderRevokeType(revokeType);//撤审类型
newSapPurchaseOrder.setMsgType(null);
newSapPurchaseOrder.setMessage(null);
String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
newSapPurchaseOrder=this.sapPurchaseOrderRepository.findOne(pId);
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java
View file @ f7957cd9
......@@ -291,4 +291,10 @@ public class SapPurchaseOrderItem extends AbstractEntity {
*/
@Column(name = "LOEKZ")
private String loekz;
/**
* 序列号
*/
@Column(name = "SERNR")
private String sernr;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java
View file @ f7957cd9
......@@ -193,4 +193,10 @@ public class SapPurchaseOrderItemVo {
@JsonProperty("LOEKZ")
private String loekz;
/**
* 序列号
*/
@JsonProperty("SERNR")
private String sernr;
}
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/costReimbursement/costReimbursement.xml
View file @ f7957cd9
......@@ -3,13 +3,20 @@
<query name="slicedSapCostReimbursementQuery" table="sap_cost_reimbursement_base_info">
<sql-query>
select t.*
from sap_cost_reimbursement_base_info t
where 1=1
SELECT t.*, d.ZPAY_STAUS
FROM sap_cost_reimbursement_base_info t
LEFT JOIN ( SELECT d.reimbursement_base_info_id, d.ZPAY_STAUS FROM sap_cost_reimbursement_detail d GROUP BY d.reimbursement_base_info_id, d.ZPAY_STAUS ) d ON t.id = d.reimbursement_base_info_id
WHERE 1 =1
</sql-query>
<condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="zep_ftype" name="zepFtype" type="java.lang.String" symbol="=" alias="t"/>
<condition column="partner" name="partner" type="java.lang.String" symbol="like" alias="t"/>
<condition column="koinh" name="koinh" type="java.lang.String" symbol="like" alias="t"/>
<condition column="fillin_date" name="fillinDateBegin" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinDatetEnd" type="java.util.Date" symbol="&lt;=" alias="t"/>
<condition column="zpay_staus" name="zpayStaus" type="java.lang.String" symbol="=" alias="d"/>
<condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
</query>
<query name="slicedSapCostReimbursementDetail" table="sap_cost_reimbursement_detail">
......
topsun/src/main/resources/config/topsun/sap/sapPurchase/sapPurchase.xml
View file @ f7957cd9
......@@ -22,6 +22,7 @@
t.revoke_reason,
t.type,
t.message,
t.prototype_code,
it.sap_purchase_id,
it.bnfpo,
it.pstyp,
......@@ -92,6 +93,7 @@
<condition column="lgort" name="lgort" type="java.lang.String" symbol="like" alias="it"/>
<condition column="dept_name" name="afnamDeptName" type="java.lang.String" symbol="like" alias="o"/>
<condition column="dept_id" name="afnamDeptId" type="java.lang.String" symbol="like" alias="o"/>
<condition column="prototype_code" name="prototypeCode" type="java.lang.String" symbol="like" alias="t"/>
</query>
</query-mappings>
......
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