Commit 8bbd803b authored by 刘学辉's avatar 刘学辉

物料主数据的调整

parent a58635c9
......@@ -14,7 +14,7 @@ function loadNonProdApplyListGrid() {
addHandler()
},
deleteHandler: deleteHandler,
testHandler: {id: 'basicInfoMaintenance', text: '基本信息维护', img: 'fa-music', className: 'btn-gray',
testHandler: {id: 'basicInfoMaintenance', text: '信息填报', img: 'fa-music', className: 'btn-gray',
click: function () {
let result=DataUtil.getUpdateRow(gridManager);
......@@ -42,7 +42,7 @@ function loadNonProdApplyListGrid() {
Public.tip("请选择一条已审核后数据!")
return false;
}
if(result.distribute!==3){
if(result.distribute!==2){
Public.tip("请选择一条已办结的数据!")
return false;
}
......@@ -58,7 +58,7 @@ function loadNonProdApplyListGrid() {
Public.tip("请选择一条已审核后数据!")
return false;
}
if(result.distribute!==3){
if(result.distribute!==2){
Public.tip("请选择一条已办结的数据!")
return false;
}
......@@ -96,17 +96,14 @@ function loadNonProdApplyListGrid() {
{display: "物料/产品编码", name: "matnr", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceTypeTextView", width: 130, minWidth: 60, type: "string", align: "left",
render:function(item){
var result = item.maintenanceTypeTextView+"-待处理基本信息";
var result = item.maintenanceTypeTextView+"-待填报";
if (item.status=="1"){
result=item.maintenanceTypeTextView+"-待审批";
}
if (item.distribute == "1"){
result=item.maintenanceTypeTextView+"-待分发";
result=item.maintenanceTypeTextView+"-待确认";
}
if (item.distribute == "2"){
result=item.maintenanceTypeTextView+"-待业务处理";
}
if (item.distribute == "3"){
result=item.maintenanceTypeTextView+"-已办结";
}
return result;
......
......@@ -4,54 +4,60 @@ let coRowNum=0;
let control = {
isInitiator: false,//是否为审核人
isDistribute: false,//是否已分发
isConfirm:false,//是否已确认
}
$(document).ready(function () {
initializate()
loadGrid();
// initAssistantGrid();
loadRejectReasonBox();
bindEvent();
})
function initializate() {
UICtrl.setDisable("#businessUsageDiv")
// UICtrl.setDisable("#businessUsageDiv")
UICtrl.setDisable("#totalContentDiv");
coRowNum= $("#busiLens").val();
$("#klart").val("023")
$("#classify").val("Z_YCL")
//alert($("#active").val());
//页面控制
UICtrl.enable($("#businessUsage"));
UICtrl.enable($("#matklName"));
switch ($("#active").val()) {
case '0'://待处理
$("#businessUsageDiv").hide();
case '0'://待填报
// $("#businessUsageDiv").hide();
hideAllBusiness();
for (var x=0;x<$("input[name='businessUsage']").length;x++) {
if ($("input[name='businessUsage']")[x].checked) {
showBusiness($("input[name='businessUsage']")[x].value);
}
}
if ($("#deptCode").val() === "system") {
$("#auditForm").show();
} else {
$("#buttonBox").show();
$("#showChart").remove();
$("#distributeDiv").hide()
$("#businessPersonnelListGrid").hide()
// $("#werksName").removeAttribute("required");
// UICtrl.setDisable("#distributeDiv");
}
if (applyType==2){ //扩展
$("#isAll").attr("disabled",true);
}
break;
case '1'://待分发 从首页进入填写基本数据
$("#buttonBox").show(); //alert();
case '1'://待确认
$("#buttonBox").show();
$("#submit").remove();
$("#save").remove();
$("#back").remove();
UICtrl.setDisable("#basicInfoDiv");
$("#maktxRemZh").attr("readonly",true);
$("#maktxRemEn").attr("readonly",true);
$("#distributeDiv").show();
break;
case '2'://已分发
viewOnly();
break;
case '2'://已办结
// $("#auditForm").show();
$("#buttonBox").remove();
UICtrl.setDisable("#basicInfoDiv");
UICtrl.setDisable("#distributeDiv");
viewOnly();
break;
case '3'://已办结
// showRejectCauseBox();
......@@ -68,13 +74,15 @@ function initializate() {
}
$('input[name="isAll"]').change(function () {
debugger
if ($(this).is(':checked')) { //alert("全选");
$("#busiLens").val(dictUsage.length);
// debugger
if ($(this).is(':checked')) {
$("#busiLens").val(dictUsage.length);
showAllBusiness();
coRowNum=dictUsage.length;
for (var x=0;x<$("input[name='businessUsage']").length;x++) {
$("input[name='businessUsage']")[x].checked = true;
let datas = gridManager.getData();
var name = "", deptCode = "";
// let datas = gridManager.getData();
/* var name = "", deptCode = "";
for (var u = 0; u < dictUsage.length; u++) {
name = dictUsage[u].split(",")[1];
deptCode = dictUsage[u].split(",")[0];
......@@ -85,17 +93,18 @@ function initializate() {
break;
}
}
if (isExist == 0) {
gridManager.addRow({deptName: name, deptCode: deptCode, userName: ""});
}
}
// if (isExist == 0) {
// gridManager.addRow({deptName: name, deptCode: deptCode, userName: ""});
// }
} */
}
} else {
$("input[name='businessUsage']").each(function(){
$(this).attr("checked",false);
for (var u=0;u<dictUsage.length;u++){
gridManager.deleteRow(u);
}
hideAllBusiness();
// for (var u=0;u<dictUsage.length;u++){
// gridManager.deleteRow(u);
// }
})
}
});
......@@ -104,7 +113,7 @@ function initializate() {
$('input[name="businessUsage"]').change(function () {
//alert($(this).is(':checked'));
if ($(this).is(':checked')) {
let datas=gridManager.getData();
//let datas=gridManager.getData();
var name="",deptCode="";
for (var u=0;u<dictUsage.length;u++){
if ($(this).val()==dictUsage[u].split(",")[0]){
......@@ -113,116 +122,252 @@ function initializate() {
break;
}
}
let isExist=0;
/* let isExist=0;
for (var i=0;i<datas.length;i++) {
if (datas[i].deptCode==deptCode){
isExist=1;
break;
}
}
if (isExist==0) {
} */
coRowNum=MathUtil.add(coRowNum,1);
// alert(name+deptCode+coRowNum);
showBusiness($(this).val());
/* if (isExist==0) {
gridManager.addRow({deptName: name, deptCode: deptCode, userName: ""});
}
datas = gridManager.getData();
datas = gridManager.getData(); */
// debugger
// alert(datas.length);alert(dictUsage.length)
if (datas.length==dictUsage.length){
// $('input[name="isAll"]').attr("checked",true);
$('input[name="isAll"]')[0].checked = true;
if (coRowNum==dictUsage.length){
$('input[name="isAll"]')[0].checked = true;
}
} else {
let datas=gridManager.getData();
var selval=$(this).val();
for (var i=0;i<datas.length;i++) {
if (datas[i].deptCode==selval){
gridManager.deleteRow(i);
}
}
datas = gridManager.getData();
if (datas.length==0){
// let datas=gridManager.getData();
// var selval=$(this).val();
hideBusiness($(this).val());
coRowNum=MathUtil.sub(coRowNum,1);
/* for (var i=0;i<datas.length;i++) {
if (datas[i].deptCode==selval){
gridManager.deleteRow(i);
}
} */
// datas = gridManager.getData();
// if (coRowNum==0){
$('input[name="isAll"]').attr("checked",false);
}
// }
}
});
}
/**
* 初始化对应的分发部门
*/
function loadGrid() {
//alert($("#businessCode").val());
// if ($("#businessCode").val()!=''){
$("#genericName").attr("disabled",true);
$("#applicableStandard").attr("disabled",true);
$("#size").attr("disabled",true);
$("#material").attr("disabled",true);
$("#design").attr("disabled",true);
$("#brand").attr("disabled",true);
$("#specifications").attr("disabled",true);
$("#materialUsage").attr("disabled",true);
UICtrl.disable($("#baseUnit"));
UICtrl.disable($("#itemAttributes"));
//}
// let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1;
// alert($("#busiLens").val());
coRowNum=$("#busiLens").val();
// let length = dept.length;
// let dept=$("#businessUsage").val().split(",");
// let a=(dept.length+1)*37.5;
gridManager = UICtrl.grid("#businessPersonnelListGrid", {
columns: [
{display: "部门代码", name: "deptCode", width: 0, minWidth: 10, type: "string", align: "left",hide: true},
{display: "部门名称", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "部门人员", name: "userName", width: 280,disable: true, minWidth: 60, type: "string", align: "left",
editor: {
type: 'tree',
required: true,
data: {
name: 'org',
filter: 'psm',
minWidth: 250
},
textField: 'userName',
valueField: 'userCode'
}
},
{ display: "人员Id", name: "userCode", width: 260, minWidth: 60, type: "string", align: "left",hide: true
},
{ display: "是否处理", name: "active", width: 160, minWidth: 60, type: "string", align: "center",disable: "true"
,render:function(item){
var result = "否";
if (item.active === "1"){
result="是";
}
return result;
function showBusiness(busiCode) {
if (busiCode=="V") {
$("#saleDiv").show();
saleMustInput(true);
}
if (busiCode=="E") {
$("#purchaseDiv").show();
purchaseMustInput(true);
}
if (busiCode=="D") {
$("#mrpDiv").show();
$("#dismm").combox({onChange:function(data) {
if (data.value=='ND'){
mrpMustInput(false);
} else {
mrpMustInput(true);
}
},
{ display: "分发时间", name: "updateDate", width: 140, minWidth: 60, type: "string", align: "left"},
{ display: "完成时间", name: "finishedDate", width: 140, minWidth: 60, type: "string", align: "left"}
],
dataAction: "server",
url: web_app.name + '/sapNonProdApplyNext/slicedDeptList.ajax',
parms: {dept: $("#businessUsage").val(),deptId: $("#applyDeptId").val(),id:$("#id").val(),businessCode:$("#businessCode").val()},
pageSize: 20,
usePager: false,
enabledEdit: true,
width: "100%",
height:coRowNum * 37.5,
heightDiff: -2,
fixedCellHeight: true,
onBeforeEdit: function (editParm) {
var cols = editParm.column, data = editParm.record;
if ($("#active").val()==2){
return false;
}
},
selectRowButtonOnly: true,
});
UICtrl.setSearchAreaToggle(gridManager);
});
UICtrl.setElRequiredFlag("#dismm",true);
}
if (busiCode=="A") {
$("#produceDiv").show();
produceMustInput(true);
}
if (busiCode=="L") {
$("#storeDiv").show();
storeMustInput(true);
}
if (busiCode=="S") {
$("#warehouseDiv").show();
warehouseMustInput(true);
}
if (busiCode=="B") {
$("#financialDiv").show();
financialMustInput(true);
}
}
function hideBusiness(busiCode) {
if (busiCode=="E") {
$("#purchaseDiv").hide();
saleMustInput(false);
}
if (busiCode=="V") {
$("#saleDiv").hide();
saleMustInput(false);
}
if (busiCode=="D"){
$("#mrpDiv").hide();
mrpMustInput(false);
}
if (busiCode=="A") {
$("#produceDiv").hide();
produceMustInput(false);
}
if (busiCode=="L") {
$("#storeDiv").hide();
storeMustInput(false);
}
if (busiCode=="S") {
$("#warehouseDiv").hide();
warehouseMustInput(false);
}
if (busiCode=="B") {
$("#financialDiv").hide();
financialMustInput(false);
}
}
function showAllBusiness() {
$("#saleDiv").show();
$("#purchaseDiv").show();
$("#mrpDiv").show();
$("#produceDiv").show();
$("#storeDiv").show();
$("#warehouseDiv").show();
$("#financialDiv").show();
//设置必输项
saleMustInput(true);
purchaseMustInput(true);
// mrpMustInput(true);
UICtrl.setElRequiredFlag("#dismm",true);
storeMustInput(true);
warehouseMustInput(true);
financialMustInput(true);
}
function hideAllBusiness() {
$("#saleDiv").hide();
$("#purchaseDiv").hide();
$("#mrpDiv").hide();
$("#produceDiv").hide();
$("#storeDiv").hide();
$("#warehouseDiv").hide();
$("#financialDiv").hide();
}
function showBusinessReadOnly(busiCode) {
if (busiCode=="V") {
$("#saleDiv").show();
UICtrl.setDisable("#saleDiv");
}
if (busiCode=="E") {
$("#purchaseDiv").show();
UICtrl.setDisable("#purchaseDiv");
}
if (busiCode=="D") {
$("#mrpDiv").show();
UICtrl.setDisable("#mrpDiv");
}
if (busiCode=="A") {
$("#produceDiv").show();
UICtrl.setDisable("#produceDiv");
}
if (busiCode=="L") {
$("#storeDiv").show();
UICtrl.setDisable("#storeDiv");
}
if (busiCode=="S") {
$("#warehouseDiv").show();
UICtrl.setDisable("#warehouseDiv");
}
if (busiCode=="B") {
$("#financialDiv").show();
UICtrl.setDisable("#financialDiv");
}
}
function viewOnly(){ //只能查看
hideAllBusiness();
for (var x=0;x<$("input[name='businessUsage']").length;x++) {
if ($("input[name='businessUsage']")[x].checked) {
showBusinessReadOnly($("input[name='businessUsage']")[x].value);
}
}
UICtrl.setDisable("#basicInfoDiv");
$("#maktxRemZh").attr("readonly",true);
$("#maktxRemEn").attr("readonly",true);
//UICtrl.setDisable($("#businessUsageV"));
// UICtrl.setDisable($("#isAll"));
$("#businessUsageV").attr("disabled",true);
$("#businessUsageE").attr("disabled",true);
$("#businessUsageD").attr("disabled",true);
$("#businessUsageA").attr("disabled",true);
$("#businessUsageL").attr("disabled",true);
$("#businessUsageS").attr("disabled",true);
$("#businessUsageB").attr("disabled",true);
$("#isAll").attr("disabled",true);
}
function saleMustInput(flag) { //销售必输项
UICtrl.setElRequiredFlag("#alandName",flag);
UICtrl.setElRequiredFlag("#aland",flag);
UICtrl.setElRequiredFlag("#taxkm",flag);
UICtrl.setElRequiredFlag("#ktgrm",flag);
}
function purchaseMustInput(flag) { //采购必输项
UICtrl.setElRequiredFlag("#ekgrpName",flag);
UICtrl.setElRequiredFlag("#ekgrp",flag);
}
function mrpMustInput(flag) { //MRP必输项
UICtrl.setElRequiredFlag("#dispo",flag);
UICtrl.setElRequiredFlag("#disls",flag);
UICtrl.setElRequiredFlag("#beskz",flag);
UICtrl.setElRequiredFlag("#mtvfp",flag);
UICtrl.setElRequiredFlag("#rgekz",flag);
UICtrl.setElRequiredFlag("#disgr",flag);
UICtrl.setElRequiredFlag("#strgr",flag);
UICtrl.setElRequiredFlag("#sbdkz",flag);
UICtrl.setElRequiredFlag("#vrmod",flag);
UICtrl.setElRequiredFlag("#vint1",flag);
UICtrl.setElRequiredFlag("#vint2",flag);
}
function produceMustInput(flag){
UICtrl.setElRequiredFlag("#sfcpf",flag);
UICtrl.setElRequiredFlag("#fevor",flag);
}
function storeMustInput(flag) {
UICtrl.setElRequiredFlag("#prctr",flag);
}
function warehouseMustInput(flag) {
if (flag){
$('#lhme1').val($('#meins').val()); //仓库的仓库设施1存储单位 默认基本计量单位
$('#lhme1Name').val( $('#meinsName').val());
}
UICtrl.setElRequiredFlag("#ltkzaName",flag);
UICtrl.setElRequiredFlag("#ltkzeName",flag);
UICtrl.setElRequiredFlag("#lgortProfitName",flag);
UICtrl.setElRequiredFlag("#lhmg1",flag);
UICtrl.setElRequiredFlag("#lhme1Name",flag);
}
function financialMustInput(flag) {
//UICtrl.setElRequiredFlag("#mlast",flag);
// UICtrl.setElRequiredFlag("#vprsv",flag);
//UICtrl.setElRequiredFlag("#peinh",flag);
UICtrl.setElRequiredFlag("#bklas",flag);
var peinh = $("#peinh").val(); //定价基数
if (Public.isBlank(peinh)){
$("#peinh").val("1000");
}
}
/**
* 表单提交
* @returns {boolean}
......@@ -257,11 +402,16 @@ function saveForm(status) {
//撤销
function clearForm() {
// $("#saleForm").formClean();
$("#matnr").val("");
// $("#matnr").val("");
$("#mtart").val("");
$("#matkl").val("");
$("#matklName").val("");
$("#groes").val("");
$("#lvorm").val("");
$("#spart").val("");
$("#spartName").val("");
$("#mtposMara").val("");
$("#maktx").val("");
$("#xchpf").val("");
......@@ -270,6 +420,8 @@ function clearForm() {
$("#magrv").val("");
$("#maktxEn").val("");
$("#meins").val("");
$("#meinsName").val("");
$("#raube").val("");
$("#brgew").val("");
$("#gewei").val("");
......@@ -282,11 +434,166 @@ function clearForm() {
$("#normt").val("");
$("#werks").val("");
$("#werksName").val("");
$("#lgort").val("");
$("#vkorg").val("");
$("#vtweg").val("");
$("#lgnum").val("");
$("#lgtyp").val("");
$("#lgtypName").val("");
$("#maktxRemZh").val("");
$("#maktxRemEn").val("");
clearForm_sale();
clearForm_produce();
clearForm_purchase();
clearForm_mrp();
clearForm_store();
clearForm_warehouse();
clearForm_financial();
}
//撤销采购
function clearForm_purchase(){
// $("#saleForm").formClean();
$("#bstme").val("");
$("#bstmeName").val("");
$("#umrenPurch").val("");
$("#umrezPurch").val("");
$("#ekgrp").val("");
$("#ekgrpName").val("");
}
//撤销销售
function clearForm_sale(){
$("#vrkme").val("");
$("#vrkmeName").val("");
$("#umrenSale").val("");
$("#umrezSale").val("");
$("#dwerkName").val("");
$("#dwerk").val("");
$("#aland").val("");
$("#alandName").val("");
$("#taxkm").val("");
$("#versg").val("");
$("#kondm").val("");
$("#ktgrm").val("");
$("#prodh").val("");
$("#mvgr1").val("");
$("#mvgr2").val("");
$("#mvgr3").val("");
$("#mvgr4").val("");
$("#mvgr5").val("");
$("#mtpos").val("");
$("#xchpf").val("");
$("#tragr").val("");
$("#ladgr").val("");
$("#ladgrName").val("");
}
// /撤销MRP
function clearForm_mrp() {
// $("#saleForm").formClean();
$("#disgr").val("");
$("#dismm").val("");
$("#minbe").val("");
$("#dispo").val("");
$("#disls").val("");
$("#bstfe").val("");
$("#bstma").val("");
$("#bstmi").val("");
$("#mabst").val("");
$("#bstrf").val("");
$("#beskz").val("");
$("#sobsl").val("");
$("#lgpro").val("");
$("#rgekz").val("");
$("#lgfsb").val("");
$("#webaz").val("");
$("#dzeit").val("");
$("#plifz").val("");
$("#fhori").val("");
$("#eisbe").val("");
$("#eislo").val("");
$("#strgr").val("");
$("#mtvfp").val("");
$("#wzeit").val("");
$("#sbdkz").val("");
$("#diskz").val("");
}
//撤销生产
function clearForm_produce() {
// $("#saleForm").formClean();
$("#ausme").val("");
$("#umrenProd").val("");
$("#umrezProd").val("");
$("#sfcpf").val("");
$("#insmk").val("");
}
//撤销储存
function clearForm_store() {
// $("#saleForm").formClean();
$("#sernp").val("");
$("#serlv").val("");
$("#prctr").val("");
}
//撤销仓库
function clearForm_warehouse(){
// $("#saleForm").formClean();
$("#ltkza").val("");
$("#ltkze").val("");
$("#lgbkz").val("");
$("#lhmg1").val("");
$("#lhme1").val("");
$("#lety1").val("");
}
//撤销财务核算
function clearForm_financial(){
// $("#saleForm").formClean();
$("#bklas").val("");
$("#mlast").val("");
$("#vprsv").val("");
//$("#peinh").val("");
$("#verpr").val("");
$("#stprs").val("");
}
/**
*领导确认
*/
function confirmForm(val){
$("#status").val(val);
if (control.isConfirm) {
Public.successTip("已确认!");
return false;
}
// let extendedData = getExtendedData();
// if (!extendedData) return false;
$('#submitForm').ajaxSubmit({
url: web_app.name + '/sapNonProdApplyNext/confirmSapNonProdApplyDept.ajax?confirm='+val,
// param: extendedData,
success: function (data) {
// alert(data.result);
if (data.result=='') {
Public.successTip("操作成功!");
} else {
Public.errorTip(data.result);
}
$("#buttonBox").remove();
control.isConfirm = true;
// _self.close();
}
});
}
/**
* 分发表单到各个部门
......@@ -389,6 +696,7 @@ function distributeForm() {
}
function bindEvent() {
//物料组
$('#matklName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -399,6 +707,7 @@ function bindEvent() {
$('#matklName').val(data.WGBEZ);
}
});
//产品组
$('#spartName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -409,6 +718,7 @@ function bindEvent() {
$('#spartName').val(data.VTEXT);
}
});
//基本计量单位
$('#meinsName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -417,10 +727,12 @@ function bindEvent() {
onChange: function (value, data) {
$('#meins').val(data.MSEH3);
$('#meinsName').val(data.MSEHL);
$('#lhme1').val(data.MSEH3); //仓库的仓库设施1存储单位
$('#lhme1Name').val(data.MSEHL);
}
});
$('#raubeName').searchbox({
/* $('#raubeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "RAUBE"}
......@@ -429,8 +741,8 @@ function bindEvent() {
$('#raube').val(data.RAUBE);
$('#raubeName').val(data.NAME);
}
});
}); */
//工厂
$('#werksName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -441,6 +753,7 @@ function bindEvent() {
$('#werksName').val(data.NAME1);
}
});
//库存地点
$('#lgortName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -451,6 +764,74 @@ function bindEvent() {
$('#lgortName').val(data.LGOBE);
}
});
//仓库号
$('#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);
}
});
//默认采购组 --采购视图
$('#ekgrpName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "EKGRP"}
},
onChange: function (value, data) {
$('#ekgrp').val(data.EKGRP);
$('#ekgrpName').val(data.EKNAM);
}
});
//采购计量单位
$('#bstmeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#bstme').val(data.MSEHI);
$('#bstmeName').val(data.MSEHL);
}
});
bindEvent_sale();
bindEvent_mrp();
//库存地点--存储管理
$('#lgortQmName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGORT",
filterValue:$("#werks").val()
}
},
onChange: function (value, data) {
$('#lgortQm').val(data.LGORT);
$('#lgortQmName').val(data.LGOBE);
}
});
bindEvent_warehouse();
}
function bindEvent_sale() {
$('#vkorgName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......@@ -468,25 +849,143 @@ function bindEvent() {
},
onChange: function (value, data) {
$('#vtweg').val(data.VTWEG);
$('#vtwegName').val(data.VTWEGTEXT);
$('#vtwegName').val(data.VKORGTEXT);
}
});
$('#lgnumName').searchbox({
$('#ladgrName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGNUM"}
return {fieldName: "LADGR"}
},
onChange: function (value, data) {
$('#lgnum').val(data.LGNUM);
$('#lgnumName').val(data.LNUMT);
$('#ladgr').val(data.LADGR);
$('#ladgrName').val(data.LADGRTEXT);
}
});
$('#vrkmeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName:"MEINS"
}
},
onChange: function (value, data) {
$('#vrkme').val(data.MSEH3);
$('#vrkmeName').val(data.MSEHL);
}
});
//交货工厂
$('#dwerkName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
onChange: function (value, data) {
$('#dwerk').val(data.WERKS);
$('#dwerkName').val(data.NAME1);
}
});
$('#alandName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LAND1"}
},
onChange: function (value, data) {
$('#aland').val(data.LAND1);
$('#alandName').val(data.LANDX);
}
});
}
function bindEvent_mrp(){
if ($('#vint1').val()==''){
$('#vint1').val("999");
}
if ($('#vint2').val()==''){
$('#vint2').val("999");
}
if ($('#vrmod').val()==''){ //消耗模式
$('#vrmod').val("2");
}
$('#lgproName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGORT"}
},
onChange: function (value, data) {
$('#lgpro').val(data.LGORT);
$('#lgproName').val(data.LGOBE);
}
});
$('#lgfsbName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGORT"}
},
onChange: function (value, data) {
$('#lgfsb').val(data.LGORT);
$('#lgfsbName').val(data.LGOBE);
}
});
$('#minbeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "MINBE",
//filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#minbe').val(data.MINBE);
$('#minbeName').val(data.NAME);
}
});
$('#dispoName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "DISPO",
//filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#dispo').val(data.DISPO);
$('#dispoName').val(data.NAME);
}
});
}
function bindEvent_warehouse(){
$("#lety1").val("TP");
//库存地点
$('#lgortProfitName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "LGORT", filterValue: $('#werks').val()}
},
onChange: function (value, data) {
$('#lgortProfit').val(data.LGORT);
$('#lgortProfitName').val(data.LGOBE);
// $('#ltkza').val("001");
// $('#ltkzaName').val("高架仓库");
}
});
//存储类型
$('#lgtypName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGTYP",
filterValue:$('#lgnum').val()
filterValue:$('#lgnum').val(),
}
},
onChange: function (value, data) {
......@@ -494,6 +993,59 @@ function bindEvent() {
$('#lgtypName').val(data.LTYPT);
}
});
//存货下架存储类型
$('#ltkzaName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGTYP",
filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#ltkza').val(data.LGTYP);
$('#ltkzaName').val(data.LTYPT);
}
});
//存货上架存储类型
$('#ltkzeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "LGTYP",
filterValue:$('#lgnum').val()
}
},
onChange: function (value, data) {
$('#ltkze').val(data.LGTYP);
$('#ltkzeName').val(data.LTYPT);
}
});
//存储分区标识
// $('#lgbkzName').searchbox({
// type: "system", name: "dictionary",
// getParam: function (item) {
// return {
// fieldName: "LGTYP",
// filterValue:$('#lgnum').val()
// }
// },
// onChange: function (value, data) {
// $('#lgbkz').val(data.LGTYP);
// $('#lgbkzName').val(data.LTYPT);
// }
// });
$('#lhme1Name').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#lhme1').val(data.MSEHI);
$('#lhme1Name').val(data.MSEHL);
}
});
}
......
......@@ -7,6 +7,7 @@
<script>
var dictUsages ="${dictUsages}";
var isAll ="${isAll}";
var applyType="${applyType}";
</script>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyNext.js'/>
......@@ -45,9 +46,12 @@
class="fa fa-reply"></i>撤销
</button>
<c:if test="${active==1}">
<button id="showChart" title="" type="button" onclick="distributeForm()" class="btn btn-gray"><i
class="fa fa-sitemap"></i>分发
<button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i
class="fa fa-sitemap"></i>确认
</button>
<button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i
class="fa fa-reply"></i>回退
</button>
</c:if>
</div>
<br/>
......@@ -78,7 +82,7 @@
</div>
</div>
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="totalContentDiv">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
......@@ -94,7 +98,7 @@
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="情况说明" labelCol="1" fieldCol="11" readonly="true"/>
<x:textareaC rows="3" name="textDescription" label="情况说明" labelCol="1" fieldCol="11" readonly="false"/>
</div>
</div>
<x:title title="维护基本信息" name="group"/>
......@@ -140,15 +144,15 @@
</div>
<div class="hg-form-cols" id="distributeDiv">
<div class="hg-form-row">
<x:inputC name="werksName" label="*工厂" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="werksName" label="工厂" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="werks"/>
<x:inputC name="lgortName" label="*库存地点" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="lgortName" label="库存地点" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgort"/>
<x:inputC name="vkorgName" label="*销售组织" required="false" labelCol="1" wrapper="select" fieldCol="2"/>
<x:inputC name="vkorgName" label="销售组织" required="true" labelCol="1" wrapper="select" fieldCol="2"/>
<x:hidden name="vkorg"/>
<x:inputC name="vtwegName" label="*分销渠道" required="false" labelCol="1" wrapper="select" fieldCol="2"/>
<x:inputC name="vtwegName" label="分销渠道" required="true" labelCol="1" wrapper="select" fieldCol="2"/>
<x:hidden name="vtweg"/>
<x:inputC name="lgnumName" label="*仓库号" required="false" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="lgnumName" label="仓库号" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgnum"/>
<x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgtyp"/>
......@@ -156,15 +160,15 @@
</div>
<div class="hg-form-cols">
<!--x:checkboxListC name="businessUsageSeled" label="扩展前业务用途" list="businessUsageSeledList" labelCol="1"
fieldCol="5" disabled="true"/-->
<!--x:checkboxListC name="businessUsage" label="业务用途" list="businessUsageUnSeledList" labelCol="1"
fieldCol="5"/-->
<div class="hg-form-row">
<x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
<x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
</div>
<c:if test="${applyType==2}">
<div class="hg-form-row">
<x:checkbox name="isAll" label="全选" />
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="8"/>
fieldCol="8" disabled="true"/>
</div>
</c:if>
<c:if test="${applyType==1}">
......@@ -180,15 +184,6 @@
fieldCol="8"/>
</div>
</c:if>
<div class="hg-form-row">
<x:title id="personTitle" title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
<x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
</div>
</div>
<div class="hg-form-cols">
</div>
......@@ -200,87 +195,107 @@
<%-- <x:inputC name="classify" label="分类" labelCol="1" fieldCol="2"/>--%>
<%-- </div>--%>
<%-- </div>--%>
<x:title title="销售" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="saleDiv">
<x:title title="销售" name="group"/>
<div class="hg-form-row">
<x:inputC name="vkorgName" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="vtwegName" label="分销渠道" labelCol="1" fieldCol="2"/>
<x:inputC name="vrkmeName" label="销售计量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="vrkmeName" label="销售计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="vrkme"/>
<x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrezSale" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="dwerkName" label="交货工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="alandName" label="税收发运国" labelCol="1" fieldCol="2"/>
<x:inputC name="dwerkName" label="交货工厂" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="dwerk"/>
<x:inputC name="alandName" label="税收发运国" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="aland"/>
<x:selectC name="taxkm" label="税分类" labelCol="1" fieldCol="2" required="false" 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="false" 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="mvgr2" label="品牌" labelCol="1" fieldCol="2" disabled="true"/>
<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"/>
<x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr4" label="备用1" labelCol="1" fieldCol="2"/>
<x:inputC name="mvgr5" label="备用2" labelCol="1" fieldCol="2"/>
<x:selectC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false" dictionary="ladgr"/>
<x:selectC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
<!--x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf"/-->
<x:selectC name="tragr" label="运输组" labelCol="1" fieldCol="2" dictionary="tragr"/>
<x:hidden name="ladgr"/>
<x:inputC name="ladgrName" label="装载组" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
</div>
</div>
<x:title title="采购" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="purchaseDiv">
<x:title title="采购" name="group"/>
<div class="hg-form-row">
<x:inputC name="bstmeName" label="采购计量单位" labelCol="1" fieldCol="2"/>
<!--x:hidden name="werks"/-->
<!--x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/-->
<x:inputC name="bstmeName" label="采购计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="bstme"/>
<x:inputC name="umrenPurch" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrezPurch" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="ekgrpName" label="默认采购组" labelCol="1" fieldCol="2"/>
<x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>
<x:inputC name="ekgrpName" label="默认采购组" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="ekgrp"/>
</div>
</div>
<x:title title="MRP" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="mrpDiv">
<x:title title="MRP" name="group" />
<div class="hg-form-row">
<!--x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/-->
<x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
<x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
<x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" dictionary="dispo"/>
<x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" dictionary="disls"/>
<x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
<x:inputC name="bstma" label="最大批量" labelCol="1" fieldCol="2"/>
<x:inputC name="bstmi" label="最小批量" labelCol="1" fieldCol="2"/>
<x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
<x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
<x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz"/>
<x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
<x:inputC name="lgpro" label="默认生产库存地" labelCol="2" fieldCol="2"/>
<x:selectC name="rgekz" label="倒冲标志" labelCol="2" fieldCol="2" dictionary="rgekz"/>
<x:inputC name="lgfsb" label="默认采购收货库存地" labelCol="2" fieldCol="2"/>
<x:inputC name="webaz" label="收货处理天数" labelCol="1" fieldCol="1"/>
<x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="1"/>
<x:inputC name="plifz" label="外部采购交货时间" labelCol="2" fieldCol="2"/>
<x:selectC name="diskz" label="库存地MRP标识" labelCol="2" fieldCol="2" dictionary="diskz"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2"/>
<x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2"/>
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
<x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" dictionary="mtvfp"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="2"/>
<x:inputC name="altsl" label="BOM选择方法" labelCol="1" fieldCol="2"/>
<x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2" dictionary="sbdkz"/>
<x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
<x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"/>
<x:inputC name="perkz" label="期间标识" labelCol="1" fieldCol="2"/>
<x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
<x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
<x:hidden name="minbe"/>
<x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
<x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="false" dictionary="dispo"/>
<x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" required="false" dictionary="disls"/>
<x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
<x:inputC name="bstma" label="最大批量" labelCol="1" fieldCol="2"/>
<x:inputC name="bstmi" label="最小批量" labelCol="1" fieldCol="2"/>
<x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
<x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
<x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz" required="false"/>
<x:selectC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2" dictionary="sobsl" required="false"/>
<x:inputC name="lgproName" label="默认生产库存地" labelCol="2" fieldCol="2" wrapper="select"/>
<x:hidden name="lgpro"/>
<x:inputC name="lgfsbName" label="默认采购收货库存地" labelCol="2" fieldCol="3" wrapper="select"/>
<x:hidden name="lgfsb"/>
<x:selectC name="rgekz" label="倒冲标志" labelCol="1" fieldCol="2" dictionary="rgekz"/>
<x:inputC name="webaz" label="收货处理天数" labelCol="1" fieldCol="2"/>
<x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/>
<x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="1" required="false"/>
<x:inputC name="plifz" label="外部采购交货时间" labelCol="2" fieldCol="2"/>
<x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="1" required="false"/>
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="1"/>
<x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="false" dictionary="mtvfp"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="1" mask="999"/>
<x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="1" dictionary="sbdkz"/>
<x:selectC name="diskz" label="库存地MRP标识" labelCol="2" fieldCol="2" dictionary="diskz"/>
<x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
<x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:selectC name="miskz" label="综合MRP" labelCol="1" fieldCol="2" dictionary="MISKZ"/>
<x:selectC name="perkz" label="期间标识" labelCol="1" fieldCol="2" dictionary="perkz"/>
</div>
</div>
<x:title title="生产" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="produceDiv">
<x:title title="生产" name="group"/>
<div class="hg-form-row">
<x:inputC name="ausme" label="投料计量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="umrenProd" label="转换分母(生产)" labelCol="2" fieldCol="2"/>
......@@ -290,37 +305,44 @@
</div>
</div>
<x:title title="存储管理" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="storeDiv">
<x:title title="存储管理" name="group"/>
<div class="hg-form-row">
<x:inputC name="lgortQmName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgortQm"/>
<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" dictionary="PRCTR"/>
<x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="false"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="sledBbd" label="过期日期" wrapper="date" labelCol="1" fieldCol="2"/>
<!--x:inputC name="sledBbd" label="过期日期" wrapper="date" labelCol="1" fieldCol="2"/-->
<x:selectC name="sledBbd" label="过期日期" labelCol="1" fieldCol="2" dictionary="sledBbd"/>
</div>
</div>
<x:title title="仓库管理" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="warehouseDiv">
<x:title title="仓库管理" name="group"/>
<div class="hg-form-row">
<x:inputC name="lgortProfitName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="lgortProfit"/>
<x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/>
<x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2"/>
<x:hidden name="lgtyp"/>
<x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2"/>
<x:hidden name="lgbkz"/>
<x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2"/>
<!--x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/-->
<x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="ltkza"/>
<x:inputC name="ltkzeName" label="存货上架存储类型" labelCol="2" fieldCol="2"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="1" required="false" readonly="true"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="1" required="false" mask="99999999"/>
<x:inputC name="ltkzeName" label="存货上架存储类型" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="ltkze"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2"/>
<x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" wrapper="select"/>
<%-- <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/>--%>
<x:hidden name="lgbkz" value="001"/>
<x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="lhme1"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="2" fieldCol="2"/>
</div>
</div>
......@@ -339,21 +361,25 @@
<%-- </div>--%>
<%-- </div>--%>
<x:title title="财务核算" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols" id="financialDiv">
<x:title title="财务核算" name="group"/>
<div class="hg-form-row">
<x:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas"/>
<x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2"/>
<x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2"/>
<x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2"/>
<!--x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="false"/-->
<x:selectC name="mlast" label="价格确定" labelCol="1" fieldCol="2" dictionary="vprsv"/>
<x:selectC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" dictionary="mlast"/>
<x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="verpr" label="移动平均价" labelCol="1" fieldCol="2"/>
<x:inputC name="stprs" label="标准价" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与核算" labelCol="1" fieldCol="2"/>
<x:selectC name="ncost" label="不参与成本核算" labelCol="2" fieldCol="1" dictionary="xchpf"/>
</div>
<div class="hg-form-row">
<x:inputC name="ekalr" label="数量结构" labelCol="1" fieldCol="2"/>
<x:inputC name="hkmat" label="物料来源" labelCol="1" fieldCol="2"/>
<x:selectC name="hkmat" label="物料来源" labelCol="1" fieldCol="2" dictionary="xchpf"/>
<x:inputC name="awsls" label="差异码" labelCol="1" fieldCol="2"/>
<x:inputC name="eklas" label="销售评估类" labelCol="1" fieldCol="2"/>
</div>
......
......@@ -35,4 +35,6 @@ public interface NonProdApplyApplication{
//保存来自SAP的产品申请
String saveProdApplyFromSapVO(ProdApplyFromSapVO prodApplyFromSapVO);
Map<String, Object> slicedNonApplyBaseInfoByMaktx(NonProdApplyBaseInfoQueryRequest query);
}
\ No newline at end of file
......@@ -48,4 +48,7 @@ public interface NonProdApplyDeptApplication {
void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId,String genericName);
//保存待办消息
void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap);
//领导确认
Map<String,Object> confirmNonProdApplyDept(SDO sdo);
}
\ No newline at end of file
......@@ -123,6 +123,9 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
newSapNonProdApplyDept.setXchpf(sapNonProdApplyDept.getXchpf());
newSapNonProdApplyDept.setMagrv(sapNonProdApplyDept.getMagrv());
newSapNonProdApplyDept.setMeins(sapNonProdApplyDept.getMeins());
newSapNonProdApplyDept.setMeinsName(sapNonProdApplyDept.getMeinsName());
newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
newSapNonProdApplyDept.setBrgew(sapNonProdApplyDept.getBrgew());
newSapNonProdApplyDept.setNtgew(sapNonProdApplyDept.getNtgew());
newSapNonProdApplyDept.setGewei(sapNonProdApplyDept.getGewei());
......@@ -228,6 +231,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
Map backMap=new HashMap();
backMap.put("TYPE","C");
backMap.put("title",nonProdApplyBaseInfo.getBillCode());
backMap.put("positionCode","HYZY");
nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
}
// }
......@@ -531,6 +535,18 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
return this.sqlExecutorDao.executeSlicedQuery(model);
}
//按汉语品名查询数据
@Override
public Map<String, Object> slicedNonApplyBaseInfoByMaktx(NonProdApplyBaseInfoQueryRequest query){
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonApplyBaseInfoByMaktx");
QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
model.setPageIndex(1);
model.setPageSize(100);
return this.sqlExecutorDao.executeSlicedQuery(model);
}
@Override
//获取变更或扩展前的业务部门
public String getChangeBusinessUsage(String bizId,String type){
......
......@@ -16,6 +16,7 @@ import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplicatio
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import com.huigou.topsun.sap.nonProdApply.domain.vo.*;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoRepository;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyDeptRepository;
......@@ -70,7 +71,28 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
NonProdApplyBaseInfo baseInfo=nonProdApplyBaseInfoRepository.findOne(sdo.getString("id"));
//判断汉语品名是否已经存在
if (StringUtil.isNotBlank(sdo.getString("maktx"))) {
List<SapNonProdApplyDept> prodApplyDeptList = nonProdApplyDeptRepository.findByMaktx(sdo.getString("maktx").trim());
List <Map <String,Object>>baseList=(List <Map <String,Object>>)sdo.getProperty("baseList");
boolean isSame=false;
if (baseList.size()>0){
Map maps=baseList.get(0);
String nbid=maps.get("id").toString();
if ("new".equals(baseInfo.getMaintenanceType())){
if (!nbid.equals(baseInfo.getId())){
isSame=true;
}
} else { //变更、扩展的
String rootId=getRootId(baseInfo.getId(),baseList);
if (!rootId.equals(nbid)){
isSame=true;
}
}
if (isSame) {
throw new RuntimeException("汉语品名:" + sdo.getString("maktx") + "已经存在!请检查输入");
}
}
/* List<SapNonProdApplyDept> prodApplyDeptList = nonProdApplyDeptRepository.findByMaktx(sdo.getString("maktx").trim());
if (prodApplyDeptList.size() > 0) {
for (SapNonProdApplyDept prodApplyDept : prodApplyDeptList) {
NonProdApplyBaseInfo parentBaseInfo = nonProdApplyBaseInfoRepository.findOne(prodApplyDept.getBaseInfoId());
......@@ -85,7 +107,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
}
}
}
} */
}
baseInfo.setBusinessUsage(sdo.getString("businessUsage"));
......@@ -112,7 +134,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
baseInfo.setMaktxRemEn(sdo.getString("maktxRemEn"));
baseInfo.setTextDescription(sdo.getString("textDescription"));
}
if ("V".equals(businessCode)) { //销售视图
if ("V".equals(businessCode)) { //销售视图
baseInfo.setBrand(sdo.getString("brand"));
baseInfo.setBrand(sdo.getString("brandName"));
}
......@@ -169,7 +191,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
nonProdApplyDept = this.save(nonProdApplyDept);
String applyDeptId=sdo.getString("applyDeptId");
//分发操作
if ((StringUtil.isBlank(businessCode)||"INIT_DPT".equals(businessCode))&&"2".equals(sdo.getString("distribute"))) { //业务类型为空 ,表示是基本信息进入的 才保存分发信息
/* if ((StringUtil.isBlank(businessCode)||"INIT_DPT".equals(businessCode))&&"2".equals(sdo.getString("distribute"))) { //业务类型为空 ,表示是基本信息进入的 才保存分发信息
//保存部门分发任务
//获取分发的部门与人员信息
ObjectMapper objectMapper = new ObjectMapper();
......@@ -188,8 +210,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
genericName=nonProdApplyDept.getMaktx()!=null?nonProdApplyDept.getMaktx():"";
}
saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
}
//不是分发的
} */
//不是分发的 提交后产生领导的待办信息
if (StringUtil.isBlank(businessCode)&&active ==1&&StringUtil.isBlank(sdo.getString("distribute"))){ //基本信息提交后 发送待分发的待办消息
//先结束 基本信息的待办
BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
......@@ -201,14 +223,14 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
}
}
//产生待分发的待办信息
//产生领导确认的待办信息
Map backMap=new HashMap();
backMap.put("TYPE","D");
backMap.put("title",nonProdApplyDept.getMaktx()); //汉语品名
backMap.put("positionCode","LDQR");
saveBsnMessageData(baseInfo,backMap);
}
if (active!=null&&active == 2&&opstatus.equals("1")){//各部门都提交后,隐藏消息
/* if (active!=null&&active == 2&&opstatus.equals("1")){//各部门都提交后,隐藏消息
bsnMessageApplication.submitTask(meId);
//如果所有的业务部门处理完 ,则推送SAP
BsnMessageSponsor bsnMessageSponsor=bsnMessageSponsorRepository.findByBusinessId(nonProdApplyDept.getApplyDeptId());
......@@ -239,12 +261,26 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String backStr=sendSapData(baseInfo, nonProdApplyDept);
map.put("result",backStr);
}
}
}*/
map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
return map;
}
private String getRootId(String id,List <Map <String,Object>>baseList){
String rootId="";
for (Map map:baseList){
if (id.equals(map.get("id").toString())) {
if (StringUtils.isBlank(map.get("sourceId").toString())) {
rootId = map.get("id").toString();
break;
} else {
rootId = getRootId(map.get("sourceId").toString(), baseList);
}
}
}
return rootId;
}
@Override
public SapNonProdApplyDept save(SapNonProdApplyDept sapNonProdApplyDept){
return nonProdApplyDeptRepository.save(sapNonProdApplyDept);
......@@ -372,6 +408,13 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if ("0".equals(sapVO.getXchpf())){ //批次管理 否 传递空
sapVO.setXchpf("");
}
if ("0".equals(sapVO.getNcost())){ //不参与成本核算 否 传递空
sapVO.setNcost("");
}
if ("0".equals(sapVO.getHkmat())){ //物料来源 否 传递空
sapVO.setHkmat("");
}
if (baseInfo.getBusinessUsage().contains("K")){
sapVO.setPstat(baseInfo.getBusinessUsage());
}else {
......@@ -438,11 +481,11 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
applyDept.setMatnr((String) backMap.get("MESSAGE_V1"));
}
this.nonProdApplyDeptRepository.save(applyDept);
baseInfo.setDistribute(3); //已办结
baseInfo.setDistribute(2); //已办结
nonProdApplyBaseInfoRepository.save(baseInfo);
} else {
//更改分发状态
baseInfo.setDistribute(1);
//更改到到提交状态
baseInfo.setDistribute(0);
List<String> messages = resultList
.stream()
.map(resultMap ->{
......@@ -465,6 +508,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
//Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
//向货源专员 发重新分发的消息
backMap.put("title",applyDept.getMaktx());//汉语品名
backMap.put("positionCode","HYZY");
saveBsnMessageData(baseInfo,backMap);
return backStr;
......@@ -493,7 +537,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
public void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap) {
BsnMessageSponsor bsnMessageSponsor = bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
String sql = "select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
"left join sa_oporg o on p.CODE=o.code where MAIN_ORG_ID in (select id from sa_oporg where code='HYZY')";
"left join sa_oporg o on p.CODE=o.code where MAIN_ORG_ID in (select id from sa_oporg where code='"+backMap.get("positionCode").toString()+"')";
List<Map<String, Object>> mapLists = this.sqlExecutorDao.queryToListMap(sql);
for (Map map : mapLists) {
if (bsnMessageSponsor == null) {
......@@ -542,7 +586,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if (genericName.equals(title)){
title="";
}
messageExecute.setTaskDescribe(genericName +sign+ "待分发(" + title+ ")");
messageExecute.setTaskDescribe(genericName +sign+ "待确认(" + title+ ")");
}
bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
......@@ -552,4 +596,40 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
bsnMessageApplication.saveBsnMessageExecute(executes);
}
}
//领导确认
@Override
public Map<String,Object> confirmNonProdApplyDept(SDO sdo){
Map<String,Object> map = new HashMap<>();
map.put("result","");
String confirm=sdo.getString("confirm");
String baseId=sdo.getString("id");
NonProdApplyBaseInfo baseInfo=nonProdApplyBaseInfoRepository.findOne(baseId);
//先结束 领导确认的待办
BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
if (bsnMessageSponsor2!=null){
List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
if ("LDQR".equals(bsnMessageExecute.getBusinessCode())) {
bsnMessageApplication.submitTask(bsnMessageExecute.getId());
}
}
}
SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId());
if ("2".equals(confirm)){//确认
// 推送SAP
String backStr=sendSapData(baseInfo,nonProdApplyDept);
map.put("result",backStr);
} else { //回退给货源专员
//产生货源专员的待办信息
Map backMap=new HashMap();
backMap.put("TYPE","D");
backMap.put("title",nonProdApplyDept.getMaktx()); //汉语品名
backMap.put("positionCode","HYZY");
saveBsnMessageData(baseInfo,backMap);
baseInfo.setDistribute(0);//改回待 提交状态
nonProdApplyBaseInfoRepository.save(baseInfo);
}
return map;
}
}
......@@ -135,9 +135,9 @@ public class NonProdApplyNextController extends CommonController {
// this.putAttribute("businessUsageSeledList",mapTmp);
// this.putAttribute("businessUsageUnSeledList",unMapTmp);
}
int slen=1;
int slen=0;
if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getBusinessUsage())){
slen=nonProdApplyBaseInfo.getBusinessUsage().split(",").length+1;
slen=nonProdApplyBaseInfo.getBusinessUsage().split(",").length;
}
this.putAttribute("busiLens",slen);
if (nonProdApplyDept != null) {
......@@ -218,10 +218,26 @@ public class NonProdApplyNextController extends CommonController {
*/
public String saveSapNonProdApplyDept() {
SDO sdo = this.getSDO();
if (StringUtil.isNotBlank(sdo.getString("maktx"))) {
NonProdApplyBaseInfoQueryRequest query = new NonProdApplyBaseInfoQueryRequest();
query.setMaktx(sdo.getString("maktx"));
Map<String, Object> map=nonProdApplyApplication.slicedNonApplyBaseInfoByMaktx(query);
List <Map <String,Object>>baseList=(List)map.get("Rows");
sdo.putProperty("baseList",baseList);
}
Map<String, Object> map = nonProdApplyDeptApplication.saveSapNonProdApplyDept(sdo);
return toResult(map);
}
/**
* 领导确认和回退
*/
public String confirmSapNonProdApplyDept() {
SDO sdo = this.getSDO();
Map<String, Object> map = nonProdApplyDeptApplication.confirmNonProdApplyDept(sdo);
return toResult(map);
}
/**
* 分发表单
......
......@@ -145,7 +145,7 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
@Column(name = "kind")
private String kind;
//处理状态: 0 待分发 1 基本信息填写 2 已分发 3 已办结
//处理状态: 0 待提交 1 待领导确认 2 已办结
@Column(name = "distribute")
private Integer distribute;
......
......@@ -148,8 +148,6 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
private String lgtypName;
private String ekgrpName;
/**
* 类型
*/
......@@ -160,16 +158,508 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
*/
private String classify;
private String lhme1Name;
private String lgbkzName;
private String ltkzeName;
private String ltkzaName;
private String bstmeName;
private String meinsName;
private String lgproName;
private String groes;
private String maktxRemZh;
private String maktxRemEn;
//销售视图字段=============================================================-----------
/**
* 销售组织
*/
// private String vkorg;
/**
* 分销渠道
*/
// private String vtweg;
/**
* 销售计量单位
*/
private String vrkme;
/**
* 销售计量单位转换分母
*/
private String umrenSale;
/**
* 销售计量单位转换分子
*/
private String umrezSale;
/**
* 转换分母
*/
private String umren;
/**
* 转换分子
*/
private String umrez;
/**
* 交货工厂
*/
private String dwerk;
/**
* 税收发运国
*/
private String aland;
/**
* 税分类
*/
private String taxkm;
/**
* 统计组
*/
private String versg;
/**
* 物料定价组
*/
private String kondm;
/**
* 会计科目组
*/
private String ktgrm;
/**
* 产品层级
*/
private String prodh;
/**
* 版式
*/
private String mvgr1;
/**
* 品牌
*/
private String mvgr2;
/**
* 用途
*/
private String mvgr3;
/**
* 备用
*/
private String mvgr4;
/**
* 备用
*/
private String mvgr5;
/**
* 销售项次组
*/
private String mtpos;
/*
*批次管理
*/
// private String xchpf;
/**
* 运输组
*/
private String tragr;
/**
* 装载组
*/
private String ladgr;
private String dwerkName;
private String alandName;
private String vrkmeName;
// 采购=======================================----------------------------------
/**
* 采购计量单位
*/
private String bstme;
private String bstmeName;
/**
* 转换分母(采购)
*/
private String umrenPurch;
/**
* 转换分子(采购)
*/
private String umrezPurch;
/**
* 默认采购组
*/
private String ekgrp;
private String ekgrpName;
/**
* MPN参数
*/
private String mprof;
// MRP=======================================----------------------------------
// private String lgort; //库存地点
// private String lgortName; //库存地点
//private String werks; //MRP组
/**
* MRP组
*/
private String disgr;
/**
* MRP类型
*/
private String dismm;
/**
* 重订货点
*/
private String minbe;
/**
* MRP控制者
*/
private String dispo;
/**
* 批量规模
*/
private String disls;
/**
* 固定批量
*/
private String bstfe;
/**
* 最大批量
*/
private String bstma;
/**
* 最小批量
*/
private String bstmi;
/**
* 最大存货水平
*/
private String mabst;
/**
* 设入值
*/
private String bstrf;
/**
* 获取类型
*/
private String beskz;
/**
* 特殊获取方式
*/
private String sobsl;
/**
* 默认生产库存地
*/
private String lgpro;
private String lgproName;
/**
* 倒冲标志
*/
private String rgekz;
/**
* 默认采购收货库存地
*/
private String lgfsb;
private String lgfsbName;
/**
* 收货处理天数
*/
private String webaz;
/**
* 自制时间
*/
private String dzeit;
/**
* 外部采购交货时间
*/
private String plifz;
/**
* 排程边际码
*/
private String fhori;
/**
* 安全库存
*/
private String eisbe;
/**
* 最小安全库存
*/
private String eislo;
/**
* 策略组
*/
private String strgr;
/**
* 可用性检查组
*/
private String mtvfp;
/**
* 补货提前天数
*/
private String wzeit;
/**
* BOM选择方法
*/
private String altsl;
/**
* 独立/集中
*/
private String sbdkz;
/**
* 库存地MRP标识
*/
private String diskz;
/**
* 消耗模式
*/
private String vrmod;
// * 逆推消耗期间
private String vint1;
/**
* 顺推消耗期间
*/
private String vint2;
/**
* 综合MRP
*/
private String miskz;
//期间标识
private String perkz;
//生产====================================================---------------
/**
* 投料计量单位
*/
private String ausme;
private String ausmeName;
/**
* 转换分母(生产)
*/
private String umrenProd;
/**
* 转换分子(生产)
*/
private String umrezProd;
/**
* 生产计划参数文件
*/
private String sfcpf;
/**
* 过账到质检
*/
//private String insmk;
//生产主管
private String fevor;
//存储管理==============================================
/**
* 库存地点(质检)
*/
private String lgortQm;
private String lgortQmName;
/**
* 序列号参数
*/
private String sernp;
/**
* 序列号水平
*/
private String serlv;
/**
* 利润中心
*/
private String prctr;
/**
* 过账到质检
*/
private String insmk;
//过期日期
private String sledBbd;
//仓库管理==========================================================================================
/**
* 工厂(利润中心)
*/
/**
* 库存地点
*/
// private String lgort;
// private String lgortName;
private String lgortProfit;
private String lgortProfitName;
/**
* 仓库号
*/
// private String lgnum;
/**
* 存储类型
*/
// private String lgtyp;
// private String lgtypName;
/**
* 存货下架存储类型
*/
private String ltkza;
private String ltkzaName;
/**
* 存货上架存储类型
*/
private String ltkze;
private String ltkzeName;
/**
* 存储分区标识
*/
private String lgbkz;
private String lgbkzName;
/**
* 仓库设施1存储数量
*/
private String lhmg1;
/**
* 仓库设施1存储单位
*/
private String lhme1;
private String lhme1Name;
/**
* 仓库设施1类型
*/
private String lety1;
//财务核算==========================================================================================
/**
* 评估分类
*/
private String bklas;
/**
* 价格确定
*/
private String mlast;
/**
* 价格控制
*/
private String vprsv;
/**
* 定价基数
*/
private String peinh;
/**
* 移动平均价
*/
private String verpr;
/**
* 标准价
*/
private String stprs;
/**
* 数量结构
*/
private String ekalr;
/**
* 不参与成本核算
*/
private String ncost;
/**
* 物料来源
*/
private String hkmat;
/**
* 差异码
*/
private String awsls;
//销售评估类
private String eklas;
}
......@@ -10,4 +10,5 @@ import java.util.List;
public interface NonProdApplyBaseInfoRepository extends JpaRepository<NonProdApplyBaseInfo,String> {
List<NonProdApplyBaseInfo> findByGenericNameAndMaintenanceType(String genericName,String maintenanceType);
}
......@@ -20,4 +20,11 @@
</sql-query>
<!--condition column="matnr" name="matnr" type="java.lang.String" symbol="=" alias="t"/-->
</query>
<query name="slicedNonApplyBaseInfoByMaktx" label="按汉语品名查询所有数据" table="sap_non_prod_apply_base_info">
<sql-query>
select id,source_id,maintenance_type,fillin_date from sap_non_prod_apply_base_info t where t.id in (
select base_info_id from sap_non_prod_apply_dept snpad where MAKTX=:maktx) and t.status!=5 order by fillin_date asc
</sql-query>
<!--condition column="matnr" name="matnr" 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