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
57401c2d
Commit
57401c2d
authored
Feb 05, 2024
by
yukang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产下料
parent
00767cc0
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
154 additions
and
74 deletions
+154
-74
HPSC002A.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002A.java
+26
-4
HPSC002B.java
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002B.java
+65
-43
ServiceHPSC002.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
+1
-0
ServiceHPSC002A.java
...java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002A.java
+1
-0
ServiceHPSC006.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
+11
-0
HPSC002.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
+1
-1
HPSC002A.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml
+6
-1
HPSC002B.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002B.xml
+15
-10
HPSC002.js
src/main/webapp/HP/SC/HPSC002.js
+1
-1
HPSC003.js
src/main/webapp/HP/SC/HPSC003.js
+1
-1
HPSC005.js
src/main/webapp/HP/SC/HPSC005.js
+1
-1
HPSC006.js
src/main/webapp/HP/SC/HPSC006.js
+8
-4
HPSC006.jsp
src/main/webapp/HP/SC/HPSC006.jsp
+17
-8
No files found.
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002A.java
View file @
57401c2d
...
...
@@ -65,7 +65,9 @@ public class HPSC002A extends DaoEPBase {
private
String
updatedBy
=
" "
;
/* 修改人*/
private
String
updatedName
=
" "
;
/* 修改人名称*/
private
String
updatedTime
=
" "
;
/* 修改时间*/
private
String
bizType
=
" "
;
/* 业务类型*/
/**
* initialize the metadata.
*/
...
...
@@ -120,8 +122,10 @@ public class HPSC002A extends DaoEPBase {
eiColumn
=
new
EiColumn
(
FIELD_UPDATED_TIME
);
eiColumn
.
setDescName
(
"修改时间"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
"bizType"
);
eiColumn
.
setDescName
(
"业务类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
}
/**
...
...
@@ -324,6 +328,22 @@ public class HPSC002A extends DaoEPBase {
this
.
updatedTime
=
updatedTime
;
}
/**
* get the bizType - .
* @return the bizType
*/
public
String
getBizType
()
{
return
this
.
bizType
;
}
/**
* set the bizType -
*
* @param bizType -
*/
public
void
setBizType
(
String
bizType
)
{
this
.
bizType
=
bizType
;
}
/**
* get the value from Map.
*
* @param map - source data map
...
...
@@ -343,6 +363,7 @@ public class HPSC002A extends DaoEPBase {
setUpdatedBy
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_BY
)),
updatedBy
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setBizType
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"bizType"
)),
bizType
));
}
/**
...
...
@@ -364,7 +385,8 @@ public class HPSC002A extends DaoEPBase {
map
.
put
(
FIELD_UPDATED_BY
,
StringUtils
.
toString
(
updatedBy
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_BY
)));
map
.
put
(
FIELD_UPDATED_NAME
,
StringUtils
.
toString
(
updatedName
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_NAME
)));
map
.
put
(
FIELD_UPDATED_TIME
,
StringUtils
.
toString
(
updatedTime
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_TIME
)));
map
.
put
(
"bizType"
,
StringUtils
.
toString
(
bizType
,
eiMetadata
.
getMeta
(
"bizType"
)));
return
map
;
}
}
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002B.java
View file @
57401c2d
...
...
@@ -19,9 +19,9 @@ import java.util.Map;
* @history 2024-01-25 16:47:50 create
*/
public
class
HPSC002B
extends
DaoEPBase
{
private
static
final
long
serialVersionUID
=
1L
;
public
static
final
String
FIELD_ID
=
"id"
;
/* 主键ID*/
public
static
final
String
FIELD_COMPANY_CODE
=
"companyCode"
;
/* 企业编码 预留*/
public
static
final
String
FIELD_DEPT_CODE
=
"deptCode"
;
/* 部门编码 预留*/
...
...
@@ -34,7 +34,7 @@ public class HPSC002B extends DaoEPBase {
public
static
final
String
FIELD_UPDATED_BY
=
"updatedBy"
;
/* 修改人*/
public
static
final
String
FIELD_UPDATED_NAME
=
"updatedName"
;
/* 修改人名称*/
public
static
final
String
FIELD_UPDATED_TIME
=
"updatedTime"
;
/* 修改时间*/
public
static
final
String
COL_ID
=
"ID"
;
/* 主键ID*/
public
static
final
String
COL_COMPANY_CODE
=
"COMPANY_CODE"
;
/* 企业编码 预留*/
public
static
final
String
COL_DEPT_CODE
=
"DEPT_CODE"
;
/* 部门编码 预留*/
...
...
@@ -47,13 +47,13 @@ public class HPSC002B extends DaoEPBase {
public
static
final
String
COL_UPDATED_BY
=
"UPDATED_BY"
;
/* 修改人*/
public
static
final
String
COL_UPDATED_NAME
=
"UPDATED_NAME"
;
/* 修改人名称*/
public
static
final
String
COL_UPDATED_TIME
=
"UPDATED_TIME"
;
/* 修改时间*/
public
static
final
String
QUERY
=
"HPSC002
B
.query"
;
public
static
final
String
COUNT
=
"HPSC002
B
.count"
;
public
static
final
String
INSERT
=
"HPSC002
B
.insert"
;
public
static
final
String
UPDATE
=
"HPSC002
B
.update"
;
public
static
final
String
DELETE
=
"HPSC002
B
.delete"
;
public
static
final
String
QUERY
=
"HPSC002
A
.query"
;
public
static
final
String
COUNT
=
"HPSC002
A
.count"
;
public
static
final
String
INSERT
=
"HPSC002
A
.insert"
;
public
static
final
String
UPDATE
=
"HPSC002
A
.update"
;
public
static
final
String
DELETE
=
"HPSC002
A
.delete"
;
private
Long
id
=
null
;
/* 主键ID*/
private
String
companyCode
=
" "
;
/* 企业编码 预留*/
private
String
deptCode
=
" "
;
/* 部门编码 预留*/
...
...
@@ -66,72 +66,76 @@ public class HPSC002B extends DaoEPBase {
private
String
updatedBy
=
" "
;
/* 修改人*/
private
String
updatedName
=
" "
;
/* 修改人名称*/
private
String
updatedTime
=
" "
;
/* 修改时间*/
private
String
bizType
=
" "
;
/* 业务类型*/
/**
* initialize the metadata.
*/
public
void
initMetaData
()
{
EiColumn
eiColumn
;
eiColumn
=
new
EiColumn
(
FIELD_ID
);
eiColumn
.
setPrimaryKey
(
true
);
eiColumn
.
setDescName
(
"主键ID"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_COMPANY_CODE
);
eiColumn
.
setDescName
(
"企业编码 预留"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_DEPT_CODE
);
eiColumn
.
setDescName
(
"部门编码 预留"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_MAT_ID
);
eiColumn
.
setDescName
(
"物料ID"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_DOC_ID
);
eiColumn
.
setDescName
(
"文件ID"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_DOC_NAME
);
eiColumn
.
setDescName
(
"文件名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_CREATED_BY
);
eiColumn
.
setDescName
(
"创建人"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_CREATED_NAME
);
eiColumn
.
setDescName
(
"创建人名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_CREATED_TIME
);
eiColumn
.
setDescName
(
"创建时间"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_UPDATED_BY
);
eiColumn
.
setDescName
(
"修改人"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_UPDATED_NAME
);
eiColumn
.
setDescName
(
"修改人名称"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_UPDATED_TIME
);
eiColumn
.
setDescName
(
"修改时间"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
"bizType"
);
eiColumn
.
setDescName
(
"业务类型"
);
eiMetadata
.
addMeta
(
eiColumn
);
}
/**
* the constructor.
*/
public
HPSC002B
()
{
initMetaData
();
}
/**
* get the id - 主键ID.
* @return the id
...
...
@@ -139,7 +143,7 @@ public class HPSC002B extends DaoEPBase {
public
Long
getId
()
{
return
this
.
id
;
}
/**
* set the id - 主键ID.
*
...
...
@@ -155,7 +159,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getCompanyCode
()
{
return
this
.
companyCode
;
}
/**
* set the companyCode - 企业编码 预留.
*
...
...
@@ -171,7 +175,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getDeptCode
()
{
return
this
.
deptCode
;
}
/**
* set the deptCode - 部门编码 预留.
*
...
...
@@ -187,7 +191,7 @@ public class HPSC002B extends DaoEPBase {
public
Long
getMatId
()
{
return
this
.
matId
;
}
/**
* set the matId - 物料ID.
*
...
...
@@ -203,7 +207,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getDocId
()
{
return
this
.
docId
;
}
/**
* set the docId - 文件ID.
*
...
...
@@ -219,7 +223,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getDocName
()
{
return
this
.
getDocName
();
}
/**
* set the docName - 文件名称.
*
...
...
@@ -235,7 +239,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getCreatedBy
()
{
return
this
.
createdBy
;
}
/**
* set the createdBy - 创建人.
*
...
...
@@ -251,7 +255,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getCreatedName
()
{
return
this
.
createdName
;
}
/**
* set the createdName - 创建人名称.
*
...
...
@@ -267,7 +271,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getCreatedTime
()
{
return
this
.
createdTime
;
}
/**
* set the createdTime - 创建时间.
*
...
...
@@ -283,7 +287,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getUpdatedBy
()
{
return
this
.
updatedBy
;
}
/**
* set the updatedBy - 修改人.
*
...
...
@@ -299,7 +303,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getUpdatedName
()
{
return
this
.
updatedName
;
}
/**
* set the updatedName - 修改人名称.
*
...
...
@@ -315,7 +319,7 @@ public class HPSC002B extends DaoEPBase {
public
String
getUpdatedTime
()
{
return
this
.
updatedTime
;
}
/**
* set the updatedTime - 修改时间.
*
...
...
@@ -325,13 +329,29 @@ public class HPSC002B extends DaoEPBase {
this
.
updatedTime
=
updatedTime
;
}
/**
* get the bizType - .
* @return the bizType
*/
public
String
getBizType
()
{
return
this
.
bizType
;
}
/**
* set the bizType -
*
* @param bizType -
*/
public
void
setBizType
(
String
bizType
)
{
this
.
bizType
=
bizType
;
}
/**
* get the value from Map.
*
* @param map - source data map
*/
@Override
public
void
fromMap
(
Map
map
)
{
setId
(
NumberUtils
.
toLong
(
StringUtils
.
toString
(
map
.
get
(
FIELD_ID
)),
id
));
setCompanyCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_COMPANY_CODE
)),
companyCode
));
setDeptCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DEPT_CODE
)),
deptCode
));
...
...
@@ -344,14 +364,15 @@ public class HPSC002B extends DaoEPBase {
setUpdatedBy
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_BY
)),
updatedBy
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setBizType
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
"bizType"
)),
bizType
));
}
/**
* set the value to Map.
*/
@Override
public
Map
toMap
()
{
Map
map
=
new
HashMap
();
map
.
put
(
FIELD_ID
,
StringUtils
.
toString
(
id
,
eiMetadata
.
getMeta
(
FIELD_ID
)));
map
.
put
(
FIELD_COMPANY_CODE
,
StringUtils
.
toString
(
companyCode
,
eiMetadata
.
getMeta
(
FIELD_COMPANY_CODE
)));
...
...
@@ -365,7 +386,8 @@ public class HPSC002B extends DaoEPBase {
map
.
put
(
FIELD_UPDATED_BY
,
StringUtils
.
toString
(
updatedBy
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_BY
)));
map
.
put
(
FIELD_UPDATED_NAME
,
StringUtils
.
toString
(
updatedName
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_NAME
)));
map
.
put
(
FIELD_UPDATED_TIME
,
StringUtils
.
toString
(
updatedTime
,
eiMetadata
.
getMeta
(
FIELD_UPDATED_TIME
)));
map
.
put
(
"bizType"
,
StringUtils
.
toString
(
bizType
,
eiMetadata
.
getMeta
(
"bizType"
)));
return
map
;
}
}
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
View file @
57401c2d
...
...
@@ -335,6 +335,7 @@ public class ServiceHPSC002 extends ServiceBase {
Map
sqlMap
=
new
HashMap
();
sqlMap
.
put
(
"id"
,
hppz002
.
getId
());
sqlMap
.
put
(
"filePath1"
,
hppz002
.
getFilePath1
());
sqlMap
.
put
(
"bizType"
,
"WL"
);
DaoUtils
.
update
(
"HPSC002.bindDocIdById"
,
hppz002
.
toMap
());
}
}
catch
(
PlatException
e
)
{
...
...
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002A.java
View file @
57401c2d
...
...
@@ -43,6 +43,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
List
<
HPSC002
>
dbSc002s
=
dao
.
query
(
"HPSC002.query"
,
queryMap
);
if
(
CollectionUtils
.
isNotEmpty
(
dbSc002s
))
{
HPSC002
dbSc002
=
dbSc002s
.
get
(
0
);
inInfo
.
set
(
"inqu_status-0-bizType"
,
queryMap
.
get
(
"bizType"
));
inInfo
.
set
(
"inqu_status-0-matId"
,
queryMap
.
get
(
"id"
));
inInfo
.
set
(
"inqu_status-0-projName"
,
dbSc002
.
getProjName
());
inInfo
.
set
(
"inqu_status-0-prdtName"
,
dbSc002
.
getPrdtName
());
...
...
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
View file @
57401c2d
...
...
@@ -94,6 +94,10 @@ public class ServiceHPSC006 extends ServiceBase {
BigDecimal
unitWt
=
HPSC006
.
getUnitWt
();
DecimalFormat
decimalFormat
=
new
DecimalFormat
(
"#.000"
);
BigDecimal
totalWt
=
new
BigDecimal
(
decimalFormat
.
format
(
Math
.
round
(
num
.
multiply
(
unitWt
).
floatValue
())));
HPSC006
.
setInventSpec
(
HPPZTools
.
jointSpec
(
HPSC006
.
getInventLength
(),
HPSC006
.
getInventWidth
(),
HPSC006
.
getInventThick
()));
HPSC006
.
setProjCode
(
projCode
);
HPSC006
.
setProjName
(
projName
);
HPSC006
.
setProductionOrderNo
(
productionOrderNo
);
HPSC006
.
setStatus
(
CommonConstant
.
YesNo
.
NO_0
.
intValue
());
HPSC006
.
setTotalWt
(
totalWt
);
HPSC006
.
setInventCode
(
HPPZTools
.
checkAndSavePZ04
(
HPSC006
.
getInventType
(),
HPSC006
.
getInventName
()));
...
...
@@ -119,6 +123,9 @@ public class ServiceHPSC006 extends ServiceBase {
public
EiInfo
update
(
EiInfo
inInfo
)
{
try
{
HPSC006
HPSC006
=
new
HPSC006
();
String
productionOrderNo
=
inInfo
.
getString
(
"productionOrderNo"
);
String
projCode
=
inInfo
.
getString
(
"projCode"
);
String
projName
=
inInfo
.
getString
(
"projName"
);
EiBlock
eiBlock
=
inInfo
.
getBlock
(
EiConstant
.
resultBlock
);
for
(
int
i
=
0
;
i
<
eiBlock
.
getRowCount
();
i
++)
{
Map
<?,
?>
map
=
eiBlock
.
getRow
(
i
);
...
...
@@ -127,6 +134,10 @@ public class ServiceHPSC006 extends ServiceBase {
BigDecimal
unitWt
=
HPSC006
.
getUnitWt
();
DecimalFormat
decimalFormat
=
new
DecimalFormat
(
"#.000"
);
BigDecimal
totalWt
=
new
BigDecimal
(
decimalFormat
.
format
(
Math
.
round
(
num
.
multiply
(
unitWt
).
floatValue
())));
HPSC006
.
setInventSpec
(
HPPZTools
.
jointSpec
(
HPSC006
.
getInventLength
(),
HPSC006
.
getInventWidth
(),
HPSC006
.
getInventThick
()));
HPSC006
.
setProjCode
(
projCode
);
HPSC006
.
setProjName
(
projName
);
HPSC006
.
setProductionOrderNo
(
productionOrderNo
);
HPSC006
.
setTotalWt
(
totalWt
);
HPSC006
.
setInventCode
(
HPPZTools
.
checkAndSavePZ04
(
HPSC006
.
getInventType
(),
HPSC006
.
getInventName
()));
DaoUtils
.
update
(
"HPSC006.update"
,
HPSC006
);
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
View file @
57401c2d
...
...
@@ -458,7 +458,7 @@
</update>
<update
id=
"bindDocIdById"
>
UPDATE hpjx.t_hpsc002 SET FILE_PATH1 = #filePath1# WHERE ID = #id#
UPDATE hpjx.t_hpsc002 SET FILE_PATH1 = #filePath1# WHERE ID = #id#
AND BIZ_TYPE = #bizType#
</update>
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml
View file @
57401c2d
...
...
@@ -6,6 +6,7 @@
A.ID as "id",
A.COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
A.DEPT_CODE as "deptCode",
<!-- 部门编码 预留 -->
A.BIZ_TYPE as "bizType",
<!-- 物料ID -->
A.MAT_ID as "matId",
<!-- 物料ID -->
A.DOC_ID as "docId",
<!-- 文件ID -->
B.DOC_NAME as "docName",
<!-- 文件名称 -->
...
...
@@ -27,6 +28,9 @@
<isNotEmpty
prepend=
" AND "
property=
"deptCode"
>
A.DEPT_CODE = #deptCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"bizType"
>
A.BIZ_TYPE = #bizType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"matId"
>
A.MAT_ID = #matId#
</isNotEmpty>
...
...
@@ -95,13 +99,14 @@
INSERT INTO ${hpjxSchema}.T_HPSC002A (
COMPANY_CODE,
<!-- 企业编码 预留 -->
DEPT_CODE,
<!-- 部门编码 预留 -->
BIZ_TYPE,
MAT_ID,
<!-- 物料ID -->
DOC_ID,
<!-- 文件ID -->
CREATED_BY,
<!-- 创建人 -->
CREATED_NAME,
<!-- 创建人名称 -->
CREATED_TIME
<!-- 创建时间 -->
) VALUES (
#companyCode#, #deptCode#, #matId#, #docId#, #createdBy#,
#companyCode#, #deptCode#, #
bizType#, #
matId#, #docId#, #createdBy#,
#createdName#, #createdTime#
)
</insert>
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002B.xml
View file @
57401c2d
...
...
@@ -6,6 +6,7 @@
A.ID as "id",
A.COMPANY_CODE as "companyCode",
<!-- 企业编码 预留 -->
A.DEPT_CODE as "deptCode",
<!-- 部门编码 预留 -->
A.BIZ_TYPE as "bizType",
<!-- 物料ID -->
A.MAT_ID as "matId",
<!-- 物料ID -->
A.DOC_ID as "docId",
<!-- 文件ID -->
B.DOC_NAME as "docName",
<!-- 文件名称 -->
...
...
@@ -27,6 +28,9 @@
<isNotEmpty
prepend=
" AND "
property=
"deptCode"
>
A.DEPT_CODE = #deptCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"bizType"
>
A.BIZ_TYPE = #bizType#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"matId"
>
A.MAT_ID = #matId#
</isNotEmpty>
...
...
@@ -95,17 +99,18 @@
</select>
<insert
id=
"insert"
>
INSERT INTO ${hpjxSchema}.T_HPSC002A (
COMPANY_CODE,
<!-- 企业编码 预留 -->
DEPT_CODE,
<!-- 部门编码 预留 -->
MAT_ID,
<!-- 物料ID -->
DOC_ID,
<!-- 文件ID -->
CREATED_BY,
<!-- 创建人 -->
CREATED_NAME,
<!-- 创建人名称 -->
CREATED_TIME
<!-- 创建时间 -->
INSERT INTO ${hpjxSchema}.T_HPSC002A (
COMPANY_CODE,
<!-- 企业编码 预留 -->
DEPT_CODE,
<!-- 部门编码 预留 -->
BIZ_TYPE,
MAT_ID,
<!-- 物料ID -->
DOC_ID,
<!-- 文件ID -->
CREATED_BY,
<!-- 创建人 -->
CREATED_NAME,
<!-- 创建人名称 -->
CREATED_TIME
<!-- 创建时间 -->
) VALUES (
#companyCode#, #deptCod
e#, #matId#, #docId#, #createdBy#,
#createdName#, #createdTime#
#companyCode#, #deptCode#, #bizTyp
e#, #matId#, #docId#, #createdBy#,
#createdName#, #createdTime#
)
</insert>
...
...
src/main/webapp/HP/SC/HPSC002.js
View file @
57401c2d
...
...
@@ -377,7 +377,7 @@ function openUploadFile(id) {
*/
function
showUploadFile
(
id
)
{
JSColorbox
.
open
({
href
:
"HPSC002A?methodName=initLoad&inqu_status-0-id="
+
id
,
href
:
"HPSC002A?methodName=initLoad&inqu_status-0-
bizType='WL'?inqu_status-0-
id="
+
id
,
title
:
"<div style='text-align: center;'>附件清单</div>"
,
width
:
"80%"
,
height
:
"80%"
,
...
...
src/main/webapp/HP/SC/HPSC003.js
View file @
57401c2d
...
...
@@ -152,7 +152,7 @@ $(function () {
function
showUploadFile
(
id
)
{
JSColorbox
.
open
({
href
:
"HPSC002B?methodName=initLoad&inqu_status-0-id="
+
id
,
href
:
"HPSC002B?methodName=initLoad&inqu_status-0-
bizType='WL'?inqu_status-0-
id="
+
id
,
title
:
"<div style='text-align: center;'>附件清单</div>"
,
width
:
"80%"
,
height
:
"80%"
,
...
...
src/main/webapp/HP/SC/HPSC005.js
View file @
57401c2d
...
...
@@ -92,7 +92,7 @@ function jump(productionOrderNo) {
}
function showUploadFile(id) {
JSColorbox.open({
href: "
HPSC002B
?
methodName
=
initLoad
&
inqu_status
-
0
-
id
=
" + id,
href: "
HPSC002B
?
methodName
=
initLoad
&
inqu_status
-
0
-
bizType
=
'WL'
?
inqu_status
-
0
-
id
=
" + id,
title: "
<
div
style
=
'text-align: center;'
>
附件清单
<
/div>"
,
width
:
"80%"
,
height
:
"80%"
,
...
...
src/main/webapp/HP/SC/HPSC006.js
View file @
57401c2d
...
...
@@ -94,14 +94,18 @@ $(function () {
{
field
:
"operator"
,
template
:
function
(
item
)
{
let
filePath1
=
item
.
filePath1
;
let
template
=
''
;
if
(
filePath1
)
{
template
+=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+
'onclick="showUploadFile('
+
filePath1
+
')" >附件清单</a>'
;
}
return
template
}
},{
field
:
"inventName"
,
query
:
function
(
container
,
options
)
{
let
eiInfo
=
new
EiInfo
();
eiInfo
.
set
(
"inventType"
,
options
.
model
[
"inventType"
]);
return
eiInfo
;
}
}
],
...
...
@@ -114,7 +118,7 @@ query = function () {
}
function
showUploadFile
(
id
)
{
JSColorbox
.
open
({
href
:
"HPSC002
B?methodName=initLoad&
inqu_status-0-id="
+
id
,
href
:
"HPSC002
A?methodName=initLoad&inqu_status-0-bizType='XL'?
inqu_status-0-id="
+
id
,
title
:
"<div style='text-align: center;'>附件清单</div>"
,
width
:
"80%"
,
height
:
"80%"
,
...
...
src/main/webapp/HP/SC/HPSC006.jsp
View file @
57401c2d
...
...
@@ -56,6 +56,8 @@
<EF:EFOption
label=
"部分派工"
value=
"1"
/>
<EF:EFOption
label=
"全部派工"
value=
"2"
/>
</EF:EFComboColumn>
<EF:EFColumn
enable=
"false"
ename=
"factoryName"
cname=
"厂区名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"orgName"
cname=
"生产组"
/>
</EF:EFGrid>
</EF:EFRegion>
...
...
@@ -69,16 +71,16 @@
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('7')"
/>
</EF:EFComboColumn>
<EF:EFPopupColumn
ename=
"inventName"
cname=
"材料名称"
width=
"200"
popupType=
"ServiceGrid"
popupTitle=
"材料信息"
serviceName=
"HPPZ004"
methodName=
"queryComboBox"
resultId=
"invent_
prdt_
name_block_id"
columnEnames=
"
inventName,inventCode
"
popupTitle=
"材料信息"
serviceName=
"HPPZ004"
methodName=
"queryComboBox"
resultId=
"invent_name_block_id"
columnEnames=
"
textField,valueField
"
columnCnames=
"材料名称,材料编码"
backFillColumnIds=
"
inventName,inventCode
"
backFillColumnIds=
"
textField,valueField
"
backFillFieldIds=
"inventName,inventCode"
valueField=
"
inventName"
textField=
"inventName
"
/>
<EF:EFColumn
ename=
"inventCode"
cname=
"材料编码"
/>
<EF:EFColumn
ename=
"
l
ength"
cname=
"长"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"
w
idth"
cname=
"宽"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"
t
hick"
cname=
"厚"
format=
"{0:N3}"
/>
valueField=
"
textField"
textField=
"textField
"
/>
<EF:EFColumn
ename=
"inventCode"
enable=
"false"
cname=
"材料编码"
/>
<EF:EFColumn
ename=
"
inventL
ength"
cname=
"长"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"
inventW
idth"
cname=
"宽"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"
inventT
hick"
cname=
"厚"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
/>
<EF:EFColumn
ename=
"num"
cname=
"计划数量"
/>
<EF:EFColumn
ename=
"unitWt"
format=
"{0:N3}"
cname=
"计划单重"
/>
...
...
@@ -87,6 +89,13 @@
<EF:EFColumn
ename=
"actualCompletionDate"
cname=
"实际完成时间"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
width=
"150"
enable=
"false"
/>
<EF:EFColumn
enable=
"false"
ename=
"actualCompletionNum"
cname=
"实际完工数量"
readonly=
"true"
/>
<EF:EFComboColumn
enable=
"false"
align=
"center"
ename=
"status"
cname=
"状态"
>
<EF:EFOption
label=
"计划中"
value=
"0"
/>
<EF:EFOption
label=
"生产中"
value=
"1"
/>
<EF:EFOption
label=
"已完成"
value=
"2"
/>
</EF:EFComboColumn>
<EF:EFColumn
enable=
"false"
ename=
"factoryName"
cname=
"厂区名称"
/>
<EF:EFColumn
enable=
"false"
ename=
"orgName"
cname=
"生产组"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
width=
"100"
enable=
"false"
readonly=
"false"
/>
</EF:EFGrid>
</EF:EFRegion>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment