Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hg-smart
Commits
d4bc51f0
Commit
d4bc51f0
authored
May 25, 2024
by
YG6494
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产任务日期逻辑调整
parent
725a5be7
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
8 deletions
+43
-8
HGSB007.xml
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB007.xml
+1
-1
HGSC007.java
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC007.java
+23
-0
ServiceHGSC006A.java
...java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java
+3
-0
ServiceHGSC006B.java
...java/com/baosight/hggp/hg/sc/service/ServiceHGSC006B.java
+3
-0
HGSC007.xml
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
+10
-4
HGSC007.jsp
src/main/webapp/HG/SC/HGSC007.jsp
+3
-3
No files found.
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB007.xml
View file @
d4bc51f0
<?xml version="1.0" encoding="UTF-8"?>
l
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap
namespace=
"HGSB007"
>
...
...
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC007.java
View file @
d4bc51f0
...
...
@@ -64,6 +64,7 @@ public class HGSC007 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
FIELD_order_date
=
"orderDate"
;
/* 生产任务日期*/
public
static
final
String
COL_id
=
"id"
;
public
static
final
String
COL_mat_id
=
"mat_id"
;
/* 物料清单ID*/
...
...
@@ -106,6 +107,7 @@ public class HGSC007 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
COL_order_date
=
"order_date"
;
/* 生产任务日期*/
public
static
final
String
QUERY
=
"HGSC007.query"
;
public
static
final
String
COUNT
=
"HGSC007.count"
;
...
...
@@ -155,6 +157,8 @@ public class HGSC007 extends DaoEPBase {
private
String
updatedName
=
" "
;
/* 修改人名称*/
private
String
updatedTime
=
" "
;
/* 更新时间*/
private
String
orderDate
=
" "
;
/* 生产任务日期*/
/**
* initialize the metadata.
*/
...
...
@@ -338,6 +342,9 @@ public class HGSC007 extends DaoEPBase {
eiColumn
.
setDescName
(
"更新时间"
);
eiMetadata
.
addMeta
(
eiColumn
);
eiColumn
=
new
EiColumn
(
FIELD_order_date
);
eiColumn
.
setDescName
(
"生产任务日期"
);
eiMetadata
.
addMeta
(
eiColumn
);
}
...
...
@@ -1004,6 +1011,20 @@ public class HGSC007 extends DaoEPBase {
public
void
setUpdatedTime
(
String
updatedTime
)
{
this
.
updatedTime
=
updatedTime
;
}
/**
* set the orderDate - 生产任务日期.
*
* @param orderDate - 生产任务日期
*/
public
void
setOrderDate
(
String
orderDate
)
{
this
.
orderDate
=
orderDate
;
}
public
String
getOrderDate
()
{
return
orderDate
;
}
/**
* get the value from Map.
*
...
...
@@ -1053,6 +1074,7 @@ public class HGSC007 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
));
setOrderDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_order_date
)),
orderDate
));
}
/**
...
...
@@ -1103,6 +1125,7 @@ public class HGSC007 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
(
FIELD_order_date
,
StringUtils
.
toString
(
orderDate
,
eiMetadata
.
getMeta
(
FIELD_order_date
)));
return
map
;
}
...
...
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java
View file @
d4bc51f0
...
...
@@ -82,11 +82,14 @@ public class ServiceHGSC006A extends ServiceBase {
}
// 写入子表数据
HGSC007
hgsc007
=
new
HGSC007
();
String
getCreatedTime
=
hgsc006
.
getCreatedTime
();
//获取订单创建时间,并截取
String
subCreatedTime
=
getCreatedTime
.
substring
(
0
,
8
);
BeanUtils
.
copyProperties
(
hgsc006A
,
hgsc007
);
cleanBaseInfo
(
hgsc007
);
hgsc007
.
setTaskCode
(
SequenceGenerator
.
getNextSequence
(
HGConstant
.
SequenceId
.
HGSC007_TASK_CODE
));
hgsc007
.
setMatId
(
hgsc006
.
getMatId
());
hgsc007
.
setOrderId
(
hgsc006
.
getId
());
hgsc007
.
setOrderDate
(
subCreatedTime
);
hgsc007
.
setOrderDetailId
(
hgsc006A
.
getId
());
hgsc007
.
setQuantity
(
assignQuantity
);
hgsc007
.
setTotalWeight
(
hgsc006A
.
getSingleWeight
().
multiply
(
new
BigDecimal
(
assignQuantity
)));
...
...
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006B.java
View file @
d4bc51f0
...
...
@@ -183,11 +183,14 @@ public class ServiceHGSC006B extends ServiceBase {
HGSCTools
.
checkAssignedNum
(
orderDetailId
,
hgsc007
.
getQuantity
());
HGSC007
add007
=
new
HGSC007
();
String
getCreatedTime
=
hgsc006
.
getCreatedTime
();
//获取订单创建时间,并截取
String
subCreatedTime
=
getCreatedTime
.
substring
(
0
,
8
);
BeanUtils
.
copyProperties
(
hgsc006A
,
add007
);
cleanBaseInfo
(
add007
);
add007
.
setTaskCode
(
SequenceGenerator
.
getNextSequence
(
HGConstant
.
SequenceId
.
HGSC007_TASK_CODE
));
add007
.
setMatId
(
hgsc006
.
getMatId
());
add007
.
setOrderId
(
hgsc006
.
getId
());
add007
.
setOrderDate
(
subCreatedTime
);
add007
.
setOrderDetailId
(
hgsc006A
.
getId
());
add007
.
setQuantity
(
hgsc007
.
getQuantity
());
add007
.
setTotalWeight
(
hgsc006A
.
getSingleWeight
().
multiply
(
new
BigDecimal
(
hgsc007
.
getQuantity
())));
...
...
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
View file @
d4bc51f0
...
...
@@ -171,6 +171,9 @@
<isNotEmpty
prepend=
" AND "
property=
"updatedTime"
>
updated_time = #updatedTime#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"orderDate"
>
order_date = #orderDate#
</isNotEmpty>
</sql>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
...
...
@@ -216,7 +219,8 @@
created_time as "createdTime",
<!-- 创建时间 -->
updated_by as "updatedBy",
<!-- 更新人 -->
updated_name as "updatedName",
<!-- 修改人名称 -->
updated_time as "updatedTime"
<!-- 更新时间 -->
updated_time as "updatedTime",
<!-- 更新时间 -->
order_date as "orderDate"
<!-- 生产任务日期 -->
FROM ${hggpSchema}.HGSC007 WHERE 1=1
<include
refid=
"condition"
/>
...
...
@@ -403,9 +407,10 @@
created_time,
<!-- 创建时间 -->
updated_by,
<!-- 更新人 -->
updated_name,
<!-- 修改人名称 -->
updated_time
<!-- 更新时间 -->
updated_time,
<!-- 更新时间 -->
order_date
<!-- 生产任务日期 -->
)
VALUES (#id#, #matId#, #orderId#, #orderDetailId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #taskCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #completeDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #singleWeight#, #totalWeight#, #finishWeight#, #unfinishWeight#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
VALUES (#id#, #matId#, #orderId#, #orderDetailId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #taskCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #completeDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #singleWeight#, #totalWeight#, #finishWeight#, #unfinishWeight#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#
,#orderDate#
)
</insert>
<delete
id=
"delete"
>
...
...
@@ -455,7 +460,8 @@
created_time = #createdTime#,
<!-- 创建时间 -->
updated_by = #updatedBy#,
<!-- 更新人 -->
updated_name = #updatedName#,
<!-- 修改人名称 -->
updated_time = #updatedTime#
<!-- 更新时间 -->
updated_time = #updatedTime#,
<!-- 更新时间 -->
order_date = #orderDate#
<!-- 生产任务日期 -->
WHERE
id = #id#
</update>
...
...
src/main/webapp/HG/SC/HGSC007.jsp
View file @
d4bc51f0
...
...
@@ -22,7 +22,7 @@
<EF:EFInput blockId="inqu_status" row="0" ename="productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="班组名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFDatePicker blockId="inqu_status" row="0" ename="
planStart
Date" cname="生产任务日期" role="date"
<EF:EFDatePicker blockId="inqu_status" row="0" ename="
order
Date" cname="生产任务日期" role="date"
format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
<%--<EF:EFDatePicker blockId="inqu_status" row="0" ename="complete_date" cname="生产完工日期" role="date"
format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>--%>
...
...
@@ -39,8 +39,8 @@
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="220" align="center"/>
<EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="120" align="center" readOnly="true"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="true" width="120" align="center" readOnly="true"/>
<EF:EFColumn ename="
planStart
Date" cname="生产任务日期" width="120" enable="true" readonly="false" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyy
-MM-
dd']" required="true"/>
<EF:EFColumn ename="
order
Date" cname="生产任务日期" width="120" enable="true" readonly="false" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyy
MM
dd']" required="true"/>
<EF:EFColumn ename="taskCode" cname="生产任务单号" width="100" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="productCode" cname="产品编码" width="100" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="productName" cname="产品名称" width="100" enable="false" readonly="true" align="center"/>
...
...
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