Skip to content

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

导入数据增加编码填写

parent b384026f
Hide whitespace changes
Inline Side-by-side
Showing with 513 additions and 45 deletions
huigou-xt/src/main/webapp/system/excelimport/AssignCodeImp.js
View file @ b98c3041
...@@ -90,7 +90,7 @@ $.extend(ExcelImpManager.prototype,{ ...@@ -90,7 +90,7 @@ $.extend(ExcelImpManager.prototype,{
debugger debugger
//截断事件发送请求，为全局code赋值 //截断事件发送请求，为全局code赋值
let code = prompt("请输入编码"); let code = prompt("请输入编码");
Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{code:code}) Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{dictionaryCode:code})
if(_self.getTemplateId()==''){ if(_self.getTemplateId()==''){
Public.errorTip('请选择模板。'); Public.errorTip('请选择模板。');
......
huigou-xt/src/main/webapp/system/excelimport/inputDictionariesCode.js 0 → 100644
View file @ b98c3041
$(document).ready(function () {
$('#productCode').searchbox({
type: "product",
name: "productCode",
onChange: function (value, data) {
$('#dictionaryCode').val(data.code)
}
});
});
huigou-xt/src/main/webapp/system/excelimport/inputDictionariesCode.jsp 0 → 100644
View file @ b98c3041
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
</head>
<body>
<x:billTitle title="导入字典对应编码" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:inputC name="dictionaryCode" wrapper="select" label="对应编码" labelCol="1" fieldCol="2"/>
</form>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ b98c3041
...@@ -10,57 +10,57 @@ ...@@ -10,57 +10,57 @@
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页--> <x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/> <x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<%-- <x:hidden name="id"/>--%> <%-- <x:hidden name="id"/>--%>
<%-- <x:hidden name="billCode"/>--%> <%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%> <%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<%-- <x:hidden name="fullId"/>--%> <%-- <x:hidden name="fullId"/>--%>
<%-- <x:hidden name="organId"/>--%> <%-- <x:hidden name="organId"/>--%>
<%-- <x:hidden name="organName"/>--%> <%-- <x:hidden name="organName"/>--%>
<%-- <x:hidden name="deptId"/>--%> <%-- <x:hidden name="deptId"/>--%>
<%-- <x:hidden name="deptName"/>--%> <%-- <x:hidden name="deptName"/>--%>
<%-- <x:hidden name="positionId"/>--%> <%-- <x:hidden name="positionId"/>--%>
<%-- <x:hidden name="positionName"/>--%> <%-- <x:hidden name="positionName"/>--%>
<%-- <x:hidden name="personMemberId"/>--%> <%-- <x:hidden name="personMemberId"/>--%>
<%-- <x:hidden name="personMemberName"/>--%> <%-- <x:hidden name="personMemberName"/>--%>
<x:title title="申请人填写区域" name="group"/> <x:title title="申请人填写区域" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="applicationId" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/> <x:inputC name="applicationId" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="applicant" label="申请人" labelCol="1" fieldCol="2"/> <x:inputC name="applicant" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="department" 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"/> <x:inputC name="applicationDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/> <x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/> <x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="approver" label="批准人" labelCol="1" fieldCol="2"/> <x:inputC name="approver" label="批准人" labelCol="1" fieldCol="2"/>
<x:inputC name="approvalDate" label="批准日期" wrapper="date" labelCol="1" fieldCol="2"/> <x:inputC name="approvalDate" label="批准日期" wrapper="date" labelCol="1" fieldCol="2"/>
</div> </div>
</div> </div>
<x:title title="维护物品总体内容" name="group"/> <x:title title="维护物品总体内容" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/> <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/> <x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="suppliesType"/> <x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/> <x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/> <x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="layout" label="版式" labelCol="1" fieldCol="2"/> <x:inputC name="layout" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/> <x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/> <x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/> <x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/> <x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务状态" dictionary="serviceusage" labelCol="1" fieldCol="11"/> <x:checkboxListC name="businessUsage" label="业务状态" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div>
</form> </form>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js 0 → 100644
View file @ b98c3041
var gridManager = null;
$(document).ready(function () {
initializateUI();
loadNonProdApplyListGrid();
})
function loadNonProdApplyListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function (){
addHandler()
},
deleteHandler: deleteHandler,
});
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"},
],
dataAction: "server",
url: web_app.name + '/sapNonProdApply/slicedStatsIndicatorsList.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
doView(data.id);
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
function resetForm(obj) {
$(obj).formClean();
}
//重写DataUtil的getUpdateRowId函数、它默认取行的id列
DataUtil.getUpdateRowId = function (gridManager) {
var result = DataUtil.getUpdateRow(gridManager);
if (result) {
return result.proofingMakeId;
}
return result;
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'sapStatsIndicators/deleteStatsIndicators.ajax',
gridManager: gridManager, idFieldName: 'id',
onSuccess: function () {
reloadGrid();
}
});
}
function addHandler() {
UICtrl.addTabItem({
tabid: 'statsIndicators',
text: "统计指标数据",
url: web_app.name + '/sapStatsIndicators/forwardStatsIndicators.job'
});
}
function doView(id) {
UICtrl.addTabItem({
tabid: 'showStatsIndicators'+id,
text: "统计指标详情",
url: web_app.name + '/sapStatsIndicators/showStatsIndicators.job?bizId='+id+"&isDetailPage=true"
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp 0 → 100644
View file @ b98c3041
<%@ page contentType="text/html; charset=utf-8" language="java" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicatorsList.js'/>
</head>
<body>
<div class="container-fluid">
<div class="ui-hide">
<x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<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"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
<div id="nonProdApplyListGrid" style="margin: 2px;"></div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/dictionary/controller/GlobalCodeController.java
View file @ b98c3041
...@@ -12,7 +12,7 @@ public class GlobalCodeController extends CommonController { ...@@ -12,7 +12,7 @@ public class GlobalCodeController extends CommonController {
public String revampGlobalCode(){ public String revampGlobalCode(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String code = sdo.getString("code"); String code = sdo.getString("dictionaryCode");
GlobalCode.set(code); GlobalCode.set(code);
return success(); return success();
} }
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyApplication.java
View file @ b98c3041
package com.huigou.topsun.sap.nonProdApply.application; package com.huigou.topsun.sap.nonProdApply.application;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import java.util.List;
import java.util.Map;
public interface NonProdApplyApplication{ public interface NonProdApplyApplication{
String PROCESS_DEFINITION_KEY = "sapNonProdApplyProc";
String QUERY_XML_FILE_PATH="config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml";
NonProdApplyBaseInfo loadNonProdApplyBaseInfoById(String id);
Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query);
void deleteNonProdApplyBaseInfoById(String id);
void deleteNonProdApplyBaseInfoByIds(List<String> ids);
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ b98c3041
package com.huigou.topsun.sap.nonProdApply.application.impl; package com.huigou.topsun.sap.nonProdApply.application.impl;
public class NonProdApplyApplicationImpl { 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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@Service
public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdApplyApplication {
@Autowired
NonProdApplyBaseInfoRepository nonProdApplyBaseInfoRepository;
@SneakyThrows
@Transactional(propagation = Propagation.REQUIRES_NEW)
@Override
protected String saveBizAndApprovalData() {
super.saveBizAndApprovalData();
NonProdApplyBaseInfo nonProdApplyBaseInfo = getBizEntity(NonProdApplyBaseInfo.class);
if (nonProdApplyBaseInfo.isNew()) {
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
} else {
nonProdApplyBaseInfo = (NonProdApplyBaseInfo) commonDomainService.loadAndFillinProperties(nonProdApplyBaseInfo);
}
nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
return nonProdApplyBaseInfo.getId();
}
@Override
protected Map<String, Object> getProcessBizParams(String bizId) {
// 返回业务数据给流程实例，
return ClassHelper.toMap(nonProdApplyBaseInfoRepository.getOne(bizId));
}
/**
* 流程实例结束
*
* @param delegateExecution
*/
@Override
protected void onEnd(DelegateExecution delegateExecution) {
super.onEnd(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
nonProdApplyBaseInfo.setStatusId(status.getId());
nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
}
@Override
protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
super.onAbortProcessInstance(delegateExecution);
String bizId = delegateExecution.getProcessBusinessKey();
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
nonProdApplyBaseInfo.setStatusId(BizBillStatus.ABORTED.getId());
nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
}
/**
* @param delegateTask
* @param destActivityId 回退到的目标节点id
*/
@Override
protected void onBack(DelegateTask delegateTask, String destActivityId) {
super.onBack(delegateTask, destActivityId);
if ("Apply".equalsIgnoreCase(destActivityId)) {
String bizId = delegateTask.getExecution().getProcessBusinessKey();
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
}
}
@Override
public NonProdApplyBaseInfo loadNonProdApplyBaseInfoById(String id) {
return nonProdApplyBaseInfoRepository.findOne(id);
}
@Override
public Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonProdApplyBaseInfoQuery");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor, query);
}
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void deleteNonProdApplyBaseInfoById(String id) {
nonProdApplyBaseInfoRepository.delete(id);
}
@Override
@Transactional
public void deleteNonProdApplyBaseInfoByIds(List<String> ids) {
ids.forEach(this::deleteNonProdApplyBaseInfoById);
}
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ b98c3041
...@@ -3,17 +3,20 @@ package com.huigou.topsun.sap.nonProdApply.controller; ...@@ -3,17 +3,20 @@ package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.base.dictionary.GlobalCode; import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsApplication; import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators; import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map;
@Controller @Controller
@ControllerMapping("/sapNonProdApply") @ControllerMapping("/sapNonProdApply")
...@@ -23,6 +26,9 @@ public class NonProdApplyController extends CommonController { ...@@ -23,6 +26,9 @@ public class NonProdApplyController extends CommonController {
return "/biz/topsun/sap/nonProdApply/"; return "/biz/topsun/sap/nonProdApply/";
} }
@Autowired
NonProdApplyApplication nonProdApplyApplication;
public static String generateApplicationNo() { public static String generateApplicationNo() {
String dateStamp =getCurrentDate("yyyyMMdd"); String dateStamp =getCurrentDate("yyyyMMdd");
// 生成10位随机数 // 生成10位随机数
...@@ -40,9 +46,43 @@ public class NonProdApplyController extends CommonController { ...@@ -40,9 +46,43 @@ public class NonProdApplyController extends CommonController {
} }
public String forwardNonProdApplyDetail(){ public String forwardNonProdApplyDetail(){
this.putAttribute("processDefinitionKey", NonProdApplyApplication.PROCESS_DEFINITION_KEY);
this.putAttribute("procUnitId", "Apply");//定义流程环节的id
NonProdApplyBaseInfo nonProdApplyBaseInfo = new NonProdApplyBaseInfo();
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator();//获取当前操作员的详情信息
nonProdApplyBaseInfo.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
this.putAttribute("applicationId",generateApplicationNo()); this.putAttribute("applicationId",generateApplicationNo());
this.putAttribute("applicationDate",getCurrentDate("yyyy/MM/dd")); this.putAttribute("applicationDate",getCurrentDate("yyyy/MM/dd"));
return forward("nonProdApplyDetail"); return forward("nonProdApplyDetail");
} }
public String slicedNonProdApplyList(){
SDO sdo = this.getSDO();
NonProdApplyBaseInfoQueryRequest queryRequest = sdo.toQueryRequest(NonProdApplyBaseInfoQueryRequest.class);
Map<String, Object> map = nonProdApplyApplication.slicedNonProdApplyBaseInfoQuery(queryRequest);
return toResult(map);
}
/**
* 工作流审核跳转页面
* @return
*/
public String showNonProdApply() {
SDO sdo = this.getSDO();
String id = sdo.getBizId();
String isDetailPage = sdo.getString("isDetailPage");
if("true".equals(isDetailPage)) this.putAttribute("isDetailPage","true");
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("statsIndicators", nonProdApplyBaseInfo);
}
public String deleteNonProdApply(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
nonProdApplyApplication.deleteNonProdApplyBaseInfoByIds(ids);
return success();
}
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
View file @ b98c3041
package com.huigou.topsun.sap.nonProdApply.domain; package com.huigou.topsun.sap.nonProdApply.domain;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* 非产品/非本成品类物料主数据维护申请基础表 * 非产品/非本成品类物料主数据维护申请基础表
* @TableName non_prod_apply_base_info * @TableName non_prod_apply_base_info
*/ */
@Table(name="non_prod_apply_base_info") @Table(name="sap_non_prod_apply_base_info")
@Data @Data
@Entity @Entity
public class NonProdApplyBaseInfo implements Serializable { public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
/** /**
* 申请单编号 * 申请单编号
*/ */
...@@ -130,5 +130,9 @@ public class NonProdApplyBaseInfo implements Serializable { ...@@ -130,5 +130,9 @@ public class NonProdApplyBaseInfo implements Serializable {
@Column(name = "text_description") @Column(name = "text_description")
private String textDescription; private String textDescription;
private static final long serialVersionUID = 1L;
@Override
protected String getCodeRuleId() {
return "sapNonProdApply";
}
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java 0 → 100644
View file @ b98c3041
package com.huigou.topsun.sap.nonProdApply.domain.query;
import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
import lombok.Data;
import java.util.Date;
@Data
public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest {
/**
* 申请单编号
*/
private Integer applicationId;
/**
* 申请人
*/
private String applicant;
/**
* 申请部门
*/
private String department;
/**
* 申请日期
*/
private Date applicationDate;
/**
* 维护类型
*/
private String maintenanceType;
/**
* 批准状态
*/
private String approvalStatus;
/**
* 批准人
*/
private String approver;
/**
* 批准日期
*/
private Date approvalDate;
/**
* 通用品名
*/
private String genericName;
/**
* 适用标准
*/
private String applicableStandard;
/**
* 基本计量单位
*/
private String baseUnit;
/**
* 规格
*/
private String specifications;
/**
* 材质
*/
private String material;
/**
* 版式
*/
private String layout;
/**
* 尺码
*/
private String size;
/**
* 品牌
*/
private String brand;
/**
* 用途
*/
private String materialUsage;
/**
* 物品属性
*/
private String itemAttributes;
/**
* 业务用途
*/
private String businessUsage;
/**
* 文本说明
*/
private String textDescription;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyBaseInfoRepository.java 0 → 100644
View file @ b98c3041
package com.huigou.topsun.sap.nonProdApply.repository;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import org.springframework.data.jpa.repository.JpaRepository;
public interface NonProdApplyBaseInfoRepository extends JpaRepository<NonProdApplyBaseInfo,String> {
}
topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/domain/query/SapStatsIndicatorsDetailQueryRequest.java
View file @ b98c3041
package com.huigou.topsun.sap.statsIndicators.domain.query; package com.huigou.topsun.sap.statsIndicators.domain.query;
import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
import com.huigou.data.domain.query.QueryAbstractRequest; import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -9,7 +10,7 @@ import java.math.BigDecimal; ...@@ -9,7 +10,7 @@ import java.math.BigDecimal;
* @TableName sap_stats_indicators * @TableName sap_stats_indicators
*/ */
@Data @Data
public class SapStatsIndicatorsDetailQueryRequest extends QueryAbstractRequest { public class SapStatsIndicatorsDetailQueryRequest extends FlowBillSuperQueryRequest {
/** /**
* 行号 * 行号
......
topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml 0 → 100644
View file @ b98c3041
<?xml version="1.0" encoding="UTF-8" ?>
<query-mappings>
<query name="slicedNonProdApplyBaseInfoQuery" table="sap_non_prod_apply_base_info">
<sql-query>
select t.* from sap_non_prod_apply_base_info t
where 1=1
</sql-query>
<!-- <condition column="stats_indicators_id" name="statsIndicatorsId" type="java.lang.String" symbol="=" 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