Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-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
hg-smart
Commits
3b65c185
Commit
3b65c185
authored
Sep 09, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-09-09
1.产品清单状态为审核或提交时,不能导入 2.产品清单需要满足同一项目可生成多个产品清单
parent
d4b28a8a
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
66 additions
and
32 deletions
+66
-32
DdynamicEnum.java
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
+1
-1
ServiceHGSC004.java
.../java/com/baosight/hggp/hg/sc/service/ServiceHGSC004.java
+4
-2
ServiceHGSC004A.java
...java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java
+12
-5
HGSC003.xml
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC003.xml
+3
-1
HGSCTools.java
src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java
+25
-14
HGSC004.js
src/main/webapp/HG/SC/HGSC004.js
+16
-7
HGSC004.jsp
src/main/webapp/HG/SC/HGSC004.jsp
+2
-1
HGSC004A.js
src/main/webapp/HG/SC/HGSC004A.js
+1
-1
HGSC004A.jsp
src/main/webapp/HG/SC/HGSC004A.jsp
+2
-0
No files found.
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
View file @
3b65c185
...
@@ -320,7 +320,7 @@ public enum DdynamicEnum {
...
@@ -320,7 +320,7 @@ public enum DdynamicEnum {
* 用途:蓝图下拉框
* 用途:蓝图下拉框
* 编写:jhs
* 编写:jhs
*/
*/
BLUEPRINT_BOX_BLOCK_ID
(
"blueprint_box_block_id"
,
"blueprintCode"
,
"blueprintName"
,
"HGSC003.queryComboBox"
),
BLUEPRINT_BOX_BLOCK_ID
(
"blueprint_box_block_id"
,
"blueprintCode"
,
"blueprintName"
,
"projCode"
,
"projName"
,
"HGSC003.queryComboBox"
),
ITEM_CODE_BOX_BLOCK_ID
(
"item_code_box_block_id"
,
"itemCode"
,
"itemCname"
,
"HGPZ005A.queryEdcm01"
),
ITEM_CODE_BOX_BLOCK_ID
(
"item_code_box_block_id"
,
"itemCode"
,
"itemCname"
,
"HGPZ005A.queryEdcm01"
),
...
...
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004.java
View file @
3b65c185
...
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
...
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
*/
*/
public
class
ServiceHGSC004
extends
ServiceBase
{
public
class
ServiceHGSC004
extends
ServiceBase
{
@Override
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
try
{
try
{
inInfo
=
super
.
query
(
inInfo
,
HGSC004
.
QUERY
,
new
HGSC004
());
inInfo
=
super
.
query
(
inInfo
,
HGSC004
.
QUERY
,
new
HGSC004
());
...
@@ -43,6 +44,7 @@ public class ServiceHGSC004 extends ServiceBase {
...
@@ -43,6 +44,7 @@ public class ServiceHGSC004 extends ServiceBase {
return
inInfo
;
return
inInfo
;
}
}
@Override
public
EiInfo
query
(
EiInfo
inInfo
)
{
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
try
{
inInfo
=
super
.
query
(
inInfo
,
HGSC004
.
QUERY
,
new
HGSC004
());
inInfo
=
super
.
query
(
inInfo
,
HGSC004
.
QUERY
,
new
HGSC004
());
...
@@ -134,7 +136,7 @@ public class ServiceHGSC004 extends ServiceBase {
...
@@ -134,7 +136,7 @@ public class ServiceHGSC004 extends ServiceBase {
AssertUtils
.
isTrue
(
hgsc003
.
getBlueprintStatus
().
compareTo
(
HGConstant
.
EnablingStatus
.
TY
)
==
0
,
"蓝图已停用不可修改!"
);
AssertUtils
.
isTrue
(
hgsc003
.
getBlueprintStatus
().
compareTo
(
HGConstant
.
EnablingStatus
.
TY
)
==
0
,
"蓝图已停用不可修改!"
);
}
}
AssertUtils
.
isTrue
(
Objects
.
isNull
(
hgsc003
),
"未获取到蓝图信息!"
);
AssertUtils
.
isTrue
(
Objects
.
isNull
(
hgsc003
),
"未获取到蓝图信息!"
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
/*
Map<String,Object> map = new HashMap<>();
map.put("projCode",hgsc004.getProjCode());
map.put("projCode",hgsc004.getProjCode());
List<HGSC004> hgsc004List = this.dao.query(HGSC004.QUERY,map);
List<HGSC004> hgsc004List = this.dao.query(HGSC004.QUERY,map);
for(HGSC004 o : hgsc004List){
for(HGSC004 o : hgsc004List){
...
@@ -143,7 +145,7 @@ public class ServiceHGSC004 extends ServiceBase {
...
@@ -143,7 +145,7 @@ public class ServiceHGSC004 extends ServiceBase {
}else{
}else{
AssertUtils.isTrue(Objects.nonNull(o),"当前项目已存在!");
AssertUtils.isTrue(Objects.nonNull(o),"当前项目已存在!");
}
}
}
}
*/
AssertUtils
.
isEmpty
(
UserSessionUtils
.
getAccountCode
(),
"当前用户未绑定公司,无法操作数据,请联系管理员!"
);
AssertUtils
.
isEmpty
(
UserSessionUtils
.
getAccountCode
(),
"当前用户未绑定公司,无法操作数据,请联系管理员!"
);
AssertUtils
.
isEmpty
(
UserSessionUtils
.
getOrgId
(),
"当前用户未绑定部门,无法操作数据,请联系管理员!"
);
AssertUtils
.
isEmpty
(
UserSessionUtils
.
getOrgId
(),
"当前用户未绑定部门,无法操作数据,请联系管理员!"
);
...
...
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java
View file @
3b65c185
...
@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
...
@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
*/
*/
public
class
ServiceHGSC004A
extends
ServiceBase
{
public
class
ServiceHGSC004A
extends
ServiceBase
{
@Override
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
try
{
try
{
// inInfo = super.query(inInfo, HGSC004A.QUERY, new HGSC004A());
// inInfo = super.query(inInfo, HGSC004A.QUERY, new HGSC004A());
...
@@ -48,6 +49,7 @@ public class ServiceHGSC004A extends ServiceBase {
...
@@ -48,6 +49,7 @@ public class ServiceHGSC004A extends ServiceBase {
return
inInfo
;
return
inInfo
;
}
}
@Override
public
EiInfo
query
(
EiInfo
inInfo
)
{
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
try
{
inInfo
=
super
.
query
(
inInfo
,
HGSC004A
.
QUERY
,
new
HGSC004A
());
inInfo
=
super
.
query
(
inInfo
,
HGSC004A
.
QUERY
,
new
HGSC004A
());
...
@@ -182,12 +184,14 @@ public class ServiceHGSC004A extends ServiceBase {
...
@@ -182,12 +184,14 @@ public class ServiceHGSC004A extends ServiceBase {
hgsc004a
.
setDepCode
(
hgsc004
.
getDepCode
());
hgsc004a
.
setDepCode
(
hgsc004
.
getDepCode
());
hgsc004a
.
setDepName
(
hgsc004
.
getDepName
());
hgsc004a
.
setDepName
(
hgsc004
.
getDepName
());
hgsc004a
.
setMaterialId
(
hgsc004
.
getId
());
hgsc004a
.
setMaterialId
(
hgsc004
.
getId
());
this
.
checkSaveData
(
hgsc004a
,
hgsc004
);
//
this.checkSaveData(hgsc004a,hgsc004);
if
(
Objects
.
nonNull
(
hgsc004a
.
getId
())&&
hgsc004a
.
getId
()!=
0
){
if
(
Objects
.
nonNull
(
hgsc004a
.
getId
())&&
hgsc004a
.
getId
()!=
0
){
this
.
checkSaveData
(
hgsc004a
,
hgsc004
,
"update"
);
//替换/修改
//替换/修改
replaceEntity
(
hgsc004a
,
hgsc004
);
replaceEntity
(
hgsc004a
,
hgsc004
);
}
else
{
}
else
{
//新增/增加
//新增/增加
this
.
checkSaveData
(
hgsc004a
,
hgsc004
,
"insert"
);
addEntity
(
hgsc004a
,
hgsc004
);
addEntity
(
hgsc004a
,
hgsc004
);
}
}
}
}
...
@@ -352,19 +356,22 @@ public class ServiceHGSC004A extends ServiceBase {
...
@@ -352,19 +356,22 @@ public class ServiceHGSC004A extends ServiceBase {
*
*
* @param hgsc004a
* @param hgsc004a
*/
*/
private
void
checkSaveData
(
HGSC004A
hgsc004a
,
HGSC004
hgsc004
)
{
private
void
checkSaveData
(
HGSC004A
hgsc004a
,
HGSC004
hgsc004
,
String
type
)
{
if
(
Objects
.
nonNull
(
hgsc004a
.
getId
())&&
hgsc004a
.
getId
()>
0
){
if
(
Objects
.
nonNull
(
hgsc004a
.
getId
())&&
hgsc004a
.
getId
()>
0
){
//蓝图信息,用于蓝图状态校验
//蓝图信息,用于蓝图状态校验
HGSC003
hgsc003
=
(
HGSC003
)
super
.
dao
.
get
(
HGSC003
.
QUERY
,
HGSC003
.
FIELD_id
,
hgsc004
.
getBlueprintId
());
HGSC003
hgsc003
=
(
HGSC003
)
super
.
dao
.
get
(
HGSC003
.
QUERY
,
HGSC003
.
FIELD_id
,
hgsc004
.
getBlueprintId
());
AssertUtils
.
isTrue
(
hgsc003
.
getBlueprintStatus
().
compareTo
(
HGConstant
.
EnablingStatus
.
TY
)
==
0
,
"蓝图已停用不可修改!"
);
AssertUtils
.
isTrue
(
hgsc003
.
getBlueprintStatus
().
compareTo
(
HGConstant
.
EnablingStatus
.
TY
)
==
0
,
"蓝图已停用不可修改!"
);
}
}
//为构件的需要验证是否已经存在了,不能重复添加
//为构件的需要验证是否已经存在了,不能重复添加
if
(
hgsc004a
.
getLv
().
intValue
()
==
3
){
if
(
type
.
equals
(
"insert"
)
&&
hgsc004a
.
getLv
().
intValue
()
==
2
||
type
.
equals
(
"update"
)
&&
hgsc004a
.
getLv
().
intValue
()
==
3
){
Map
<
String
,
Object
>
mapA
=
new
HashMap
<>();
Map
<
String
,
Object
>
mapA
=
new
HashMap
<>();
mapA
.
put
(
"materialId"
,
hgsc004a
.
getMaterialId
());
//mapA.put("materialId",hgsc004a.getMaterialId());
mapA
.
put
(
"projCode"
,
hgsc004
.
getProjCode
());
mapA
.
put
(
"productId"
,
hgsc004a
.
getProductId
());
mapA
.
put
(
"productId"
,
hgsc004a
.
getProductId
());
mapA
.
put
(
"parentProdCode"
,
hgsc004a
.
getParentProdCode
());
mapA
.
put
(
"parentProdCode"
,
hgsc004a
.
getParentProdCode
());
if
(
hgsc004a
.
getId
()>
0
){
mapA
.
put
(
"notId"
,
hgsc004a
.
getId
());
mapA
.
put
(
"notId"
,
hgsc004a
.
getId
());
}
List
<
HGSC004A
>
hgsc004AList
=
dao
.
query
(
HGSC004A
.
QUERY
,
mapA
,
0
,
-
999999
);
List
<
HGSC004A
>
hgsc004AList
=
dao
.
query
(
HGSC004A
.
QUERY
,
mapA
,
0
,
-
999999
);
AssertUtils
.
isTrue
(!
CollectionUtils
.
isEmpty
(
hgsc004AList
),
"已存在构建"
+
hgsc004a
.
getProductCode
()+
"-"
+
hgsc004a
.
getProductName
());
AssertUtils
.
isTrue
(!
CollectionUtils
.
isEmpty
(
hgsc004AList
),
"已存在构建"
+
hgsc004a
.
getProductCode
()+
"-"
+
hgsc004a
.
getProductName
());
}
}
...
@@ -641,7 +648,7 @@ public class ServiceHGSC004A extends ServiceBase {
...
@@ -641,7 +648,7 @@ public class ServiceHGSC004A extends ServiceBase {
});
});
//int lv = Integer.parseInt((String) params.get("lv")) +1;
//int lv = Integer.parseInt((String) params.get("lv")) +1;
HGSCTools
.
THGSC004A
.
add
(
dataList
,
params
.
get
(
"materialId"
).
toString
());
HGSCTools
.
THGSC004A
.
add
(
dataList
,
params
.
get
(
"materialId"
).
toString
()
,
projCode
);
//Map<String, Object> params = new HashMap<>(10);
//Map<String, Object> params = new HashMap<>(10);
//String fileName = inInfo.getString(ACConstants.FILE_NAME);
//String fileName = inInfo.getString(ACConstants.FILE_NAME);
//String projCode = inInfo.getString(HGSC004A.FIELD_proj_code);
//String projCode = inInfo.getString(HGSC004A.FIELD_proj_code);
...
...
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC003.xml
View file @
3b65c185
...
@@ -176,7 +176,9 @@
...
@@ -176,7 +176,9 @@
resultClass=
"java.util.HashMap"
>
resultClass=
"java.util.HashMap"
>
SELECT DISTINCT
SELECT DISTINCT
BLUEPRINT_CODE as "blueprintCode",
<!-- 蓝图编号 -->
BLUEPRINT_CODE as "blueprintCode",
<!-- 蓝图编号 -->
BLUEPRINT_NAME as "blueprintName"
<!-- 蓝图名称 -->
BLUEPRINT_NAME as "blueprintName",
<!-- 蓝图名称 -->
proj_code as "projCode",
<!-- 项目编码 -->
proj_name as "projName"
<!-- 项目名称 -->
FROM ${hggpSchema}.HGSC003
FROM ${hggpSchema}.HGSC003
WHERE 1=1
WHERE 1=1
<include
refid=
"HGXSDataAuth.authCondition"
/>
<include
refid=
"HGXSDataAuth.authCondition"
/>
...
...
src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java
View file @
3b65c185
...
@@ -379,6 +379,14 @@ public class HGSCTools {
...
@@ -379,6 +379,14 @@ public class HGSCTools {
});
});
return
CollectionUtils
.
isEmpty
(
results
)
?
null
:
results
.
get
(
0
);
return
CollectionUtils
.
isEmpty
(
results
)
?
null
:
results
.
get
(
0
);
}
}
public
static
List
<
HGSC004
>
queryProjCode
(
String
projCode
)
{
AssertUtils
.
isNull
(
projCode
,
"项目编码不能为空!"
);
List
<
HGSC004
>
results
=
DaoBase
.
getInstance
().
query
(
HGSC004
.
QUERY
,
new
HashMap
<
String
,
Object
>(){
{
put
(
"projCode"
,
projCode
);}
});
return
results
;
}
}
}
public
static
class
THGSC004A
{
public
static
class
THGSC004A
{
...
@@ -392,23 +400,24 @@ public class HGSCTools {
...
@@ -392,23 +400,24 @@ public class HGSCTools {
return
DaoBase
.
getInstance
().
query
(
HGSC004A
.
QUERY
,
paramMap
);
return
DaoBase
.
getInstance
().
query
(
HGSC004A
.
QUERY
,
paramMap
);
}
}
public
static
void
add
(
List
<
HGSC004A
>
arrayList
,
String
materialId
)
{
public
static
void
add
(
List
<
HGSC004A
>
arrayList
,
String
materialId
,
String
projCode
)
{
HGSC004
hgsc004
=
Hgsc004
.
getId
(
materialId
);
List
<
HGSC004
>
hgsc004List
=
Hgsc004
.
queryProjCode
(
projCode
);
List
<
HGSC004A
>
hgsc004aList
=
Optional
.
ofNullable
(
List
<
HGSC004A
>
hgsc004aList
=
Optional
.
ofNullable
(
list
(
new
HashMap
<
String
,
Object
>(){{
put
(
HGSC004A
.
FIELD_material_id
,
materialId
);}})).
orElse
(
new
ArrayList
<>());
list
(
new
HashMap
<
String
,
Object
>(){{
put
(
HGSC004A
.
FIELD_product_code
,
projCode
);}})).
orElse
(
new
ArrayList
<>());
AssertUtils
.
isEmpty
(
Collections
.
singleton
(
hgsc004
),
"物料清单不存在,添加失败!"
);
List
<
HGSC004
>
hgsc004s
=
hgsc004List
.
stream
().
filter
(
hgsc004
->
hgsc004
.
getId
().
equals
(
Long
.
valueOf
(
materialId
))).
collect
(
Collectors
.
toList
());
AssertUtils
.
isTrue
(
hgsc004
.
getMaterialStatus
()==
2
||
hgsc004
.
getApprovalStatus
()==
2
,
"物料清单已提交或已审核,无法添加!"
);
AssertUtils
.
isEmpty
(
hgsc004s
,
"物料清单不存在,添加失败!"
);
AssertUtils
.
isTrue
(
hgsc004s
.
get
(
0
).
getMaterialStatus
()==
2
||
hgsc004s
.
get
(
0
).
getApprovalStatus
()==
2
,
"物料清单已提交或已审核,无法添加!"
);
for
(
HGSC004A
hgsc004a
:
arrayList
){
for
(
HGSC004A
hgsc004a
:
arrayList
){
hgsc004a
.
setCompanyCode
(
hgsc004
.
getCompanyCode
());
hgsc004a
.
setCompanyCode
(
hgsc004
s
.
get
(
0
)
.
getCompanyCode
());
hgsc004a
.
setCompanyName
(
hgsc004
.
getCompanyName
());
hgsc004a
.
setCompanyName
(
hgsc004
s
.
get
(
0
)
.
getCompanyName
());
hgsc004a
.
setDepCode
(
hgsc004
.
getDepCode
());
hgsc004a
.
setDepCode
(
hgsc004
s
.
get
(
0
)
.
getDepCode
());
hgsc004a
.
setDepName
(
hgsc004
.
getDepName
());
hgsc004a
.
setDepName
(
hgsc004
s
.
get
(
0
)
.
getDepName
());
hgsc004a
.
setProductCode
(
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getProductCode
()));
hgsc004a
.
setProductCode
(
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getProductCode
()));
hgsc004a
.
setProductName
(
hgsc004a
.
getProjNamePrefix
().
trim
().
concat
(
hgsc004a
.
getProductName
()));
hgsc004a
.
setProductName
(
hgsc004a
.
getProjNamePrefix
().
trim
().
concat
(
hgsc004a
.
getProductName
()));
if
(
hgsc004a
.
getParentProdCode
().
trim
().
isEmpty
()){
if
(
hgsc004a
.
getParentProdCode
().
trim
().
isEmpty
()){
hgsc004a
.
setParentProdCode
(
hgsc004
.
getProjCode
());
hgsc004a
.
setParentProdCode
(
hgsc004
s
.
get
(
0
)
.
getProjCode
());
hgsc004a
.
setParentProdName
(
hgsc004
.
getProjName
());
hgsc004a
.
setParentProdName
(
hgsc004
s
.
get
(
0
)
.
getProjName
());
hgsc004a
.
setMaterialId
(
hgsc004
.
getId
(
));
hgsc004a
.
setMaterialId
(
Long
.
valueOf
(
materialId
));
hgsc004a
.
setLv
(
3
);
hgsc004a
.
setLv
(
3
);
}
else
{
}
else
{
/*Map<String,Object> paramMap = new HashMap<>();
/*Map<String,Object> paramMap = new HashMap<>();
...
@@ -423,7 +432,7 @@ public class HGSCTools {
...
@@ -423,7 +432,7 @@ public class HGSCTools {
&& o.getCompanyCode().equals(hgsc004a.getCompanyCode())
&& o.getCompanyCode().equals(hgsc004a.getCompanyCode())
).collect(Collectors.toList());*/
).collect(Collectors.toList());*/
AssertUtils
.
isEmpty
(
hgsc004a
.
getParentProdCode
(),
String
.
format
(
"父节点-产品编号[%s]数据不存在,导入失败!"
,
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdCode
())));
AssertUtils
.
isEmpty
(
hgsc004a
.
getParentProdCode
(),
String
.
format
(
"父节点-产品编号[%s]数据不存在,导入失败!"
,
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdCode
())));
hgsc004a
.
setMaterialId
(
hgsc004
.
getId
(
));
hgsc004a
.
setMaterialId
(
Long
.
valueOf
(
materialId
));
hgsc004a
.
setLv
(
4
);
hgsc004a
.
setLv
(
4
);
hgsc004a
.
setParentProdCode
(
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdCode
()));
hgsc004a
.
setParentProdCode
(
hgsc004a
.
getProjCodePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdCode
()));
hgsc004a
.
setParentProdName
(
hgsc004a
.
getProjNamePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdName
()));
hgsc004a
.
setParentProdName
(
hgsc004a
.
getProjNamePrefix
().
trim
().
concat
(
hgsc004a
.
getParentProdName
()));
...
@@ -527,8 +536,10 @@ public class HGSCTools {
...
@@ -527,8 +536,10 @@ public class HGSCTools {
//为构件的需要验证是否已经存在了,不能重复添加
//为构件的需要验证是否已经存在了,不能重复添加
if
(
hgsc004a
.
getLv
()
==
3
){
if
(
hgsc004a
.
getLv
()
==
3
){
Map
<
String
,
Object
>
mapA
=
new
HashMap
<>();
Map
<
String
,
Object
>
mapA
=
new
HashMap
<>();
mapA
.
put
(
HGSC004A
.
FIELD_material_id
,
hgsc004a
.
getMaterialId
());
//
mapA.put(HGSC004A.FIELD_material_id,hgsc004a.getMaterialId());
//mapA.put(HGSC004A.FIELD_product_id,hgsc004a.getProductId());
//mapA.put(HGSC004A.FIELD_product_id,hgsc004a.getProductId());
mapA
.
put
(
HGSC004A
.
FIELD_company_code
,
hgsc004a
.
getCompanyCode
());
mapA
.
put
(
HGSC004A
.
FIELD_proj_code
,
hgsc004a
.
getProjCode
());
mapA
.
put
(
HGSC004A
.
FIELD_parent_prod_code
,
hgsc004a
.
getParentProdCode
());
mapA
.
put
(
HGSC004A
.
FIELD_parent_prod_code
,
hgsc004a
.
getParentProdCode
());
mapA
.
put
(
HGSC004A
.
FIELD_product_code
,
hgsc004a
.
getProductCode
());
mapA
.
put
(
HGSC004A
.
FIELD_product_code
,
hgsc004a
.
getProductCode
());
List
<
HGSC004A
>
hgsc004AList
=
list
(
mapA
);
List
<
HGSC004A
>
hgsc004AList
=
list
(
mapA
);
...
...
src/main/webapp/HG/SC/HGSC004.js
View file @
3b65c185
...
@@ -94,18 +94,18 @@ $(function (){
...
@@ -94,18 +94,18 @@ $(function (){
}
}
},
{
},
{
field
:
"blueprintCode"
,
field
:
"blueprintCode"
,
template
:
function
(
item
)
{
/*
template: function (item) {
let template = "";
let template = "";
if(item.blueprintCode){
if(item.blueprintCode){
for(let i=0;i<blueprintCodes.length;i++){
for(let i=0;i<blueprintCodes.length;i++){
if(item.blueprintCode === blueprintCodes[i]['valueField']){
if(item.blueprintCode === blueprintCodes[i]['valueField']){
item['blueprintName'] = blueprintCodes[i]['textField'];
item['blueprintName'] = blueprintCodes[i]['textField'];
template
=
blueprintCodes
[
i
][
'valueField'
];
return
blueprintCodes[i]['valueField'];
}
}
}
}
}
}
return item.blueprintCode;
return item.blueprintCode;
},
},
*/
editor
:
function
(
container
,
options
)
{
editor
:
function
(
container
,
options
)
{
let
inInfo
=
new
EiInfo
();
let
inInfo
=
new
EiInfo
();
inInfo
.
set
(
"inqu_status-0-companyCode"
,
options
.
model
[
"companyCode"
]);
inInfo
.
set
(
"inqu_status-0-companyCode"
,
options
.
model
[
"companyCode"
]);
...
@@ -146,6 +146,7 @@ $(function (){
...
@@ -146,6 +146,7 @@ $(function (){
for
(
let
i
=
0
;
i
<
blueprintCodes
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
blueprintCodes
.
length
;
i
++
)
{
if
(
e
.
items
[
0
].
blueprintCode
===
blueprintCodes
[
i
][
'valueField'
])
{
if
(
e
.
items
[
0
].
blueprintCode
===
blueprintCodes
[
i
][
'valueField'
])
{
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintName"
,
blueprintCodes
[
i
][
'textField'
]);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintName"
,
blueprintCodes
[
i
][
'textField'
]);
break
;
}
}
}
}
}
}
...
@@ -155,12 +156,20 @@ $(function (){
...
@@ -155,12 +156,20 @@ $(function (){
for
(
let
i
=
0
;
i
<
projCodes
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
projCodes
.
length
;
i
++
)
{
if
(
e
.
items
[
0
].
projCode
===
projCodes
[
i
][
'valueField'
])
{
if
(
e
.
items
[
0
].
projCode
===
projCodes
[
i
][
'valueField'
])
{
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"projName"
,
projCodes
[
i
][
'textField'
]);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"projName"
,
projCodes
[
i
][
'textField'
]);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintCode"
,
""
);
let
blueprintList
=
blueprintCodes
.
filter
(
item
=>
item
.
param1Field
===
e
.
items
[
0
].
projCode
);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintName"
,
""
);
let
blueprintCode
=
blueprintList
.
length
<
0
?
""
:
blueprintList
[
0
][
'valueField'
];
let
blueprintName
=
blueprintList
.
length
<
0
?
""
:
blueprintList
[
0
][
'textField'
];
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintCode"
,
blueprintCode
);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"blueprintName"
,
blueprintName
);
if
(
isBlank
(
e
.
items
[
0
].
companyCode
)){
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"companyCode"
,
projCodes
[
i
][
'param1Field'
]);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"companyName"
,
projCodes
[
i
][
'param2Field'
]);
}
break
;
}
}
}
}
}
}
loadChange
(
grid
,
e
,
"blueprintCode"
);
//
loadChange(grid,e,"blueprintCode");
}
}
if
(
e
.
field
==
"companyCode"
)
{
if
(
e
.
field
==
"companyCode"
)
{
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"projCode"
,
""
);
resultGrid
.
setCellValue
(
e
.
items
[
0
],
"projCode"
,
""
);
...
@@ -229,7 +238,7 @@ let save = function (btnNode) {
...
@@ -229,7 +238,7 @@ let save = function (btnNode) {
*/
*/
function
showDetail
(
id
,
companyCode
,
projCode
,
status
)
{
function
showDetail
(
id
,
companyCode
,
projCode
,
status
)
{
JSColorbox
.
open
({
JSColorbox
.
open
({
href
:
"HGSC004A?
companyCode="
+
companyCode
+
"&
projCode="
+
projCode
+
"&methodName=initLoad&inqu_status-0-materialId="
+
id
+
"&inqu_status-0-status="
+
status
,
href
:
"HGSC004A?
inqu_status-0-companyCode="
+
companyCode
+
"&inqu_status-0-
projCode="
+
projCode
+
"&methodName=initLoad&inqu_status-0-materialId="
+
id
+
"&inqu_status-0-status="
+
status
,
title
:
"<div style='text-align: center;'>物料清单详情</div>"
,
title
:
"<div style='text-align: center;'>物料清单详情</div>"
,
width
:
"80%"
,
width
:
"80%"
,
height
:
"80%"
,
height
:
"80%"
,
...
...
src/main/webapp/HG/SC/HGSC004.jsp
View file @
3b65c185
...
@@ -38,7 +38,8 @@
...
@@ -38,7 +38,8 @@
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
align=
"center"
enable=
"false"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
align=
"center"
enable=
"false"
/>
<EF:EFColumn
ename=
"blueprintCode"
cname=
"蓝图编码"
enable=
"true"
width=
"120"
align=
"center"
required=
"true"
/>
<EF:EFColumn
ename=
"blueprintCode"
cname=
"蓝图编码"
enable=
"true"
width=
"120"
align=
"center"
required=
"true"
/>
<EF:EFColumn
ename=
"blueprintName"
cname=
"蓝图名称"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"blueprintName"
cname=
"蓝图名称"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFComboColumn
ename=
"materialStatus"
cname=
"提交状态"
width=
"80"
align=
"center"
enable=
"false"
required=
"false"
readonly=
"true"
>
<EF:EFComboColumn
ename=
"materialStatus"
cname=
"提交状态"
width=
"80"
align=
"center"
enable=
"false"
required=
"false"
readonly=
"true"
defaultValue=
"0"
>
<EF:EFCodeOption
codeName=
"hggp.sc.materialStatus"
/>
<EF:EFCodeOption
codeName=
"hggp.sc.materialStatus"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
</EF:EFGrid>
</EF:EFGrid>
...
...
src/main/webapp/HG/SC/HGSC004A.js
View file @
3b65c185
...
@@ -818,7 +818,7 @@ function deteleDetail(id) {
...
@@ -818,7 +818,7 @@ function deteleDetail(id) {
inEiInfo
.
set
(
"result-0-materialId"
,
$
(
"#inqu_status-0-materialId"
).
val
());
inEiInfo
.
set
(
"result-0-materialId"
,
$
(
"#inqu_status-0-materialId"
).
val
());
EiCommunicator
.
send
(
'HGSC004A'
,
'delete'
,
inEiInfo
,
{
EiCommunicator
.
send
(
'HGSC004A'
,
'delete'
,
inEiInfo
,
{
onSuccess
(
response
)
{
onSuccess
(
response
)
{
if
(
response
.
status
==
1
){
if
(
response
.
status
!=
-
1
){
NotificationUtil
(
response
.
msg
);
NotificationUtil
(
response
.
msg
);
query
();
query
();
refreshTree
();
refreshTree
();
...
...
src/main/webapp/HG/SC/HGSC004A.jsp
View file @
3b65c185
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
</style>
</style>
<EF:EFPage
title=
"物料清单详情"
>
<EF:EFPage
title=
"物料清单详情"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<EF:EFInput
ename=
"inqu_status-0-companyCode"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-projCode"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-materialId"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-materialId"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-parentProdCode"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-parentProdCode"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-status"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-status"
type=
"hidden"
/>
...
...
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