Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hp-smart
Overview
Overview
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
platform
hp-smart
Commits
c696c369
Commit
c696c369
authored
Jan 24, 2024
by
yukang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询条件修改,生产计划BUG修改
parent
0114ce3d
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
17 deletions
+17
-17
ServiceHPSC004.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC004.java
+1
-1
HPSC001.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
+1
-1
HPSC002.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
+2
-2
HPSC003.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
+1
-1
HPSC011.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml
+1
-1
HPSC003.js
src/main/webapp/HP/SC/HPSC003.js
+2
-2
HPSC003.jsp
src/main/webapp/HP/SC/HPSC003.jsp
+2
-2
HPSC011.jsp
src/main/webapp/HP/SC/HPSC011.jsp
+7
-7
No files found.
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC004.java
View file @
c696c369
...
@@ -130,7 +130,7 @@ public class ServiceHPSC004 extends ServiceBase {
...
@@ -130,7 +130,7 @@ public class ServiceHPSC004 extends ServiceBase {
//添加返回到前台的块,块名和前台的对应
//添加返回到前台的块,块名和前台的对应
EiBlock
eiBlock
=
outInfo
.
addBlock
(
"result"
);
EiBlock
eiBlock
=
outInfo
.
addBlock
(
"result"
);
HashMap
params
=
new
HashMap
();
HashMap
params
=
new
HashMap
();
params
.
put
(
"p
rojCode"
,
inInfo
.
get
(
"proj
Code"
));
params
.
put
(
"p
arentPrdtCode"
,
inInfo
.
get
(
"parentPrdt
Code"
));
List
list
=
dao
.
query
(
"HPSC004.queryDetail"
,
params
,
0
,-
999999
);
List
list
=
dao
.
query
(
"HPSC004.queryDetail"
,
params
,
0
,-
999999
);
outInfo
.
addBlock
(
"detail"
).
addBlockMeta
(
HPSC004
.
eiMetadata
);
outInfo
.
addBlock
(
"detail"
).
addBlockMeta
(
HPSC004
.
eiMetadata
);
outInfo
.
addBlock
(
"detail"
).
addRows
(
list
);
outInfo
.
addBlock
(
"detail"
).
addRows
(
list
);
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
View file @
c696c369
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
PROJ_TYPE = #projType#
PROJ_TYPE = #projType#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME
= #projName#
PROJ_NAME
LIKE ('%$#projName#$%')
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
STATUS = #status#
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
View file @
c696c369
...
@@ -75,10 +75,10 @@
...
@@ -75,10 +75,10 @@
PARENT_PRDT_CODE = #parentPrdtCode#
PARENT_PRDT_CODE = #parentPrdtCode#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtName"
>
<isNotEmpty
prepend=
" AND "
property=
"prdtName"
>
PRDT_NAME LIKE
CONCAT('%',CONCAT( #prdtName#,'%')
)
PRDT_NAME LIKE
('%$#prdtName#$%'
)
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE
CONCAT('%',CONCAT( #projName#,'%')
)
PROJ_NAME LIKE
('%$#projName#$%'
)
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
STATUS = #status#
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
View file @
c696c369
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
PROJ_CODE = #projCode#
PROJ_CODE = #projCode#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME
= #projName#
PROJ_NAME
LIKE ('%$#projName#$%')
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"planInfoNo"
>
<isNotEmpty
prepend=
" AND "
property=
"planInfoNo"
>
PLAN_INFO_NO = #planInfoNo#
PLAN_INFO_NO = #planInfoNo#
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml
View file @
c696c369
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
PROJ_TYPE = #projType#
PROJ_TYPE = #projType#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME
= #projName#
PROJ_NAME
LIKE ('%$#projName#$%')
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
STATUS = #status#
...
...
src/main/webapp/HP/SC/HPSC003.js
View file @
c696c369
...
@@ -36,8 +36,8 @@ $(function () {
...
@@ -36,8 +36,8 @@ $(function () {
detailGrid
.
setEiBlock
(
block
);
detailGrid
.
setEiBlock
(
block
);
}
}
var
info
=
new
EiInfo
()
var
info
=
new
EiInfo
()
var
p
rojCode
=
e
.
model
[
'projCode
'
];
var
p
arentPrdtCode
=
e
.
model
[
'id
'
];
info
.
set
(
"p
rojCode"
,
proj
Code
);
info
.
set
(
"p
arentPrdtCode"
,
parentPrdt
Code
);
EiCommunicator
.
send
(
"HPSC004"
,
"queryDetail"
,
info
,{
EiCommunicator
.
send
(
"HPSC004"
,
"queryDetail"
,
info
,{
onSuccess
:
function
(
ei
){
//返回结果集
onSuccess
:
function
(
ei
){
//返回结果集
detailGrid
.
setEiInfo
(
ei
);
detailGrid
.
setEiInfo
(
ei
);
...
...
src/main/webapp/HP/SC/HPSC003.jsp
View file @
c696c369
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
<div
class=
"row"
>
<
%
--
blockId=
"inqu_status"
row=
"0"
--
%
>
<div
class=
"row"
>
<
%
--
blockId=
"inqu_status"
row=
"0"
--
%
>
<EF:EFInput
blockId=
"inqu_status"
ename=
"projName"
cname=
"项目名称:"
row=
"0"
/>
<EF:EFInput
blockId=
"inqu_status"
ename=
"projName"
cname=
"项目名称:"
row=
"0"
/>
<EF:EFInput
blockId=
"inqu_status"
ename=
"p
rojName
"
cname=
"生产计划单号:"
row=
"0"
/>
<EF:EFInput
blockId=
"inqu_status"
ename=
"p
lanInfoNo
"
cname=
"生产计划单号:"
row=
"0"
/>
<EF:EFDatePicker
blockId=
"inqu_status"
ename=
"planCompletionDate"
cname=
"计划完成日期"
<EF:EFDatePicker
blockId=
"inqu_status"
ename=
"planCompletionDate"
cname=
"计划完成日期"
format=
"yyyy-MM-dd"
required=
"true"
/>
format=
"yyyy-MM-dd"
required=
"true"
/>
<EF:EFSelect
cname=
"状态:"
optionLabel=
"全部"
blockId=
"inqu_status"
ename=
"status"
row=
"0"
>
<EF:EFSelect
cname=
"状态:"
optionLabel=
"全部"
blockId=
"inqu_status"
ename=
"status"
row=
"0"
>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<EF:EFColumn
enable=
"false"
ename=
"planInfoNo"
cname=
"生产计划单号"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"planInfoNo"
cname=
"生产计划单号"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtCode"
cname=
"产品编码"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtCode"
cname=
"产品编码"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtName"
cname=
"产品名称"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtName"
cname=
"产品名称"
readonly=
"true"
/>
<EF:EFColumn
ena
ble=
"false"
ena
me=
"planCompletionDate"
cname=
"计划完成日期"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
width=
"150"
<EF:EFColumn
ename=
"planCompletionDate"
cname=
"计划完成日期"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
width=
"150"
required=
'true'
/>
required=
'true'
/>
<EF:EFColumn
enable=
"false"
ename=
"schedule"
cname=
"生产完工进度"
format=
"{0:N2}"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"schedule"
cname=
"生产完工进度"
format=
"{0:N2}"
readonly=
"true"
/>
<EF:EFComboColumn
enable=
"false"
ename=
"status"
cname=
"状态"
>
<EF:EFComboColumn
enable=
"false"
ename=
"status"
cname=
"状态"
>
...
...
src/main/webapp/HP/SC/HPSC011.jsp
View file @
c696c369
...
@@ -25,16 +25,16 @@
...
@@ -25,16 +25,16 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"projType"
required=
'true'
cname=
"项目类型"
/>
<EF:EFColumn
ename=
"projType"
enable=
"false"
cname=
"项目类型"
/>
<EF:EFColumn
required=
"tru
e"
ename=
"projCode"
cname=
"项目编码"
/>
<EF:EFColumn
enable=
"fals
e"
ename=
"projCode"
cname=
"项目编码"
/>
<EF:EFColumn
required=
"tru
e"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFColumn
enable=
"fals
e"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFColumn
required=
"tru
e"
ename=
"princ1"
cname=
"本公司项目负责人"
/>
<EF:EFColumn
enable=
"fals
e"
ename=
"princ1"
cname=
"本公司项目负责人"
/>
<EF:EFColumn
required=
"tru
e"
ename=
"princ2"
cname=
"客户项目负责人"
/>
<EF:EFColumn
enable=
"fals
e"
ename=
"princ2"
cname=
"客户项目负责人"
/>
<EF:EFComboColumn
required=
"tru
e"
align=
"center"
ename=
"status"
cname=
"状态"
>
<EF:EFComboColumn
enable=
"fals
e"
align=
"center"
ename=
"status"
cname=
"状态"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
/>
<EF:EFColumn
enable=
"false"
ename=
"remark"
cname=
"备注"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"100"
enable=
"false"
readonly=
"false"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"100"
enable=
"false"
readonly=
"false"
/>
</EF:EFGrid>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFRegion>
...
...
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