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
84e33109
Commit
84e33109
authored
Jan 30, 2024
by
wuwenlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
产品更名为部件
parent
a23761d7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
68 additions
and
68 deletions
+68
-68
HPSC004.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
+19
-19
HPSC005.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java
+16
-16
HPSC002.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
+21
-21
HPSC005.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml
+4
-4
HPSC002.js
src/main/webapp/HP/SC/HPSC002.js
+1
-1
HPSC002.jsp
src/main/webapp/HP/SC/HPSC002.jsp
+7
-7
No files found.
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
View file @
84e33109
...
...
@@ -173,7 +173,7 @@ public class HPSC004 extends DaoEPBase {
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PARENT_PRDT_NAME
);
eiColumn
.
setDescName
(
"父节点-
产品
名称"
);
eiColumn
.
setDescName
(
"父节点-
部件
名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_TYPE
);
...
...
@@ -193,15 +193,15 @@ public class HPSC004 extends DaoEPBase {
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_TYPE
);
eiColumn
.
setDescName
(
"
产品
类型"
);
eiColumn
.
setDescName
(
"
部件
类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_CODE
);
eiColumn
.
setDescName
(
"
产品
编码"
);
eiColumn
.
setDescName
(
"
部件
编码"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_NAME
);
eiColumn
.
setDescName
(
"
产品
名称"
);
eiColumn
.
setDescName
(
"
部件
名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_NUM
);
...
...
@@ -391,7 +391,7 @@ public class HPSC004 extends DaoEPBase {
this
.
projName
=
projName
;
}
/**
* get the parentId - 父节点-
产品
编码.
* get the parentId - 父节点-
部件
编码.
* @return the parentId
*/
public
String
getParentId
()
{
...
...
@@ -399,15 +399,15 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the parentId - 父节点-
产品
编码.
* set the parentId - 父节点-
部件
编码.
*
* @param parentId - 父节点-
产品
编码
* @param parentId - 父节点-
部件
编码
*/
public
void
setParentId
(
String
parentId
)
{
this
.
parentId
=
parentId
;
}
/**
* get the parentPrdtName - 父节点-
产品
名称.
* get the parentPrdtName - 父节点-
部件
名称.
* @return the parentPrdtName
*/
public
String
getParentPrdtName
()
{
...
...
@@ -415,9 +415,9 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the parentPrdtName - 父节点-
产品
名称.
* set the parentPrdtName - 父节点-
部件
名称.
*
* @param parentPrdtName - 父节点-
产品
名称
* @param parentPrdtName - 父节点-
部件
名称
*/
public
void
setParentPrdtName
(
String
parentPrdtName
)
{
this
.
parentPrdtName
=
parentPrdtName
;
...
...
@@ -487,7 +487,7 @@ public class HPSC004 extends DaoEPBase {
this
.
icon
=
icon
;
}
/**
* get the prdtCode -
产品
编码.
* get the prdtCode -
部件
编码.
* @return the prdtCode
*/
public
Integer
getPrdtType
()
{
...
...
@@ -495,15 +495,15 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the prdtCode -
产品
编码.
* set the prdtCode -
部件
编码.
*
* @param prdtCode -
产品
编码
* @param prdtCode -
部件
编码
*/
public
void
setPrdtType
(
Integer
prdtType
)
{
this
.
prdtType
=
prdtType
;
}
/**
* get the prdtCode -
产品
编码.
* get the prdtCode -
部件
编码.
* @return the prdtCode
*/
public
String
getPrdtCode
()
{
...
...
@@ -511,15 +511,15 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the prdtCode -
产品
编码.
* set the prdtCode -
部件
编码.
*
* @param prdtCode -
产品
编码
* @param prdtCode -
部件
编码
*/
public
void
setPrdtCode
(
String
prdtCode
)
{
this
.
prdtCode
=
prdtCode
;
}
/**
* get the prdtName -
产品
名称.
* get the prdtName -
部件
名称.
* @return the prdtName
*/
public
String
getPrdtName
()
{
...
...
@@ -527,9 +527,9 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the prdtName -
产品
名称.
* set the prdtName -
部件
名称.
*
* @param prdtName -
产品
名称
* @param prdtName -
部件
名称
*/
public
void
setPrdtName
(
String
prdtName
)
{
this
.
prdtName
=
prdtName
;
...
...
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java
View file @
84e33109
...
...
@@ -56,7 +56,7 @@ public class HPSC005 extends DaoEPBase {
public
static
final
String
COL_PRODUCTION_ORDER_NO
=
"PRODUCTION_ORDER_NO"
;
/* 生产订单号*/
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_PRDT_NAME
=
"PRDT_NAME"
;
/*
部件
名称*/
public
static
final
String
COL_PLAN_COMPLETION_DATE
=
"PLAN_COMPLETION_DATE"
;
/* 计划完成日期*/
public
static
final
String
COL_NUM
=
"NUM"
;
/* 计划数量*/
public
static
final
String
COL_TOTAL_WT
=
"TOTAL_WT"
;
/* 计划重量*/
...
...
@@ -87,9 +87,9 @@ public class HPSC005 extends DaoEPBase {
private
String
projCode
=
" "
;
/* 项目编码*/
private
String
projName
=
" "
;
/* 项目名称*/
private
String
productionOrderNo
=
" "
;
/* 生产订单号*/
private
Integer
prdtType
=
0
;
/*
产品
类型*/
private
String
prdtCode
=
" "
;
/*
产品
编码*/
private
String
prdtName
=
" "
;
/*
产品
名称*/
private
Integer
prdtType
=
0
;
/*
部件
类型*/
private
String
prdtCode
=
" "
;
/*
部件
编码*/
private
String
prdtName
=
" "
;
/*
部件
名称*/
private
String
planCompletionDate
=
" "
;
/* 计划完成日期*/
private
BigDecimal
num
=
new
BigDecimal
(
0.000
);
/* 计划数量*/
private
BigDecimal
totalWt
=
new
BigDecimal
(
0.000
);
/* 计划重量*/
...
...
@@ -137,15 +137,15 @@ public class HPSC005 extends DaoEPBase {
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_TYPE
);
eiColumn
.
setDescName
(
"
产品
类型"
);
eiColumn
.
setDescName
(
"
部件
类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_CODE
);
eiColumn
.
setDescName
(
"
产品
编码"
);
eiColumn
.
setDescName
(
"
部件
编码"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PRDT_NAME
);
eiColumn
.
setDescName
(
"
产品
名称"
);
eiColumn
.
setDescName
(
"
部件
名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_PLAN_COMPLETION_DATE
);
...
...
@@ -312,7 +312,7 @@ public class HPSC005 extends DaoEPBase {
this
.
productionOrderNo
=
productionOrderNo
;
}
/**
* get the prdtCode -
产品
编码.
* get the prdtCode -
部件
编码.
* @return the prdtCode
*/
public
Integer
getPrdtType
()
{
...
...
@@ -320,15 +320,15 @@ public class HPSC005 extends DaoEPBase {
}
/**
* set the prdtCode -
产品
编码.
* set the prdtCode -
部件
编码.
*
* @param prdtCode -
产品
编码
* @param prdtCode -
部件
编码
*/
public
void
setPrdtType
(
Integer
prdtType
)
{
this
.
prdtType
=
prdtType
;
}
/**
* get the prdtCode -
产品
编码.
* get the prdtCode -
部件
编码.
* @return the prdtCode
*/
public
String
getPrdtCode
()
{
...
...
@@ -336,15 +336,15 @@ public class HPSC005 extends DaoEPBase {
}
/**
* set the prdtCode -
产品
编码.
* set the prdtCode -
部件
编码.
*
* @param prdtCode -
产品
编码
* @param prdtCode -
部件
编码
*/
public
void
setPrdtCode
(
String
prdtCode
)
{
this
.
prdtCode
=
prdtCode
;
}
/**
* get the prdtName -
产品
名称.
* get the prdtName -
部件
名称.
* @return the prdtName
*/
public
String
getPrdtName
()
{
...
...
@@ -352,9 +352,9 @@ public class HPSC005 extends DaoEPBase {
}
/**
* set the prdtName -
产品
名称.
* set the prdtName -
部件
名称.
*
* @param prdtName -
产品
名称
* @param prdtName -
部件
名称
*/
public
void
setPrdtName
(
String
prdtName
)
{
this
.
prdtName
=
prdtName
;
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
View file @
84e33109
...
...
@@ -44,14 +44,14 @@
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PARENT_ID as "parentId",
<!-- 父节点-部件编码 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
产品
名称 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
部件
名称 -->
TYPE as "type",
<!-- 类别 -->
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!--
产品
编码 -->
PRDT_NAME as "prdtName",
<!--
产品
名称 -->
PRDT_CODE as "prdtCode",
<!--
部件
编码 -->
PRDT_NAME as "prdtName",
<!--
部件
名称 -->
INVENT_RECORD_ID as "inventRecordId",
<!-- 存货档案ID -->
NUM as "num",
<!-- 数量 -->
UNIT_WT as "unitWt",
<!-- 单重 -->
...
...
@@ -234,15 +234,15 @@
DEPT_CODE,
<!-- 部门编码 预留 -->
PROJ_CODE,
<!-- 项目编码 -->
PROJ_NAME,
<!-- 项目名称 -->
PARENT_ID,
<!-- 父节点-
产品
编码 -->
PARENT_PRDT_NAME,
<!-- 父节点-
产品
名称 -->
PARENT_ID,
<!-- 父节点-
部件
编码 -->
PARENT_PRDT_NAME,
<!-- 父节点-
部件
名称 -->
TYPE,
<!-- 类别 -->
LEAF,
<!-- 是否有叶子节点 -->
SORT,
<!-- 排序字段 -->
ICON,
<!-- 图片地址 -->
PRDT_TYPE,
PRDT_CODE,
<!--
产品
编码 -->
PRDT_NAME,
<!--
产品
名称 -->
PRDT_CODE,
<!--
部件
编码 -->
PRDT_NAME,
<!--
部件
名称 -->
INVENT_RECORD_ID,
<!-- 存货档案ID -->
NUM,
<!-- 数量 -->
UNIT_WT,
<!-- 单重 -->
...
...
@@ -276,15 +276,15 @@
DEPT_CODE = #deptCode#,
<!-- 部门编码 预留 -->
PROJ_CODE = #projCode#,
<!-- 项目编码 -->
PROJ_NAME = #projName#,
<!-- 项目名称 -->
PARENT_ID = #parentId#,
<!-- 父节点-
产品
编码 -->
PARENT_PRDT_NAME = #parentPrdtName#,
<!-- 父节点-
产品名称 -->
PARENT_ID = #parentId#,
<!-- 父节点-
部件
编码 -->
PARENT_PRDT_NAME = #parentPrdtName#,
<!-- 父节点-
部件名称 -->
TYPE = #type#,
<!-- 类别 -->
LEAF = #leaf#,
<!-- 是否有叶子节点 -->
SORT = #sort#,
<!-- 排序字段 -->
ICON = #icon#,
<!-- 图片地址 -->
PRDT_CODE = #prdtCode#,
<!--
产品
编码 -->
PRDT_CODE = #prdtCode#,
<!--
部件
编码 -->
PRDT_TYPE = #prdtType#,
PRDT_NAME = #prdtName#,
<!--
产品
名称 -->
PRDT_NAME = #prdtName#,
<!--
部件
名称 -->
INVENT_RECORD_ID = #inventRecordId#,
<!-- 存货档案ID -->
NUM = #num#,
<!-- 数量 -->
UNIT_WT = #unitWt#,
<!-- 单重 -->
...
...
@@ -314,8 +314,8 @@
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PRDT_name as "prdtName",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
ID as "label",
<!-- 名
产品
编码-->
PRDT_NAME as "text",
<!--
产品
名称 -->
ID as "label",
<!-- 名
部件
编码-->
PRDT_NAME as "text",
<!--
部件
名称 -->
INVENT_RECORD_ID as "inventRecordId",
<!-- 存货档案ID -->
PARENT_ID as "pId",
<!-- 父节点编码 -->
TYPE as "type",
<!-- 类别 -->
...
...
@@ -343,15 +343,15 @@
DEPT_CODE as "deptCode",
<!-- 部门编码 预留 -->
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PARENT_ID as "parentId",
<!-- 父节点-
产品
编码 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
产品
名称 -->
PARENT_ID as "parentId",
<!-- 父节点-
部件
编码 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
部件
名称 -->
TYPE as "type",
<!-- 类别 -->
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!--
产品
编码 -->
PRDT_NAME as "prdtName",
<!--
产品
名称 -->
PRDT_CODE as "prdtCode",
<!--
部件
编码 -->
PRDT_NAME as "prdtName",
<!--
部件
名称 -->
INVENT_RECORD_ID as "inventRecordId",
<!-- 存货档案ID -->
NUM as "num",
<!-- 数量 -->
UNIT_WT as "unitWt",
<!-- 单重 -->
...
...
@@ -388,15 +388,15 @@
DEPT_CODE as "deptCode",
<!-- 部门编码 预留 -->
PROJ_CODE as "projCode",
<!-- 项目编码 -->
PROJ_NAME as "projName",
<!-- 项目名称 -->
PARENT_ID as "parentId",
<!-- 父节点-
产品
编码 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
产品
名称 -->
PARENT_ID as "parentId",
<!-- 父节点-
部件
编码 -->
PARENT_PRDT_NAME as "parentPrdtName",
<!-- 父节点-
部件
名称 -->
TYPE as "type",
<!-- 类别 -->
LEAF as "leaf",
<!-- 是否有叶子节点 -->
SORT as "sort",
<!-- 排序字段 -->
ICON as "icon",
<!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode",
<!--
产品
编码 -->
PRDT_NAME as "prdtName",
<!--
产品
名称 -->
PRDT_CODE as "prdtCode",
<!--
部件
编码 -->
PRDT_NAME as "prdtName",
<!--
部件
名称 -->
INVENT_RECORD_ID as "inventRecordId",
<!-- 存货档案ID -->
NUM as "num",
<!-- 数量 -->
UNIT_WT as "unitWt",
<!-- 单重 -->
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml
View file @
84e33109
...
...
@@ -224,8 +224,8 @@
PRODUCTION_ORDER_NO,
<!-- 生产订单号 -->
INVENT_RECORD_ID,
PRDT_TYPE,
PRDT_CODE,
<!--
产品
编码 -->
PRDT_NAME,
<!--
产品
名称 -->
PRDT_CODE,
<!--
部件
编码 -->
PRDT_NAME,
<!--
部件
名称 -->
PLAN_COMPLETION_DATE,
<!-- 计划完成日期 -->
NUM,
<!-- 计划数量 -->
TOTAL_WT,
<!-- 计划重量 -->
...
...
@@ -260,8 +260,8 @@
PROJ_NAME = #projName#,
<!-- 项目名称 -->
PRODUCTION_ORDER_NO = #productionOrderNo#,
<!-- 生产订单号 -->
PRDT_TYPE = #prdtType#,
PRDT_CODE = #prdtCode#,
<!--
产品
编码 -->
PRDT_NAME = #prdtName#,
<!--
产品
名称 -->
PRDT_CODE = #prdtCode#,
<!--
部件
编码 -->
PRDT_NAME = #prdtName#,
<!--
部件
名称 -->
PLAN_COMPLETION_DATE = #planCompletionDate#,
<!-- 计划完成日期 -->
NUM = #num#,
<!-- 计划数量 -->
TOTAL_WT = #totalWt#,
<!-- 计划重量 -->
...
...
src/main/webapp/HP/SC/HPSC002.js
View file @
84e33109
...
...
@@ -305,7 +305,7 @@ $(function () {
}
};
//
产品
类型下拉联动
//
部件
类型下拉联动
$
(
'input[name="inqu_status-0-prdtType"]'
).
change
(
function
()
{
var
inInfo
=
new
EiInfo
();
var
prdtType
=
$
(
"#inqu_status-0-prdtType"
).
val
();
...
...
src/main/webapp/HP/SC/HPSC002.jsp
View file @
84e33109
...
...
@@ -10,12 +10,12 @@
<EF:EFPage
title=
"物料清单"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<div
class=
"row"
>
<EF:EFSelect
ename=
"inqu_status-0-prdtType"
cname=
"
产品
类型"
colWidth=
"3"
filter=
"contains"
<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
cname=
"
产品
名称"
ename=
"inqu_status-0-prdtCode"
filter=
"contains"
defultValue=
""
>
<EF:EFSelect
cname=
"
部件
名称"
ename=
"inqu_status-0-prdtCode"
filter=
"contains"
defultValue=
""
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"invent_name_block_id"
textField=
"textField"
valueField=
"valueField"
/>
</EF:EFSelect>
...
...
@@ -46,13 +46,13 @@
<EF:EFColumn
ename=
"level"
cname=
"层级"
hidden=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"projCode"
cname=
"项目编码"
/>
<EF:EFColumn
enable=
"false"
ename=
"projName"
cname=
"项目名称"
/>
<EF:EFComboColumn
cname=
"
产品
类型"
ename=
"prdtType"
width=
"90"
align=
"center"
required=
"true"
>
<EF:EFComboColumn
cname=
"
部件
类型"
ename=
"prdtType"
width=
"90"
align=
"center"
required=
"true"
>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('3','4')"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"inventRecordId"
required=
"true"
cname=
"
产品
名称"
/>
<EF:EFColumn
ename=
"prdtCode"
required=
"true"
cname=
"
产品
编码"
hidden=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"parentId"
hidden=
"true"
cname=
"上级
产品
名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"parentPrdtName"
cname=
"上级
产品
名称"
/>
<EF:EFColumn
ename=
"inventRecordId"
required=
"true"
cname=
"
部件
名称"
/>
<EF:EFColumn
ename=
"prdtCode"
required=
"true"
cname=
"
部件
编码"
hidden=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"parentId"
hidden=
"true"
cname=
"上级
部件
名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"parentPrdtName"
cname=
"上级
部件
名称"
/>
<EF:EFColumn
ename=
"num"
required=
"true"
cname=
"数量"
/>
<EF:EFColumn
ename=
"unitWt"
required=
"true"
format=
"{0:N3}"
cname=
"单重"
/>
<EF:EFColumn
enable=
"false"
format=
"{0:N3}"
ename=
"totalWt"
cname=
"总重"
/>
...
...
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