Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
鲁鑫
topsun-bpm
Commits
a7c81661
Commit
a7c81661
authored
Nov 27, 2023
by
wanghang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打样申请 多级联动
parent
392a54d5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
399 additions
and
0 deletions
+399
-0
WorkInstrcutionApply.jsp
.../main/webapp/biz/topsun/proofing/WorkInstrcutionApply.jsp
+41
-0
proofingApplyList.js
.../src/main/webapp/biz/topsun/proofing/proofingApplyList.js
+303
-0
proofingApplyList.jsp
...src/main/webapp/biz/topsun/proofing/proofingApplyList.jsp
+30
-0
proofingMakeDetail.js
...src/main/webapp/biz/topsun/proofing/proofingMakeDetail.js
+24
-0
TechnologyApplication.java
.../topsun/technology/application/TechnologyApplication.java
+1
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/proofing/WorkInstrcutionApply.jsp
0 → 100644
View file @
a7c81661
<%@ page
contentType=
"text/html; charset=utf-8"
language=
"java"
%>
<%@ taglib
uri=
"/WEB-INF/taglib.tld"
prefix=
"x"
%>
<%@ taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%>
<x:base
include=
"grid,date,layout,combox,tree,comboDialog,attachment"
/>
<x:script
src=
'/system/opm/js/OpmUtil.js'
/>
<x:script
src=
'/biz/topsun/common/purchaseCommon.js'
/>
<x:script
src=
'/biz/topsun/proofing/proofingMakeDetail.js'
/>
<div
class=
"container-fluid"
style=
"padding: 10px;"
>
<form
class=
"hg-form"
method=
"post"
action=
""
id=
"submitForm"
>
<div><h3>
基本信息
</h3></div>
<div
class=
"hg-form-cols"
>
<x:inputC
name=
"proofingMakeNo"
readonly=
"true"
label=
"指导书编号"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"productId"
readonly=
"true"
label=
"产品编号"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"specificationNo"
readonly=
"true"
label=
"规格书编号"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplyPageNeedTime"
readonly=
"true"
label=
"产品类型"
wrapper=
"date"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplySampleCnName"
readonly=
"true"
label=
"品牌"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplySampleEnName"
readonly=
"true"
label=
"采购单位"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplySampleVersion"
readonly=
"true"
label=
"换算值"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplySampleSize"
readonly=
"true"
label=
"产品名称"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplySampleNum"
readonly=
"true"
label=
"产品英文名称"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplyOutputSituation"
readonly=
"true"
label=
"仓库"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"sizeGroup"
readonly=
"true"
label=
"尺码组"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isDisable"
readonly=
"true"
label=
"是否禁用"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isNewSpecification"
label=
"是否创建新规格书"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isShoePattern"
label=
"是否要鞋图"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isAttachedSample"
readonly=
"true"
label=
"是否附样品"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isOnlyCode"
readonly=
"true"
label=
"是否唯一码产品"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"isBodyColor"
readonly=
"true"
label=
"是否不考虑形体配色"
maxLength=
"32"
labelCol=
"2"
fieldCol=
"2"
/>
</div>
</form>
</div>
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.js
0 → 100644
View file @
a7c81661
//因为页面表格较多,每次操作一张表格时需要切换gridManager
var
gridManager
=
null
,
refreshFlag
=
false
;
//定义生成表格的参数对象
var
bomObj
=
{
parms
:{},
node
:
""
,
url
:
""
,
columns
:[
{
display
:
"物料"
,
name
:
"materialName"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"物料数量"
,
name
:
"materialNumber"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"产品"
,
name
:
"productId"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
}
]
}
var
technologyObj
=
{
parms
:{},
node
:
"technologyGrid"
,
url
:
"slicedTechnologyList"
,
gridManager
:
null
,
columns
:[
{
display
:
"工艺路线名称"
,
name
:
"technologyName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
}
]
}
var
processObj
=
{
parms
:{},
node
:
"processGrid"
,
url
:
"slicedTechnologyProcessList"
,
gridManager
:
null
,
columns
:[
{
display
:
"工序内容"
,
name
:
"processContent"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
hidden
:
true
},
{
display
:
"工序名称"
,
name
:
"processName"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"工序说明"
,
name
:
"processRemark"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"工序类别"
,
name
:
"processTypeTextView"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"工时"
,
name
:
"workHours"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
}
]
}
var
processBomObj
=
{
parms
:{},
node
:
""
,
url
:
""
,
columns
:[
{
display
:
"物料"
,
name
:
"materialId"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
hidden
:
true
},
{
display
:
"SAP物料详细信息"
,
name
:
"materialName"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"使用的物料数量"
,
name
:
"materialNumber"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"物料计量单位"
,
name
:
"productName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
}
]
}
//创建表格(参数、列、插入的节点、请求地址)
function
loadProofingApplyGrid
(
obj
)
{
// const toolbarOptions= UICtrl.getDefaultToolbarOptions({
// addHandler: addHandler,
// updateHandler() {
// updateHandler();
// },
// deleteHandler: deleteHandler,
// })
obj
.
gridManager
=
UICtrl
.
grid
(
"#"
+
obj
.
node
,
{
columns
:
obj
.
columns
,
dataAction
:
"server"
,
url
:
web_app
.
name
+
'/proofingApply/'
+
obj
.
url
+
'.ajax'
,
parms
:
obj
.
parms
,
pageSize
:
10
,
usePager
:
true
,
// toolbar: toolbarOptions,
width
:
"50%"
,
height
:
400
,
heightDiff
:
-
8
,
fixedCellHeight
:
true
,
selectRowButtonOnly
:
true
});
UICtrl
.
setSearchAreaToggle
(
obj
.
gridManager
);
}
/**
* 切换gridManager
* 定义监听器、操作对应表格是自动切换
*/
function
switchGridManager
()
{
$
(
"#technology"
).
on
(
"click"
,
"*"
,
function
(
event
)
{
if
(
gridManager
==
technologyObj
.
gridManager
)
return
;
gridManager
=
technologyObj
.
gridManager
;
});
$
(
"#process"
).
on
(
"click"
,
"*"
,
function
(
event
)
{
if
(
gridManager
==
processObj
.
gridManager
)
return
;
this
.
gridManager
=
processObj
.
gridManager
;
})
}
$
(
document
).
ready
(
function
()
{
initializateUI
();
bindQueryEvent
();
// Public.updateDefaultValue($("#productId"));
// echo("productType")
switchGridManager
();
a
();
});
// function echo(node){
// $("#"+node+"_text").val($("#"+node).val())
// }
function
initializateUI
()
{
UICtrl
.
layout
(
"#layout"
,
{
leftWidth
:
3
});
}
//绑定selectC
function
bindQueryEvent
(){
$
(
'#productId'
).
searchbox
({
type
:
"product"
,
name
:
"productCode"
,
onChange
:
function
(
value
,
data
){
$
(
'#productId'
).
val
(
data
.
productId
);
if
(
technologyObj
.
gridManager
!=
null
){
gridManager
=
technologyObj
.
gridManager
;
//手动切换gridManager
reloadGrid
({
productId
:
data
.
productId
});
gridManager
=
processObj
.
gridManager
;
//手动切换gridManager
reloadGrid
({
technologyId
:
-
1
});
}
else
{
technologyObj
.
parms
=
{
productId
:
data
.
productId
};
loadProofingApplyGrid
(
technologyObj
);
}
}
});
}
function
updateHandler
(
id
){
if
(
!
id
){
var
id
=
DataUtil
.
getUpdateRowId
(
gridManager
);
if
(
!
id
){
return
;
}
}
UICtrl
.
showAjaxDialog
({
url
:
web_app
.
name
+
'/codeRule/showLoadCodeRule.load'
,
title
:
"修改BOM"
,
width
:
340
,
param
:{
id
:
id
},
ok
:
function
(
div
){
var
_self
=
this
;
$
(
'#submitForm'
,
div
).
ajaxSubmit
({
url
:
web_app
.
name
+
'/codeRule/updateCodeRule.ajax'
,
success
:
function
()
{
_self
.
close
();
reloadGrid
();
}
});
}
});
}
// 查询
function
query
(
obj
)
{
var
param
=
$
(
obj
).
formToJSON
();
UICtrl
.
gridSearch
(
gridManager
,
param
);
}
/**
* 刷新表格
* @param parms 刷新时请求的参数
*/
function
reloadGrid
(
parms
)
{
if
(
parms
!=
null
){
gridManager
.
options
.
parms
=
parms
}
gridManager
.
loadData
();
}
//重置表单
function
resetForm
(
obj
)
{
$
(
obj
).
formClean
();
}
//关闭对话框
function
dialogClose
(){
if
(
refreshFlag
){
reloadGrid
();
refreshFlag
=
false
;
}
}
//添加按钮
function
addHandler
()
{
UICtrl
.
showAjaxDialog
({
title
:
$
.
i18nProp
(
'添加BOM'
),
url
:
web_app
.
name
+
'/proofingApply/forwardAddBom.load'
,
ok
:
insert
,
width
:
600
,
close
:
dialogClose
});
}
//新增保存
function
insert
()
{
var
_self
=
this
;
$
(
'#submitDetailForm'
).
ajaxSubmit
({
url
:
web_app
.
name
+
'/resourceField/saveResourceFiledValue.ajax'
,
param
:{},
success
:
function
(
data
)
{
if
(
data
==
"1"
){
Public
.
successTip
(
"保存成功!"
);
}
_self
.
close
();
reloadGrid
();
}
});
}
//编辑按钮
function
updateHandler
(
id
)
{
if
(
!
id
)
{
//获取所选行id
id
=
DataUtil
.
getUpdateRowId
(
gridManager
);
if
(
!
id
)
{
return
;
}
}
UICtrl
.
showAjaxDialog
({
title
:
$
.
i18nProp
(
'更新Bom'
),
width
:
600
,
url
:
web_app
.
name
+
'/proofingApply/forwardAddBom.load'
,
param
:
{
id
:
id
,
resourceTypeId
:
$
(
'#resourceTypeId'
).
val
()},
ok
:
update
,
close
:
dialogClose
});
}
//编辑保存
function
update
()
{
var
_self
=
this
;
$
(
'#submitDetailForm'
).
ajaxSubmit
({
url
:
web_app
.
name
+
'/proofingApply/updateResourceFiledValue.ajax'
,
success
:
function
(
data
)
{
if
(
data
==
"1"
){
Public
.
successTip
(
"修改成功!"
);
}
refreshFlag
=
true
;
_self
.
close
();
reloadGrid
();
}
});
}
//删除按钮
function
deleteHandler
()
{
DataUtil
.
del
({
action
:
'resourceField/deleteResourceFiledValue.ajax'
,
param
:{
id
:
DataUtil
.
getUpdateRowId
(
gridManager
),
resourceTypeId
:
$
(
'#resourceTypeId'
).
val
()
},
gridManager
:
gridManager
,
idFieldName
:
'id'
,
onSuccess
:
function
(
data
)
{
if
(
data
==
"1"
){
Public
.
successTip
(
"删除成功!"
);
}
reloadGrid
();
}
});
}
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
*/
function
setId
(
proofingApplyId
)
{
$
(
"#proofingApplyId"
).
val
(
proofingApplyId
);
// 为文件上传控件绑定业务id
}
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
*/
function
getId
()
{
return
$
(
"#proofingApplyId"
).
val
()
||
""
;
}
function
a
(){
$
(
document
).
on
(
'click'
,
'#technology .l-grid-row'
,
function
(
event
)
{
// 延迟执行新创建的点击事件逻辑,确保在当前点击事件逻辑之后执行
setTimeout
(
function
()
{
let
result
=
DataUtil
.
getUpdateRow
(
gridManager
);
// 获取选中行
processObj
.
parms
=
{
technologyId
:
result
.
technologyId
};
if
(
processObj
.
gridManager
!=
null
)
{
gridManager
=
processObj
.
gridManager
;
// 手动切换 gridManager
reloadGrid
({
technologyId
:
result
.
technologyId
});
}
else
{
loadProofingApplyGrid
(
processObj
);
}
},
0
);
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.jsp
0 → 100644
View file @
a7c81661
<%@ page
contentType=
"text/html; charset=utf-8"
language=
"java"
%>
<%@ taglib
uri=
"/WEB-INF/taglib.tld"
prefix=
"x"
%>
<%@ taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%>
<html>
<head>
<x:base
include=
"layout,dialog,grid,tree,combox,commonTree"
/>
<x:script
src=
'/biz/topsun/proofing/proofingMake.js'
/>
</head>
<body>
<div
class=
"container-fluid"
>
<div
class=
"ui-hide"
>
<x:select
name=
"processType"
dictionary=
"processType"
/>
<x:select
name=
"yesorno"
dictionary=
"yesorno"
/>
</div>
<div
id=
"layout"
>
<div
position=
"center"
title=
"打样申请"
>
<x:title
title=
"common.button.search"
hideTable=
"queryMainForm"
isHide=
"true"
/>
<form
class=
"hg-form ui-hide"
method=
"post"
action=
""
id=
"queryMainForm"
>
<x:inputC
name=
"ruleKind"
required=
"false"
label=
"申请单号"
labelCol=
"1"
/>
<x:searchButtons />
</form>
<div
class=
"blank_div clearfix"
></div>
<div
id=
"proofingApplyTableGrid"
style=
"margin: 2px;"
></div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeDetail.js
0 → 100644
View file @
a7c81661
$
(
document
).
ready
(
function
()
{
//生成操作文件的窗口
// $('#proofingMakeDetail').fileList()
// .find('table').css({
// borderTopWidth : 0
// });
$
(
'#proofingMakeDetail'
).
fileList
();
$
(
'#proofingMakeDetail .col-xs-4'
).
removeClass
(
'col-sm-2'
);
$
(
'#proofingMakeDetail .col-xs-4'
).
addClass
(
'col-sm-3'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
removeClass
(
'col-sm-10'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
addClass
(
'col-sm-9'
);
echo
(
"page"
);
echo
(
"productType"
)
});
function
echo
(
node
){
$
(
"#"
+
node
+
"_text"
).
val
(
$
(
"#"
+
node
).
val
())
}
topsun/src/main/java/com/huigou/topsun/technology/application/TechnologyApplication.java
View file @
a7c81661
...
...
@@ -5,6 +5,7 @@ import com.huigou.topsun.technology.domain.model.Technology;
import
com.huigou.topsun.technology.domain.query.TechnologyQueryRequest
;
import
com.huigou.topsun.technology.vo.TechnologyVo
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment