Skip to content

T
topsun-bpm
Commit 7243093c authored by wanghang's avatar wanghang
Browse files
Options

导入数据增加编码填写

parent b98c3041
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 51 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ 7243093c
......@@ -10,22 +10,22 @@
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<%-- <x:hidden name="id"/>--%>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<%-- <x:hidden name="fullId"/>--%>
<%-- <x:hidden name="organId"/>--%>
<%-- <x:hidden name="organName"/>--%>
<%-- <x:hidden name="deptId"/>--%>
<%-- <x:hidden name="deptName"/>--%>
<%-- <x:hidden name="positionId"/>--%>
<%-- <x:hidden name="positionName"/>--%>
<%-- <x:hidden name="personMemberId"/>--%>
<%-- <x:hidden name="personMemberName"/>--%>
<x:hidden name="id"/>
<x:hidden name="billCode"/>
<x:hidden name="fillinDate" type="datetime"/>
<x:hidden name="fullId"/>
<x:hidden name="organId"/>
<x:hidden name="organName"/>
<x:hidden name="deptId"/>
<x:hidden name="deptName"/>
<x:hidden name="positionId"/>
<x:hidden name="positionName"/>
<x:hidden name="personMemberId"/>
<x:hidden name="personMemberName"/>
<x:title title="申请人填写区域" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="applicationId" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="applicationNo" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="applicant" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="department" label="申请部门" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 7243093c
var gridManager = null;
$(document).ready(function () {
initializateUI();
debugger
loadNonProdApplyListGrid();
})
......@@ -15,16 +15,29 @@ function loadNonProdApplyListGrid() {
});
gridManager = UICtrl.grid("#nonProdApplyListGrid", {
columns: [
{display: "导入sap", name: "btns", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "成本控制范围", name: "kokrs", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "凭证日期", name: "bldat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "过账日期", name: "budat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "凭证文本", name: "bltxt", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "SAP用户名", name: "usnam", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请单编号", name: "applicationNo", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "applicant", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "department", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "applicationDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceType", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准人", name: "approver", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准日期", name: "approvalDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnit", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "版式", name: "layout", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "尺码", name: "size", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物品属性", name: "itemAttributes", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "business_usage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapNonProdApply/slicedStatsIndicatorsList.ajax',
url: web_app.name + '/sapNonProdApply/slicedNonProdApplyList.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
......@@ -66,7 +79,7 @@ DataUtil.getUpdateRowId = function (gridManager) {
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'sapStatsIndicators/deleteStatsIndicators.ajax',
action: 'sapNonProdApply/deleteNonProdApply.ajax',
gridManager: gridManager, idFieldName: 'id',
onSuccess: function () {
reloadGrid();
......@@ -76,16 +89,16 @@ function deleteHandler() {
function addHandler() {
UICtrl.addTabItem({
tabid: 'statsIndicators',
tabid: 'nonProdApply',
text: "统计指标数据",
url: web_app.name + '/sapStatsIndicators/forwardStatsIndicators.job'
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
});
}
function doView(id) {
UICtrl.addTabItem({
tabid: 'showStatsIndicators'+id,
tabid: 'showNonProdApply'+id,
text: "统计指标详情",
url: web_app.name + '/sapStatsIndicators/showStatsIndicators.job?bizId='+id+"&isDetailPage=true"
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ 7243093c
......@@ -4,7 +4,7 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicatorsList.js'/>
<%-- <x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyList.js'/>--%>
</head>
<body>
<div class="container-fluid">
......@@ -13,7 +13,7 @@
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="统计指标">
<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="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
......@@ -24,7 +24,5 @@
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ 7243093c
package com.huigou.topsun.sap.nonProdApply.application.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.sap.common.DefaultHttpClient;
import com.huigou.topsun.sap.common.serializer.MessageCodec;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoRepository;
import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsApplication;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicatorsDetail;
import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsQueryRequest;
import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsDetailRepository;
import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsRepository;
import com.huigou.topsun.sap.statsIndicators.repository.SapStatsIndicatorsResultRepository;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import com.huigou.util.SDO;
import lombok.SneakyThrows;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
......@@ -31,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@Service
@Service("nonProdApplyApplication")
public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdApplyApplication {
@Autowired
NonProdApplyBaseInfoRepository nonProdApplyBaseInfoRepository;
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 7243093c
......@@ -29,6 +29,8 @@ public class NonProdApplyController extends CommonController {
@Autowired
NonProdApplyApplication nonProdApplyApplication;
public static String generateApplicationNo() {
String dateStamp =getCurrentDate("yyyyMMdd");
// 生成10位随机数
......@@ -45,6 +47,10 @@ public class NonProdApplyController extends CommonController {
return formattedDate;
}
public String forwardNonProdApplyList(){
return forward("nonProdApplyList");
}
public String forwardNonProdApplyDetail(){
this.putAttribute("processDefinitionKey", NonProdApplyApplication.PROCESS_DEFINITION_KEY);
this.putAttribute("procUnitId", "Apply");//定义流程环节的id
......@@ -52,9 +58,9 @@ public class NonProdApplyController extends CommonController {
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator();//获取当前操作员的详情信息
nonProdApplyBaseInfo.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
this.putAttribute("applicationId",generateApplicationNo());
this.putAttribute("applicationNo",generateApplicationNo());
this.putAttribute("applicationDate",getCurrentDate("yyyy/MM/dd"));
return forward("nonProdApplyDetail");
return forward("nonProdApplyDetail",nonProdApplyBaseInfo);
}
public String slicedNonProdApplyList(){
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
View file @ 7243093c
......@@ -20,9 +20,8 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
/**
* 申请单编号
*/
@Id
@Column(name = "application_id")
private Integer applicationId;
@Column(name = "application_no")
private Integer applicationNo;
/**
* 申请人
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java
View file @ 7243093c
......@@ -10,7 +10,7 @@ public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest
/**
* 申请单编号
*/
private Integer applicationId;
private Integer applicationNo;
/**
* 申请人
......
topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/repository/SapStatsIndicatorsResultRepository.java
View file @ 7243093c
package com.huigou.topsun.sap.statsIndicators.repository;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicatorsDetail;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicatorsResult;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface SapStatsIndicatorsResultRepository extends JpaRepository<SapStatsIndicatorsResult,String> {
......
topsun/src/main/resources/config/bpm/topsun/sapNonProdApplyProc.bpmn 0 → 100644
View file @ 7243093c
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
<process id="sapStatsIndicatorsProc" name="统计指标" isExecutable="true">
<extensionElements>
<activiti:executionListener event="start" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:executionListener>
<activiti:executionListener event="end" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:executionListener>
</extensionElements>
<startEvent id="startevent1" name="Start"></startEvent>
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="Apply" name="统计指标申请" activiti:formKey="sapStatsIndicators/showStatsIndicators.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
</extensionElements>
</userTask>
<userTask id="Approve" name="统计指标审批" activiti:assignee="${assignee} " activiti:formKey="sapStatsIndicators/showStatsIndicators.job">
<extensionElements>
<activiti:taskListener event="all" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
<activiti:taskListener event="saveBizData" delegateExpression="#{sapStatsIndicatorsApplication}"></activiti:taskListener>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" activiti:collection="handlerList" activiti:elementVariable="assignee">
<completionCondition>${chiefApprovePassed}</completionCondition>
</multiInstanceLoopCharacteristics>
</userTask>
<sequenceFlow id="flow1" sourceRef="startevent1" targetRef="Apply"></sequenceFlow>
<sequenceFlow id="flow2" sourceRef="Apply" targetRef="Approve"></sequenceFlow>
<exclusiveGateway id="ApproveFinished" name="审批结束"></exclusiveGateway>
<sequenceFlow id="flow3" name="审批通过" sourceRef="ApprovePassed" targetRef="ApproveFinished">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${approvePassed}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow4" name="审批结束" sourceRef="ApproveFinished" targetRef="endevent1">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${approveFinished}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow5" name="审批未结束" sourceRef="ApproveFinished" targetRef="Approve">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${!approveFinished}]]></conditionExpression>
</sequenceFlow>
<exclusiveGateway id="ApprovePassed" name="审批通过"></exclusiveGateway>
<sequenceFlow id="flow6" sourceRef="Approve" targetRef="ApprovePassed"></sequenceFlow>
<sequenceFlow id="flow9" name="审批未通过" sourceRef="ApprovePassed" targetRef="Apply">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${!approvePassed}]]></conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_sapStatsIndicatorsProc">
<bpmndi:BPMNPlane bpmnElement="sapStatsIndicatorsProc" id="BPMNPlane_sapStatsIndicatorsProc">
<bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
<omgdc:Bounds height="35.0" width="35.0" x="355.0" y="50.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
<omgdc:Bounds height="35.0" width="35.0" x="355.0" y="550.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="Apply" id="BPMNShape_Apply">
<omgdc:Bounds height="55.0" width="161.0" x="292.0" y="140.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="Approve" id="BPMNShape_Approve">
<omgdc:Bounds height="55.0" width="161.0" x="292.0" y="240.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ApproveFinished" id="BPMNShape_ApproveFinished">
<omgdc:Bounds height="40.0" width="40.0" x="352.0" y="440.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="ApprovePassed" id="BPMNShape_ApprovePassed">
<omgdc:Bounds height="40.0" width="40.0" x="352.0" y="349.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
<omgdi:waypoint x="372.0" y="85.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="140.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
<omgdi:waypoint x="372.0" y="195.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="240.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
<omgdi:waypoint x="372.0" y="389.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="440.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="48.0" x="320.0" y="396.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
<omgdi:waypoint x="372.0" y="480.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="550.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="48.0" x="382.0" y="489.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
<omgdi:waypoint x="392.0" y="460.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="459.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="317.0"></omgdi:waypoint>
<omgdi:waypoint x="519.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="489.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="453.0" y="267.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="60.0" x="459.0" y="411.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
<omgdi:waypoint x="372.0" y="295.0"></omgdi:waypoint>
<omgdi:waypoint x="372.0" y="349.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9">
<omgdi:waypoint x="352.0" y="369.0"></omgdi:waypoint>
<omgdi:waypoint x="231.0" y="369.0"></omgdi:waypoint>
<omgdi:waypoint x="231.0" y="167.0"></omgdi:waypoint>
<omgdi:waypoint x="292.0" y="167.0"></omgdi:waypoint>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="60.0" x="257.0" y="376.0"></omgdc:Bounds>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
\ 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