Skip to content

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

同步非产品/非本成品类物料基本信息到SAP

parent ecd23e26
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 932 additions and 536 deletions
huigou-xt/src/main/webapp/system/taskCenter/TasksExecute.js
View file @ deecfac3
......@@ -78,7 +78,7 @@ function showTask(taskKind){
function reloadExecuteTasks() {
Public.ajax(web_app.name + "/homePage/queryAllTasks.ajax", {}, function (data) {
parseTaskHtml('#waitTaskContent',data['tasks']);
parseTaskHtml('#trackTaskContent',data['trackingTasks']);
parseSpecialTaskHtml('#trackTaskContent',data['trackingTasks']);
$('span.taskCount').html(data['taskCount']);
$('span.trackingTaskCount').html(data['trackingTaskCount']);
});
......@@ -109,4 +109,31 @@ function parseTaskHtml(container,taskList){
html.push('</div>');
});
$(container).html(html.join(''));
}
function parseSpecialTaskHtml(container,taskList){
if(!taskList) return;
var html=[];
$.each(taskList, function (i, o) {
html.push('<div id="task_',o.id,'"');
if(o.statusId=='ready'){
html.push(' class="ready_task"');
}
html.push(' catalogId="',o.catalogId,'"');
html.push(' taskKindId="',o.kindId,'"');
html.push(' bizId="',o.businessId,'"');
html.push(' taskId="',o.id,'"');
html.push(' statusId="',o.statusId,'"');
html.push(' name="',o.title,'"');
html.push(' url="',o.executorUrl,'"');
html.push('>');
html.push('<div class="title-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.title + ':' + o.taskDescribe,'</a>');
html.push('</div>');
html.push('<div class="date-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.updateDate,'</a>');
html.push('</div>');
html.push('</div>');
});
$(container).html(html.join(''));
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.js
View file @ deecfac3
......@@ -14,8 +14,8 @@ $(document).ready(function () {
function initializate() {
$("#businessPersonnelList").hide();
//页面控制
debugger
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -172,7 +172,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val()+"000");
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -184,6 +185,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -220,7 +222,6 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -246,7 +247,6 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.jsp
View file @ deecfac3
......@@ -10,23 +10,23 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料分类信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
<button id="showChart" title="" type="button" onclick="distributeForm()" class="btn btn-gray"><i
class="fa fa-sitemap"></i>分发
</button>
</div>
<br/>
......@@ -52,7 +52,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -84,9 +84,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.js
View file @ deecfac3
......@@ -15,7 +15,8 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide()
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -171,7 +172,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -183,6 +185,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -220,7 +223,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -246,7 +249,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.jsp
View file @ deecfac3
......@@ -10,17 +10,19 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料成本信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="meId"/> <!--状态-->
<x:hidden name="active"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +54,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -86,9 +88,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.js
View file @ deecfac3
......@@ -2,6 +2,7 @@ var gridManager = null;
$(document).ready(function () {
initialize();
bindEvent();
});
function initialize(){
let isDetailPage = ($("#isDetailPage").val() === "true");
......@@ -24,4 +25,18 @@ function setId(id) {
*/
function getId() {
return $("#id").val() || "";
}
function bindEvent(){
$('#baseUnit').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName:"MEINS"
}
},
onChange: function (value, data) {
$('#baseUnit').val(data.MSEH3);
}
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ deecfac3
......@@ -43,7 +43,7 @@
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.js
View file @ deecfac3
......@@ -15,7 +15,8 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide();
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -171,7 +172,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
// alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -183,6 +185,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -224,7 +227,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -250,7 +253,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.jsp
View file @ deecfac3
......@@ -10,17 +10,19 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料财务信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +54,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -90,9 +92,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ deecfac3
......@@ -22,11 +22,15 @@ function loadNonProdApplyListGrid() {
Public.tip("请选择一条已审核后数据！")
return false;
}
var url = '/sapNonProdApplyNext/forwardNonProdApplyNext.do?bizId='+result.id;
if (result.deptStatus == 1){
url = '/sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=true&bizId='+result.id;
}
UICtrl.addTabItem({
tabid: 'showNonProdApplyNext'+result.id,
text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApplyNext/forwardNonProdApplyNext.do?bizId='+result.id
url: web_app.name + url
});
}
},
......@@ -45,15 +49,16 @@ function loadNonProdApplyListGrid() {
});
gridManager = UICtrl.grid("#nonProdApplyListGrid", {
columns: [
{display: "申请单编号", name: "billCode", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请单编号", name: "billCode", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
{display: "维护类型", name: "maintenanceTypeTextView", 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: "approvalDate", width: 140, minWidth: 60, type: "date", align: "left"},
{display: "物料编码", name: "matnr", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "通用品名", name: "genericName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
......@@ -63,7 +68,7 @@ function loadNonProdApplyListGrid() {
{display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "businessUsageTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "businessUsageTextView", width: 300, minWidth: 60, type: "string", align: "left"},
{display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
],
......@@ -128,7 +133,7 @@ function doView(id) {
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?isReadOnly=true&bizId='+id+"&isDetailPage=true"
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.js
View file @ deecfac3
......@@ -15,7 +15,7 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide()
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -173,8 +173,9 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
// alert($("#businessCode").val());
$("#active").val(status)
let extendedData = getExtendedData();
if (!extendedData) return false;
var _self = this;
......@@ -185,6 +186,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -249,7 +251,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -275,7 +277,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料MRP信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -95,7 +98,7 @@
<x:inputC name="webaz" label="收货处理天数" labelCol="1" fieldCol="2"/>
<x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/>
<x:inputC name="plifz" label="外部采购交货时间" labelCol="1" fieldCol="2"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2"/>
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
<x:inputC name="strgr" label="策略组" labelCol="1" fieldCol="2" required="true"/>
......@@ -110,9 +113,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMass.js
View file @ deecfac3
......@@ -15,7 +15,8 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide();
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -171,7 +172,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -183,6 +185,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -227,7 +230,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -253,7 +256,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMass.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料质量信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -92,9 +95,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ deecfac3
......@@ -10,14 +10,23 @@ $(document).ready(function () {
loadGrid();
// initAssistantGrid();
loadRejectReasonBox();
bindEvent();
})
function initializate() {
//
//$("##businessUsageDiv").hide();
UICtrl.setDisable("#businessUsageDiv")
// var status = $("#status").val();
// if (status == 1){
// UICtrl.setDisable("#submitForm");
// UICtrl.setDisable("#auditForm");
// }
//页面控制
debugger
switch ($("#active").val()) {
case '0'://已分发未完成
$("##businessUsageDiv").hide();
if ($("#deptCode").val() === "system") {
$("#auditForm").show();
} else {
......@@ -127,26 +136,8 @@ function loadGrid() {
textField: 'userName',
valueField: 'userCode'
}
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "testUser",
// back: {
// id: "userName",
// userCode: "userCode"
// },
// getParam: function (data) {
// return {deptCode: data.deptCode}
// },
// },
// }
},
{ display: "人员Id", name: "userCode", width: 260, minWidth: 60, type: "string", align: "left",
editor: {
type: 'text',
required: true
}
{ display: "人员Id", name: "userCode", width: 260, minWidth: 60, type: "string", align: "left",hide: true
},
],
dataAction: "server",
......@@ -171,6 +162,7 @@ function loadGrid() {
*/
function saveForm() {
// alert($("#businessCode").val());
$("#status").val(0)
let extendedData = getExtendedData();
if (!extendedData) return false;
var _self = this;
......@@ -181,6 +173,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -223,6 +216,7 @@ function clearForm() {
* 分发表单到各个部门
*/
function distributeForm() {
$("#status").val(1)
if (control.isDistribute) {
Public.successTip("已分发");
return false;
......@@ -240,12 +234,103 @@ function distributeForm() {
});
}
function bindEvent() {
$('#matklName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MATKL"}
},
onChange: function (value, data) {
$('#matkl').val(data.MATKL);
$('#matklName').val(data.WGBEZ);
}
});
$('#spartName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "SPART"}
},
onChange: function (value, data) {
$('#spart').val(data.SPART);
$('#spartName').val(data.VTEXT);
}
});
$('#meins').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#meins').val(data.MSEH3);
}
});
$('#werksName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
onChange: function (value, data) {
$('#werks').val(data.WERKS);
$('#werksName').val(data.NAME1);
}
});
$('#lgortName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGORT"}
},
onChange: function (value, data) {
$('#lgort').val(data.LGORT);
$('#lgortName').val(data.LGOBE);
}
});
$('#vkorgName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "VKORG"}
},
onChange: function (value, data) {
$('#vkorg').val(data.VKORG);
$('#vkorgName').val(data.VTEXT);
}
});
$('#vtwegName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "VTWEG"}
},
onChange: function (value, data) {
$('#vtweg').val(data.VTWEG);
$('#vtwegName').val(data.VKORGTEXT);
}
});
$('#lgnumName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGNUM"}
},
onChange: function (value, data) {
$('#lgnum').val(data.LGNUM);
$('#lgnumName').val(data.LNUMT);
}
});
$('#lgtypName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGTYP",
filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#lgtyp').val(data.LGTYP);
$('#lgtypName').val(data.LTYPT);
}
});
}
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -271,7 +356,6 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.js
View file @ deecfac3
......@@ -15,7 +15,8 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide();
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -170,7 +171,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -182,6 +184,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -222,7 +225,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -248,7 +251,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.jsp
View file @ deecfac3
......@@ -10,23 +10,23 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料生产信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
<button id="showChart" title="" type="button" onclick="distributeForm()" class="btn btn-gray"><i
class="fa fa-sitemap"></i>分发
</button>
</div>
<br/>
......@@ -52,7 +52,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -88,9 +88,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.js
View file @ deecfac3
......@@ -10,12 +10,13 @@ $(document).ready(function () {
loadGrid();
// initAssistantGrid();
loadRejectReasonBox();
bindEvent()
})
function initializate() {
$("#businessPersonnelList").hide()
//页面控制
debugger
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -172,7 +173,8 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
// alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -184,6 +186,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -218,12 +221,30 @@ function distributeForm() {
});
}
function bindEvent(){
$('#bstme').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#bstme').val(data.MSEH3);
}
});
$('#ekgrpName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "EKGRP"}
},
onChange: function (value, data) {
$('#ekgrp').val(data.EKGRP);
$('#ekgrpName').val(data.EKNAM);
}
});
}
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -249,7 +270,6 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料采购信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--执行消息id-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -75,11 +78,12 @@
<x:title title="维护采购信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:selectC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="umrenPurch" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrezPurch" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="ekgrp" label="默认采购组" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ekgrpName" label="默认采购组" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
<x:hidden name="ekgrp"/>
<x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>
</div>
</div>
......@@ -88,9 +92,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.js
View file @ deecfac3
......@@ -10,12 +10,13 @@ $(document).ready(function () {
loadGrid();
// initAssistantGrid();
loadRejectReasonBox();
bindEvent()
})
function initializate() {
$("#businessPersonnelList").hide();
//页面控制
debugger
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -199,7 +200,8 @@ function clearForm(){
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
$("#active").val(status)
//alert($("#businessCode").val());
let extendedData = getExtendedData();
if (!extendedData) return false;
......@@ -211,6 +213,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -241,7 +244,6 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -267,7 +269,6 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......@@ -376,4 +377,102 @@ function showRejectCauseBox() {
function getMeId() {
return $("#meId").val() || '';
}
function bindEvent(){
$('#vtwegName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "VTWEG"}
},
onChange: function (value, data) {
$('#vtweg').val(data.VTWEG);
$('#vtwegName').val(data.VKORGTEXT);
}
});
/*$('#dwerk').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "DWERK"}
},
onChange: function (value, data) {
$('#dwerk').val(data.DWERK);
}
});
$('#aland').searchbox({
type: "system", name: "dictionary",
isMultipleSelect:true,
getParam: function (item) {
return {fieldName: "ALAND"}
},
onChange: function (value, data) {
$('#aland').val(data.ALAND);
}
});
$('#taxkm').searchbox({
type: "system", name: "dictionary",
isMultipleSelect:true,
getParam: function (item) {
return {fieldName: "TAXKM"}
},
onChange: function (value, data) {
$('#taxkm').val(data.TAXKM);
}
});
$('#versg').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "VERSG"}
},
onChange: function (value, data) {
$('#versg').val(data.VERSG);
}
});
$('#kondm').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "KONDM"}
},
onChange: function (value, data) {
$('#kondm').val(data.KONDM);
}
});
$('#ktgrm').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "KTGRM"}
},
onChange: function (value, data) {
$('#ktgrm').val(data.KTGRM);
}
});
$('#mtpos').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MTPOS"}
},
onChange: function (value, data) {
$('#mtpos').val(data.MTPOS);
}
});
$('#tragr').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "TRAGR"}
},
onChange: function (value, data) {
$('#tragr').val(data.TRAGR);
}
});
$('#ladgr').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LADGR"}
},
onChange: function (value, data) {
$('#ladgr').val(data.LADGR);
}
});*/
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料销售信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -76,26 +79,28 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:selectC name="vkorg" required="false" label="销售组织" labelCol="1" dictionary="vkorg" fieldCol="2"/>
<x:selectC name="vtweg" required="false" label="分销渠道" labelCol="1" dictionary="vtweg" fieldCol="2"/>
<x:inputC name="vtwegName" required="false" label="分销渠道" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="vtweg"/>
<x:selectC name="vrkme" label="销售计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="umren" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrez" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrezSale" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="dwerk" label="交货工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="aland" label="税收发运国" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="taxkm" label="税分类" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="versg" label="统计组" labelCol="1" fieldCol="2"/>
<x:inputC name="kondm" label="物料定价组" labelCol="1" fieldCol="2"/>
<x:inputC name="ktgrm" label="会计科目组" labelCol="1" fieldCol="2" required="true"/>
<x:selectC name="prodh" label="产品层级" labelCol="1" fieldCol="2" dictionary="productLevels"/>
<x:selectC name="taxkm" label="税分类" labelCol="1" fieldCol="2" required="true" dictionary="taxkm"/>
<x:selectC name="versg" label="统计组" labelCol="1" fieldCol="2" dictionary="versg"/>
<x:selectC name="kondm" label="物料定价组" labelCol="1" fieldCol="2" dictionary="kondm"/>
<x:selectC name="ktgrm" label="会计科目组" labelCol="1" fieldCol="2" required="true" dictionary="ktgrm"/>
<%--<x:selectC name="prodh" label="产品层级" labelCol="1" fieldCol="2" dictionary="productLevels"/>--%>
<x:inputC name="prodh" label="产品层级" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr1" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr2" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr3" label="用途" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr4" label="备用" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr5" label="备用" labelCol="1" fieldCol="2"/>
<x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false"/>
</div>
</div>
......@@ -103,9 +108,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.js
View file @ deecfac3
......@@ -15,7 +15,8 @@ $(document).ready(function () {
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide();
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -172,8 +173,9 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
// alert($("#businessCode").val());
$("#active").val(status)
let extendedData = getExtendedData();
if (!extendedData) return false;
var _self = this;
......@@ -184,6 +186,7 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
......@@ -220,7 +223,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -246,7 +249,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料存储信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -79,7 +82,7 @@
<x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
<x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
<x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" required="true" dictionary="suppliesType"/>
<x:inputC name="prctr" label="利润中心" labelCol="1" fieldCol="2" required="true"/>
</div>
</div>
......@@ -87,9 +90,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyWarehouse.js
View file @ deecfac3
......@@ -10,12 +10,14 @@ $(document).ready(function () {
loadGrid();
// initAssistantGrid();
loadRejectReasonBox();
bindEvent();
})
function initializate() {
//页面控制
debugger
$("#businessPersonnelList").hide();
switch ($("#active").val()) {
case '0'://已分发未完成
if ($("#deptCode").val() === "system") {
......@@ -109,7 +111,7 @@ function loadGrid() {
UICtrl.disable($("#werks"));
UICtrl.disable($("#lgort"));
UICtrl.disable($("#lgnum"));
UICtrl.disable($("#lgtyp"));
//UICtrl.disable($("#lgtyp"));
UICtrl.disable($("#businessUsage"));
UICtrl.disable($("#baseUnit"));
......@@ -176,8 +178,9 @@ function loadGrid() {
* 表单提交
* @returns {boolean}
*/
function saveForm() {
function saveForm(status) {
//alert($("#businessCode").val());
$("#active").val(status)
let extendedData = getExtendedData();
if (!extendedData) return false;
var _self = this;
......@@ -188,6 +191,23 @@ function saveForm() {
$("#applyDeptId").val(data.applyDeptId);
Public.successTip("保存成功！");
_self.close();
UICtrl.reloadTabById('homepage');
}
});
}
function bindEvent(){
$('#lgtypName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGTYP",
filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#lgtyp').val(data.LGTYP);
$('#lgtypName').val(data.LTYPT);
}
});
}
......@@ -229,7 +249,7 @@ function distributeForm() {
function getExtendedData() {
debugger
let msg = "[";
let isUndefined = false
let deptStaffResult = DataUtil.getGridData({
......@@ -255,7 +275,7 @@ function getExtendedData() {
function rejectForm() {
debugger
$('#auditForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
param: {meId:getMeId()},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyWarehouse.jsp
View file @ deecfac3
......@@ -10,17 +10,20 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料仓库信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active" value=""/> <!--状态-->
<x:hidden name="meId" value=""/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-save"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
......@@ -52,7 +55,7 @@
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType"/>
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
......@@ -78,13 +81,14 @@
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="lgnum" label="仓库号" labelCol="1" fieldCol="2"/>
<x:selectC name="lgtyp" label="存储类型" labelCol="1" fieldCol="2" dictionary="storeType"/>
<x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgtyp"/>
<x:inputC name="ltkza" label="存货下架存储类型" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="ltkze" label="存货上架存储类型" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lgbkz" label="存储分区标识" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lhme1" label="仓库设施1存储单位" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="lhme1" label="仓库设施1存储单位" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2" required="false"/>
</div>
</div>
......@@ -92,9 +96,9 @@
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/>
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row">
<div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
......
topsun-xt/src/main/webapp/javaScript/HomePage.js
View file @ deecfac3
......@@ -91,33 +91,6 @@ function reloadSpecialTaskGrid(){
});
}
function parseSpecialTaskHtml(container,taskList){
if(!taskList) return;
var html=[];
$.each(taskList, function (i, o) {
html.push('<div id="task_',o.id,'"');
if(o.statusId=='ready'){
html.push(' class="ready_task"');
}
html.push(' catalogId="',o.catalogId,'"');
html.push(' taskKindId="',o.kindId,'"');
html.push(' bizId="',o.businessId,'"');
html.push(' taskId="',o.id,'"');
html.push(' statusId="',o.statusId,'"');
html.push(' name="',o.title,'"');
html.push(' url="',o.executorUrl,'"');
html.push('>');
html.push('<div class="title-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.title + ':' + o.taskDescribe,'</a>');
html.push('</div>');
html.push('<div class="date-view">');
html.push('<a href="javascript:void(0)" class="aLink" taskId="',o.id,'">',o.updateDate,'</a>');
html.push('</div>');
html.push('</div>');
});
$(container).html(html.join(''));
}
function reloadAllGrid(){
Public.ajax(web_app.name + "/homePage/queryTasksByViewKind.ajax", {viewTaskKind:'1,2,7,8'}, function (data) {
parseTaskHtml('#waitTaskContent',data['tasks1']);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java
View file @ deecfac3
......@@ -22,6 +22,8 @@ public interface NonProdApplyDeptApplication {
*/
Map<String,Object> saveSapNonProdApplyDept(SDO sdo);
SapNonProdApplyDept save(SapNonProdApplyDept sapNonProdApplyDept);
/**
* 更改分发状态
* @param sdo
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ deecfac3
......@@ -35,10 +35,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
@Service("nonProdApplyApplication")
public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdApplyApplication {
......@@ -89,6 +86,8 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
nonProdApplyBaseInfo.setStatusId(status.getId());
nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName());
nonProdApplyBaseInfo.setApprovalDate(new Date());
nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
}
......@@ -166,57 +165,39 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
* 远程调用sap接口，传递数据
*/
public void sendSapData(NonProdApplyBaseInfo prodApplyBaseInfo,SapNonProdApplyDept applyDept) {
// Map<String, Object> paramItem = new HashMap<>();
// paramItem.put("ebeln", sapPurchaseOrder.getEbeln());
/*paramItem.put("BEDNR", suppliersInfo.getBillCode());
paramItem.put("frgkz", "10");
paramItem.put("flag", flag);
List<Map<String, Object>> paramList = new ArrayList<>();
paramList.add(paramItem);
Map<String, Object> param = new HashMap<>();
param.put("MODE", "PO");
param.put("DATA", paramList);*/
Map<String, Object> map = new HashMap<>();
Gson gson = new Gson();
ProdApplyToSapVO sapVO=new ProdApplyToSapVO();
ClassHelper.copyProperties(prodApplyBaseInfo,sapVO);
ClassHelper.copyProperties(applyDept,sapVO);
BeanUtil.copyProperties(sapVO, map);
map.remove("fullId");
map.remove("personMemberId");
map.remove("personMemberName");
map.remove("positionId");
map.remove("positionName");
map.remove("deptId");
map.remove("deptName");
map.remove("organId");
map.remove("organName");
map.remove("version");
map.put("maktxZh",map.get("maktx"));
map.put("sparsZh",map.get("spars"));
map.put("updkz","I");
// BeanUtil.copyProperties(applyDept, map);
Set<String> keySet=map.keySet();
Map <String,Object>upperMap=new HashMap<String,Object>();
for (String str:keySet){
upperMap.put(CommonUtil.camelToUnderline(str).toUpperCase(),map.get(str));
}
sapVO.setUpdkz("I");
Map<String,Object> unitsaleMap = new HashMap<>();
List<Map<String,Object>> unitMapList = new ArrayList<>();
//销售单位转换
unitsaleMap.put("MEINH",sapVO.getVrkme());
unitsaleMap.put("UMREZ",sapVO.getUmrezSale());
unitsaleMap.put("UMREN",sapVO.getUmrenSale());
unitsaleMap.put("MEINS",sapVO.getMeins());
unitMapList.add(unitsaleMap);
sapVO.setMapList(unitMapList);
ObjectMapper objectMapper = new ObjectMapper();
String url = "bd_mastdata/material";
List<ProdApplyToSapVO> mapList = new ArrayList<>();
mapList.add(sapVO);
//日志记录
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("businessType", "nonProdApplyBaseInfo");
resultMap.put("businessId", prodApplyBaseInfo.getId());
resultMap.put("parameter", JSON.toJSONString(upperMap));
resultMap.put("parameter", JSON.toJSONString(map));
resultMap.put("sequence", resultMap.get("row"));
try {
String result = defaultHttpClient.execute(upperMap, url);
String result = defaultHttpClient.execute(mapList, url);
List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
});
resultMap = resultList.get(0);
resultMap.put("sequence", resultMap.get("row"));
sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
if ("S".equals(resultMap.get("TYPE"))) {
applyDept.setMatnr((String) map.get("MESSAGE_V1"));
nonProdApplyDeptApplication.save(applyDept);
} else {
throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ deecfac3
......@@ -33,6 +33,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
public Map<String,Object> saveSapNonProdApplyDept(SDO sdo){
Map<String,Object> map = new HashMap<>();
String businessCode=sdo.getString("businessCode");
String genericName=sdo.getString("genericName");
Integer active=sdo.getInteger("active");
String meId=sdo.getString("meId");
NonProdApplyDeptVo deptVo=null;
switch (businessCode) {
case "K":
......@@ -80,7 +83,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
ClassHelper.copyProperties(deptVo,nonProdApplyDept);
nonProdApplyDept = nonProdApplyDeptRepository.save(nonProdApplyDept);
nonProdApplyDept = this.save(nonProdApplyDept);
String applyDeptId=sdo.getString("applyDeptId");
if (StringUtil.isBlank(businessCode)) { //业务类型为空 ，表示是基本信息进入的 才保存分发信息
......@@ -95,17 +98,25 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
} catch (JsonProcessingException e) {
throw new RuntimeException("JSON转换失败：" + e);
}
saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId());
saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
}
//if (active == 1){//各部门提交后，隐藏消息
//bsnMessageApplication.submitTask(meId);
//}
map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
return map;
}
public void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId){
@Override
public SapNonProdApplyDept save(SapNonProdApplyDept sapNonProdApplyDept){
return nonProdApplyDeptRepository.save(sapNonProdApplyDept);
}
public void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId,String genericName){
//封装分发数据
BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(this.getOperator().getUserId());
bsnMessageSponsor.setTitle("非产品/非本成品类物料");
bsnMessageSponsor.setTitle(genericName);//通用品名
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/fillInNonProdApplyDept.do");
bsnMessageSponsor.setBusinessId(bussinessId);
bsnMessageSponsor.setCreateDate(new Date());
......@@ -119,7 +130,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
messageExecute.setActive(ActiveStatus.SAVED.getValue());
messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
messageExecute.setUpdateDate(new Date());
messageExecute.setTaskDescribe(deptName+"部门数据维护");
bsnMessageSponsor.addExecute(messageExecute);
......@@ -154,7 +165,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
@Override
public SapNonProdApplyDept getNonProdApplyDeptById(String id) {
return nonProdApplyDeptRepository.findOne(id);
return nonProdApplyDeptRepository.findByApplyDeptId(id);
}
@Override
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @ deecfac3
......@@ -57,6 +57,7 @@ public class NonProdApplyNextController extends CommonController {
getBaseInfoAttrs(nonProdApplyBaseInfo, nonProdApplyDept);
return forward("nonProdApplyNext", nonProdApplyDept);
} else {
this.putAttribute("active",0);
return forward("nonProdApplyNext", nonProdApplyBaseInfo);
}
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @ deecfac3
......@@ -205,6 +205,18 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "VRKME")
private String vrkme;
/**
* 销售计量单位转换分母
*/
@Column(name = "UMREN_SALE")
private String umrenSale;
/**
* 销售计量单位转换分子
*/
@Column(name = "UMREZ_SALE")
private String umrezSale;
/**
* 转换分母
*/
......@@ -757,6 +769,39 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "AWSLS")
private String awsls;
/**
* 维护状态（0草稿；1保存；2分发）
*/
@Column(name = "STATUS")
private String status;
@Column(name = "matkl_name")
private String matklName;
@Column(name = "spart_name")
private String spartName;
@Column(name = "werks_name")
private String werksName;
@Column(name = "lgort_name")
private String lgortName;
@Column(name = "vkorg_name")
private String vkorgName;
@Column(name = "vtweg_name")
private String vtwegName;
@Column(name = "lgnum_name")
private String lgnumName;
@Column(name = "lgtyp_name")
private String lgtypName;
@Column(name = "ekgrp_name")
private String ekgrpName;
@Transient
private String billCode;
@Transient
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
View file @ deecfac3
......@@ -129,4 +129,22 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
private String vtweg; //分销渠道
private String lgnum; //仓库号
private String lgtyp; //存储类型
private String matklName;
private String spartName;
private String werksName;
private String lgortName;
private String vkorgName;
private String vtwegName;
private String lgnumName;
private String lgtypName;
private String ekgrpName;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyPurchaseVo.java
View file @ deecfac3
......@@ -26,6 +26,7 @@ public class NonProdApplyPurchaseVo extends NonProdApplyDeptVo {
* 默认采购组
*/
private String ekgrp;
private String ekgrpName;
/**
* MPN参数
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplySaleVo.java
View file @ deecfac3
......@@ -22,6 +22,16 @@ public class NonProdApplySaleVo extends NonProdApplyDeptVo {
*/
private String vrkme;
/**
* 销售计量单位转换分母
*/
private String umrenSale;
/**
* 销售计量单位转换分子
*/
private String umrezSale;
/**
* 转换分母
*/
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyDeptRepository.java
View file @ deecfac3
......@@ -10,4 +10,5 @@ import java.util.List;
public interface NonProdApplyDeptRepository extends JpaRepository<SapNonProdApplyDept,String> {
SapNonProdApplyDept findByBaseInfoId(String baseInfoId);
SapNonProdApplyDept findByApplyDeptId(String applyDeptId);
}
topsun/src/main/resources/config/topsun/base/bsnMessage.xml
View file @ deecfac3
......@@ -5,11 +5,12 @@
<sql-query>
SELECT t.id,t.message_sponsor_id,t.task_execute,t.business_code,t.update_date,t.finished_date,t.active,
CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, :addText) ELSE t.task_describe END AS task_describe,
t2.title,
ad.maktx as title,
t2.executor_url,
t2.business_id
FROM bsn_message_execute t
LEFT JOIN bsn_message_sponsor t2 ON t2.id = t.message_sponsor_id
LEFT JOIN sap_non_prod_apply_dept ad ON ad.apply_dept_id = t2.business_id
WHERE t.active IN (0, 3) and task_execute = :taskExecute
</sql-query>
</query>
......
topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml
View file @ deecfac3
......@@ -2,8 +2,7 @@
<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
select t.*,ad.matnr,ad.status as dept_status 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"/>-->
</query>
......
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