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
997e1fde
Commit
997e1fde
authored
Nov 24, 2023
by
wanghang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打样制造表格展示
parent
db374b8b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
19 deletions
+12
-19
proofingMake.js
...un-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
+2
-1
ProofingApplyController.java
...u/topsun/proofing/controller/ProofingApplyController.java
+3
-10
ProofingMakeController.java
...ou/topsun/proofing/controller/ProofingMakeController.java
+7
-8
No files found.
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @
997e1fde
...
...
@@ -124,6 +124,7 @@ function dialogClose(){
//添加按钮
function
addHandler
()
{
debugger
// var resourceTypeId=$('#resourceTypeId').val();
// if (Public.isBlank(resourceTypeId)) {
// Public.tip('请选择资源!');
...
...
@@ -131,7 +132,7 @@ function addHandler() {
// }
UICtrl
.
showAjaxDialog
({
title
:
$
.
i18nProp
(
'添加BOM'
),
url
:
web_app
.
name
+
'/proofing
Apply/forwardAddBom
.load'
,
url
:
web_app
.
name
+
'/proofing
Make/forwardSaveProofingMake
.load'
,
//init:initDetailDialog,
// param:{resourceTypeId:resourceTypeId},
ok
:
insert
,
...
...
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @
997e1fde
...
...
@@ -2,7 +2,6 @@ package com.huigou.topsun.proofing.controller;
import
com.huigou.context.Operator
;
import
com.huigou.context.OrgUnit
;
import
com.huigou.topsun.product.application.ProductLookedService
;
import
com.huigou.topsun.proofing.application.ProofingApplyApplication
;
import
com.huigou.topsun.proofing.domain.model.ProofingApply
;
import
com.huigou.topsun.proofing.domain.vo.BomVo
;
...
...
@@ -34,8 +33,7 @@ public class ProofingApplyController extends CommonController {
private
BomService
bomService
;
@Autowired
ProofingApplyApplication
proofingApplyApplication
;
@Autowired
ProductLookedService
productLookedService
;
/**
* 打样表单页
...
...
@@ -59,8 +57,8 @@ public class ProofingApplyController extends CommonController {
//如果有id的话就带参数过去
SDO
sdo
=
this
.
getSDO
();
String
id
=
sdo
.
getId
();
BomVo
bom
=
bomService
.
getBomVoById
(
Long
.
valueOf
(
id
));
return
forward
(
"BomDetail"
,
bom
);
//
BomVo bom = bomService.getBomVoById(Long.valueOf(id));
return
forward
(
"BomDetail"
);
}
public
String
addProofingApply
(){
...
...
@@ -81,11 +79,6 @@ public class ProofingApplyController extends CommonController {
return
toResult
(
map
);
}
public
String
updateResourceFiledValue
(){
SDO
sdo
=
this
.
getSDO
();
Map
<
String
,
Object
>
map
=
sdo
.
getProperties
();
return
toResult
(
null
);
}
/**
...
...
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @
997e1fde
package
com
.
huigou
.
topsun
.
proofing
.
controller
;
import
com.huigou.context.Operator
;
import
com.huigou.context.OrgUnit
;
import
com.huigou.topsun.product.application.ProductLookedService
;
import
com.huigou.topsun.proofing.application.ProofingApplyApplication
;
import
com.huigou.topsun.proofing.domain.model.ProofingApply
;
import
com.huigou.topsun.proofing.domain.vo.BomVo
;
import
com.huigou.topsun.proofing.domain.vo.ProofingMakeVo
;
import
com.huigou.topsun.proofing.repository.ProofingMakeRepository
;
import
com.huigou.topsun.proofing.service.BomService
;
...
...
@@ -46,13 +41,17 @@ public class ProofingMakeController extends CommonController {
@LogInfo
(
logType
=
LogType
.
BIZ
,
subType
=
""
,
operaionType
=
OperationType
.
QUERY
,
description
=
"分页查询打样制造表"
)
public
String
slicedQueryProofingMake
()
{
// SDO sdo = this.getSDO();
// String id = sdo.getId();
List
<
ProofingMakeVo
>
proofingMakeList
=
proofingMakeService
.
getProofingMakeList
();
Map
<
String
,
Object
>
map
=
new
HashMap
();
map
.
put
(
"Rows"
,
proofingMakeList
);
return
toResult
(
map
);
}
public
String
forwardSaveProofingMake
(){
//如果有id的话就带参数过去
SDO
sdo
=
this
.
getSDO
();
String
id
=
sdo
.
getId
();
return
forward
(
"proofingMakeDetail"
);
}
}
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