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
5711734b
Commit
5711734b
authored
Jul 22, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
固定资产采购申请验证绑定的资产编号与采购数量是否一致;物料申请流程标题优化
parent
9bde5ca1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
purchaseAnln1Detail.jsp
...in/webapp/biz/topsun/sap/purchase/purchaseAnln1Detail.jsp
+1
-1
sapZNE1PurchaseDetail.js
...n/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
+6
-0
NonProdApplyApplicationImpl.java
...odApply/application/impl/NonProdApplyApplicationImpl.java
+7
-7
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/purchaseAnln1Detail.jsp
View file @
5711734b
...
...
@@ -14,7 +14,7 @@
<form
class=
"hg-form"
method=
"post"
action=
""
id=
"queryMainForm"
>
<div
class=
"hg-form-row"
>
<x:hidden
name=
"werks"
/>
<x:inputC
name=
"paramValue"
label=
"查询条件"
labelCol=
"2"
fieldCol=
"4"
required=
"
fals
e"
/>
<x:inputC
name=
"paramValue"
label=
"查询条件"
labelCol=
"2"
fieldCol=
"4"
required=
"
tru
e"
/>
</div>
<x:searchButtons/>
</form>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
View file @
5711734b
...
...
@@ -125,6 +125,7 @@ function initItemGrid() {
if
(
$clicked
.
is
(
'a.bindAnln1'
))
{
// 绑定资产编号
var
id
=
$clicked
.
data
(
'id'
);
var
werks
=
$clicked
.
data
(
'werks'
);
var
menge
=
$clicked
.
data
(
'menge'
);
UICtrl
.
showAjaxDialog
({
title
:
'绑定'
,
height
:
500
,
...
...
@@ -133,6 +134,10 @@ function initItemGrid() {
ok
:
function
(
d
){
var
_self
=
this
;
var
rows
=
gridManager
.
getSelectedRows
();
if
(
rows
.
length
!=
menge
){
Public
.
tip
(
"资产号数量必须与采购数量("
+
menge
+
")一致"
);
return
false
;
}
var
anln1s
=
[];
var
anln1
=
""
;
if
(
rows
.
length
>
0
){
...
...
@@ -320,6 +325,7 @@ function getGridColumns() {
html
.
push
(
'<a class="bindAnln1" href="javascript:void(0);"'
);
html
.
push
(
' data-id="'
,
item
.
id
,
'"'
);
html
.
push
(
' data-werks="'
,
item
.
werks
,
'"'
);
html
.
push
(
' data-menge="'
,
item
.
menge
,
'"'
);
html
.
push
(
' data-name="'
,
item
.
txz01
,
'">'
);
html
.
push
(
'<i class="fa fa-location-arrow"></i> '
);
html
.
push
(
'绑定资产编号'
);
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @
5711734b
...
...
@@ -411,13 +411,13 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
String
fillinDateStr
=
DateUtil
.
getDateFormat
(
"yyyy-MM-dd HH:mm:ss"
,
baseInfo
.
getFillinDate
());
//设置标题
String
title
=
"非产品/半成品类物料主数据"
;
switch
(
baseInfo
.
getMaintenanceType
()){
case
"new"
:
//新增
title
=
title
+
"新增"
;
case
"modify"
:
//修改
title
=
title
+
"修改"
;
case
"extend"
:
//扩展
title
=
title
+
"扩展"
;
String
maintenanceType
=
baseInfo
.
getMaintenanceType
();
if
(
"new"
.
equals
(
maintenanceType
)){
title
=
title
+
"新增"
;
}
else
if
(
"modify"
.
equals
(
maintenanceType
))
{
title
=
title
+
"修改"
;
}
else
if
(
"extend"
.
equals
(
maintenanceType
))
{
title
=
title
+
"扩展"
;
}
return
String
.
format
(
"%s-%s(%s)"
,
title
,
baseInfo
.
getBillCode
(),
fillinDateStr
);
}
...
...
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