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
a8914771
Commit
a8914771
authored
Aug 27, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ECN变更,工序外协
parent
e1d806a8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
69 additions
and
15 deletions
+69
-15
数据库变更记录
topsun-xt/src/main/resources/数据库变更记录
+0
-0
epChangeFormDetail.js
...rc/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js
+22
-2
epChangeFormDetail.jsp
...c/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
+10
-1
epChangeFormList.js
.../src/main/webapp/biz/topsun/ep/change/epChangeFormList.js
+9
-3
processOutsourceDetail.js
...biz/topsun/sap/processOutsource/processOutsourceDetail.js
+7
-7
processOutsourceList.js
...p/biz/topsun/sap/processOutsource/processOutsourceList.js
+1
-0
EpChangeForm.java
...java/com/huigou/topsun/ep/change/domain/EpChangeForm.java
+18
-0
ProcessOutsourceMaterial.java
...sap/processOutsource/domain/ProcessOutsourceMaterial.java
+2
-2
No files found.
topsun-xt/src/main/resources/数据库变更记录
View file @
a8914771
This diff is collapsed.
Click to expand it.
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js
View file @
a8914771
...
...
@@ -17,14 +17,18 @@ function initialize(){
function
bindEvent
(){
$
(
'#brandName'
).
searchbox
({
type
:
"system"
,
name
:
"queryBrand"
,
checkbox
:
true
,
checkboxIndex
:
"brandCode"
,
textIndex
:
"brandName"
,
valueIndex
:
"brandCode"
,
getParam
:
function
(
item
)
{
return
{
//fieldName:"MEINS"
}
},
onChange
:
function
(
value
,
data
)
{
$
(
'#brandCode'
).
val
(
data
.
brandCod
e
);
$
(
'#brandName'
).
val
(
data
.
brandName
);
$
(
'#brandCode'
).
val
(
value
.
valu
e
);
$
(
'#brandName'
).
val
(
value
.
text
);
}
});
...
...
@@ -66,6 +70,22 @@ function bindEvent(){
}
});
$
(
'input[name="reasonForChange"]'
).
change
(
function
()
{
//变更后的制程工艺和原材料可以不必填,原材料变更不需要
if
(
$
(
this
).
is
(
':checked'
))
{
if
(
$
(
this
).
val
()
==
"MATERIAL CHANGE"
){
UICtrl
.
setElRequiredFlag
(
"#changedProcess"
,
false
);
UICtrl
.
setElRequiredFlag
(
"#changedMaterial"
,
false
);
}
}
else
{
if
(
$
(
this
).
val
()
==
"MATERIAL CHANGE"
){
UICtrl
.
setElRequiredFlag
(
"#changedProcess"
,
true
);
UICtrl
.
setElRequiredFlag
(
"#changedMaterial"
,
true
);
}
}
})
}
function
loadGrid
()
{
...
...
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
View file @
a8914771
...
...
@@ -26,7 +26,7 @@
<div
class=
"hg-form-cols"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"fillinDate"
required=
"false"
readonly=
"true"
label=
"日期"
labelCol=
"2"
maxLength=
"64"
fieldCol=
"2"
wrapper=
"dateTime"
/>
<x:inputC
name=
"brandName"
required=
"
tru
e"
label=
"品牌名称"
labelCol=
"2"
fieldCol=
"2"
wrapper=
"select"
/>
<x:inputC
name=
"brandName"
required=
"
fals
e"
label=
"品牌名称"
labelCol=
"2"
fieldCol=
"2"
wrapper=
"select"
/>
<x:hidden
name=
"brandCode"
/>
<x:inputC
name=
"deptNameAndPersonName"
required=
"false"
readonly=
"true"
label=
"变更申请部门/姓名"
labelCol=
"2"
fieldCol=
"2"
/>
</div>
...
...
@@ -51,12 +51,21 @@
<x:inputC
name=
"process"
required=
"true"
label=
"制程工艺"
labelCol=
"2"
fieldCol=
"10"
wrapper=
"select"
/>
<x:hidden
name=
"productionSolutionId"
/>
</div>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"otherProcess"
required=
"true"
label=
"涉及成品编码"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
<div
class=
"hg-form-row"
>
<x:textareaC
name=
"material"
required=
"true"
label=
"原材料"
labelCol=
"2"
fieldCol=
"10"
rows=
"3"
readonly=
"true"
/>
</div>
<div
class=
"hg-form-row"
>
<x:textareaC
name=
"oldMaterial"
required=
"true"
label=
"旧原材料库存"
labelCol=
"2"
fieldCol=
"10"
rows=
"3"
/>
</div>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"others"
required=
"true"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"othersMaterialStore"
required=
"true"
label=
"涉及原材料成品库存"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
<x:title
title=
"REVISED SPEC 变更后产品信息"
name=
"group"
/>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"changedPd"
required=
"true"
label=
"产品代号"
labelCol=
"2"
maxLength=
"64"
fieldCol=
"10"
/>
...
...
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js
View file @
a8914771
...
...
@@ -11,6 +11,9 @@ function initUI() {
function
loadGrid
()
{
var
toolbarOptions
=
UICtrl
.
getDefaultToolbarOptions
({
addHandler
:
addHandler
,
exportExcelHandler
:
function
()
{
UICtrl
.
gridExport
(
gridManager
);
},
printHandler
:
{
id
:
'print'
,
text
:
'打印'
,
img
:
'fa-clipboard'
,
click
:
function
(){
printHandler
();
...
...
@@ -20,12 +23,13 @@ function loadGrid() {
gridManager
=
UICtrl
.
grid
(
"#maingrid"
,
{
columns
:
[
{
display
:
"单据编号"
,
name
:
"billCode"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"创建日期"
,
name
:
"fillinDate"
,
width
:
120
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
},
{
display
:
"申请人"
,
name
:
"personMemberName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"申请部门"
,
name
:
"deptName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"变更原因"
,
name
:
"reasonForChangeTextView"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"产品代号"
,
name
:
"pd"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"产品名称"
,
name
:
"productName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"审批状态"
,
name
:
"statusTextView"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"创建日期"
,
name
:
"fillinDate"
,
width
:
120
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
},
{
display
:
"申请人"
,
name
:
"personMemberName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"申请部门"
,
name
:
"deptName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"状态码"
,
name
:
"code"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"消息"
,
name
:
"msg"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
],
...
...
@@ -37,6 +41,8 @@ function loadGrid() {
width
:
"100%"
,
height
:
"100%"
,
heightDiff
:
-
8
,
sortName
:
'fillinDate'
,
sortOrder
:
'desc'
,
checkbox
:
true
,
fixedCellHeight
:
true
,
selectRowButtonOnly
:
true
,
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js
View file @
a8914771
...
...
@@ -91,7 +91,7 @@ function getOrderColumns(){
var
columns
=
[];
columns
.
push
({
display
:
"采购订单"
,
name
:
"ebeln"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
});
columns
.
push
({
display
:
"订单行项目号"
,
name
:
"ebelp"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
});
columns
.
push
({
display
:
"序号"
,
name
:
"sequence"
,
width
:
14
0
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},);
columns
.
push
({
display
:
"序号"
,
name
:
"sequence"
,
width
:
5
0
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},);
columns
.
push
({
display
:
"原工单"
,
name
:
"aufnr"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
...
...
@@ -115,7 +115,7 @@ function getOrderColumns(){
}
},);
columns
.
push
({
display
:
"工序描述"
,
name
:
"txz01"
,
width
:
14
0
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
display
:
"工序描述"
,
name
:
"txz01"
,
width
:
20
0
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
required
:
true
}
...
...
@@ -302,15 +302,15 @@ function loadMaterialGrid() {
}
},
{
display
:
"运输方式"
,
name
:
"deliveryMethodTextView"
,
width
:
200
,
minWidth
:
60
,
type
:
"String"
,
align
:
"left"
,
display
:
"运输方式"
,
name
:
"deliveryMethod
Out
TextView"
,
width
:
200
,
minWidth
:
60
,
type
:
"String"
,
align
:
"left"
,
editor
:
{
type
:
'dictionary'
,
data
:
{
name
:
'deliveryMethod'
},
textField
:
'deliveryMethodTextView'
,
valueField
:
'deliveryMethod'
,
data
:
{
name
:
'deliveryMethod
Out
'
},
textField
:
'deliveryMethod
Out
TextView'
,
valueField
:
'deliveryMethod
Out
'
,
required
:
true
,
render
:
function
(
item
)
{
return
item
.
deliveryMethodTextView
;
return
item
.
deliveryMethod
Out
TextView
;
}
}
},
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js
View file @
a8914771
...
...
@@ -45,6 +45,7 @@ function loadProcessOutsourceOrderListGrid() {
usePager
:
true
,
toolbar
:
toolbarOptions
,
sortName
:
"fillinDate"
,
sortOrder
:
'desc'
,
width
:
"100%"
,
height
:
"100%"
,
heightDiff
:
-
8
,
...
...
topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeForm.java
View file @
a8914771
...
...
@@ -75,18 +75,36 @@ public class EpChangeForm extends FlowBillAbstractEntity {
@Column
(
name
=
"process"
)
private
String
process
;
/**
* 涉及成品编码
*/
@Column
(
name
=
"other_process"
)
private
String
otherProcess
;
/**
* 原材料
*/
@Column
(
name
=
"material"
)
private
String
material
;
/**
* 旧原材料库存
*/
@Column
(
name
=
"old_material"
)
private
String
oldMaterial
;
/**
* 其他
*/
@Column
(
name
=
"others"
)
private
String
others
;
/**
* 涉及原材料成品库存
*/
@Column
(
name
=
"others_material_store"
)
private
String
othersMaterialStore
;
//变更后产品信息
...
...
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsourceMaterial.java
View file @
a8914771
...
...
@@ -32,6 +32,6 @@ public class ProcessOutsourceMaterial extends AbstractEntity {
@Column
(
name
=
"unit_name"
)
private
String
unitName
;
@Column
(
name
=
"delivery_method"
)
private
String
deliveryMethod
;
@Column
(
name
=
"delivery_method
_out
"
)
private
String
deliveryMethod
Out
;
}
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