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
96f0e859
Commit
96f0e859
authored
Feb 29, 2024
by
宋祥
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/main/webapp/HP/KC/HPKC003A.jsp
parents
cd84c766
bc142e4b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
ServiceHPKC003A.java
...java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java
+1
-0
HPKC003.jsp
src/main/webapp/HP/KC/HPKC003.jsp
+6
-6
HPKC003A.jsp
src/main/webapp/HP/KC/HPKC003A.jsp
+2
-2
No files found.
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java
View file @
96f0e859
...
@@ -137,6 +137,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
...
@@ -137,6 +137,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
newKc003
.
setProdNo
(
SequenceGenerator
.
getNextSequence
(
HPConstant
.
SequenceId
.
HPKC003_PROD_NO
));
newKc003
.
setProdNo
(
SequenceGenerator
.
getNextSequence
(
HPConstant
.
SequenceId
.
HPKC003_PROD_NO
));
newKc003
.
setDocumentDate
(
DateUtils
.
shortDate
());
newKc003
.
setDocumentDate
(
DateUtils
.
shortDate
());
newKc003
.
setWhCode
(
whCode
);
newKc003
.
setWhCode
(
whCode
);
newKc003
.
setRemark
(
MapUtils
.
getString
(
row
,
"remark1"
));
newKc003
.
setWhName
(
HPPZTools
.
HpPz007
.
getByCode
(
whCode
).
getWhName
());
newKc003
.
setWhName
(
HPPZTools
.
HpPz007
.
getByCode
(
whCode
).
getWhName
());
newKc003
.
setAmount
(
applyNum
);
newKc003
.
setAmount
(
applyNum
);
newKc003
.
setWeight
(
applyNum
.
multiply
(
dbSc005b
.
getUnitWt
()));
newKc003
.
setWeight
(
applyNum
.
multiply
(
dbSc005b
.
getUnitWt
()));
...
...
src/main/webapp/HP/KC/HPKC003.jsp
View file @
96f0e859
...
@@ -24,15 +24,15 @@
...
@@ -24,15 +24,15 @@
<div
class=
"row"
>
<div
class=
"row"
>
<EF:EFInput
cname=
"部件名称"
ename=
"prdtName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"部件名称"
ename=
"prdtName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"零件名称"
ename=
"partName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"零件名称"
ename=
"partName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"生产订单号"
ename=
"prodOrderNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"生产任务号"
ename=
"prodTaskNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
</div>
<div
class=
"row"
>
<EF:EFDateSpan
startCname=
"创建日期(从)"
endCname=
"至"
blockId=
"inqu_status"
<EF:EFDateSpan
startCname=
"创建日期(从)"
endCname=
"至"
blockId=
"inqu_status"
startName=
"createdDateFrom"
endName=
"createdDateTo"
row=
"0"
role=
"date"
startName=
"createdDateFrom"
endName=
"createdDateTo"
row=
"0"
role=
"date"
format=
"yyyy-MM-dd"
ratio=
"3:3"
satrtRatio=
"4:8"
endRatio=
"4:8"
readonly=
"true"
>
format=
"yyyy-MM-dd"
ratio=
"3:3"
satrtRatio=
"4:8"
endRatio=
"4:8"
readonly=
"true"
>
</EF:EFDateSpan>
</EF:EFDateSpan>
</div>
</div>
<div
class=
"row"
>
<
%
--
<
EF:EFInput
cname=
"生产订单号"
ename=
"prodOrderNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"生产任务号"
ename=
"prodTaskNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
--%>
</div>
</EF:EFRegion>
</EF:EFRegion>
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
...
@@ -54,8 +54,8 @@
...
@@ -54,8 +54,8 @@
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
<EF:EFColumn
ename=
"prdtCode"
cname=
"部件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"prdtCode"
cname=
"部件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"partCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"partCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"prodTaskNo"
cname=
"生产任务号"
enable=
"false"
width=
"150"
align=
"center"
/>
<
%
--
<
EF:EFColumn
ename=
"prodTaskNo"
cname=
"生产任务号"
enable=
"false"
width=
"150"
align=
"center"
/>
<EF:EFColumn
ename=
"prodOrderNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"prodOrderNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
/>
--%>
</EF:EFGrid>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFRegion>
...
...
src/main/webapp/HP/KC/HPKC003A.jsp
View file @
96f0e859
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
required=
"true"
>
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
required=
"true"
>
</EF:EFComboColumn>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"applyNum"
cname=
"入库数量"
width=
"120"
align=
"right"
format=
"{0:N0}"
required=
"true"
/>
<EF:EFColumn
ename=
"applyNum"
cname=
"入库数量"
width=
"120"
align=
"right"
format=
"{0:N0}"
required=
"true"
/>
<EF:EFColumn
ename=
"
completeNum"
cname=
"已入库数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
<EF:EFColumn
ename=
"
remark1"
cname=
"入库说明"
width=
"150"
/>
hidden=
"true"
/>
<EF:EFColumn
ename=
"completeNum"
cname=
"已入库数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
hidden=
"true"
/>
<EF:EFColumn
ename=
"unCompleteNum"
cname=
"待入库数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"unCompleteNum"
cname=
"待入库数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"num"
cname=
"任务数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"num"
cname=
"任务数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"totalWt"
cname=
"任务重量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"totalWt"
cname=
"任务重量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
...
...
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