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
c858c60b
Commit
c858c60b
authored
Feb 27, 2024
by
liulei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下料登记优化
parent
6888fc57
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
16 deletions
+20
-16
ServiceHPSC005C.java
...java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005C.java
+1
-1
ServiceHPSC006.java
.../java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
+5
-0
HPSC006.jsp
src/main/webapp/HP/SC/HPSC006.jsp
+7
-7
HPSC007.jsp
src/main/webapp/HP/SC/HPSC007.jsp
+7
-8
No files found.
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005C.java
View file @
c858c60b
...
...
@@ -62,7 +62,7 @@ public class ServiceHPSC005C extends ServiceBase {
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
Map
queryRow
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
inInfo
=
super
.
query
(
inInfo
,
HPSC005
.
QUERY
,
new
HPSC005
());
inInfo
=
super
.
query
(
inInfo
,
HPSC005
C
.
QUERY
,
new
HPSC005C
());
}
catch
(
Throwable
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
}
...
...
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
View file @
c858c60b
...
...
@@ -4,12 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
import
com.baosight.hpjx.aspect.annotation.OperationLogAnnotation
;
import
com.baosight.hpjx.common.DdynamicEnum
;
import
com.baosight.hpjx.common.HPConstants
;
import
com.baosight.hpjx.common.ProdOrderStatusEnum
;
import
com.baosight.hpjx.core.constant.CommonConstant
;
import
com.baosight.hpjx.core.dao.DaoUtils
;
import
com.baosight.hpjx.hp.constant.HPConstant
;
import
com.baosight.hpjx.hp.pz.domain.HPPZ011
;
import
com.baosight.hpjx.hp.pz.tools.HPPZTools
;
import
com.baosight.hpjx.hp.sc.domain.*
;
import
com.baosight.hpjx.util.AssertUtils
;
import
com.baosight.hpjx.util.CommonMethod
;
import
com.baosight.hpjx.util.LogUtils
;
import
com.baosight.iplat4j.core.ei.EiBlock
;
...
...
@@ -111,7 +113,10 @@ public class ServiceHPSC006 extends ServiceBase {
HPSC006
.
setStatus
(
CommonConstant
.
YesNo
.
NO_0
.
intValue
());
HPSC006
.
setTotalWt
(
totalWt
);
HPSC006
.
setInventCode
(
HPPZTools
.
checkAndSavePZ04
(
HPSC006
.
getInventType
(),
HPSC006
.
getInventName
()));
if
(
HPSC006
.
getFactoryCode
()!=
null
&&
!(
HPSC006
.
getFactoryCode
().
equals
(
" "
)))
{
AssertUtils
.
isEmpty
(
HPSC006
.
getOrgNo
(),
"已选择厂区,下料组不能为空"
);
HPSC006
.
setStatus
(
1
);
}
DaoUtils
.
insert
(
"HPSC006.insert"
,
HPSC006
);
}
inInfo
.
setStatus
(
EiConstant
.
STATUS_SUCCESS
);
...
...
src/main/webapp/HP/SC/HPSC006.jsp
View file @
c858c60b
...
...
@@ -68,6 +68,12 @@
<EF:EFColumn
ename=
"num"
width=
"80"
cname=
"数量"
/>
<EF:EFColumn
ename=
"unitWt"
format=
"{0:N3}"
width=
"80"
cname=
"单重"
/>
<EF:EFColumn
enable=
"false"
format=
"{0:N3}"
ename=
"totalWt"
width=
"80"
cname=
"总重"
/>
<EF:EFComboColumn
ename=
"factoryCode"
cname=
"厂区"
width=
"110"
align=
"center"
filter=
"contains"
readonly=
"true"
>
<EF:EFOption
label=
" "
value=
""
/>
<EF:EFOptions
blockId=
"factory_record_block_id"
valueField=
"valueField"
textField=
"textField"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"orgNo"
cname=
"生产组"
width=
"110"
align=
"center"
readonly=
"true"
/>
<EF:EFColumn
ename=
"planCompletionDate"
required=
'true'
cname=
"计划完成时间"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
width=
"120"
/>
<EF:EFColumn
ename=
"actualCompletionDate"
cname=
"实际完成时间"
editType=
"date"
...
...
@@ -79,13 +85,7 @@
<EF:EFOption
label=
"生产中"
value=
"1"
/>
<EF:EFOption
label=
"已完成"
value=
"2"
/>
</EF:EFComboColumn>
<EF:EFComboColumn
ename=
"factoryCode"
cname=
"厂区"
width=
"110"
align=
"center"
required=
"true"
filter=
"contains"
readonly=
"true"
>
<EF:EFOptions
blockId=
"factory_record_block_id"
valueField=
"valueField"
textField=
"textField"
/>
</EF:EFComboColumn>
<EF:EFColumn
enable=
"false"
ename=
"factoryName"
cname=
"厂区名称"
hidden=
"true"
/>
<EF:EFColumn
ename=
"orgNo"
cname=
"生产组"
width=
"110"
align=
"center"
required=
"true"
readonly=
"true"
/>
<EF:EFColumn
enable=
"false"
ename=
"orgName"
cname=
"生产组"
hidden=
"true"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
...
...
src/main/webapp/HP/SC/HPSC007.jsp
View file @
c858c60b
...
...
@@ -7,31 +7,29 @@
<EF:EFPage
title=
"下料登记"
>
<EF:EFRegion
id=
"inqu"
title=
"订单详情"
>
<EF:EFInput
ename=
"inqu_status-0-hpsc006Id"
type=
"hidden"
/>
<EF:EFInput
ename=
"detail-0-id"
type=
"hidden"
/>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-projCode"
cname=
"项目号"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-projName"
cname=
"项目名称"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-prdtName"
cname=
"部件名称"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-partName"
cname=
"零件名称"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-partName"
cname=
"零件名称"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-partName"
cname=
"零部件名称"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-inventName"
cname=
"材料名称"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-num"
cname=
"计划数量"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-num"
cname=
"计划数量"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-unitWt"
cname=
"单重"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-totalWt"
cname=
"计划重量"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-actualCompletionNum"
cname=
"完工数量"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-actualCompletionUnitWt"
cname=
"完工重量"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
ename=
"detail-0-actualCompletionTotalWt"
cname=
"完工重量"
colWidth=
"4"
readonly=
"true"
/>
<EF:EFInput
ename=
"detail-0-planCompletionDate"
cname=
"计划完成日期"
colWidth=
"4"
readonly=
"true"
/>
</div>
<div
class=
"row"
>
<EF:EFSelect
ename=
"detail-0-status"
cname=
"状态"
colWidth=
"4"
readonly=
"true"
>
<EF:EFOption
label=
"计划中"
value=
"0"
/>
<EF:EFOption
label=
"生产中"
value=
"1"
/>
...
...
@@ -44,7 +42,8 @@
<EF:EFInput
ename=
"productionOrderNo"
type=
"hidden"
/>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"actualCompletionDate"
required=
'true'
cname=
"完成日期"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
/>
<EF:EFColumn
ename=
"hpsc006Id"
cname=
"生产下料ID"
hidden=
"true"
/>
<EF:EFColumn
ename=
"actualCompletionDate"
cname=
"完成日期"
editType=
"date"
dateFormat=
"yyyy/MM/dd"
/>
<EF:EFPopupColumn
ename=
"userId"
cname=
"完成人"
popupType=
"ServiceGrid"
popupTitle=
"人员信息"
serviceName=
"HPXSUser"
methodName=
"queryComboBox"
resultId=
"user_block_id"
columnEnames=
"textField,valueField"
...
...
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