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
3f87a977
Commit
3f87a977
authored
Nov 30, 2023
by
wanghang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决null值问题
parent
b72d74ec
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
17 deletions
+8
-17
proofingApply.js
...n-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
+1
-5
proofingApply.jsp
...-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp
+1
-1
proofingMake.js
...un-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
+0
-8
proofingMake.jsp
...n-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
+1
-1
ProofingApplyApplicationImpl.java
...oofing/application/impl/ProofingApplyApplicationImpl.java
+4
-1
ProofingMakeController.java
...ou/topsun/proofing/controller/ProofingMakeController.java
+1
-1
No files found.
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @
3f87a977
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
bindQueryEvent
();
bindQueryEvent
();
console
.
log
(
"@"
+
$
(
"#productId"
).
val
())
showTechnologyTable
(
$
(
"#productId"
).
val
());
showTechnologyTable
(
$
(
"#productId"
).
val
());
echo
(
"productId"
)
});
});
function
echo
(
node
){
$
(
"#"
+
node
+
"_text"
).
val
(
$
(
"#"
+
node
).
val
())
}
//绑定selectC
//绑定selectC
...
...
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp
View file @
3f87a977
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<div
class=
"hg-form-cols"
>
<div
class=
"hg-form-cols"
>
<x:inputC
name=
"proofingApplyNo"
readonly=
"true"
label=
"申请单号"
maxLength=
"32"
labelCol=
"1"
<x:inputC
name=
"proofingApplyNo"
readonly=
"true"
label=
"申请单号"
maxLength=
"32"
labelCol=
"1"
fieldCol=
"2"
/>
fieldCol=
"2"
/>
<x:inputC
name=
"productId"
label=
"产品编号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"productId"
wrapper=
"select"
label=
"产品编号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"customerId"
label=
"品牌客户编号"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"customerId"
label=
"品牌客户编号"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
...
...
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @
3f87a977
...
@@ -10,17 +10,9 @@ $(document).ready(function () {
...
@@ -10,17 +10,9 @@ $(document).ready(function () {
$
(
'#proofingMakeDetail .col-xs-4'
).
addClass
(
'col-sm-3'
);
$
(
'#proofingMakeDetail .col-xs-4'
).
addClass
(
'col-sm-3'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
removeClass
(
'col-sm-10'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
removeClass
(
'col-sm-10'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
addClass
(
'col-sm-9'
);
$
(
'#proofingMakeDetail .col-xs-8'
).
addClass
(
'col-sm-9'
);
echo
(
"page"
);
echo
(
"productType"
)
});
});
function
echo
(
node
)
{
$
(
"#"
+
node
+
"_text"
).
val
(
$
(
"#"
+
node
).
val
())
}
//绑定selectC
//绑定selectC
function
bindQueryEvent
()
{
function
bindQueryEvent
()
{
$
(
'#proofingApplyNo'
).
searchbox
({
$
(
'#proofingApplyNo'
).
searchbox
({
...
...
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @
3f87a977
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<x:inputC
name=
"proofingMakeNo"
readonly=
"true"
label=
"制造单号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingMakeNo"
readonly=
"true"
label=
"制造单号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"proofingApplyNo"
label=
"申请单号"
maxLength=
"32"
labelCol=
"1"
<x:inputC
name=
"proofingApplyNo"
wrapper=
"select"
label=
"申请单号"
maxLength=
"32"
labelCol=
"1"
fieldCol=
"2"
/>
fieldCol=
"2"
/>
<x:inputC
name=
"productId"
readonly=
"true"
label=
"产品编号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"productId"
readonly=
"true"
label=
"产品编号"
labelCol=
"1"
fieldCol=
"2"
/>
...
...
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java
View file @
3f87a977
...
@@ -129,7 +129,10 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
...
@@ -129,7 +129,10 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
ProofingApply
proofingApply
=
proofingApplyRepository
.
findByProofingApplyNo
(
proofingApplyNo
);
ProofingApply
proofingApply
=
proofingApplyRepository
.
findByProofingApplyNo
(
proofingApplyNo
);
ProofingApplyAndLookedVo
proofingApplyAndLookedVo
=
this
.
getProofingApplyAndLookedVoByPAId
(
proofingApply
.
getId
());
ProofingApplyAndLookedVo
proofingApplyAndLookedVo
=
this
.
getProofingApplyAndLookedVoByPAId
(
proofingApply
.
getId
());
ProductPublishedConf
productPublishedConf
=
productPublishedConfRepository
.
getProductPublishedConfByProductId
(
proofingApply
.
getProductId
());
ProductPublishedConf
productPublishedConf
=
productPublishedConfRepository
.
getProductPublishedConfByProductId
(
proofingApply
.
getProductId
());
BeanUtils
.
copyProperties
(
productPublishedConf
,
proofingApplyAndLookedVo
);
if
(
productPublishedConf
!=
null
){
BeanUtils
.
copyProperties
(
productPublishedConf
,
proofingApplyAndLookedVo
);
}
return
proofingApplyAndLookedVo
;
return
proofingApplyAndLookedVo
;
}
}
...
...
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @
3f87a977
...
@@ -73,7 +73,7 @@ public class ProofingMakeController extends CommonController {
...
@@ -73,7 +73,7 @@ public class ProofingMakeController extends CommonController {
* 跳转打样制造详情页
* 跳转打样制造详情页
*/
*/
public
String
forwardDetailsProofingMake
(){
public
String
forwardDetailsProofingMake
(){
//如果有id的话就带参数过去
SDO
sdo
=
this
.
getSDO
();
SDO
sdo
=
this
.
getSDO
();
String
id
=
sdo
.
getId
();
String
id
=
sdo
.
getId
();
ProofingMakeVo
proofingMakeVo
=
ProofingMakeVo
proofingMakeVo
=
...
...
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