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
b8049e85
Commit
b8049e85
authored
Jan 25, 2024
by
yukang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
相关BUG修改优化
销售管理 HPSC001 项目档案 HPSC011 物料清单 HPSC002 生产计划 HPSC003
parent
97f2ec05
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
446 additions
and
96 deletions
+446
-96
DdynamicEnum.java
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
+1
-0
HPConstant.java
src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
+4
-0
HPSC001.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC001.java
+23
-3
HPSC002.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
+24
-6
HPSC003.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003.java
+21
-0
HPSC004.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
+26
-0
ServiceHPSC001.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
+16
-12
ServiceHPSC002.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
+0
-0
ServiceHPSC011.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC011.java
+12
-9
HPSC001.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
+45
-5
HPSC002.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
+51
-3
HPSC003.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
+7
-1
HPSC004.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
+7
-1
HPSC011.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml
+48
-14
ServiceHPZL001.java
.../java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
+3
-4
HPSC001.js
src/main/webapp/HP/SC/HPSC001.js
+4
-3
HPSC001.jsp
src/main/webapp/HP/SC/HPSC001.jsp
+26
-9
HPSC002.js
src/main/webapp/HP/SC/HPSC002.js
+90
-9
HPSC002.jsp
src/main/webapp/HP/SC/HPSC002.jsp
+16
-13
HPSC003.jsp
src/main/webapp/HP/SC/HPSC003.jsp
+2
-0
HPSC011.js
src/main/webapp/HP/SC/HPSC011.js
+1
-1
HPSC011.jsp
src/main/webapp/HP/SC/HPSC011.jsp
+19
-3
No files found.
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
View file @
b8049e85
...
...
@@ -72,6 +72,7 @@ public enum DdynamicEnum {
WH_RECORD_BLOCK_ID
(
"wh_record_block_id"
,
"whCode"
,
"whName"
,
"HPPZ007.queryComboBox"
),
/**
* (废弃)
* 模块:存货类型
* 用途:存货类型下拉框
* 编写:yk
...
...
src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
View file @
b8049e85
...
...
@@ -44,6 +44,10 @@ public class HPConstant {
public
static
final
String
OTHER_ENTER_NO
=
"OTHER_ENTER_NO"
;
// 其他出库单号
public
static
final
String
OTHER_OUTER_NO
=
"OTHER_OUTER_NO"
;
//生产计划单
public
static
final
String
HPSC003_PROD_NO
=
"HPSC003_PROD_NO"
;
}
/**
...
...
src/main/java/com/baosight/hpjx/hp/sc/domain/
T
HPSC001.java
→
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC001.java
View file @
b8049e85
...
...
@@ -8,7 +8,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
T
HPSC001
extends
DaoEPBase
{
public
class
HPSC001
extends
DaoEPBase
{
private
Long
id
=
0L
;
private
String
companyCode
=
" "
;
/* 企业编码 预留*/
...
...
@@ -26,6 +26,8 @@ public class THPSC001 extends DaoEPBase {
private
String
updatedTime
;
/* 更新时间*/
private
String
depCode
=
" "
;
/* 部门编码*/
private
String
remark
=
" "
;
/* 备注*/
private
Integer
materialStatus
=
0
;
/* 物料审核状态0-未审核,1部分审核,2全部审核*/
/**
* initialize the metadata
*/
...
...
@@ -97,12 +99,14 @@ public class THPSC001 extends DaoEPBase {
eiColumn
.
setDescName
(
"备注"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
"materialStatus"
);
eiColumn
.
setDescName
(
"物料审核状态0-未审核,1部分审核,2全部审核"
);
eiMetadata
.
addMeta
(
eiColumn
);
}
/**
* the constructor
*/
public
T
HPSC001
()
{
public
HPSC001
()
{
initMetaData
();
}
...
...
@@ -321,6 +325,19 @@ public class THPSC001 extends DaoEPBase {
this
.
remark
=
remark
;
}
/**
* set the materialStatus - 物料审核状态0-未审核,1部分审核,2全部审核
*/
public
void
setMaterialStatus
(
Integer
materialStatus
)
{
this
.
materialStatus
=
materialStatus
;
}
/**
* get the materialStatus - 物料审核状态0-未审核,1部分审核,2全部审核
* @return the materialStatus
*/
public
Integer
getMaterialStatus
()
{
return
this
.
materialStatus
;
}
/**
* get the value from Map
*/
public
void
fromMap
(
Map
map
)
{
...
...
@@ -341,6 +358,8 @@ public class THPSC001 extends DaoEPBase {
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"updatedTime"
)),
updatedTime
));
setDepCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"depCode"
)),
depCode
));
setRemark
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"remark"
)),
remark
));
setMaterialStatus
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
"materialStatus"
)),
materialStatus
));
}
/**
...
...
@@ -365,6 +384,7 @@ public class THPSC001 extends DaoEPBase {
map
.
put
(
"updatedTime"
,
StringUtils
.
toString
(
updatedTime
,
eiMetadata
.
getMeta
(
"updatedTime"
)));
map
.
put
(
"depCode"
,
StringUtils
.
toString
(
depCode
,
eiMetadata
.
getMeta
(
"depCode"
)));
map
.
put
(
"remark"
,
StringUtils
.
toString
(
remark
,
eiMetadata
.
getMeta
(
"remark"
)));
map
.
put
(
"materialStatus"
,
StringUtils
.
toString
(
materialStatus
,
eiMetadata
.
getMeta
(
"materialStatus"
)));
return
map
;
...
...
src/main/java/com/baosight/hpjx/hp/sc/domain/
T
HPSC002.java
→
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
View file @
b8049e85
...
...
@@ -8,10 +8,6 @@ import com.baosight.iplat4j.core.util.NumberUtils;
import
java.math.BigDecimal
;
import
com.baosight.iplat4j.core.util.DateUtils
;
import
java.sql.Timestamp
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
...
...
@@ -24,7 +20,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
* THpsc002
*
*/
public
class
T
HPSC002
extends
DaoEPBase
{
public
class
HPSC002
extends
DaoEPBase
{
private
Long
id
=
0L
;
private
String
companyCode
=
" "
;
/* 企业编码 预留*/
...
...
@@ -37,6 +33,7 @@ public class THPSC002 extends DaoEPBase {
private
String
leaf
=
"1"
;
/* 是否有叶子节点*/
private
String
sort
=
" "
;
/* 排序字段*/
private
String
icon
=
" "
;
/* 图片地址*/
private
Integer
prdtType
=
0
;
/*产品类型*/
private
String
prdtCode
=
" "
;
/* 产品编码*/
private
String
prdtName
=
" "
;
/* 产品名称*/
private
BigDecimal
num
=
new
BigDecimal
(
0.000
);
/* 数量*/
...
...
@@ -106,6 +103,10 @@ public class THPSC002 extends DaoEPBase {
eiColumn
.
setDescName
(
"图片地址"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
"prdtType"
);
eiColumn
.
setDescName
(
"产品类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
"prdtCode"
);
eiColumn
.
setDescName
(
"产品编码"
);
eiMetadata
.
addMeta
(
eiColumn
);
...
...
@@ -186,7 +187,7 @@ public class THPSC002 extends DaoEPBase {
/**
* the constructor
*/
public
T
HPSC002
()
{
public
HPSC002
()
{
initMetaData
();
}
...
...
@@ -356,6 +357,21 @@ public class THPSC002 extends DaoEPBase {
}
/**
* get the prdtType - 产品类型
* @return the prdtType
*/
public
Integer
getPrdtType
()
{
return
this
.
prdtType
;
}
/**
* set the prdtType - 产品类型
*/
public
void
setPrdtType
(
Integer
prdtType
)
{
this
.
prdtType
=
prdtType
;
}
/**
* get the prdtCode - 产品编码
* @return the prdtCode
*/
...
...
@@ -626,6 +642,7 @@ public class THPSC002 extends DaoEPBase {
setLeaf
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"leaf"
)),
leaf
));
setSort
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"sort"
)),
sort
));
setIcon
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"icon"
)),
icon
));
setPrdtType
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
"prdtType"
)),
prdtType
));
setPrdtCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"prdtCode"
)),
prdtCode
));
setPrdtName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"prdtName"
)),
prdtName
));
setNum
(
NumberUtils
.
toBigDecimal
(
StringUtils
.
toString
(
map
.
get
(
"num"
)),
num
));
...
...
@@ -662,6 +679,7 @@ public class THPSC002 extends DaoEPBase {
map
.
put
(
"leaf"
,
StringUtils
.
toString
(
leaf
,
eiMetadata
.
getMeta
(
"leaf"
)));
map
.
put
(
"sort"
,
StringUtils
.
toString
(
sort
,
eiMetadata
.
getMeta
(
"sort"
)));
map
.
put
(
"icon"
,
StringUtils
.
toString
(
icon
,
eiMetadata
.
getMeta
(
"icon"
)));
map
.
put
(
"prdtType"
,
StringUtils
.
toString
(
prdtType
,
eiMetadata
.
getMeta
(
"prdtType"
)));
map
.
put
(
"prdtCode"
,
StringUtils
.
toString
(
prdtCode
,
eiMetadata
.
getMeta
(
"prdtCode"
)));
map
.
put
(
"prdtName"
,
StringUtils
.
toString
(
prdtName
,
eiMetadata
.
getMeta
(
"prdtName"
)));
map
.
put
(
"num"
,
StringUtils
.
toString
(
num
,
eiMetadata
.
getMeta
(
"num"
)));
...
...
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003.java
View file @
b8049e85
...
...
@@ -27,6 +27,7 @@ public class HPSC003 extends DaoEPBase {
public
static
final
String
FIELD_PROJ_CODE
=
"projCode"
;
/* 项目编码*/
public
static
final
String
FIELD_PROJ_NAME
=
"projName"
;
/* 项目名称*/
public
static
final
String
FIELD_PLAN_INFO_NO
=
"planInfoNo"
;
/* 生产计划单号*/
public
static
final
String
FIELD_PRDT_TYPE
=
"prdtType"
;
/* 产品编码*/
public
static
final
String
FIELD_PRDT_CODE
=
"prdtCode"
;
/* 产品编码*/
public
static
final
String
FIELD_PRDT_NAME
=
"prdtName"
;
/* 产品名称*/
public
static
final
String
FIELD_PLAN_COMPLETION_DATE
=
"planCompletionDate"
;
/* 计划完成日期*/
...
...
@@ -45,6 +46,7 @@ public class HPSC003 extends DaoEPBase {
public
static
final
String
COL_PROJ_CODE
=
"PROJ_CODE"
;
/* 项目编码*/
public
static
final
String
COL_PROJ_NAME
=
"PROJ_NAME"
;
/* 项目编码*/
public
static
final
String
COL_PLAN_INFO_NO
=
"PLAN_INFO_NO"
;
/* 生产计划单号*/
public
static
final
String
COL_PRDT_TYPE
=
"PROJ_TYPE"
;
/* 项目类型*/
public
static
final
String
COL_PRDT_CODE
=
"PRDT_CODE"
;
/* 产品编码*/
public
static
final
String
COL_PRDT_NAME
=
"PRDT_NAME"
;
/* 产品名称*/
public
static
final
String
COL_PLAN_COMPLETION_DATE
=
"PLAN_COMPLETION_DATE"
;
/* 计划完成日期*/
...
...
@@ -68,6 +70,7 @@ public class HPSC003 extends DaoEPBase {
private
String
projCode
=
" "
;
/* 项目编码*/
private
String
projName
=
" "
;
/* 项目名称*/
private
String
planInfoNo
=
" "
;
/* 生产计划单号*/
private
Integer
prdtType
=
0
;
/*产品类型*/
private
String
prdtCode
=
" "
;
/* 产品编码*/
private
String
prdtName
=
" "
;
/* 产品名称*/
private
String
planCompletionDate
=
" "
;
/* 计划完成日期*/
...
...
@@ -112,6 +115,10 @@ public class HPSC003 extends DaoEPBase {
eiColumn
.
setDescName
(
"生产计划单号"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_TYPE
);
eiColumn
.
setDescName
(
"产品类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_CODE
);
eiColumn
.
setDescName
(
"产品编码"
);
eiMetadata
.
addMeta
(
eiColumn
);
...
...
@@ -259,6 +266,18 @@ public class HPSC003 extends DaoEPBase {
public
void
setPlanInfoNo
(
String
planInfoNo
)
{
this
.
planInfoNo
=
planInfoNo
;
}
public
Integer
getPrdtType
()
{
return
this
.
prdtType
;
}
/**
* set the prdtCode - 产品编码.
*
* @param prdtCode - 产品编码
*/
public
void
setPrdtType
(
Integer
prdtType
)
{
this
.
prdtType
=
prdtType
;
}
/**
* get the prdtCode - 产品编码.
* @return the prdtCode
...
...
@@ -433,6 +452,7 @@ public class HPSC003 extends DaoEPBase {
setProjCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PROJ_CODE
)),
projCode
));
setProjName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PROJ_NAME
)),
projName
));
setPlanInfoNo
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_INFO_NO
)),
planInfoNo
));
setPrdtType
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_TYPE
)),
prdtType
));
setPrdtCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_CODE
)),
prdtCode
));
setPrdtName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_NAME
)),
prdtName
));
setPlanCompletionDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_COMPLETION_DATE
)),
planCompletionDate
));
...
...
@@ -461,6 +481,7 @@ public class HPSC003 extends DaoEPBase {
map
.
put
(
FIELD_PROJ_NAME
,
StringUtils
.
toString
(
projName
,
eiMetadata
.
getMeta
(
FIELD_PROJ_NAME
)));
map
.
put
(
FIELD_PLAN_INFO_NO
,
StringUtils
.
toString
(
planInfoNo
,
eiMetadata
.
getMeta
(
FIELD_PLAN_INFO_NO
)));
map
.
put
(
FIELD_PRDT_CODE
,
StringUtils
.
toString
(
prdtCode
,
eiMetadata
.
getMeta
(
FIELD_PRDT_CODE
)));
map
.
put
(
FIELD_PRDT_TYPE
,
StringUtils
.
toString
(
prdtType
,
eiMetadata
.
getMeta
(
FIELD_PRDT_TYPE
)));
map
.
put
(
FIELD_PRDT_NAME
,
StringUtils
.
toString
(
prdtName
,
eiMetadata
.
getMeta
(
FIELD_PRDT_NAME
)));
map
.
put
(
FIELD_PLAN_COMPLETION_DATE
,
StringUtils
.
toString
(
planCompletionDate
,
eiMetadata
.
getMeta
(
FIELD_PLAN_COMPLETION_DATE
)));
map
.
put
(
FIELD_STATUS
,
StringUtils
.
toString
(
status
,
eiMetadata
.
getMeta
(
FIELD_STATUS
)));
...
...
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
View file @
b8049e85
...
...
@@ -34,6 +34,7 @@ public class HPSC004 extends DaoEPBase {
public
static
final
String
FIELD_LEAF
=
"leaf"
;
/* 是否有叶子节点*/
public
static
final
String
FIELD_SORT
=
"sort"
;
/* 排序字段*/
public
static
final
String
FIELD_ICON
=
"icon"
;
/* 图片地址*/
public
static
final
String
FIELD_PRDT_TYPE
=
"prdtType"
;
/* 产品编码*/
public
static
final
String
FIELD_PRDT_CODE
=
"prdtCode"
;
/* 产品编码*/
public
static
final
String
FIELD_PRDT_NAME
=
"prdtName"
;
/* 产品名称*/
public
static
final
String
FIELD_NUM
=
"num"
;
/* 数量*/
...
...
@@ -61,6 +62,7 @@ public class HPSC004 extends DaoEPBase {
public
static
final
String
COL_ID
=
"ID"
;
public
static
final
String
COL_COMPANY_CODE
=
"COMPANY_CODE"
;
/* 企业编码 预留*/
public
static
final
String
COL_DEPT_CODE
=
"DEPT_CODE"
;
/* 部门编码 预留*/
public
static
final
String
COL_PROJ_TYPE
=
"PROJ_TYPE"
;
/* 项目编码*/
public
static
final
String
COL_PROJ_CODE
=
"PROJ_CODE"
;
/* 项目编码*/
public
static
final
String
COL_PROJ_NAME
=
"PROJ_NAME"
;
/* 项目名称*/
public
static
final
String
COL_PARENT_PRDT_CODE
=
"PARENT_PRDT_CODE"
;
/* 父节点-产品编码*/
...
...
@@ -69,6 +71,7 @@ public class HPSC004 extends DaoEPBase {
public
static
final
String
COL_LEAF
=
"LEAF"
;
/* 是否有叶子节点*/
public
static
final
String
COL_SORT
=
"SORT"
;
/* 排序字段*/
public
static
final
String
COL_ICON
=
"ICON"
;
/* 图片地址*/
public
static
final
String
COL_PRDT_TYPE
=
"PRDT_TYPE"
;
/* 项目类型*/
public
static
final
String
COL_PRDT_CODE
=
"PRDT_CODE"
;
/* 产品编码*/
public
static
final
String
COL_PRDT_NAME
=
"PRDT_NAME"
;
/* 产品名称*/
public
static
final
String
COL_NUM
=
"NUM"
;
/* 数量*/
...
...
@@ -110,6 +113,7 @@ public class HPSC004 extends DaoEPBase {
private
String
leaf
=
"1"
;
/* 是否有叶子节点*/
private
String
sort
=
" "
;
/* 排序字段*/
private
String
icon
=
" "
;
/* 图片地址*/
private
Integer
prdtType
=
0
;
/*产品类型*/
private
String
prdtCode
=
" "
;
/* 产品编码*/
private
String
prdtName
=
" "
;
/* 产品名称*/
private
BigDecimal
num
=
new
BigDecimal
(
0.000
);
/* 数量*/
...
...
@@ -185,6 +189,10 @@ public class HPSC004 extends DaoEPBase {
eiColumn
.
setDescName
(
"图片地址"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_TYPE
);
eiColumn
.
setDescName
(
"产品类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_CODE
);
eiColumn
.
setDescName
(
"产品编码"
);
eiMetadata
.
addMeta
(
eiColumn
);
...
...
@@ -476,6 +484,22 @@ public class HPSC004 extends DaoEPBase {
* get the prdtCode - 产品编码.
* @return the prdtCode
*/
public
Integer
getPrdtType
()
{
return
this
.
prdtType
;
}
/**
* set the prdtCode - 产品编码.
*
* @param prdtCode - 产品编码
*/
public
void
setPrdtType
(
Integer
prdtType
)
{
this
.
prdtType
=
prdtType
;
}
/**
* get the prdtCode - 产品编码.
* @return the prdtCode
*/
public
String
getPrdtCode
()
{
return
this
.
prdtCode
;
}
...
...
@@ -859,6 +883,7 @@ public class HPSC004 extends DaoEPBase {
setLeaf
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_LEAF
)),
leaf
));
setSort
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_SORT
)),
sort
));
setIcon
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_ICON
)),
icon
));
setPrdtType
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_TYPE
)),
prdtType
));
setPrdtCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_CODE
)),
prdtCode
));
setPrdtName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRDT_NAME
)),
prdtName
));
setNum
(
NumberUtils
.
toBigDecimal
(
StringUtils
.
toString
(
map
.
get
(
FIELD_NUM
)),
num
));
...
...
@@ -902,6 +927,7 @@ public class HPSC004 extends DaoEPBase {
map
.
put
(
FIELD_LEAF
,
StringUtils
.
toString
(
leaf
,
eiMetadata
.
getMeta
(
FIELD_LEAF
)));
map
.
put
(
FIELD_SORT
,
StringUtils
.
toString
(
sort
,
eiMetadata
.
getMeta
(
FIELD_SORT
)));
map
.
put
(
FIELD_ICON
,
StringUtils
.
toString
(
icon
,
eiMetadata
.
getMeta
(
FIELD_ICON
)));
map
.
put
(
FIELD_PRDT_TYPE
,
StringUtils
.
toString
(
prdtType
,
eiMetadata
.
getMeta
(
FIELD_PRDT_TYPE
)));
map
.
put
(
FIELD_PRDT_CODE
,
StringUtils
.
toString
(
prdtCode
,
eiMetadata
.
getMeta
(
FIELD_PRDT_CODE
)));
map
.
put
(
FIELD_PRDT_NAME
,
StringUtils
.
toString
(
prdtName
,
eiMetadata
.
getMeta
(
FIELD_PRDT_NAME
)));
map
.
put
(
FIELD_NUM
,
StringUtils
.
toString
(
num
,
eiMetadata
.
getMeta
(
FIELD_NUM
)));
...
...
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
View file @
b8049e85
package
com
.
baosight
.
hpjx
.
hp
.
sc
.
service
;
import
com.baosight.hpjx.common.DdynamicEnum
;
import
com.baosight.hpjx.core.dao.DaoUtils
;
import
com.baosight.hpjx.hp.constant.HPConstant
;
import
com.baosight.hpjx.hp.sc.domain.THPSC002
;
import
com.baosight.hpjx.util.CommonMethod
;
import
com.baosight.hpjx.util.LogUtils
;
import
com.baosight.iplat4j.core.ei.EiBlock
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiInfo
;
import
com.baosight.iplat4j.core.exception.PlatException
;
import
com.baosight.iplat4j.core.service.impl.ServiceBase
;
import
com.baosight.iplat4j.core.service.soa.XLocalManager
;
import
com.baosight.iplat4j.core.web.threadlocal.UserSession
;
import
com.baosight.hpjx.hp.sc.domain.THPSC001
;
import
com.baosight.hpjx.hp.sc.domain.HPSC001
;
import
com.baosight.iplat4j.ed.util.SequenceGenerator
;
import
java.text.SimpleDateFormat
;
...
...
@@ -27,9 +27,13 @@ public class ServiceHPSC001 extends ServiceBase {
* 画面初始化.
*/
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
THPSC001
hpsc001
=
new
THPSC001
();
EiInfo
outInfo
=
super
.
initLoad
(
inInfo
,
hpsc001
);
outInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
hpsc001
.
eiMetadata
);
try
{
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
USER_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
CUSTOMER_RECORD_BLOCK_ID
),
null
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HPSC001
().
eiMetadata
);
}
catch
(
PlatException
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"初始化失败"
);
}
return
inInfo
;
}
...
...
@@ -40,7 +44,7 @@ public class ServiceHPSC001 extends ServiceBase {
@Override
public
EiInfo
query
(
EiInfo
inInfo
)
{
/* 调用EI查询方法.*/
EiInfo
outInfo
=
super
.
query
(
inInfo
,
"HPSC001.query"
,
new
T
HPSC001
());
EiInfo
outInfo
=
super
.
query
(
inInfo
,
"HPSC001.query"
,
new
HPSC001
());
return
outInfo
;
}
...
...
@@ -51,7 +55,7 @@ public class ServiceHPSC001 extends ServiceBase {
@Override
public
EiInfo
insert
(
EiInfo
inInfo
)
{
try
{
THPSC001
hpsc001
=
new
T
HPSC001
();
HPSC001
hpsc001
=
new
HPSC001
();
EiBlock
eiBlock
=
inInfo
.
getBlock
(
EiConstant
.
resultBlock
);
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
Map
<?,
?>
map
=
eiBlock
.
getRow
(
i
);
...
...
@@ -79,7 +83,7 @@ public class ServiceHPSC001 extends ServiceBase {
public
EiInfo
update
(
EiInfo
inInfo
)
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
try
{
THPSC001
hpsc001
=
new
T
HPSC001
();
HPSC001
hpsc001
=
new
HPSC001
();
EiBlock
eiBlock
=
inInfo
.
getBlock
(
EiConstant
.
resultBlock
);
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
Map
<?,
?>
map
=
eiBlock
.
getRow
(
i
);
...
...
@@ -102,7 +106,7 @@ public class ServiceHPSC001 extends ServiceBase {
* 删除操作.
*/
public
EiInfo
delete
(
EiInfo
eiInfo
)
{
THPSC001
hpsc001
=
new
T
HPSC001
();
HPSC001
hpsc001
=
new
HPSC001
();
EiBlock
eiBlock
=
eiInfo
.
getBlock
(
EiConstant
.
resultBlock
);
try
{
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
...
...
@@ -129,7 +133,7 @@ public class ServiceHPSC001 extends ServiceBase {
* 审核 反审.
*/
public
EiInfo
check
(
EiInfo
eiInfo
)
{
THPSC001
hpsc001
=
new
T
HPSC001
();
HPSC001
hpsc001
=
new
HPSC001
();
EiBlock
eiBlock
=
eiInfo
.
getBlock
(
EiConstant
.
resultBlock
);
try
{
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
...
...
@@ -158,7 +162,7 @@ public class ServiceHPSC001 extends ServiceBase {
public
void
buildHPSC002
(
EiInfo
eiInfo
)
{
THPSC001
hpsc001
=
new
T
HPSC001
();
HPSC001
hpsc001
=
new
HPSC001
();
EiBlock
eiBlock
=
eiInfo
.
getBlock
(
EiConstant
.
resultBlock
);
List
rows
=
new
ArrayList
();
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
...
...
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
View file @
b8049e85
This diff is collapsed.
Click to expand it.
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC011.java
View file @
b8049e85
package
com
.
baosight
.
hpjx
.
hp
.
sc
.
service
;
import
com.baosight.hpjx.hp.sc.domain.THPSC001
;
import
com.baosight.iplat4j.core.ei.EiBlock
;
import
com.baosight.hpjx.common.DdynamicEnum
;
import
com.baosight.hpjx.hp.sc.domain.HPSC001
;
import
com.baosight.hpjx.util.CommonMethod
;
import
com.baosight.hpjx.util.LogUtils
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiInfo
;
import
com.baosight.iplat4j.core.exception.PlatException
;
import
com.baosight.iplat4j.core.service.impl.ServiceBase
;
import
com.baosight.iplat4j.core.service.soa.XLocalManager
;
import
com.baosight.iplat4j.core.web.threadlocal.UserSession
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
/**
...
...
@@ -22,9 +21,13 @@ public class ServiceHPSC011 extends ServiceBase {
* 画面初始化.
*/
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
THPSC001
hpsc001
=
new
THPSC001
();
EiInfo
outInfo
=
super
.
initLoad
(
inInfo
,
hpsc001
);
outInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
hpsc001
.
eiMetadata
);
try
{
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
USER_BLOCK_ID
),
null
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
CUSTOMER_RECORD_BLOCK_ID
),
null
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HPSC001
().
eiMetadata
);
}
catch
(
PlatException
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"初始化失败"
);
}
return
inInfo
;
}
...
...
@@ -36,7 +39,7 @@ public class ServiceHPSC011 extends ServiceBase {
public
EiInfo
query
(
EiInfo
inInfo
)
{
/* 调用EI查询方法.*/
inInfo
.
setCell
(
EiConstant
.
queryBlock
,
0
,
"status"
,
1
);
EiInfo
outInfo
=
super
.
query
(
inInfo
,
"HPSC001.query"
,
new
T
HPSC001
());
EiInfo
outInfo
=
super
.
query
(
inInfo
,
"HPSC001.query"
,
new
HPSC001
());
return
outInfo
;
}
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
View file @
b8049e85
...
...
@@ -21,7 +21,7 @@
<sqlMap
namespace=
"HPSC001"
>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
resultClass=
"com.baosight.hpjx.hp.sc.domain.
T
HPSC001"
>
resultClass=
"com.baosight.hpjx.hp.sc.domain.HPSC001"
>
SELECT
ID as "id",
COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
...
...
@@ -35,7 +35,8 @@
CREATED_TIME as "createdTime",
<!-- 创建时间 -->
UPDATED_BY as "updatedBy",
<!-- 更新人 -->
UPDATED_TIME as "updatedTime",
<!-- 更新时间 -->
DEP_CODE as "depCode"
<!-- 部门编码 -->
DEP_CODE as "depCode",
<!-- 部门编码 -->
MATERIAL_STATUS as "materialStatus"
FROM hpjx.t_hpsc001 WHERE 1=1
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
...
...
@@ -43,12 +44,24 @@
<isNotEmpty
prepend=
" AND "
property=
"projType"
>
PROJ_TYPE = #projType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ1"
>
PRINC1 = #princ1#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ2"
>
PRINC2 = #princ2#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE ('%$projName$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projCode"
>
PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"materialStatus"
>
MATERIAL_STATUS = #materialStatus#
</isNotEmpty>
<dynamic
prepend=
"ORDER BY"
>
<isEmpty
property=
"orderBy"
>
CREATED_TIME desc
...
...
@@ -63,6 +76,27 @@
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projType"
>
PROJ_TYPE = #projType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ1"
>
PRINC1 = #princ1#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ2"
>
PRINC2 = #princ2#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE ('%$projName$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projCode"
>
PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"materialStatus"
>
MATERIAL_STATUS = #materialStatus#
</isNotEmpty>
</select>
<!--
...
...
@@ -116,13 +150,14 @@
PRINC1,
<!-- 本公司项目负责人 -->
PRINC2,
<!-- 客户项目负责人 -->
STATUS,
<!-- 状态 0-未审核,1-已审核 -->
MATERIAL_STATUS,
CREATED_BY,
<!-- 创建人 -->
CREATED_TIME,
<!-- 创建时间 -->
UPDATED_BY,
<!-- 更新人 -->
UPDATED_TIME,
<!-- 更新时间 -->
DEP_CODE
<!-- 部门编码 -->
)
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #status#,
#createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#)
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #status#,
0, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#)
</insert>
<delete
id=
"delete"
>
...
...
@@ -139,7 +174,8 @@
PROJ_NAME = #projName#,
<!-- 项目名称 -->
PRINC1 = #princ1#,
<!-- 本公司项目负责人 -->
PRINC2 = #princ2#,
<!-- 客户项目负责人 -->
STATUS = #status#,
<!-- 状态 0-未审核,1-已审核 -->
STATUS = #status#,
<!-- 状态 0-未审核,1-已审核 -->
MATERIAL_STATUS = #materialStatus#,
CREATED_BY = #createdBy#,
<!-- 创建人 -->
CREATED_TIME = #createdTime#,
<!-- 创建时间 -->
UPDATED_BY = #updatedBy#,
<!-- 更新人 -->
...
...
@@ -168,9 +204,13 @@
UPDATE hpjx.t_hpsc001 SET status = #status# WHERE ID = #id#
</update>
<update
id=
"checkByProjCode"
>
UPDATE hpjx.t_hpsc001 SET MATERIAL_STATUS = #materialStatus# WHERE PROJ_CODE = #projCode#
</update>
<select
id=
"queryDomainById"
parameterClass=
"java.util.HashMap"
resultClass=
"com.baosight.hpjx.hp.sc.domain.
T
HPSC001"
>
resultClass=
"com.baosight.hpjx.hp.sc.domain.HPSC001"
>
SELECT
ID as "id",
COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
View file @
b8049e85
...
...
@@ -36,7 +36,7 @@
<sqlMap
namespace=
"HPSC002"
>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
resultClass=
"com.baosight.hpjx.hp.sc.domain.
T
HPSC002"
>
resultClass=
"com.baosight.hpjx.hp.sc.domain.HPSC002"
>
SELECT
ID as "id",
COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
...
...
@@ -49,6 +49,7 @@
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!-- 产品编码 -->
PRDT_NAME as "prdtName",
<!-- 产品名称 -->
NUM as "num",
<!-- 数量 -->
...
...
@@ -68,12 +69,19 @@
REMARK as "remark"
<!-- 备注 -->
FROM hpjx.t_hpsc002 WHERE 1=1
AND PARENT_PRDT_CODE NOT IN ('root')
AND DEL_STATUS = 1
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"parentPrdtCode"
>
PARENT_PRDT_CODE = #parentPrdtCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtType"
>
PRDT_TYPE = #prdtType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtCode"
>
PRDT_CODE = #prdtCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtName"
>
PRDT_NAME LIKE ('%$#prdtName#$%')
</isNotEmpty>
...
...
@@ -93,12 +101,29 @@
<select
id=
"count"
resultClass=
"int"
>
SELECT COUNT(*) FROM hpjx.t_hpsc002 WHERE 1=1
AND PARENT_PRDT_CODE NOT IN ('root')
AND DEL_STATUS = 1
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"parentPrdtCode"
>
PARENT_PRDT_CODE = #parentPrdtCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtType"
>
PRDT_TYPE = #prdtType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtCode"
>
PRDT_CODE = #prdtCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtName"
>
PRDT_NAME LIKE ('%$#prdtName#$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE ('%$projName$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
</isNotEmpty>
</select>
<!--
...
...
@@ -200,6 +225,7 @@
LEAF,
<!-- 是否有叶子节点 -->
SORT,
<!-- 排序字段 -->
ICON,
<!-- 图片地址 -->
PRDT_TYPE,
PRDT_CODE,
<!-- 产品编码 -->
PRDT_NAME,
<!-- 产品名称 -->
NUM,
<!-- 数量 -->
...
...
@@ -218,7 +244,7 @@
UPDATED_TIME,
<!-- 更新时间 -->
REMARK
<!-- 备注 -->
)
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentPrdtCode#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdt
Code#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentPrdtCode#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdt
Type#, #prdtCode#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
</insert>
<delete
id=
"delete"
>
...
...
@@ -239,7 +265,8 @@
LEAF = #leaf#,
<!-- 是否有叶子节点 -->
SORT = #sort#,
<!-- 排序字段 -->
ICON = #icon#,
<!-- 图片地址 -->
PRDT_CODE = #prdtCode#,
<!-- 产品编码 -->
PRDT_CODE = #prdtCode#,
<!-- 产品编码 -->
PRDT_TYPE = #prdtType#,
PRDT_NAME = #prdtName#,
<!-- 产品名称 -->
NUM = #num#,
<!-- 数量 -->
UNIT_WT = #unitWt#,
<!-- 单重 -->
...
...
@@ -264,6 +291,7 @@
<select
id=
"queryTree"
resultClass=
"java.util.HashMap"
>
SELECT
ID as "nodeId",
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!-- 项目编码 -->
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PRDT_name as "prdtName",
<!-- 项目编码 -->
...
...
@@ -301,6 +329,7 @@
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!-- 产品编码 -->
PRDT_NAME as "prdtName",
<!-- 产品名称 -->
NUM as "num",
<!-- 数量 -->
...
...
@@ -334,6 +363,25 @@
</update>
<select
id=
"checkExamineNum1"
resultClass=
"int"
>
SELECT COUNT(1) from hpjx.t_hpsc002
WHERE 1 = 1
AND PARENT_PRDT_CODE != 'root'
AND `STATUS` = 0
<isNotEmpty
prepend=
" AND "
property=
"parentPrdtCode"
>
PROJ_CODE = #projCode#
</isNotEmpty>
</select>
<select
id=
"checkExamineNum1Count"
resultClass=
"int"
>
SELECT COUNT(1) from hpjx.t_hpsc002
WHERE 1 = 1
AND PARENT_PRDT_CODE != 'root'
<isNotEmpty
prepend=
" AND "
property=
"parentPrdtCode"
>
PROJ_CODE = #projCode#
</isNotEmpty>
</select>
<select
id=
"checkExamineNum"
resultClass=
"int"
>
SELECT COUNT(1) FROM hpjx.t_hpsc002
WHERE LEAF = '1'
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
View file @
b8049e85
...
...
@@ -42,6 +42,9 @@
<isNotEmpty
prepend=
" AND "
property=
"planInfoNo"
>
PLAN_INFO_NO = #planInfoNo#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtType"
>
PRDT_TYPE = #prdtType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtCode"
>
PRDT_CODE = #prdtCode#
</isNotEmpty>
...
...
@@ -83,6 +86,7 @@
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PLAN_INFO_NO as "planInfoNo",
<!-- 生产计划单号 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!-- 产品编码 -->
PRDT_NAME as "prdtName",
<!-- 产品名称 -->
PLAN_COMPLETION_DATE as "planCompletionDate",
<!-- 计划完成日期 -->
...
...
@@ -174,6 +178,7 @@
PROJ_CODE,
<!-- 项目编码 -->
PROJ_NAME,
<!-- 项目名称 -->
PLAN_INFO_NO,
<!-- 生产计划单号 -->
PRDT_TYPE,
PRDT_CODE,
<!-- 产品编码 -->
PRDT_NAME,
<!-- 产品名称 -->
PLAN_COMPLETION_DATE,
<!-- 计划完成日期 -->
...
...
@@ -185,7 +190,7 @@
DEP_CODE,
<!-- 部门编码 -->
REMARK
<!-- 备注 -->
)
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#, #prdt
Type#, #prdt
Code#, #prdtName#, #planCompletionDate#, #status#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
</insert>
<delete
id=
"delete"
>
...
...
@@ -201,6 +206,7 @@
PROJ_CODE = #projCode#,
<!-- 项目编码 -->
PROJ_NAME = #projName#,
<!-- 项目编码 -->
PLAN_INFO_NO = #planInfoNo#,
<!-- 生产计划单号 -->
PRDT_TYPE = #prdtType#,
PRDT_CODE = #prdtCode#,
<!-- 产品编码 -->
PRDT_NAME = #prdtName#,
<!-- 产品名称 -->
PLAN_COMPLETION_DATE = #planCompletionDate#,
<!-- 计划完成日期 -->
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
View file @
b8049e85
...
...
@@ -74,6 +74,9 @@
<isNotEmpty
prepend=
" AND "
property=
"icon"
>
ICON = #icon#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtType"
>
PRDT_TYPE = #prdtType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"prdtCode"
>
PRDT_CODE = #prdtCode#
</isNotEmpty>
...
...
@@ -159,6 +162,7 @@
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!-- 产品编码 -->
PRDT_NAME as "prdtName",
<!-- 产品名称 -->
NUM as "num",
<!-- 数量 -->
...
...
@@ -313,6 +317,7 @@
LEAF,
<!-- 是否有叶子节点 -->
SORT,
<!-- 排序字段 -->
ICON,
<!-- 图片地址 -->
PRDT_TYPE,
PRDT_CODE,
<!-- 产品编码 -->
PRDT_NAME,
<!-- 产品名称 -->
NUM,
<!-- 数量 -->
...
...
@@ -336,7 +341,7 @@
UPDATED_TIME,
<!-- 更新时间 -->
REMARK
<!-- 备注 -->
)
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentPrdtCode#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdtCode#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentPrdtCode#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdt
Type#, #prdt
Code#, #prdtName#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#)
</insert>
<delete
id=
"delete"
>
...
...
@@ -357,6 +362,7 @@
LEAF = #leaf#,
<!-- 是否有叶子节点 -->
SORT = #sort#,
<!-- 排序字段 -->
ICON = #icon#,
<!-- 图片地址 -->
PRDT_TYPE = #prdtType#,
PRDT_CODE = #prdtCode#,
<!-- 产品编码 -->
PRDT_NAME = #prdtName#,
<!-- 产品名称 -->
NUM = #num#,
<!-- 数量 -->
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml
View file @
b8049e85
...
...
@@ -21,21 +21,22 @@
<sqlMap
namespace=
"HPSC001"
>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
resultClass=
"com.baosight.hpjx.hp.sc.domain.
T
HPSC001"
>
resultClass=
"com.baosight.hpjx.hp.sc.domain.HPSC001"
>
SELECT
ID as "id",
COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
PROJ_TYPE as "projType",
<!-- 项目类型 -->
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PRINC1 as "princ1",
<!-- 本公司项目负责人 -->
PRINC2 as "princ2",
<!-- 客户项目负责人 -->
STATUS as "status",
<!-- 状态 0-未审核,1-已审核 -->
CREATED_BY as "createdBy",
<!-- 创建人 -->
CREATED_TIME as "createdTime",
<!-- 创建时间 -->
UPDATED_BY as "updatedBy",
<!-- 更新人 -->
UPDATED_TIME as "updatedTime",
<!-- 更新时间 -->
DEP_CODE as "depCode"
<!-- 部门编码 -->
ID as "id",
COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
PROJ_TYPE as "projType",
<!-- 项目类型 -->
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PRINC1 as "princ1",
<!-- 本公司项目负责人 -->
PRINC2 as "princ2",
<!-- 客户项目负责人 -->
STATUS as "status",
<!-- 状态 0-未审核,1-已审核 -->
CREATED_BY as "createdBy",
<!-- 创建人 -->
CREATED_TIME as "createdTime",
<!-- 创建时间 -->
UPDATED_BY as "updatedBy",
<!-- 更新人 -->
UPDATED_TIME as "updatedTime",
<!-- 更新时间 -->
DEP_CODE as "depCode",
<!-- 部门编码 -->
MATERIAL_STATUS as "materialStatus"
FROM hpjx.t_hpsc001 WHERE 1=1
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
...
...
@@ -43,12 +44,24 @@
<isNotEmpty
prepend=
" AND "
property=
"projType"
>
PROJ_TYPE = #projType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ1"
>
PRINC1 = #princ1#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ2"
>
PRINC2 = #princ2#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE ('%$projName$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projCode"
>
PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"materialStatus"
>
MATERIAL_STATUS = #materialStatus#
</isNotEmpty>
<dynamic
prepend=
"ORDER BY"
>
<isEmpty
property=
"orderBy"
>
CREATED_TIME desc
...
...
@@ -63,6 +76,27 @@
<isNotEmpty
prepend=
" AND "
property=
"id"
>
ID = #id#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projType"
>
PROJ_TYPE = #projType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ1"
>
PRINC1 = #princ1#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"princ2"
>
PRINC2 = #princ2#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projName"
>
PROJ_NAME LIKE ('%$projName$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"projCode"
>
PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"status"
>
STATUS = #status#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"materialStatus"
>
MATERIAL_STATUS = #materialStatus#
</isNotEmpty>
</select>
<!--
...
...
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
View file @
b8049e85
...
...
@@ -4,13 +4,12 @@ import com.baosight.hpjx.common.DdynamicEnum;
import
com.baosight.hpjx.core.dao.DaoUtils
;
import
com.baosight.hpjx.hp.constant.HPConstant
;
import
com.baosight.hpjx.hp.kc.domain.HPKC008
;
import
com.baosight.hpjx.hp.sc.domain.
T
HPSC001
;
import
com.baosight.hpjx.hp.sc.domain.HPSC001
;
import
com.baosight.hpjx.hp.zl.domain.HPZL001
;
import
com.baosight.hpjx.util.CommonMethod
;
import
com.baosight.hpjx.util.EiInfoUtils
;
import
com.baosight.hpjx.util.LogUtils
;
import
com.baosight.hpjx.util.StringUtil
;
import
com.baosight.iplat4j.core.ei.EiBlock
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiInfo
;
import
com.baosight.iplat4j.core.service.impl.ServiceBase
;
...
...
@@ -73,7 +72,7 @@ public class ServiceHPZL001 extends ServiceBase {
// 项目名称
Map
params1
=
new
HashMap
<>();
params1
.
put
(
"itemCode"
,
fZl001
.
getItemCode
());
List
<
T
HPSC001
>
query1
=
dao
.
query
(
"HPSC001.query"
,
params1
);
List
<
HPSC001
>
query1
=
dao
.
query
(
"HPSC001.query"
,
params1
);
fZl001
.
setItemName
(
query1
.
get
(
0
).
getProjName
());
// 生成单据号
fZl001
.
setChkBillno
(
SequenceGenerator
.
getNextSequence
(
...
...
@@ -106,7 +105,7 @@ public class ServiceHPZL001 extends ServiceBase {
// 项目名称
Map
params1
=
new
HashMap
<>();
params1
.
put
(
"itemCode"
,
fZl001
.
getItemCode
());
List
<
T
HPSC001
>
query1
=
dao
.
query
(
"HPSC001.query"
,
params1
);
List
<
HPSC001
>
query1
=
dao
.
query
(
"HPSC001.query"
,
params1
);
fZl001
.
setItemName
(
query1
.
get
(
0
).
getProjName
());
DaoUtils
.
update
(
"HPZL001.update"
,
fZl001
);
}
...
...
src/main/webapp/HP/SC/HPSC001.js
View file @
b8049e85
...
...
@@ -20,10 +20,11 @@ $(function () {
if
(
auditStatus
==
0
)
{
template
+=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;" '
+
'onclick="check('
+
item
.
id
+
',1)" >审核</a>'
;
}
else
{
template
+=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;" '
+
'onclick="check('
+
item
.
id
+
',0)" >反审</a>'
;
}
// else if (auditStatus == 1) {
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
// 'onclick="check(' + item.id + ',0)" >反审</a>';
// }
return
template
;
}
}
...
...
src/main/webapp/HP/SC/HPSC001.jsp
View file @
b8049e85
...
...
@@ -17,11 +17,20 @@
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFCodeOption
codeName=
"hpjx.hpsc.projType"
/>
</EF:EFSelect>
<EF:EFInput
blockId=
"inqu_status"
ename=
"projName"
cname=
"项目名称:"
row=
"0"
/>
<EF:EFSelect
cname=
"单据状态:"
optionLabel=
"全部"
blockId=
"inqu_status"
ename=
"status"
row=
"0"
>
<EF:EFInput
ename=
"inqu_status-0-projCode"
cname=
"项目编码"
colWidth=
"3"
/>
<EF:EFInput
ename=
"inqu_status-0-projName"
cname=
"项目名称"
colWidth=
"3"
/>
<EF:EFSelect
cname=
"单据状态"
optionLabel=
"全部"
ename=
"inqu_status-0-status"
colWidth=
"3"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"项目负责人"
ename=
"inqu_status-0-princ1"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"user_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"客户负责人"
ename=
"inqu_status-0-princ2"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"customer_record_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
</div>
<
%
--
<
EF:EFButton
ename=
"QUERY"
cname=
"查询"
row=
"1"
class=
"btn-align-right"
></EF:EFButton>
--%>
</EF:EFRegion>
...
...
@@ -30,18 +39,26 @@
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFComboColumn
ename=
"projType"
cname=
"项目类型"
width=
"100"
align=
"center"
required=
"true"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
>
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
readonly=
"true"
>
<EF:EFCodeOption
codeName=
"hpjx.hpsc.projType"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"projCode"
enable=
"false"
cname=
"项目编码"
/>
<EF:EFColumn
required=
"true"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFColumn
required=
"true"
ename=
"princ1"
cname=
"本公司项目负责人"
/>
<EF:EFColumn
required=
"true"
ename=
"princ2"
cname=
"客户项目负责人"
/>
<EF:EFComboColumn
required=
"true"
align=
"center"
ename=
"status"
cname=
"状态"
defaultValue=
"0"
>
<EF:EFColumn
ename=
"projCode"
enable=
"false"
cname=
"项目编码"
readonly=
"true"
/>
<EF:EFColumn
required=
"true"
ename=
"projName"
cname=
"项目名称"
readonly=
"true"
/>
<EF:EFComboColumn
ename=
"princ1"
cname=
"本公司项目负责人"
width=
"120"
align=
"center"
required=
"true"
blockName=
"user_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
readonly=
"true"
filter=
"contains"
>
</EF:EFComboColumn>
<EF:EFComboColumn
ename=
"princ2"
cname=
"客户项目负责人"
width=
"120"
align=
"center"
required=
"true"
blockName=
"customer_record_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
readonly=
"true"
filter=
"contains"
>
</EF:EFComboColumn>
<EF:EFComboColumn
enable=
"false"
align=
"center"
ename=
"status"
cname=
"状态"
readonly=
"true"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
readonly=
"true"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"100"
enable=
"false"
readonly=
"false"
/>
</EF:EFGrid>
</EF:EFRegion>
...
...
src/main/webapp/HP/SC/HPSC002.js
View file @
b8049e85
let
inventNameGlobalData
=
[];
// 传递参数 将附件ID与当前记录ID进行绑定
let
rowId
=
''
;
let
parentPrdtCode
=
''
;
...
...
@@ -8,6 +9,7 @@ if (url.indexOf("?") != -1) { //判断是否有参数
strs
=
str
.
split
(
"="
);
//用等号进行分隔 (因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔)
console
.
log
(
'strs='
+
strs
)
//直接弹出第一个参数 (如果有多个参数 还要进行循环的)
}
$
(
function
()
{
IPLATUI
.
EFTree
=
{
"materialTree"
:
{
...
...
@@ -45,15 +47,14 @@ $(function () {
IPLATUI
.
EFTree
.
materialTree
.
selectTreeNode
.
projName
=
nodeData
.
projName
;
// 重新查询EFGrid
parentPrdtCode
=
nodeData
.
nodeId
;
resultGrid
.
dataSource
.
page
(
1
);
query
(
);
},
selectTreeNode
:
{}
}
};
$
(
"#QUERY"
).
on
(
"click"
,
function
()
{
resultGrid
.
dataSource
.
page
(
1
);
query
();
});
...
...
@@ -80,10 +81,11 @@ $(function () {
},
query
:
function
()
{
var
ei
=
new
EiInfo
();
ei
.
set
(
"inqu_status-0-pr
ojName"
,
$
(
"#inqu_status-0-projNam
e"
).
val
());
ei
.
set
(
"inqu_status-0-prdt
Name"
,
$
(
"#inqu_status-0-prdtNam
e"
).
val
());
ei
.
set
(
"inqu_status-0-pr
dtType"
,
$
(
"#inqu_status-0-prdtTyp
e"
).
val
());
ei
.
set
(
"inqu_status-0-prdt
Code"
,
$
(
"#inqu_status-0-prdtCod
e"
).
val
());
ei
.
set
(
"inqu_status-0-status"
,
$
(
"#inqu_status-0-status"
).
val
());
ei
.
set
(
"inqu_status-0-parentPrdtCode"
,
parentPrdtCode
);
ei
.
set
(
"inqu_status-0-parentPrdtCode"
,
parentPrdtCode
?
parentPrdtCode
:
strs
[
1
]);
return
ei
;
},
/**
...
...
@@ -108,7 +110,7 @@ $(function () {
* e.preventDefault 阻止事件发生
*/
beforeAdd
:
function
(
e
)
{
var
logic
=
Object
.
keys
(
IPLATUI
.
EFTree
.
materialTree
.
selectTreeNode
).
length
===
0
;
var
logic
=
IPLATUI
.
EFTree
.
materialTree
.
selectTreeNode
.
nodeId
?
false
:
true
;
if
(
logic
)
{
// 通过业务逻辑判断, 控制是否进行新增
IPLAT
.
alert
({
message
:
'<b>请选择项目列表</b>'
,
...
...
@@ -187,6 +189,8 @@ $(function () {
if
(
filePath1
===
' '
)
{
template
=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+
'onclick="openUploadFile('
+
item
.
id
+
',1)" >附件上传</a>'
;
}
else
if
(
!
filePath1
)
{
}
else
{
template
=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+
'href="'
+
ctx
+
'/EU/DM/EUDM06.jsp?docId='
+
filePath1
+
'" >下载</a>'
;
...
...
@@ -202,6 +206,42 @@ $(function () {
}
return
template
;
}
},{
field
:
"prdtCode"
,
template
:
function
(
dataItem
)
{
for
(
let
i
=
0
;
i
<
inventNameGlobalData
.
length
;
i
++
)
{
if
(
inventNameGlobalData
[
i
][
'valueField'
]
===
dataItem
[
'prdtCode'
])
{
return
inventNameGlobalData
[
i
][
'textField'
];
}
}
return
""
;
},
editor
:
function
(
container
,
options
)
{
var
grid
=
container
.
closest
(
".k-grid"
).
data
(
"kendoGrid"
);
var
cellIndex
=
grid
.
cellIndex
(
container
);
var
input
=
$
(
'<input />'
);
input
.
attr
(
"name"
,
options
.
field
);
input
.
attr
(
"id"
,
options
.
field
);
input
.
appendTo
(
container
);
let
eiInfo
=
new
EiInfo
();
eiInfo
.
set
(
"inventType"
,
options
.
model
[
"prdtType"
]);
var
dataSource
;
EiCommunicator
.
send
(
"HPPZ004"
,
"queryComboBox"
,
eiInfo
,
{
onSuccess
:
function
(
ei
)
{
dataSource
=
ei
.
getBlock
(
"invent_name_block_id"
).
getMappedRows
();
inventNameGlobalData
=
dataSource
;
},
onFail
:
function
(
ei
)
{
}
},
{
async
:
false
});
input
.
kendoDropDownList
({
valuePrimitive
:
true
,
dataTextField
:
"textField"
,
dataValueField
:
"valueField"
,
dataSource
:
dataSource
,
template
:
"#=textField#"
});
}
}
],
},
...
...
@@ -219,7 +259,7 @@ $(function () {
inEiInfo
.
set
(
"result-0-filePath1"
,
uploadFile
);
EiCommunicator
.
send
(
'HPSC002'
,
'bindDocIdById'
,
inEiInfo
,
{
onSuccess
(
response
)
{
resultGrid
.
dataSource
.
page
(
1
);
query
(
);
},
onFail
(
errorMessage
,
status
,
e
)
{
NotificationUtil
(
"执行失败!"
,
"error"
);
...
...
@@ -232,8 +272,49 @@ $(function () {
},
}
};
//产品类型下拉联动
$
(
'input[name="inqu_status-0-prdtType"]'
).
change
(
function
()
{
var
inInfo
=
new
EiInfo
();
var
prdtType
=
$
(
"#inqu_status-0-prdtType"
).
val
();
inInfo
.
set
(
"inventType"
,
prdtType
);
EiCommunicator
.
send
(
"HPPZ004"
,
"queryComboBox"
,
inInfo
,
{
onSuccess
:
function
(
ei
)
{
var
input
=
$
(
"#inqu_status-0-prdtCode"
);
dataEdition
=
ei
.
getBlock
(
"invent_name_block_id"
).
getMappedRows
();
input
.
kendoDropDownList
({
valuePrimitive
:
true
,
dataTextField
:
"textField"
,
dataValueField
:
"valueField"
,
optionLabel
:
"请选择"
,
dataSource
:
dataEdition
,
template
:
"#=textField#"
});
},
onFail
:
function
(
ei
)
{
}
},
{
async
:
false
});
});
});
$
(
window
).
load
(
function
()
{
// 存货名称
let
inInfo
=
new
EiInfo
();
EiCommunicator
.
send
(
"HPPZ004"
,
"queryComboBox"
,
inInfo
,
{
onSuccess
:
function
(
ei
)
{
inventNameGlobalData
=
ei
.
getBlock
(
"invent_name_block_id"
).
getMappedRows
();
},
onFail
:
function
(
ei
)
{
}
},
{
async
:
false
});
// 查
query
();
});
/**
* 查询
*/
let
query
=
function
()
{
resultGrid
.
dataSource
.
page
(
1
);
}
function
openUploadFile
(
id
)
{
uploadFileWindow
.
open
().
center
();
rowId
=
id
;
...
...
@@ -246,7 +327,7 @@ function check(id, auditStatus) {
EiCommunicator
.
send
(
'HPSC002'
,
'check'
,
inEiInfo
,
{
onSuccess
(
response
)
{
NotificationUtil
(
response
.
msg
);
resultGrid
.
dataSource
.
page
(
1
);
query
(
);
},
onFail
(
errorMessage
,
status
,
e
)
{
NotificationUtil
(
"执行失败!"
,
"error"
);
...
...
src/main/webapp/HP/SC/HPSC002.jsp
View file @
b8049e85
...
...
@@ -10,14 +10,21 @@
<EF:EFPage
title=
"物料清单"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<div
class=
"row"
>
<EF:EFInput
ename=
"projName"
cname=
"项目名称"
blockId=
"inqu_status"
row=
"0"
/>
<EF:EFInput
ename=
"prdtName"
cname=
"产品名称"
blockId=
"inqu_status"
row=
"0"
/>
<EF:EFSelect
cname=
"状态"
optionLabel=
"全部"
blockId=
"inqu_status"
ename=
"status"
row=
"0"
>
<EF:EFSelect
ename=
"inqu_status-0-prdtType"
cname=
"产品类型"
colWidth=
"3"
filter=
"contains"
template=
"#=textField#"
valueTemplate=
"#=textField#"
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('3','4')"
/>
</EF:EFSelect>
<EF:EFSelect
ename=
"inqu_status-0-prdtCode"
cname=
"产品名称"
filter=
"contains"
required=
"false"
template=
"#=textField#"
valueTemplate=
"#=valueField#"
defaultValue=
"请选择"
>
<EF:EFOption
label=
"请选择"
value=
""
/>
<EF:EFOptions
blockId=
"invent_name_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"状态"
optionLabel=
"全部"
ename=
"inqu_status-0-status"
colWidth=
"3"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
</EF:EFSelect>
</div>
<EF:EFInput
ename=
"parentPrdtCode"
blockId=
"inqu_status"
hidden=
"true"
/>
<
%
--
<
EF:EFButton
ename=
"QUERY"
cname=
"查询"
row=
"1"
class=
"btn-align-right"
></EF:EFButton>
--%>
</EF:EFRegion>
<div
id=
"splitter"
class=
"i-fit-height"
style=
"display: inline"
>
...
...
@@ -39,8 +46,11 @@
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"projCode"
cname=
"项目编码"
/>
<EF:EFColumn
enable=
"false"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFColumn
ename=
"prdtCode"
required=
"true"
cname=
"产品编码"
/>
<EF:EFColumn
ename=
"prdtName"
required=
"true"
cname=
"产品名称"
/>
<EF:EFComboColumn
cname=
"产品类型"
ename=
"prdtType"
width=
"90"
align=
"center"
>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('3','4')"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"prdtCode"
required=
"true"
cname=
"产品名称"
/>
<
%
--
<
EF:EFColumn
ename=
"prdtName"
required=
"true"
cname=
"产品名称"
/>
--%>
<EF:EFColumn
enable=
"false"
ename=
"parentPrdtCode"
hidden=
"true"
cname=
"上级产品名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"parentPrdtName"
cname=
"上级产品名称"
/>
<EF:EFColumn
ename=
"num"
required=
"true"
cname=
"数量"
/>
...
...
@@ -53,13 +63,6 @@
<EF:EFOption
label=
"未审核"
value=
"0"
></EF:EFOption>
<EF:EFOption
label=
"已审核"
value=
"1"
></EF:EFOption>
</EF:EFComboColumn>
<EF:EFComboColumn
enable=
"false"
ename=
"delStatus"
align=
"center"
columnTemplate=
"#=textField#"
optionLabel=
" "
itemTemplate=
"#=textField#"
textField=
"textField"
valueField=
"valueField"
cname=
"删除标识"
>
<EF:EFOption
label=
"未删除"
value=
"1"
></EF:EFOption>
<EF:EFOption
label=
"删除"
value=
"0"
></EF:EFOption>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"200"
enable=
"false"
readonly=
"false"
/>
</EF:EFGrid>
</EF:EFRegion>
...
...
src/main/webapp/HP/SC/HPSC003.jsp
View file @
b8049e85
...
...
@@ -30,6 +30,7 @@
<EF:EFColumn
enable=
"false"
ename=
"projCode"
cname=
"项目号"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"projName"
cname=
"项目名称"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"planInfoNo"
cname=
"生产计划单号"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtType"
cname=
"产品类型"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtCode"
cname=
"产品编码"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtName"
cname=
"产品名称"
readonly=
"true"
/>
<EF:EFColumn
ename=
"planCompletionDate"
cname=
"计划完成日期"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
width=
"150"
...
...
@@ -47,6 +48,7 @@
<EF:EFRegion
id=
"detail"
title=
"明细信息"
>
<EF:EFGrid
blockId=
"detail"
autoDraw=
"no"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtType"
cname=
"部件类型"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtCode"
required=
'true'
cname=
"部件编码"
/>
<EF:EFColumn
enable=
"false"
ename=
"prdtName"
readonly=
"true"
cname=
"部件名称"
/>
<EF:EFComboColumn
enable=
"false"
ename=
"delStatus"
cname=
"状态"
>
...
...
src/main/webapp/HP/SC/HPSC011.js
View file @
b8049e85
...
...
@@ -25,6 +25,6 @@ $(function () {
});
function
jump
(
id
)
{
var
herf
=
ctx
+
"
\\
web
\
\"
+ "
HPSC002
?
i
d
=
" + id;
var
herf
=
ctx
+
"
\\
web
\
\"
+ "
HPSC002
?
i
nqu_status
-
0
-
parentPrdtCode
=
" + id;
window.open(herf);
}
src/main/webapp/HP/SC/HPSC011.jsp
View file @
b8049e85
...
...
@@ -21,7 +21,21 @@
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFCodeOption
codeName=
"hpjx.hpsc.projType"
/>
</EF:EFSelect>
<EF:EFInput
blockId=
"inqu_status"
ename=
"projName"
cname=
"项目名称:"
row=
"0"
/>
<EF:EFInput
ename=
"inqu_status-0-projCode"
cname=
"项目编码"
colWidth=
"3"
/>
<EF:EFInput
ename=
"inqu_status-0-projName"
cname=
"项目名称"
colWidth=
"3"
/>
<EF:EFSelect
cname=
"物料审核状态"
optionLabel=
"全部"
ename=
"inqu_status-0-materialStatus"
colWidth=
"3"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"部分审核"
value=
"1"
/>
<EF:EFOption
label=
"全部审核"
value=
"2"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"项目负责人"
ename=
"inqu_status-0-princ1"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"user_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"客户负责人"
ename=
"inqu_status-0-princ2"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"customer_record_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
</div>
<
%
--
<
EF:EFButton
ename=
"QUERY"
cname=
"查询"
row=
"1"
class=
"btn-align-right"
></EF:EFButton>
--%>
</EF:EFRegion>
...
...
@@ -37,10 +51,12 @@
<EF:EFColumn
enable=
"false"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"princ1"
cname=
"本公司项目负责人"
/>
<EF:EFColumn
enable=
"false"
ename=
"princ2"
cname=
"客户项目负责人"
/>
<EF:EFComboColumn
enable=
"false"
align=
"center"
ename=
"status"
cname=
"状态
"
>
<EF:EFComboColumn
required=
"true"
align=
"center"
ename=
"materialStatus"
cname=
"物料审核状态"
defaultValue=
"0
"
>
<EF:EFOption
label=
"未审核"
value=
"0"
/>
<EF:EFOption
label=
"已审核"
value=
"1"
/>
<EF:EFOption
label=
"部分审核"
value=
"1"
/>
<EF:EFOption
label=
"全部审核"
value=
"2"
/>
</EF:EFComboColumn>
<EF:EFColumn
enable=
"false"
ename=
"remark"
cname=
"备注"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"100"
enable=
"false"
readonly=
"false"
/>
</EF:EFGrid>
...
...
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