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
d7a14892
Commit
d7a14892
authored
Mar 06, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://gitlab.baocloud.cn/bggf/smart/hp-smart
into dev
parents
c945af87
98ca7a49
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
71 additions
and
88 deletions
+71
-88
ServiceHPKC001.java
.../java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java
+1
-1
ServiceHPKC002.java
.../java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java
+1
-0
ServiceHPKC004.java
.../java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java
+2
-1
ServiceHPKC004B.java
...java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004B.java
+5
-1
HPKC001.js
src/main/webapp/HP/KC/HPKC001.js
+2
-2
HPKC002.jsp
src/main/webapp/HP/KC/HPKC002.jsp
+2
-5
HPKC002A.js
src/main/webapp/HP/KC/HPKC002A.js
+4
-3
HPKC002A.jsp
src/main/webapp/HP/KC/HPKC002A.jsp
+4
-8
HPKC003.jsp
src/main/webapp/HP/KC/HPKC003.jsp
+3
-2
HPKC003A.jsp
src/main/webapp/HP/KC/HPKC003A.jsp
+6
-6
HPKC004.jsp
src/main/webapp/HP/KC/HPKC004.jsp
+10
-10
HPKC004A.jsp
src/main/webapp/HP/KC/HPKC004A.jsp
+7
-8
HPKC004B.jsp
src/main/webapp/HP/KC/HPKC004B.jsp
+3
-10
HPKC005.js
src/main/webapp/HP/KC/HPKC005.js
+7
-0
HPKC005A.js
src/main/webapp/HP/KC/HPKC005A.js
+0
-4
HPKC005A.jsp
src/main/webapp/HP/KC/HPKC005A.jsp
+1
-1
HPKC006.js
src/main/webapp/HP/KC/HPKC006.js
+2
-2
HPKC011.jsp
src/main/webapp/HP/KC/HPKC011.jsp
+7
-7
HPKC012.jsp
src/main/webapp/HP/KC/HPKC012.jsp
+1
-1
HPPZ006.js
src/main/webapp/HP/PZ/HPPZ006.js
+0
-13
HPPZ006.jsp
src/main/webapp/HP/PZ/HPPZ006.jsp
+3
-3
No files found.
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java
View file @
d7a14892
...
...
@@ -203,7 +203,7 @@ public class ServiceHPKC001 extends ServiceBase {
}
/**
* 删除操作
* 删除操作
intCompact = 14040
*
* @param inInfo
* @return
...
...
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java
View file @
d7a14892
...
...
@@ -50,6 +50,7 @@ public class ServiceHPKC002 extends ServiceBase {
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
INVENT_SPEC_BLOCK_ID
),
queryMap
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
SPEC_NAME_BLOCK_ID
),
queryMap
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
PROJ_RECORD_BLOCK_ID
),
null
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
INVENT_ALL_BLOCK_ID
),
queryMap
,
false
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HPKC002
().
eiMetadata
);
inInfo
.
setBlock
(
InventTypeEnum
.
generatorEiBlock
());
}
catch
(
PlatException
e
)
{
...
...
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java
View file @
d7a14892
...
...
@@ -21,6 +21,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
import
com.baosight.iplat4j.ed.util.SequenceGenerator
;
import
org.apache.commons.collections.MapUtils
;
import
java.math.BigDecimal
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -117,7 +118,7 @@ public class ServiceHPKC004 extends ServiceBase {
// 修改库存
if
(
dbKc004
.
getProdNo
().
equals
(
" "
))
HPKCTools
.
updateStock
(
dbKc004
.
getWhCode
(),
hpkc010
.
getInventRecordId
(),
dbKc004
.
getAmount
(),
dbKc004
.
getWeight
());
dbKc004
.
getAmount
(),
dbKc004
.
getWeight
()
.
multiply
(
new
BigDecimal
(
1000
))
);
else
HPKCTools
.
updateProdStock
(
dbKc004
.
getWhCode
(),
dbKc004
.
getProdNo
(),
dbKc004
.
getAmount
(),
dbKc004
.
getWeight
());
...
...
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004B.java
View file @
d7a14892
...
...
@@ -136,12 +136,16 @@ public class ServiceHPKC004B extends ServiceEPBase {
String
applyRemark
=
MapUtils
.
getString
(
row
,
"applyRemark"
);
String
projCode
=
MapUtils
.
getString
(
row
,
"projCode"
);
Long
kcId
=
MapUtils
.
getLong
(
row
,
"id"
);
HPKC010
dbKc010
=
dbKc010Map
.
get
(
kcId
);
HPKC004
newKc004
=
BeanUtils
.
copy
(
dbKc010
,
HPKC004
.
class
);
BigDecimal
multiply
=
dbKc010
.
getUnitWeight
().
multiply
(
applyAmount
);
newKc004
.
setSaleNo
(
SequenceGenerator
.
getNextSequence
(
HPConstant
.
SequenceId
.
HPKC004_SALE_NO
));
newKc004
.
setReceiptDate
(
DateUtils
.
shortDate
());
newKc004
.
setAmount
(
applyAmount
);
newKc004
.
setWeight
(
dbKc010
.
getUnitWeight
().
multiply
(
applyAmount
));
//转换t
newKc004
.
setWeight
(
multiply
.
divide
(
new
BigDecimal
(
1000
)));
newKc004
.
setUnitWeight
(
newKc004
.
getUnitWeight
().
divide
(
new
BigDecimal
(
1000
)));
newKc004
.
setRemark
(
applyRemark
);
newKc004
.
setKcId
(
kcId
);
newKc004
.
setIsPrint
(
CommonConstant
.
YesNo
.
NO_0
);
...
...
src/main/webapp/HP/KC/HPKC001.js
View file @
d7a14892
...
...
@@ -92,12 +92,12 @@ $(function() {
},
{
field
:
"unitWeight"
,
template
:
function
(
options
)
{
return
options
.
length
==
0
?
"-"
:
options
.
length
;
return
options
.
unitWeight
==
0
?
"-"
:
options
.
unitWeight
;
}
},
{
field
:
"weight"
,
template
:
function
(
options
)
{
return
options
.
length
==
0
?
"-"
:
options
.
length
;
return
options
.
weight
==
0
?
"-"
:
options
.
weight
;
}
},
{
field
:
"length"
,
...
...
src/main/webapp/HP/KC/HPKC002.jsp
View file @
d7a14892
...
...
@@ -68,14 +68,11 @@
blockName=
"invent_spec_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"amount"
cname=
"数量"
enable=
"false"
format=
"{0:N0}"
maxLength=
"20"
width=
"100"
align=
"right"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重"
enable=
"false"
format=
"{0:N3}"
maxLength=
"20"
width=
"100"
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重
(KG)
"
enable=
"false"
format=
"{0:N3}"
maxLength=
"20"
width=
"100"
align=
"right"
/>
<EF:EFColumn
ename=
"weight"
cname=
"重量"
enable=
"false"
format=
"{0:N3}"
maxLength=
"20"
width=
"100"
<EF:EFColumn
ename=
"weight"
cname=
"重量
(KG)
"
enable=
"false"
format=
"{0:N3}"
maxLength=
"20"
width=
"100"
align=
"right"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"100"
align=
"center"
/>
<EF:EFColumn
ename=
"oldReqNo"
cname=
"原领料单号"
enable=
"false"
width=
"140"
align=
"center"
/>
...
...
src/main/webapp/HP/KC/HPKC002A.js
View file @
d7a14892
let
projNameGlobalData
=
[];
inventAllGlobalData
=
[]
$
(
function
()
{
IPLATUI
.
EFGrid
=
{
"result"
:
{
columns
:
[],
dataBound
:
function
()
{
columns
:
[]
}
}
};
$
(
"#ef_form_head"
).
hide
();
...
...
@@ -26,6 +25,8 @@ $(window).load(function () {
query
();
});
/**
* 查询
*/
...
...
src/main/webapp/HP/KC/HPKC002A.jsp
View file @
d7a14892
...
...
@@ -30,7 +30,7 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFInput
ename=
"inqu_result-0-hpsc006Id"
type=
"hidden"
/>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
autoFit=
"true"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
/>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
hidden=
"true"
/>
<EF:EFComboColumn
ename=
"inventType"
cname=
"存货类型"
enable=
"false"
width=
"10"
align=
"center"
>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
/>
</EF:EFComboColumn>
...
...
@@ -46,21 +46,17 @@
blockName=
"invent_spec_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFComboColumn
ename=
"projCode"
cname=
"项目名称"
width=
"300"
align=
"center"
defaultValue=
""
required=
"true"
filter=
"contains"
>
<EF:EFOptions
blockId=
"proj_record_block_id"
valueField=
"valueField"
textField=
"textField"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"applyAmount"
cname=
"申请数量"
width=
"120"
align=
"right"
format=
"{0:N0}"
required=
"true"
/>
<EF:EFColumn
ename=
"applyRemark"
cname=
"申请说明"
width=
"
15
0"
editType=
"textarea"
copy=
"true"
/>
<EF:EFColumn
ename=
"applyRemark"
cname=
"申请说明"
width=
"
30
0"
editType=
"textarea"
copy=
"true"
/>
<EF:EFColumn
ename=
"amount"
cname=
"库存数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
sumType=
"all"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
<EF:EFColumn
ename=
"unitWeight"
cname=
"单量
(KG)
"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量
(KG)
"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
sumType=
"all"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/KC/HPKC003.jsp
View file @
d7a14892
...
...
@@ -38,9 +38,10 @@
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"内码"
hidden=
"true"
/>
<EF:EFColumn
ename=
"prodNo"
cname=
"生产单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"documentDate"
cname=
"单据日期"
width=
"100"
align=
"center"
editType=
"date"
readonly=
"true"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
required=
"true"
/>
<
EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
/
>
<
%
--
<
EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
/>
--%
>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFComboColumn
ename=
"whCode"
cname=
"仓库名称"
enable=
"false"
width=
"120"
align=
"center"
blockName=
"wh_record_block_id"
textField=
"textField"
valueField=
"valueField"
...
...
@@ -50,7 +51,7 @@
<EF:EFColumn
ename=
"partName"
cname=
"零件名称"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"partSpec"
cname=
"零件规格"
enable=
"false"
width=
"150"
align=
"center"
/>
<EF:EFColumn
ename=
"amount"
cname=
"数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"重量(
KG
)"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"重量(
T
)"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<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=
"partCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
...
...
src/main/webapp/HP/KC/HPKC003A.jsp
View file @
d7a14892
...
...
@@ -9,14 +9,14 @@
<EF:EFRegion
id=
"inqu"
title=
"查询区域"
type=
"query"
>
<div
class=
"row"
>
<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"
/>
<
%
--
<
EF:EFInput
cname=
"生产订单号"
ename=
"prodOrderNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"生产任务号"
ename=
"prodTaskNo"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
--%>
<EF:EFInput
cname=
"项目名称"
ename=
"projName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"部件名称"
ename=
"prdtName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
cname=
"零件名称"
ename=
"partName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"厂区名称"
ename=
"factoryName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
</div>
<div
class=
"row"
>
<EF:EFInput
cname=
"生产组名称"
ename=
"orgName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
</div>
</div>
...
...
@@ -44,9 +44,9 @@
<EF:EFColumn
ename=
"factoryName"
cname=
"厂区名称"
enable=
"false"
width=
"150"
align=
"center"
/>
<EF:EFColumn
ename=
"orgName"
cname=
"生产组名称"
enable=
"false"
width=
"150"
align=
"center"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
/>
<
%
--
<
EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
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: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=
"factoryCode"
cname=
"厂区编码"
enable=
"false"
width=
"150"
hidden=
"true"
/>
...
...
src/main/webapp/HP/KC/HPKC004.jsp
View file @
d7a14892
...
...
@@ -37,6 +37,7 @@
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"内码"
hidden=
"true"
/>
<EF:EFColumn
ename=
"saleNo"
cname=
"销售单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"receiptDate"
cname=
"单据日期"
enable=
"false"
width=
"90"
align=
"center"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
enable=
"false"
width=
"140"
align=
"center"
/>
...
...
@@ -50,20 +51,19 @@
blockName=
"invent_spec_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
hidden=
"true"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
hidden=
"true"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
hidden=
"true"
/>
<EF:EFColumn
ename=
"amount"
cname=
"数量"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重(
KG
)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"总重(
KG
)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重(
T
)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"总重(
T
)"
enable=
"false"
width=
"100"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFComboColumn
ename=
"isPrint"
cname=
"是否打印"
width=
"80"
align=
"center"
>
<EF:EFCodeOption
codeName=
"hpjx.hpjx.isPrint"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"100"
align=
"center"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"prodNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"saleNo"
cname=
"销售单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"oldSaleNo"
cname=
"原销售单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"100"
align=
"center"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"prodNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"oldSaleNo"
cname=
"原销售单号"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"inventCode"
cname=
"部件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"subInventCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"createdName"
cname=
"创建人"
enable=
"false"
width=
"120"
align=
"center"
/>
...
...
src/main/webapp/HP/KC/HPKC004A.jsp
View file @
d7a14892
...
...
@@ -9,7 +9,6 @@
<EF:EFRegion
id=
"inqu"
title=
"查询区域"
type=
"query"
>
<div
class=
"row"
>
<div
class=
"row"
>
<EF:EFInput
cname=
"项目号"
ename=
"projCode"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"项目名称"
ename=
"projName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"部件名称"
ename=
"inventName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFInput
cname=
"零件名称"
ename=
"subInventName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
...
...
@@ -19,7 +18,7 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
/>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"whName"
cname=
"仓库名称"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"inventName"
cname=
"部件名称"
enable=
"false"
width=
"120"
align=
"center"
/>
...
...
@@ -28,12 +27,12 @@
<EF:EFColumn
ename=
"applyRemark"
cname=
"申请说明"
width=
"150"
editType=
"textarea"
copy=
"true"
/>
<EF:EFColumn
ename=
"amount"
cname=
"库存数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
<EF:EFColumn
ename=
"whCode"
cname=
"仓库编码"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"inventCode"
cname=
"部件编码"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"subInventCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"prodNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
hidden=
"true"
/>
<EF:EFColumn
ename=
"whCode"
cname=
"仓库编码"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目号"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"inventCode"
cname=
"部件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"subInventCode"
cname=
"零件编码"
enable=
"false"
width=
"120"
align=
"center"
hidden=
"true"
/>
<EF:EFColumn
ename=
"prodNo"
cname=
"生产订单号"
enable=
"false"
width=
"140"
align=
"center"
hidden=
"true"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/KC/HPKC004B.jsp
View file @
d7a14892
...
...
@@ -8,10 +8,6 @@
<EF:EFPage
title=
"库存查询"
>
<EF:EFRegion
id=
"inqu"
title=
"查询区域"
type=
"query"
>
<div
class=
"row"
>
<EF:EFSelect
cname=
"存货类型"
ename=
"inqu_status-0-inventType"
colWidth=
"3"
filter=
"contains"
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('1', '2')"
/>
</EF:EFSelect>
<EF:EFSelect
cname=
"仓库名称"
ename=
"inqu_status-0-whCode"
colWidth=
"3"
filter=
"contains"
>
<EF:EFOption
label=
"全部"
value=
""
/>
<EF:EFOptions
blockId=
"wh_record_block_id"
textField=
"textField"
valueField=
"valueField"
/>
...
...
@@ -29,7 +25,7 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
autoFit=
"true"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
/>
<EF:EFColumn
ename=
"id"
cname=
"库存ID"
enable=
"false"
width=
"60"
align=
"center"
hidden=
"true"
/>
<EF:EFComboColumn
ename=
"inventType"
cname=
"存货类型"
enable=
"false"
width=
"100"
align=
"center"
>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
condition=
"ITEM_CODE IN ('2')"
/>
</EF:EFComboColumn>
...
...
@@ -45,9 +41,6 @@
blockName=
"invent_spec_block_id"
textField=
"textField"
valueField=
"valueField"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
enable=
"false"
width=
"20"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFComboColumn
ename=
"projCode"
cname=
"项目名称"
width=
"300"
align=
"center"
defaultValue=
""
required=
"true"
filter=
"contains"
>
<EF:EFOptions
blockId=
"proj_record_block_id"
valueField=
"valueField"
textField=
"textField"
/>
...
...
@@ -56,8 +49,8 @@
<EF:EFColumn
ename=
"applyRemark"
cname=
"申请说明"
width=
"150"
editType=
"textarea"
copy=
"true"
/>
<EF:EFColumn
ename=
"amount"
cname=
"库存数量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N0}"
sumType=
"all"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
<EF:EFColumn
ename=
"unitWeight"
cname=
"单量
(KG)
"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量
(KG)
"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
sumType=
"all"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
</EF:EFGrid>
...
...
src/main/webapp/HP/KC/HPKC005.js
View file @
d7a14892
...
...
@@ -10,6 +10,13 @@ $(function() {
pageSizes
:
[
20
,
50
,
70
,
100
],
},
"result"
:
{
toolbarConfig
:
{
// hidden: false, // true时,不显示功能按钮,但保留setting导出按钮
// add: false, // 不显示新增按钮
add
:
false
,
// 不显示取消按钮
// save: true, // 不显示保存按钮
// delete: true, // 显示删除按钮
},
columns
:
[{
field
:
"receiptDate"
,
attributes
:
{
...
...
src/main/webapp/HP/KC/HPKC005A.js
View file @
d7a14892
...
...
@@ -71,10 +71,6 @@ let select = function () {
message
(
"勾选的第"
+
(
i
+
1
)
+
"行实物数量必须是大于0的整数"
);
return
;
}
if
(
parseFloat
(
entityAmount
)
>
parseFloat
(
amount
))
{
message
(
"第"
+
(
i
+
1
)
+
"行实物数量不能大于库存数量"
);
return
;
}
}
JSUtils
.
confirm
(
"确定对勾选中的["
+
rows
.
length
+
"]条数据生成盘点单吗? "
,
{
ok
:
function
()
{
...
...
src/main/webapp/HP/KC/HPKC005A.jsp
View file @
d7a14892
...
...
@@ -51,7 +51,7 @@
sumType=
"all"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量(KG)"
enable=
"false"
width=
"120"
align=
"right"
format=
"{0:N3}"
sumType=
"all"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
/>
<EF:EFColumn
ename=
"remark"
cname=
"备注"
enable=
"false"
width=
"150"
hidden=
"true"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/KC/HPKC006.js
View file @
d7a14892
...
...
@@ -95,12 +95,12 @@ $(function() {
},
{
field
:
"unitWeight"
,
template
:
function
(
options
)
{
return
options
.
length
==
0
?
"-"
:
options
.
length
;
return
options
.
unitWeight
==
0
?
"-"
:
options
.
unitWeight
;
}
},
{
field
:
"weight"
,
template
:
function
(
options
)
{
return
options
.
length
==
0
?
"-"
:
options
.
length
;
return
options
.
weight
==
0
?
"-"
:
options
.
weight
;
}
},
{
field
:
"length"
,
...
...
src/main/webapp/HP/KC/HPKC011.jsp
View file @
d7a14892
...
...
@@ -8,7 +8,7 @@
<EF:EFPage
title=
"产品库存管理"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<div
class=
"row"
>
<
EF:EFInput
blockId=
"inqu_status"
ename=
"projCode"
colWidth=
"3"
cname=
"项目编号:"
/
>
<
%
--
<
EF:EFInput
blockId=
"inqu_status"
ename=
"projCode"
colWidth=
"3"
cname=
"项目编号:"
/>
--%
>
<EF:EFInput
blockId=
"inqu_status"
ename=
"projName"
colWidth=
"3"
cname=
"项目名称:"
/>
<
%
--
<
EF:EFInput
blockId=
"inqu_status"
ename=
"prodNo"
colWidth=
"3"
cname=
"生产单号:"
/>
--%>
<EF:EFSelect
ename=
"inqu_status-0-whCode"
cname=
"仓库名称"
colWidth=
"3"
filter=
"contains"
defultValue=
""
>
...
...
@@ -37,17 +37,17 @@
textField=
"textField"
valueField=
"valueField"
align=
"center"
filter=
"contains"
required=
"true"
enable=
"false"
>
</EF:EFComboColumn>
<
EF:EFColumn
ename=
"projCode"
cname=
"项目编号"
width=
"120"
align=
"center"
required=
"true"
enable=
"false"
/
>
<
%
--
<
EF:EFColumn
ename=
"projCode"
cname=
"项目编号"
width=
"120"
align=
"center"
required=
"true"
enable=
"false"
/>
--%
>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
align=
"center"
required=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"inventCode"
cname=
"部件名称"
width=
"120"
align=
"center"
required=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"subInventCode"
cname=
"零件名称"
width=
"120"
align=
"center"
required=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<
%
--
<
EF:EFColumn
ename=
"length"
cname=
"长(MM)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
--%>
<EF:EFColumn
ename=
"amount"
cname=
"数量"
format=
"{0:N0}"
maxLength=
"20"
width=
"90"
align=
"right"
required=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重(
KG
)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<EF:EFColumn
ename=
"weight"
cname=
"重量(
KG
)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<
EF:EFColumn
ename=
"remark"
cname=
"备注"
width=
"120"
align=
"center"
enable=
"false"
/
>
<EF:EFColumn
ename=
"unitWeight"
cname=
"单重(
T
)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<EF:EFColumn
ename=
"weight"
cname=
"重量(
T
)"
format=
"{0:N3}"
maxLength=
"20"
width=
"90"
align=
"right"
enable=
"false"
/>
<
%
--
<
EF:EFColumn
ename=
"remark"
cname=
"备注"
width=
"120"
align=
"center"
enable=
"false"
/>
--%
>
<EF:EFColumn
ename=
"createdBy"
cname=
"创建人"
enable=
"false"
width=
"100"
align=
"center"
/>
<EF:EFColumn
ename=
"createdTime"
cname=
"创建时刻"
enable=
"false"
width=
"140"
align=
"center"
editType=
"datetime"
parseFormats=
"['yyyyMMddHHmmss']"
/>
...
...
src/main/webapp/HP/KC/HPKC012.jsp
View file @
d7a14892
...
...
@@ -55,8 +55,8 @@
<EF:EFColumn
ename=
"spec"
cname=
"规格"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"material"
cname=
"材质"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
enable=
"false"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"amount"
cname=
"库存数量"
enable=
"false"
width=
"90"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"warnNum"
cname=
"预警值"
enable=
"false"
width=
"90"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"amount"
cname=
"库存数量"
enable=
"false"
width=
"90"
align=
"right"
format=
"{0:N0}"
/>
<EF:EFColumn
ename=
"weight"
cname=
"库存重量(KG)"
enable=
"false"
width=
"90"
align=
"right"
format=
"{0:N3}"
/>
<EF:EFComboColumn
ename=
"princ"
cname=
"仓库负责人"
width=
"120"
align=
"center"
enable=
"false"
blockName=
"user_block_id"
textField=
"textField"
valueField=
"valueField"
...
...
src/main/webapp/HP/PZ/HPPZ006.js
View file @
d7a14892
...
...
@@ -123,14 +123,6 @@ let save = function () {
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
存货名称
\"
,不能为空!"
);
return
false
;
}
if
(
isBlank
(
row
[
"material"
]))
{
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
材质
\"
,不能为空!"
);
return
false
;
}
if
(
isBlank
(
row
[
"unit"
]))
{
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
单位
\"
,不能为空!"
);
return
false
;
}
if
(
isBlank
(
row
[
"status"
]))
{
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
状态
\"
,不能为空!"
);
return
false
;
...
...
@@ -150,11 +142,6 @@ let save = function () {
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
厚
\"
,必须是数值!"
);
return
false
;
}
let
coefficient
=
row
[
"coefficient"
];
if
(
!
isBlank
(
coefficient
)
&&
!
isNumber
(
coefficient
))
{
message
(
"选中的第"
+
(
i
+
1
)
+
"行
\"
厚
\"
,必须是数值!"
);
return
false
;
}
}
JSUtils
.
confirm
(
"确定对勾选中的["
+
rows
.
length
+
"]条数据做
\"
保存
\"
操作? "
,
{
ok
:
function
()
{
...
...
src/main/webapp/HP/PZ/HPPZ006.jsp
View file @
d7a14892
...
...
@@ -25,7 +25,7 @@
<EF:EFRegion
id=
"result"
title=
"明细信息"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"档案ID"
enable=
"false"
width=
"60"
align=
"center
"
/>
<EF:EFColumn
ename=
"id"
cname=
"档案ID"
hidden=
"true
"
/>
<EF:EFComboColumn
ename=
"inventType"
cname=
"存货类型"
width=
"80"
align=
"center"
required=
"true"
readonly=
"true"
>
<EF:EFCodeOption
codeName=
"hpjx.hpkc.inventType"
/>
...
...
@@ -35,10 +35,10 @@
<EF:EFColumn
ename=
"length"
cname=
"长(MM)"
width=
"100"
align=
"right"
format=
"{0:N2}"
maxLength=
"10"
/>
<EF:EFColumn
ename=
"width"
cname=
"宽(MM)"
width=
"100"
align=
"right"
format=
"{0:N2}"
maxLength=
"10"
/>
<EF:EFColumn
ename=
"thick"
cname=
"厚(MM)"
width=
"100"
align=
"right"
format=
"{0:N2}"
maxLength=
"10"
/>
<EF:EFColumn
ename=
"material"
cname=
"材质"
width=
"100"
align=
"center"
required=
"true"
/>
<EF:EFColumn
ename=
"material"
cname=
"材质"
width=
"100"
align=
"center"
/>
<EF:EFColumn
ename=
"coefficient"
cname=
"系数"
width=
"80"
align=
"right"
format=
"{0:N2}"
maxLength=
"10"
defaultValue=
"1"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
width=
"80"
align=
"center"
required=
"true"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
width=
"80"
align=
"center"
/>
<EF:EFComboColumn
ename=
"status"
cname=
"状态"
align=
"center"
width=
"80"
required=
"true"
defaultValue=
"1"
>
<EF:EFCodeOption
codeName=
"hpjx.hpjx.status"
/>
</EF:EFComboColumn>
...
...
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