Skip to content

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

bean注入问题

parent 0ba4686a
Hide whitespace changes
Inline Side-by-side
Showing with 1080 additions and 148 deletions
.idea/mybatisx/templates.xml
View file @ 5841f10a
......@@ -48,8 +48,8 @@
<option name="tableUIInfoList">
<list>
<TableUIInfo>
<option name="className" value="NonProdApplyBaseInfo" />
<option name="tableName" value="non_prod_apply_base_info" />
<option name="className" value="SapNonProdApplyDept" />
<option name="tableName" value="sap_non_prod_apply_dept" />
</TableUIInfo>
</list>
</option>
......
huigou-xt/src/main/webapp/system/excelimport/AssignCodeImp.js
View file @ 5841f10a
......@@ -92,6 +92,15 @@ $.extend(ExcelImpManager.prototype,{
let code = prompt("请输入编码");
Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{dictionaryCode:code})
// UICtrl.showDialog({
// title: $.i18nProp('编码详情'),
// width: 600,
// url: web_app.name + '/globalCode/forwardGlobalCode.load',
// ok: function (){
// let code =$("#dictionaryCode").val();
// Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{dictionaryCode:code})
// }
// });
if(_self.getTemplateId()==''){
Public.errorTip('请选择模板。');
return false;
......
huigou-xt/src/main/webapp/system/excelimport/inputDictionariesCode.js
View file @ 5841f10a
$(document).ready(function () {
$('#productCode').searchbox({
type: "product",
name: "productCode",
$('#dictionaryCode').searchbox({
type: "system",
name: "dictionaryCodes",
onChange: function (value, data) {
$('#dictionaryCode').val(data.code)
}
......
huigou-xt/src/main/webapp/system/excelimport/inputDictionariesCode.jsp
View file @ 5841f10a
......@@ -4,7 +4,7 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
<script src='<c:url value="/system/excelimport/inputDictionariesCode.js"/>' type="text/javascript"></script>
</head>
<body>
<x:billTitle title="导入字典对应编码" needStatus="false" needPerson="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ 5841f10a
......@@ -9,7 +9,7 @@ function initialize(){
$("#proofingApplyNgReReason").prop("placeholder","录入此列本单作废");
//若是作为流程页或详情页，则初始化bom
if($("#productId").val()!=null&&$("#productId").val()!=""){
showTable({proofingApplyId:$("#proofingApplyId").val()});
showTechnologyTable({proofingApplyId:$("#proofingApplyId").val()},"proofingApplyTechnologyId",null);
}
let isDetailPage = ($("#isDetailPage").val() === "true");
if (isDetailPage) {
......@@ -24,11 +24,14 @@ function bindQueryEvent() {
onChange: function (value, data) {
ajaxRenderDataGoForm({productId:data.productId});
$('#productCategoryName').val(data.productCategoryName)
showTechnologyTable(data.productId);
showTechnologyTable({productId:data.productId},"technologyId",null);
}
});
}
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
......@@ -72,5 +75,4 @@ function getExtendedData(processAction) {
return extendedData;
}
return getTableResult();
}
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ 5841f10a
......@@ -13,7 +13,7 @@ function initialize() {
*/
let isDetailPage = ($("#isDetailPage").val() === "true");
if (isDetailPage) {
showTable({proofingMakeId:$("#proofingMakeId").val()});
showTechnologyTable({proofingMakeId:$("#proofingMakeId").val()},"proofingMakeTechnologyId",null);
$("#jobPageTop").hide();
if($("#jobPageTop").length>0){
$("#formButton").hide();
......@@ -28,7 +28,7 @@ function bindQueryEvent() {
onChange: function (value, data) {
$('#productCode').val(data.productCode);
ajaxRenderDataGoForm(data.proofingApplyNo);
showTable({proofingApplyId:data.proofingApplyId});
showTechnologyTable({proofingApplyId:data.proofingApplyId},"proofingApplyTechnologyId",null);
}
});
}
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ 5841f10a
//是否开启联动事件
var isDetail=false,isComplete=null;
// var isDetail=false;
//定义生成表格的参数对象
var bomObj={
......@@ -17,6 +17,7 @@ var technologyObj={
node:"technologyGrid",
url:"slicedTechnologyList",
gridManager:null,
primaryKey:null,
columns:[
{display: "工艺路线名称", name: "technologyName", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
......@@ -26,13 +27,13 @@ var technologyObj={
}
],
linkage:function (data){
debugger
let result = data.Rows.length>0?data.Rows[0].technologyId:-1; // 获取选中行
processObj.parms = { technologyId: result };
processBomObj.parms = { technologyId: result };
let key = this.primaryKey;
let val = data.Rows.length>0?data.Rows[0][key]:-1; // 获取选中行
processObj.parms = { [key]: val };
processBomObj.parms = { [key]: val };
if(processObj.gridManager==null){
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
loadGrid(processObj);
loadGrid(processBomObj);
}else {
reloadGrid(processObj);
reloadGrid(processBomObj);
......@@ -108,6 +109,7 @@ var processBomObj={
parms:{},
node:"processBomGrid",
url:"slicedProcessMaterialList",
primaryKey:null,
columns:[
{ display: "物料", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
......@@ -137,8 +139,7 @@ var processBomObj={
}
//创建表格（参数、列、插入的节点、请求地址）
function loadProofingApplyGrid(obj) {
isComplete=false;
function loadGrid(obj) {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
UICtrl.addGridRow(obj.gridManager);
......@@ -174,60 +175,14 @@ function loadProofingApplyGrid(obj) {
}
/**
* 详情页初始化调用
* 获取申请或制造单的工艺工序等数据生成表格
* @param proofingApplyId
*/
function showTable(params) {
isDetail=true;
// 根据传入的参数确定使用哪个ID
let key = Object.keys(params)[0];
let value = params[key];
// 根据key来确定是"apply"还是"make"
let a=key.includes("Apply")?"proofingApply":"proofingMake";
technologyObj.parms = { [a+"Id"]: value };
let promise = new Promise(function(resolve, reject) {
if (technologyObj.gridManager != null) {
reloadGrid(technologyObj);
} else {
technologyObj=loadProofingApplyGrid(technologyObj);
}
setTimeout(function() {
resolve();
}, 1200);
});
promise.then(function() {
let technologyResult = DataUtil.getGridData({
gridManager: technologyObj.gridManager,
isAllData: true
});
let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
processObj.parms = {[a+"TechnologyId"]: technologyId}
processBomObj.parms = {[a+"TechnologyId"]: technologyId}
if (processObj.gridManager != null) {
reloadGrid(processObj);
reloadGrid(processBomObj);
} else {
processObj=loadProofingApplyGrid(processObj);
processBomObj=loadProofingApplyGrid(processBomObj);
}
});
}
//根据产品编号展示产品的艺表格
function showTechnologyTable(productId){
isDetail=false;
technologyObj.parms = {productId: productId};
function showTechnologyTable(parms,technologyKey,processKey){
// isDetail=false;
technologyObj.primaryKey=technologyKey
processObj.primaryKey=processKey
technologyObj.parms = parms;
if(technologyObj.gridManager==null) {
loadProofingApplyGrid(technologyObj);
loadGrid(technologyObj);
}{
reloadGrid(technologyObj);
}
......@@ -235,7 +190,6 @@ function showTechnologyTable(productId){
$(document).ready(function() {
// switchGridManager();
// technologyClickRequestProcess();
UICtrl.layout("#layout",{
leftWidth:2,
......@@ -258,36 +212,35 @@ function reloadGrid(obj) {
/**
* 根据选定的technology列获取对应的process
* 冒泡机制永远都会先执行此点击事件，需要让平台内置事件先执行来获取行id
*/
function technologyClickRequestProcess(){
$(document).on('click', '#technology .l-grid-row', function(event) {
setTimeout(function() {
if(isDetail)return;
debugger
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
if (processObj.gridManager != null) {
reloadGrid(processObj);
reloadGrid(processBomObj);
} else {
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}
}, 0);
});
}
// /**
// * 根据选定的technology列获取对应的process
// * 冒泡机制永远都会先执行此点击事件，需要让平台内置事件先执行来获取行id
// */
// function technologyClickRequestProcess(){
// $(document).on('click', '#technology .l-grid-row', function(event) {
// setTimeout(function() {
// if(isDetail)return;
// debugger
// let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
// processObj.parms = { technologyId: result.technologyId };
// processBomObj.parms = { technologyId: result.technologyId };
// if (processObj.gridManager != null) {
// reloadGrid(processObj);
// reloadGrid(processBomObj);
// } else {
// loadProofingApplyGrid(processObj);
// loadProofingApplyGrid(processBomObj);
// }
// }, 0);
// });
//
// }
/**
* 获取编辑表格中的数据
* @returns {{}|boolean}
*/
function getTableResult(){
debugger
let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
let processResult =processObj.gridManager.getSelectedRows();
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ 5841f10a
......@@ -33,7 +33,7 @@
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/>
<x:selectC name="statusId" label="批准状态" dictionary="bizBillStatus" disabled="true" labelCol="1" fieldCol="2"/>
<x:inputC name="approver" label="批准人" labelCol="1" fieldCol="2"/>
<x:inputC name="approvalDate" label="批准日期" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 5841f10a
......@@ -2,8 +2,7 @@ var gridManager = null;
$(document).ready(function () {
initializateUI()
// loadNonProdApplyListGrid();
// console.log(gridManager)
loadNonProdApplyListGrid();
})
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
......@@ -61,11 +60,6 @@ function loadNonProdApplyListGrid() {
UICtrl.setSearchAreaToggle(gridManager);
}
function a() {
debugger
loadNonProdApplyListGrid();
console.log(gridManager)
}
function query(obj) {
var param = $(obj).formToJSON();
......@@ -103,7 +97,7 @@ function deleteHandler() {
function addHandler() {
UICtrl.addTabItem({
tabid: 'nonProdApply',
text: "统计指标数据",
text: "非产品/非本成品类物料主数据维护申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
});
}
......@@ -111,7 +105,15 @@ function addHandler() {
function doView(id) {
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "统计指标详情",
text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
});
}
function next(){
UICtrl.addTabItem({
tabid: 'showNonProdApplyNext',
text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?isDetailPage=true'
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ 5841f10a
......@@ -8,7 +8,7 @@
</head>
<body>
<div class="container-fluid">
<div onclick="a()">a</div>
<x:button value="next" onclick="next()" icon="fa-save"/>
<div class="ui-hide">
<x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 5841f10a
$(document).ready(function () {
initializate()
})
function initializate() {
console.log("aa")
$("#a").show();
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ 5841f10a
......@@ -4,24 +4,29 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyNext.js'/>
</head>
<style>
.box {
display: none;
}
</style>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<x:hidden name="fullId"/>
<x:hidden name="organId"/>
<x:hidden name="organName"/>
<x:hidden name="deptId"/>
<%-- <x:hidden name="deptName"/>--%>
<x:hidden name="positionId"/>
<x:hidden name="positionName"/>
<x:hidden name="personMemberId"/>
<%-- <x:hidden name="personMemberName"/>--%>
<x:hidden name="id"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<%-- <x:hidden name="fullId"/>--%>
<%-- <x:hidden name="organId"/>--%>
<%-- <x:hidden name="organName"/>--%>
<%-- <x:hidden name="deptId"/>--%>
<%-- <x:hidden name="deptName"/>--%>
<%-- <x:hidden name="positionId"/>--%>
<%-- <x:hidden name="positionName"/>--%>
<%-- <x:hidden name="personMemberId"/>--%>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
......@@ -37,37 +42,37 @@
<x:title title="维护基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="" label="物品编码" labelCol="1" fieldCol="5"/>
<x:selectC name="itemAttributes" label="物品类型" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="" label="物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="集团级删除" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="产品组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="项目类别组" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="汉语品名" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="批次管理" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="包装物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="matnr" label="物品编码" labelCol="1" fieldCol="5"/>
<x:selectC name="mtart" label="物品类型" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="matkl" label="物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="lvorm" label="集团级删除" labelCol="1" fieldCol="2"/>
<x:inputC name="spart" label="产品组" labelCol="1" fieldCol="2"/>
<x:inputC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2"/>
<x:inputC name="maktx" label="汉语品名" labelCol="1" fieldCol="2"/>
<x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2"/>
<x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:inputC name="" label="英语品名" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="" label="存储条件" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="毛重" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="重量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="体积" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="体积单位" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="有效时间标识" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="总有效期" labelCol="1" fieldCol="2"/>
<x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
<x:selectC name="meins" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="raube" label="存储条件" labelCol="1" fieldCol="2"/>
<x:inputC name="brgew" label="毛重" labelCol="1" fieldCol="2"/>
<x:inputC name="gewei" label="重量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="volum" label="体积" labelCol="1" fieldCol="2"/>
<x:inputC name="voleh" label="体积单位" labelCol="1" fieldCol="2"/>
<x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/>
<x:inputC name="mhdhb" label="总有效期" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="旧料号" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="最小货架寿命" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="分销渠道" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="仓库号" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="mhdrz" label="最小货架寿命" labelCol="1" fieldCol="2"/>
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="vkorg" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="vtweg" label="分销渠道" labelCol="1" fieldCol="2"/>
<x:inputC name="lgnum" label="仓库号" labelCol="1" fieldCol="2"/>
<x:inputC name="lgtyp" label="存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="" label="文本说明" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
......@@ -79,6 +84,124 @@
</div>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="klart" label="类型" labelCol="1" fieldCol="2"/>
<x:inputC name="classify" label="分类" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row" id="a">
<x:inputC name="vkorg" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="vtweg" label="分销渠道" labelCol="1" fieldCol="2"/>
<x:inputC name="vrkme" label="销售计量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="umren" label="转换分母" labelCol="1" fieldCol="2"/>
<x:inputC name="umrez" label="转换分子" labelCol="1" fieldCol="2"/>
<x:inputC name="dwerk" label="交货工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="aland" label="税收发运国" labelCol="1" fieldCol="2"/>
<x:inputC name="taxkm" label="税分类" labelCol="1" fieldCol="2"/>
<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"/>
<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"/>
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2"/>
<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"/>
<x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="werksPurch" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="disgr" label="MRP组" labelCol="1" fieldCol="2"/>
<x:inputC name="dismm" label="MRP类型" labelCol="1" fieldCol="2"/>
<x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
<x:inputC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2"/>
<x:inputC name="disls" label="批量规模" labelCol="1" fieldCol="2"/>
<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:inputC name="beskz" label="获取类型" labelCol="1" fieldCol="2"/>
<x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
<x:inputC name="lgpro" label="默认生产库存地" labelCol="1" fieldCol="2"/>
<x:inputC name="rgekz" label="倒冲标志" labelCol="1" fieldCol="2"/>
<x:inputC name="lgfsb" label="默认采购收货库存地" labelCol="1" fieldCol="2"/>
<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"/>
<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"/>
<x:inputC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="2"/>
<x:inputC name="altsl" label="BOM选择方法" labelCol="1" fieldCol="2"/>
<x:inputC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2"/>
<x:inputC name="diskz" label="库存地MRP标识" labelCol="1" fieldCol="2"/>
<x:inputC name="ausme" label="投料计量单位" labelCol="1" fieldCol="2"/>
<x:inputC name="umrenProd" label="转换分母（生产）" labelCol="1" fieldCol="2"/>
<x:inputC name="umrezProd" label="转换分子（生产）" labelCol="1" fieldCol="2"/>
<x:inputC name="sfcpf" label="生产计划参数文件" labelCol="1" fieldCol="2"/>
<x:inputC name="insmk" label="过账到质检" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="werksQm" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="lgortQm" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
<x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
<x:inputC name="prctr" label="利润中心" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="werksProfit" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="lgortProfit" label="库存地点" labelCol="1" fieldCol="2"/>
<x:inputC name="lgnum" label="仓库号" labelCol="1" fieldCol="2"/>
<x:inputC name="lgtyp" label="存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="ltkza" label="存货下架存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="ltkze" label="存货上架存储类型" labelCol="1" fieldCol="2"/>
<x:inputC name="lgbkz" label="存储分区标识" labelCol="1" fieldCol="2"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="1" fieldCol="2"/>
<x:inputC name="lhme1" label="仓库设施1存储单位" labelCol="1" fieldCol="2"/>
<x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="werksDoc" label="工厂（文档要求）" labelCol="1" fieldCol="2"/>
<x:inputC name="kzdkz" label="文档要求" labelCol="1" fieldCol="2"/>
<x:inputC name="art" label="检验类型" labelCol="1" fieldCol="2"/>
<x:inputC name="aktiv" label="激活标识" labelCol="1" fieldCol="2"/>
<x:inputC name="insmkQm" label="过账到质检（质检）" labelCol="1" fieldCol="2"/>
<x:inputC name="aktiv" label="激活标识" labelCol="1" fieldCol="2"/>
<x:inputC name="ppl" label="带任务清单检验" labelCol="1" fieldCol="2"/>
<x:inputC name="app" label="自动分配" labelCol="1" fieldCol="2"/>
<x:inputC name="mer" label="检查特性" labelCol="1" fieldCol="2"/>
<x:inputC name="dyn" label="允许略过" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row box">
<x:inputC name="bwkey" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="bklas" label="评估分类" labelCol="1" fieldCol="2"/>
<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="verpr" label="移动平均价" labelCol="1" fieldCol="2"/>
<x:inputC name="stprs" label="标准价" labelCol="1" fieldCol="2"/>
<x:inputC name="ekalr" label="数量结构" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与成本核算" labelCol="1" fieldCol="2"/>
<x:inputC name="hkmat" label="物料来源" labelCol="1" fieldCol="2"/>
<x:inputC name="awsls" label="差异码" labelCol="1" fieldCol="2"/>
</div>
</div>
</form>
</body>
......
topsun/src/main/java/com/huigou/topsun/base/dictionary/GlobalCode.java
View file @ 5841f10a
package com.huigou.topsun.base.dictionary;
import java.util.concurrent.atomic.AtomicInteger;
import com.huigou.util.StringUtil;
import java.util.concurrent.atomic.AtomicReference;
public class GlobalCode {
......@@ -12,6 +13,9 @@ public class GlobalCode {
}
public static String get() {
if(StringUtil.isBlank( str.get())){
throw new RuntimeException("未选择编码");
}
return str.get();
}
}
topsun/src/main/java/com/huigou/topsun/base/dictionary/application/DictionaryImportApplication.java
View file @ 5841f10a
package com.huigou.topsun.base.dictionary.application;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2023/12/20/10:30
* @Description:
*/
public interface DictionaryImportApplication {
static String QUERY_XML_FILE_PATH = "config/topsun/base/dictionaryImport.xml";
Map<String,Object> querySaDictionary(String code);
}
topsun/src/main/java/com/huigou/topsun/base/dictionary/application/impl/DictionaryImportApplicationImpl.java
View file @ 5841f10a
......@@ -66,4 +66,11 @@ public class DictionaryImportApplicationImpl extends BaseApplication implements
return BatchSqlUpdateDetail.newInstance(this.sqlExecutorDao.getDataSource(),
queryDescriptor.getSqlByName("insertRecord"), paramType);
}
@Override
public Map<String, Object> querySaDictionary(String code) {
QueryDescriptor query = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "querySaDictionary");
return this.sqlExecutorDao.queryOneToMap(code,query);
}
}
topsun/src/main/java/com/huigou/topsun/base/dictionary/controller/GlobalCodeController.java
View file @ 5841f10a
package com.huigou.topsun.base.dictionary.controller;
import com.huigou.topsun.base.dictionary.GlobalCode;
import com.huigou.topsun.base.dictionary.application.DictionaryImportApplication;
import com.huigou.topsun.technology.domain.query.ProcessQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.easysearch.EasySearch;
import com.huigou.uasp.bmp.common.easysearch.domain.model.EasySearchParse;
import com.huigou.uasp.bmp.common.easysearch.domain.model.QuerySchemeField;
import com.huigou.uasp.bmp.opm.application.MemEasySearcher;
import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@Controller
@ControllerMapping("/globalCode")
public class GlobalCodeController extends CommonController {
protected String getPagePath() {
return "/excelImport/";
}
@Autowired
DictionaryImportApplication dictionaryImportApplication;
public String revampGlobalCode(){
SDO sdo = this.getSDO();
String code = sdo.getString("dictionaryCode");
GlobalCode.set(code);
return success();
}
public String forwardGlobalCode(){
return forward("inputDictionariesCode");
}
@EasySearch(queryName = "dictionaryCodes")
public Map<String, Object> queryDictionaryCodes(SDO sdo){
Integer intPage = sdo.getInteger("intPage", 1);
Integer pageSize = sdo.getInteger("pageSize",10);
PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);
List<QuerySchemeField> fields =
Arrays.asList(new QuerySchemeField("id", "id", "string", 200L),
new QuerySchemeField("工序名称", "processName", "string", 200L),
new QuerySchemeField("工序类型", "processType", "hidden", 100L),
new QuerySchemeField("工序类型", "processTypeTextView", "string", 100L),
new QuerySchemeField("工时", "workHours", "string", 100L),
new QuerySchemeField("工序内容", "processContent", "hidden", 100L),
new QuerySchemeField("工序说明", "processRemark", "hidden", 100L)
);
EasySearchParse easySearchParse = new EasySearchParse();
easySearchParse.setFields(fields);
easySearchParse.setWidth(450L);
// String processName = sdo.getString("paramValue");
// ProcessQueryRequest queryRequest = sdo.toQueryRequest(ProcessQueryRequest.class);
// queryRequest.setProcessName(processName);
// Map<String, Object> map = processApplication.slicedProcessList(queryRequest);
String code = sdo.getString("code");
Map<String, Object> map = dictionaryImportApplication.querySaDictionary(code);
List<Map<String, Object>> mapList = (List<Map<String, Object>>)map.get("Rows");
MemEasySearcher<Map<String, Object>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model;
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 5841f10a
......@@ -71,6 +71,9 @@ public class NonProdApplyController extends CommonController {
return success();
}
public String forwardNonProdApplyNext(){
return forward("nonProdApplyNext");
}
}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java 0 → 100644
View file @ 5841f10a
package com.huigou.topsun.sap.nonProdApply.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
*
* @TableName sap_non_prod_apply_dept
*/
@Table(name="sap_non_prod_apply_dept")
@Data
@Entity
public class SapNonProdApplyDept implements Serializable {
@Id
@GeneratedValue(
generator = "system-uuid"
)
@GenericGenerator(
name = "system-uuid",
strategy = "guid"
)
private String id;
/**
* 主表id
*/
@Column(name = "base_info_id")
private String baseInfoId;
/**
* 物料编码
*/
@Column(name = "MATNR")
private String matnr;
/**
* 物料类型
*/
@Column(name = "MTART")
private String mtart;
/**
* 物料组
*/
@Column(name = "MATKL")
private String matkl;
/**
* 集团删除
*/
@Column(name = "LVORM")
private String lvorm;
/**
* 产品组
*/
@Column(name = "SPART")
private String spart;
/**
* 一般销售项次组
*/
@Column(name = "MTPOS_MARA")
private String mtposMara;
/**
* 汉语品名
*/
@Column(name = "MAKTX")
private String maktx;
/**
* 汉语语言
*/
@Column(name = "SPARS")
private String spars;
/**
* 英语品名
*/
@Column(name = "MAKTX_EN")
private String maktxEn;
/**
* 英语语言码
*/
@Column(name = "SPARS_EN")
private String sparsEn;
/**
* 适用标准
*/
@Column(name = "NORMT")
private String normt;
/**
* 批次管理
*/
@Column(name = "XCHPF")
private String xchpf;
/**
* 包装物料组
*/
@Column(name = "MAGRV")
private String magrv;
/**
* 基本计量单位
*/
@Column(name = "MEINS")
private String meins;
/**
* 毛重
*/
@Column(name = "BRGEW")
private String brgew;
/**
* 净重
*/
@Column(name = "NTGEW")
private String ntgew;
/**
* 重量单位
*/
@Column(name = "GEWEI")
private String gewei;
/**
* 体积
*/
@Column(name = "VOLUM")
private String volum;
/**
* 体积单位
*/
@Column(name = "VOLEH")
private String voleh;
/**
* 存储条件
*/
@Column(name = "RAUBE")
private String raube;
/**
* 有效期标识
*/
@Column(name = "IPRKZ")
private String iprkz;
/**
* 最小货架寿命
*/
@Column(name = "MHDRZ")
private String mhdrz;
/**
* 总有效期
*/
@Column(name = "MHDHB")
private String mhdhb;
/**
* 类型
*/
@Column(name = "KLART")
private String klart;
/**
* 分类
*/
@Column(name = "CLASS")
private String classify;
/**
* 销售组织
*/
@Column(name = "VKORG")
private String vkorg;
/**
* 分销渠道
*/
@Column(name = "VTWEG")
private String vtweg;
/**
* 销售计量单位
*/
@Column(name = "VRKME")
private String vrkme;
/**
* 转换分母
*/
@Column(name = "UMREN")
private String umren;
/**
* 转换分子
*/
@Column(name = "UMREZ")
private String umrez;
/**
* 交货工厂
*/
@Column(name = "DWERK")
private String dwerk;
/**
* 税收发运国
*/
@Column(name = "ALAND")
private String aland;
/**
* 税分类
*/
@Column(name = "TAXKM")
private String taxkm;
/**
* 统计组
*/
@Column(name = "VERSG")
private String versg;
/**
* 物料定价组
*/
@Column(name = "KONDM")
private String kondm;
/**
* 会计科目组
*/
@Column(name = "KTGRM")
private String ktgrm;
/**
* 产品层级
*/
@Column(name = "PRODH")
private String prodh;
/**
* 版式
*/
@Column(name = "MVGR1")
private String mvgr1;
/**
* 品牌
*/
@Column(name = "MVGR2")
private String mvgr2;
/**
* 用途
*/
@Column(name = "MVGR3")
private String mvgr3;
/**
* 备用
*/
@Column(name = "MVGR4")
private String mvgr4;
/**
* 备用
*/
@Column(name = "MVGR5")
private String mvgr5;
/**
* 销售项次组
*/
@Column(name = "MTPOS")
private String mtpos;
/**
* 运输组
*/
@Column(name = "TRAGR")
private String tragr;
/**
* 装载组
*/
@Column(name = "LADGR")
private String ladgr;
/**
* 工厂
*/
@Column(name = "WERKS")
private String werks;
/**
* 采购计量单位
*/
@Column(name = "BSTME")
private String bstme;
/**
* 转换分母（采购）
*/
@Column(name = "UMREN_PURCH")
private String umrenPurch;
/**
* 转换分子（采购）
*/
@Column(name = "UMREZ_PURCH")
private String umrezPurch;
/**
* 默认采购组
*/
@Column(name = "EKGRP")
private String ekgrp;
/**
* MPN参数
*/
@Column(name = "MPROF")
private String mprof;
/**
* 工厂（采购）
*/
@Column(name = "WERKS_PURCH")
private String werksPurch;
/**
* 库存地点
*/
@Column(name = "LGORT")
private String lgort;
/**
* MRP组
*/
@Column(name = "DISGR")
private String disgr;
/**
* MRP类型
*/
@Column(name = "DISMM")
private String dismm;
/**
* 重订货点
*/
@Column(name = "MINBE")
private String minbe;
/**
* MRP控制者
*/
@Column(name = "DISPO")
private String dispo;
/**
* 批量规模
*/
@Column(name = "DISLS")
private String disls;
/**
* 固定批量
*/
@Column(name = "BSTFE")
private String bstfe;
/**
* 最大批量
*/
@Column(name = "BSTMA")
private String bstma;
/**
* 最小批量
*/
@Column(name = "BSTMI")
private String bstmi;
/**
* 最大存货水平
*/
@Column(name = "MABST")
private String mabst;
/**
* 设入值
*/
@Column(name = "BSTRF")
private String bstrf;
/**
* 获取类型
*/
@Column(name = "BESKZ")
private String beskz;
/**
* 特殊获取方式
*/
@Column(name = "SOBSL")
private String sobsl;
/**
* 默认生产库存地
*/
@Column(name = "LGPRO")
private String lgpro;
/**
* 倒冲标志
*/
@Column(name = "RGEKZ")
private String rgekz;
/**
* 默认采购收货库存地
*/
@Column(name = "LGFSB")
private String lgfsb;
/**
* 收货处理天数
*/
@Column(name = "WEBAZ")
private String webaz;
/**
* 自制时间
*/
@Column(name = "DZEIT")
private String dzeit;
/**
* 外部采购交货时间
*/
@Column(name = "PLIFZ")
private String plifz;
/**
* 排程边际码
*/
@Column(name = "FHORI")
private String fhori;
/**
* 安全库存
*/
@Column(name = "EISBE")
private String eisbe;
/**
* 最小安全库存
*/
@Column(name = "EISLO")
private String eislo;
/**
* 策略组
*/
@Column(name = "STRGR")
private String strgr;
/**
* 可用性检查组
*/
@Column(name = "MTVFP")
private String mtvfp;
/**
* 补货提前天数
*/
@Column(name = "WZEIT")
private String wzeit;
/**
* BOM选择方法
*/
@Column(name = "ALTSL")
private String altsl;
/**
* 独立/集中
*/
@Column(name = "SBDKZ")
private String sbdkz;
/**
* 库存地MRP标识
*/
@Column(name = "DISKZ")
private String diskz;
/**
* 投料计量单位
*/
@Column(name = "AUSME")
private String ausme;
/**
* 转换分母（生产）
*/
@Column(name = "UMREN_PROD")
private String umrenProd;
/**
* 转换分子（生产）
*/
@Column(name = "UMREZ_PROD")
private String umrezProd;
/**
* 生产计划参数文件
*/
@Column(name = "SFCPF")
private String sfcpf;
/**
* 过账到质检
*/
@Column(name = "INSMK")
private String insmk;
/**
* 工厂（质检）
*/
@Column(name = "WERKS_QM")
private String werksQm;
/**
* 库存地点（质检）
*/
@Column(name = "LGORT_QM")
private String lgortQm;
/**
* 序列号参数
*/
@Column(name = "SERNP")
private String sernp;
/**
* 序列号水平
*/
@Column(name = "SERLV")
private String serlv;
/**
* 利润中心
*/
@Column(name = "PRCTR")
private String prctr;
/**
* 工厂（利润中心）
*/
@Column(name = "WERKS_PROFIT")
private String werksProfit;
/**
* 库存地点（利润中心）
*/
@Column(name = "LGORT_PROFIT")
private String lgortProfit;
/**
* 仓库号
*/
@Column(name = "LGNUM")
private String lgnum;
/**
* 存储类型
*/
@Column(name = "LGTYP")
private String lgtyp;
/**
* 存货下架存储类型
*/
@Column(name = "LTKZA")
private String ltkza;
/**
* 存货上架存储类型
*/
@Column(name = "LTKZE")
private String ltkze;
/**
* 存储分区标识
*/
@Column(name = "LGBKZ")
private String lgbkz;
/**
* 仓库设施1存储数量
*/
@Column(name = "LHMG1")
private String lhmg1;
/**
* 仓库设施1存储单位
*/
@Column(name = "LHME1")
private String lhme1;
/**
* 仓库设施1类型
*/
@Column(name = "LETY1")
private String lety1;
/**
* 工厂（文档要求）
*/
@Column(name = "WERKS_DOC")
private String werksDoc;
/**
* 文档要求
*/
@Column(name = "KZDKZ")
private String kzdkz;
/**
* 检验类型
*/
@Column(name = "ART")
private String art;
/**
* 激活标识
*/
@Column(name = "AKTIV")
private String aktiv;
/**
* 过账到质检（质检）
*/
@Column(name = "INSMK_QM")
private String insmkQm;
/**
* 带任务清单检验
*/
@Column(name = "PPL")
private String ppl;
/**
* 自动分配
*/
@Column(name = "APP")
private String app;
/**
* 检查特性
*/
@Column(name = "MER")
private String mer;
/**
* 允许略过
*/
@Column(name = "DYN")
private String dyn;
/**
* 工厂（评估分类）
*/
@Column(name = "BWKEY")
private String bwkey;
/**
* 评估分类
*/
@Column(name = "BKLAS")
private String bklas;
/**
* 价格确定
*/
@Column(name = "MLAST")
private String mlast;
/**
* 价格控制
*/
@Column(name = "VPRSV")
private String vprsv;
/**
* 定价基数
*/
@Column(name = "PEINH")
private String peinh;
/**
* 移动平均价
*/
@Column(name = "VERPR")
private String verpr;
/**
* 标准价
*/
@Column(name = "STPRS")
private String stprs;
/**
* 数量结构
*/
@Column(name = "EKALR")
private String ekalr;
/**
* 不参与成本核算
*/
@Column(name = "NCOST")
private String ncost;
/**
* 物料来源
*/
@Column(name = "HKMAT")
private String hkmat;
/**
* 差异码
*/
@Column(name = "AWSLS")
private String awsls;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/resources/config/topsun/base/dictionaryImport.xml
View file @ 5841f10a
......@@ -31,4 +31,10 @@
</sql>
</query>
<query name="querySaDictionary" label="" table="sa_dictionary">
<sql-query>
select t.id from sa_dictionary t where 1=1 and t.code like ?
</sql-query>
</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