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
65235f80
Commit
65235f80
authored
Jan 23, 2024
by
宋祥
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.增加无规格查询
parent
60d6ee29
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
85 additions
and
30 deletions
+85
-30
DdynamicEnum.java
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
+7
-0
ServiceHPKC005.java
.../java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
+2
-0
HPKC005.xml
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml
+26
-8
ServiceHPPZ006.java
.../java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java
+1
-1
HPPZ004.xml
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml
+1
-1
HPPZ006.xml
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml
+19
-0
HPKC005.js
src/main/webapp/HP/KC/HPKC005.js
+2
-4
HPKC005.jsp
src/main/webapp/HP/KC/HPKC005.jsp
+27
-16
No files found.
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
View file @
65235f80
...
...
@@ -51,6 +51,13 @@ public enum DdynamicEnum {
INVENT_SPEC_BLOCK_ID
(
"invent_spec_block_id"
,
"id"
,
"spec"
,
"HPPZ006.queryComboBoxSpec"
),
/**
* 模块:存货档案(规格)
* 用途:存货档案下拉框
* 编写:wwl
*/
SPEC_NAME_BLOCK_ID
(
"spec_name_block_id"
,
"spec"
,
"spec"
,
"HPPZ006.queryComboBoxSpecName"
),
/**
* 模块:仓库档案
* 用途:仓库档案下拉框
* 编写:wwl
...
...
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
View file @
65235f80
...
...
@@ -42,7 +42,9 @@ public class ServiceHPKC005 extends ServiceBase {
outInfo
.
getBlock
(
EiConstant
.
resultBlock
).
getRows
().
clear
();
CommonMethod
.
initBlock
(
outInfo
,
Arrays
.
asList
(
DdynamicEnum
.
WH_RECORD_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
outInfo
,
Arrays
.
asList
(
DdynamicEnum
.
WH_RECORD_QUERY_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
outInfo
,
Arrays
.
asList
(
DdynamicEnum
.
MATERIAL_RECORD_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
outInfo
,
Arrays
.
asList
(
DdynamicEnum
.
INVENT_SPEC_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
outInfo
,
Arrays
.
asList
(
DdynamicEnum
.
SPEC_NAME_BLOCK_ID
),
null
,
false
);
return
outInfo
;
}
...
...
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml
View file @
65235f80
...
...
@@ -81,25 +81,42 @@
</isNotEmpty>
</sql>
<sql
id=
"customCondition"
>
<isNotEmpty
prepend=
" AND "
property=
"spec"
>
<isEqual
property=
"spec"
compareValue=
"无规格"
>
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')
</isEqual>
<isNotEqual
property=
"spec"
compareValue=
"无规格"
>
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
</sql>
<sql
id=
"order"
>
<dynamic
prepend=
"ORDER BY"
>
<isNotEmpty
property=
"orderBy"
>
$orderBy$
</isNotEmpty>
<isEmpty
property=
"orderBy"
>
ID DESC
</isEmpty>
</dynamic>
</sql>
<select
id=
"query"
resultClass=
"com.baosight.hpjx.hp.kc.domain.HPKC005"
>
SELECT
<include
refid=
"column"
/>
FROM hpjx.T_HPKC005
WHERE 1=1
<include
refid=
"condition"
/>
<dynamic
prepend=
"ORDER BY"
>
<isNotEmpty
property=
"orderBy"
>
$orderBy$
</isNotEmpty>
<isEmpty
property=
"orderBy"
>
ID DESC
</isEmpty>
</dynamic>
<include
refid=
"customCondition"
/>
<include
refid=
"order"
/>
</select>
<select
id=
"count"
resultClass=
"int"
>
SELECT COUNT(*) FROM hpjx.T_HPKC005
WHERE 1=1
<include
refid=
"condition"
/>
<include
refid=
"customCondition"
/>
</select>
<!-- 查询统计 -->
...
...
@@ -114,6 +131,7 @@
FROM ${hpjxSchema}.T_HPKC005
WHERE 1=1
<include
refid=
"condition"
/>
<include
refid=
"customCondition"
/>
</select>
<insert
id=
"insert"
>
...
...
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java
View file @
65235f80
...
...
@@ -156,7 +156,7 @@ public class ServiceHPPZ006 extends ServiceBase {
try
{
List
<
DdynamicEnum
>
list
=
new
ArrayList
<>();
list
.
add
(
DdynamicEnum
.
INVENT_SPEC_BLOCK_ID
);
CommonMethod
.
initBlock
(
inInfo
,
list
,
EiInfoUtils
.
getFirstRow
(
inInfo
));
CommonMethod
.
initBlock
(
inInfo
,
list
,
EiInfoUtils
.
getFirstRow
(
inInfo
)
,
false
);
}
catch
(
Exception
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询规格失败"
);
}
...
...
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml
View file @
65235f80
...
...
@@ -115,7 +115,7 @@
INVENT_CODE as "inventCode",
INVENT_NAME as "inventName"
FROM hpjx.t_hppz004
WHERE DELETE_FLAG
WHERE DELETE_FLAG
= 0
AND STATUS = 1
<isNotEmpty
prepend=
" AND "
property=
"companyCode"
>
COMPANY_CODE = #companyCode#
...
...
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml
View file @
65235f80
...
...
@@ -177,4 +177,23 @@
ORDER BY ID
</select>
<!-- 规格下拉框(无ID) -->
<select
id=
"queryComboBoxSpecName"
parameterClass=
"java.util.HashMap"
resultClass=
"java.util.HashMap"
>
SELECT DISTINCT
(CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
FROM hpjx.t_hppz006
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty
prepend=
" AND "
property=
"companyCode"
>
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"inventCode"
>
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"inventType"
>
INVENT_TYPE = #inventType#
</isNotEmpty>
ORDER BY SPEC DESC
</select>
</sqlMap>
src/main/webapp/HP/KC/HPKC005.js
View file @
65235f80
...
...
@@ -33,10 +33,9 @@ $(function() {
let
eiInfo
=
new
EiInfo
();
eiInfo
.
set
(
"inventType"
,
options
.
model
[
"inventType"
]);
var
dataSource
;
EiCommunicator
.
send
(
"HPPZ00
4"
,
"query
ComboBox"
,
eiInfo
,
{
EiCommunicator
.
send
(
"HPPZ00
6"
,
"queryMaterial
ComboBox"
,
eiInfo
,
{
onSuccess
:
function
(
ei
)
{
dataSource
=
ei
.
getBlock
(
"invent_name_block_id"
).
getMappedRows
();
inventNameGlobalData
=
dataSource
;
dataSource
=
ei
.
getBlock
(
"material_record_block_id"
).
getMappedRows
();
},
onFail
:
function
(
ei
)
{
}
...
...
@@ -72,7 +71,6 @@ $(function() {
EiCommunicator
.
send
(
"HPPZ006"
,
"queryComboBoxSpec"
,
eiInfo
,
{
onSuccess
:
function
(
ei
)
{
dataSource
=
ei
.
getBlock
(
"invent_spec_block_id"
).
getMappedRows
();
specGlobalData
=
dataSource
;
},
onFail
:
function
(
ei
)
{
}
...
...
src/main/webapp/HP/KC/HPKC005.jsp
View file @
65235f80
...
...
@@ -8,24 +8,35 @@
<EF:EFPage
title=
"库存盘点单"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<div
class=
"row"
>
<EF:EFDatePicker
ename=
"inqu_status-0-receiptDate"
cname=
"单据日期"
role=
"date"
format=
"yyyy-MM-dd"
readonly=
"true"
/>
<EF:EFSelect
ename=
"inqu_status-0-inventType"
cname=
"存货类型"
filter=
"contains"
defaultValue=
""
>
<EF:EFOption
label=
"请选择"
value=
""
/>
<EF:EFDatePicker
ename=
"inqu_status-0-receiptDate"
cname=
"单据日期"
colWidth=
"3"
role=
"date"
format=
"yyyy-MM-dd"
readonly=
"true"
/>
<EF:EFSelect
ename=
"inqu_status-0-whCode"
cname=
"仓库名称"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"whName_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<EF:EFSelect
ename=
"inqu_status-0-inventType"
cname=
"存货类型"
colWidth=
"3"
filter=
"contains"
template=
"#=valueField#-#=textField#"
valueTemplate=
"#=valueField#-#=textField#"
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
/>
</EF:EFSelect>
<EF:EFSelect
ename=
"inqu_status-0-whCode"
cname=
"仓库名称"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"请选择"
value=
""
/>
<EF:EFOptions
blockId=
"whName_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<
%
--
<
EF:EFSelect
ename=
"inqu_status-0-status"
cname=
"单据状态"
filter=
"contains"
required=
"false"
template=
"#=textField#"
valueTemplate=
"#=textField#"
defaultValue=
""
>
<EF:EFOption
label=
"请选择"
value=
""
></EF:EFOption>
<EF:EFOption
label=
"0-待审核"
value=
"0"
></EF:EFOption>
<EF:EFOption
label=
"1-已审核"
value=
"1"
></EF:EFOption>
</EF:EFSelect>
--%>
</div>
</EF:EFRegion>
<EF:EFSelect
ename=
"inqu_status-0-inventCode"
cname=
"存货名称"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"material_record_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<
%
--
<
EF:EFSelect
ename=
"inqu_status-0-status"
cname=
"单据状态"
filter=
"contains"
required=
"false"
template=
"#=textField#"
valueTemplate=
"#=textField#"
defaultValue=
""
>
<EF:EFOption
label=
"请选择"
value=
""
></EF:EFOption>
<EF:EFOption
label=
"0-待审核"
value=
"0"
></EF:EFOption>
<EF:EFOption
label=
"1-已审核"
value=
"1"
></EF:EFOption>
</EF:EFSelect>
--%>
</div>
<div
class=
"row"
>
<EF:EFSelect
ename=
"inqu_status-0-spec"
cname=
"规格"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"spec_name_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
</div>
</EF:EFRegion>
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
checkMode=
"row"
>
...
...
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