Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
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
鲁鑫
topsun-bpm
Commits
0188c3af
Commit
0188c3af
authored
Nov 21, 2024
by
1650842865
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物料复制功能；验证物料品名不能重复
parent
f28912ae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
646 additions
and
57 deletions
+646
-57
materialApplyNext.js
...n/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
+162
-0
materialApplyNext.jsp
.../webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp
+5
-5
nonProdApplyNext.js
...in/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
+236
-0
nonProdApplyNext.jsp
...n/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
+5
-9
EpChangeFormApplicationImpl.java
.../change/application/impl/EpChangeFormApplicationImpl.java
+7
-5
NonProdApplyDeptApplicationImpl.java
...ply/application/impl/NonProdApplyDeptApplicationImpl.java
+31
-37
ProcessQuotedPriceItemApplicationImpl.java
...plication/impl/ProcessQuotedPriceItemApplicationImpl.java
+5
-1
easy-search-material.xml
...ources/config/content/easysearch/easy-search-material.xml
+195
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @
0188c3af
...
@@ -417,6 +417,168 @@ function bindEvent() {
...
@@ -417,6 +417,168 @@ function bindEvent() {
}
}
}
}
});
});
//参考物料选择
$
(
"#copyMatnr"
).
searchbox
({
type
:
"material"
,
name
:
"selectMaterials"
,
getParam
:
function
(
item
)
{
if
(
Public
.
isBlank
(
$
(
'#mtart'
).
val
())){
Public
.
tip
(
"请先选择物品类型！"
)
return
false
}
if
(
Public
.
isBlank
(
$
(
'#matkl'
).
val
())){
Public
.
tip
(
"请先选择物料组！"
)
return
false
}
return
{
mtart
:
$
(
"#mtart"
).
val
(),
matkl
:
$
(
"#matkl"
).
val
()
}
},
onChange
:
function
(
value
,
data
)
{
//先清空勾选视图
$
(
"input[name='businessUsage']"
).
each
(
function
(){
$
(
this
).
prop
(
"checked"
,
false
);
hideAllBusiness
(
true
);
})
$
(
"#copyMatnr"
).
val
(
value
.
text
);
var
mtart
=
$
(
"#mtart"
).
val
();
var
matkl
=
$
(
"#matkl"
).
val
();
if
(
Public
.
isBlank
(
mtart
)){
$
(
"#mtart"
).
val
(
data
.
mtart
)
$
(
"#mtart_text"
).
val
(
data
.
mtartTextView
)
}
if
(
Public
.
isBlank
(
matkl
)){
$
(
"#matkl"
).
val
(
data
.
matkl
)
$
(
"#matklName"
).
val
(
data
.
matklName
)
}
$
(
"#groes"
).
val
(
data
.
groes
)
$
(
"#spartName"
).
val
(
data
.
spartName
)
$
(
"#spart"
).
val
(
data
.
spart
)
$
(
"#mtposMara"
).
val
(
data
.
mtposMara
)
//$("#maktx").val(data.maktx)
$
(
"#xchpf"
).
val
(
data
.
xchpf
)
$
(
"#maktxEn"
).
val
(
data
.
maktxEn
)
$
(
"#meinsName"
).
val
(
data
.
meinsName
)
$
(
"#meins"
).
val
(
data
.
meins
)
$
(
"#werksName"
).
val
(
data
.
werksName
)
$
(
"#werks"
).
val
(
data
.
werks
)
$
(
"#lgortName"
).
val
(
data
.
lgortName
)
$
(
"#lgort"
).
val
(
data
.
lgort
)
$
(
"#raube"
).
val
(
data
.
raube
)
$
(
"#brgew"
).
val
(
data
.
brgew
)
$
(
"#gewei"
).
val
(
data
.
gewei
)
$
(
"#volum"
).
val
(
data
.
volum
)
$
(
"#voleh"
).
val
(
data
.
voleh
)
$
(
"#iprkz"
).
val
(
data
.
iprkz
)
$
(
"#mhdhb"
).
val
(
data
.
mhdhb
)
$
(
"#mhdrz"
).
val
(
data
.
mhdrz
)
$
(
"#length"
).
val
(
data
.
length
)
$
(
"#widthCm"
).
val
(
data
.
widthCm
)
$
(
"#thickness"
).
val
(
data
.
thickness
)
$
(
"#weight"
).
val
(
data
.
weight
)
$
(
"#singleThickness"
).
val
(
data
.
singleThickness
)
$
(
"#klart"
).
val
(
data
.
klart
)
$
(
"#classify"
).
val
(
data
.
class
)
//$("#businessUsage").val(data.businessUsage)
var
businessUsages
=
data
.
businessUsage
;
var
businessUsageStr
=
businessUsages
.
split
(
","
);
for
(
let
i
=
0
;
i
<
businessUsageStr
.
length
;
i
++
)
{
var
businessUsageVal
=
businessUsageStr
[
i
];
var
id
=
"businessUsage"
+
businessUsageVal
;
$
(
"#"
+
id
).
prop
(
"checked"
,
true
);
coRowNum
=
MathUtil
.
add
(
coRowNum
,
1
);
showBusiness
(
businessUsageVal
)
}
$
(
"#isAll"
).
val
(
data
.
isAll
)
$
(
"#lgtypName"
).
val
(
data
.
lgtypName
)
$
(
"#lgtyp"
).
val
(
data
.
lgtyp
)
$
(
"#mtvfp"
).
val
(
data
.
mtvfp
)
//销售视图
$
(
"#vkorgName"
).
val
(
data
.
vkorgName
)
$
(
"#vkorg"
).
val
(
data
.
vkorg
)
$
(
"#vtwegName"
).
val
(
data
.
vtwegName
)
$
(
"#vtweg"
).
val
(
data
.
vtweg
)
$
(
"#alandName"
).
val
(
data
.
alandName
)
$
(
"#aland"
).
val
(
data
.
aland
)
$
(
"#taxkm"
).
val
(
data
.
taxkm
)
$
(
"#mtpos"
).
val
(
data
.
mtpos
)
$
(
"#tragr"
).
val
(
data
.
tragr
)
$
(
"#ladgr"
).
val
(
data
.
ladgr
)
$
(
"#ladgrName"
).
val
(
data
.
ladgrName
)
//采购视图
$
(
"#bstmeName"
).
val
(
data
.
bstmeName
)
$
(
"#bstme"
).
val
(
data
.
bstme
)
$
(
"#umrenPurch"
).
val
(
data
.
umrenPurch
)
$
(
"#umrezPurch"
).
val
(
data
.
umrezPurch
)
$
(
"#ekgrpName"
).
val
(
data
.
ekgrpName
)
$
(
"#ekgrp"
).
val
(
data
.
ekgrp
)
//MRP视图
$
(
"#rgekz"
).
val
(
data
.
rgekz
)
$
(
"#strgr"
).
val
(
data
.
strgr
)
$
(
"#sbdkz"
).
val
(
data
.
sbdkz
)
$
(
"#vrmod"
).
val
(
data
.
vrmod
)
$
(
"#vint1"
).
val
(
data
.
vint1
)
$
(
"#vint2"
).
val
(
data
.
vint2
)
$
(
"#perkz"
).
val
(
data
.
perkz
)
$
(
"#dismm"
).
val
(
data
.
dismm
)
$
(
"#dispo"
).
val
(
data
.
dispo
)
$
(
"#disls"
).
val
(
data
.
disls
)
$
(
"#bstmi"
).
val
(
data
.
bstmi
)
$
(
"#bstrf"
).
val
(
data
.
bstrf
)
$
(
"#lgproName"
).
val
(
data
.
lgproName
)
$
(
"#lgpro"
).
val
(
data
.
lgpro
)
$
(
"#lgfsbName"
).
val
(
data
.
lgfsbName
)
$
(
"#lgfsb"
).
val
(
data
.
lgfsb
)
//生产视图
$
(
"#fevor"
).
val
(
data
.
fevor
)
$
(
"#sfcpf"
).
val
(
data
.
sfcpf
)
//存储视图
$
(
"#lgortQmName"
).
val
(
data
.
lgortQmName
)
$
(
"#lgortQm"
).
val
(
data
.
lgortQm
)
$
(
"#sernp"
).
val
(
data
.
sernp
)
$
(
"#serlv"
).
val
(
data
.
serlv
)
$
(
"#prctr"
).
val
(
data
.
prctr
)
$
(
"#insmk"
).
val
(
data
.
insmk
)
$
(
"#sledBbd"
).
val
(
data
.
sledBbd
)
//仓库视图
$
(
"#lgnumName"
).
val
(
data
.
lgnumName
)
$
(
"#lgnum"
).
val
(
data
.
lgnum
)
$
(
"#lgortProfitName"
).
val
(
data
.
lgortProfitName
)
$
(
"#lgortProfit"
).
val
(
data
.
lgortProfit
)
$
(
"#ltkzaName"
).
val
(
data
.
ltkzaName
)
$
(
"#ltkza"
).
val
(
data
.
ltkza
)
$
(
"#lety1"
).
val
(
data
.
lety1
)
$
(
"#lhmg1"
).
val
(
data
.
lhmg1
)
$
(
"#lhme1Name"
).
val
(
data
.
lhme1Name
)
$
(
"#lhme1"
).
val
(
data
.
lhme1
)
$
(
"#ltkzeName"
).
val
(
data
.
ltkzeName
)
$
(
"#ltkze"
).
val
(
data
.
ltkze
)
$
(
"#lgbkz"
).
val
(
data
.
lgbkz
)
//财务视图
$
(
"#bklas"
).
val
(
data
.
bklas
)
$
(
"#vprsv"
).
val
(
data
.
vprsv
)
$
(
"#mlast"
).
val
(
data
.
mlast
)
$
(
"#peinh"
).
val
(
data
.
peinh
)
$
(
"#ncost"
).
val
(
data
.
ncost
)
$
(
"#hkmat"
).
val
(
data
.
hkmat
)
$
(
"#verpr"
).
val
(
data
.
verpr
)
$
(
"#stprs"
).
val
(
data
.
stprs
)
$
(
"#ekalr"
).
val
(
data
.
ekalr
)
$
(
"#awsls"
).
val
(
data
.
awsls
)
$
(
"#eklas"
).
val
(
data
.
eklas
)
}
});
}
}
function
bindEvent_raube
(
werks
,
lgort
){
function
bindEvent_raube
(
werks
,
lgort
){
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp
View file @
0188c3af
...
@@ -108,6 +108,7 @@
...
@@ -108,6 +108,7 @@
<div
class=
"hg-form-cols"
id=
"basicInfoDiv"
>
<div
class=
"hg-form-cols"
id=
"basicInfoDiv"
>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"matnr"
label=
"物品编码"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"matnr"
label=
"物品编码"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"copyMatnr"
label=
"参考物料"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<!--x:inputC name="mbrsh" label="行业" labelCol="1" fieldCol="2"/-->
<!--x:inputC name="mbrsh" label="行业" labelCol="1" fieldCol="2"/-->
<x:selectC
name=
"mtart"
label=
"物品类型"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
<x:selectC
name=
"mtart"
label=
"物品类型"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
...
@@ -115,10 +116,6 @@
...
@@ -115,10 +116,6 @@
<x:inputC
name=
"matklName"
label=
"物料组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:inputC
name=
"matklName"
label=
"物料组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:hidden
name=
"matkl"
/>
<x:hidden
name=
"matkl"
/>
<x:inputC
name=
"groes"
label=
"规格"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"groes"
label=
"规格"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<c:if
test=
"
${
applyType
==
1
}
"
>
<x:selectC
name=
"lvorm"
label=
"集团级删除"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"lvorm"
/>
</c:if>
<%-- <x:inputC name="spartName" value="通用产品组" label="产品组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>--%>
<%-- <x:inputC name="spartName" value="通用产品组" label="产品组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>--%>
<x:hidden
name=
"spartName"
value=
"通用产品组"
/>
<x:hidden
name=
"spartName"
value=
"通用产品组"
/>
<x:hidden
name=
"spart"
/>
<x:hidden
name=
"spart"
/>
...
@@ -159,7 +156,10 @@
...
@@ -159,7 +156,10 @@
<x:inputC
name=
"thickness"
label=
"厚度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"thickness"
label=
"厚度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"weight"
label=
"克重g"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"weight"
label=
"克重g"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"singleThickness"
label=
"单层厚"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"singleThickness"
label=
"单层厚"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<c:if
test=
"
${
applyType
==
1
}
"
>
<x:selectC
name=
"lvorm"
label=
"集团级删除"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"lvorm"
/>
</c:if>
<x:hidden
name=
"klart"
/>
<x:hidden
name=
"klart"
/>
<x:hidden
name=
"classify"
/>
<x:hidden
name=
"classify"
/>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @
0188c3af
...
@@ -1098,6 +1098,242 @@ function bindEvent() {
...
@@ -1098,6 +1098,242 @@ function bindEvent() {
}
}
});
});
bindEvent_warehouse
();
bindEvent_warehouse
();
//参考物料选择
//参考物料选择
$
(
"#copyMatnr"
).
searchbox
({
type
:
"material"
,
name
:
"selectMaterials"
,
getParam
:
function
(
item
)
{
if
(
Public
.
isBlank
(
$
(
'#mtart'
).
val
())){
Public
.
tip
(
"请先选择物品类型！"
)
return
false
}
if
(
Public
.
isBlank
(
$
(
'#matkl'
).
val
())){
Public
.
tip
(
"请先选择物料组！"
)
return
false
}
return
{
mtart
:
$
(
"#mtart"
).
val
(),
matkl
:
$
(
"#matkl"
).
val
()
}
},
onChange
:
function
(
value
,
data
)
{
//先清空勾选视图
$
(
"input[name='businessUsage']"
).
each
(
function
(){
$
(
this
).
prop
(
"checked"
,
false
);
hideAllBusiness
(
true
);
})
$
(
"#copyMatnr"
).
val
(
value
.
text
);
var
mtart
=
$
(
"#mtart"
).
val
();
var
matkl
=
$
(
"#matkl"
).
val
();
if
(
Public
.
isBlank
(
mtart
)){
$
(
"#mtart"
).
val
(
data
.
mtart
)
$
(
"#mtart_text"
).
val
(
data
.
mtartTextView
)
}
if
(
Public
.
isBlank
(
matkl
)){
$
(
"#matkl"
).
val
(
data
.
matkl
)
$
(
"#matklName"
).
val
(
data
.
matklName
)
}
$
(
"#groes"
).
val
(
data
.
groes
)
$
(
"#spartName"
).
val
(
data
.
spartName
)
$
(
"#spart"
).
val
(
data
.
spart
)
$
(
"#mtposMara"
).
val
(
data
.
mtposMara
)
//$("#maktx").val(data.maktx)
$
(
"#xchpf"
).
val
(
data
.
xchpf
)
$
(
"#xchpf_text"
).
val
(
data
.
xchpfTextView
)
$
(
"#maktxEn"
).
val
(
data
.
maktxEn
)
$
(
"#meinsName"
).
val
(
data
.
meinsName
)
$
(
"#meins"
).
val
(
data
.
meins
)
$
(
"#werksName"
).
val
(
data
.
werksName
)
$
(
"#werks"
).
val
(
data
.
werks
)
$
(
"#lgortName"
).
val
(
data
.
lgortName
)
$
(
"#lgort"
).
val
(
data
.
lgort
)
$
(
"#raube"
).
val
(
data
.
raube
)
$
(
"#raube_text"
).
val
(
data
.
raubeTextView
)
$
(
"#brgew"
).
val
(
data
.
brgew
)
$
(
"#gewei"
).
val
(
data
.
gewei
)
$
(
"#gewei_text"
).
val
(
data
.
geweiTextView
)
$
(
"#volum"
).
val
(
data
.
volum
)
$
(
"#voleh"
).
val
(
data
.
voleh
)
$
(
"#voleh_text"
).
val
(
data
.
volehTextView
)
$
(
"#iprkz"
).
val
(
data
.
iprkz
)
$
(
"#iprkz_text"
).
val
(
data
.
iprkzTextView
)
$
(
"#mhdhb"
).
val
(
data
.
mhdhb
)
$
(
"#mhdrz"
).
val
(
data
.
mhdrz
)
$
(
"#length"
).
val
(
data
.
length
)
$
(
"#widthCm"
).
val
(
data
.
widthCm
)
$
(
"#thickness"
).
val
(
data
.
thickness
)
$
(
"#weight"
).
val
(
data
.
weight
)
$
(
"#singleThickness"
).
val
(
data
.
singleThickness
)
$
(
"#klart"
).
val
(
data
.
klart
)
$
(
"#classify"
).
val
(
data
.
class
)
$
(
"#maktxRemZh"
).
val
(
data
.
maktxRemZh
)
$
(
"#maktxRemEn"
).
val
(
data
.
maktxRemEn
)
//$("#businessUsage").val(data.businessUsage)
var
businessUsages
=
data
.
businessUsage
;
var
businessUsageStr
=
businessUsages
.
split
(
","
);
for
(
let
i
=
0
;
i
<
businessUsageStr
.
length
;
i
++
)
{
var
businessUsageVal
=
businessUsageStr
[
i
];
var
id
=
"businessUsage"
+
businessUsageVal
;
$
(
"#"
+
id
).
prop
(
"checked"
,
true
);
coRowNum
=
MathUtil
.
add
(
coRowNum
,
1
);
showBusiness
(
businessUsageVal
)
}
$
(
"#isAll"
).
val
(
data
.
isAll
)
$
(
"#lgtypName"
).
val
(
data
.
lgtypName
)
$
(
"#lgtyp"
).
val
(
data
.
lgtyp
)
$
(
"#mtvfp"
).
val
(
data
.
mtvfp
)
$
(
"#mtvfp_text"
).
val
(
data
.
mtvfpTextView
)
//销售视图
$
(
"#vkorgName"
).
val
(
data
.
vkorgName
)
$
(
"#vkorg"
).
val
(
data
.
vkorg
)
$
(
"#vtwegName"
).
val
(
data
.
vtwegName
)
$
(
"#vtweg"
).
val
(
data
.
vtweg
)
$
(
"#vrkmeName"
).
val
(
data
.
vrkmeName
)
$
(
"#vrkme"
).
val
(
data
.
vrkme
)
$
(
"#umrenSale"
).
val
(
data
.
umrenSale
)
$
(
"#umrezSale"
).
val
(
data
.
umrezSale
)
$
(
"#dwerkName"
).
val
(
data
.
dwerkName
)
$
(
"#dwerk"
).
val
(
data
.
dwerk
)
$
(
"#alandName"
).
val
(
data
.
alandName
)
$
(
"#aland"
).
val
(
data
.
aland
)
$
(
"#taxkm"
).
val
(
data
.
taxkm
)
$
(
"#taxkm_text"
).
val
(
data
.
taxkmTextView
)
$
(
"#versg"
).
val
(
data
.
versg
)
$
(
"#versg_text"
).
val
(
data
.
versgTextView
)
$
(
"#kondm"
).
val
(
data
.
kondm
)
$
(
"#kondm_text"
).
val
(
data
.
kondmTextView
)
$
(
"#ktgrm"
).
val
(
data
.
ktgrm
)
$
(
"#ktgrm_text"
).
val
(
data
.
ktgrmTextView
)
$
(
"#prodh"
).
val
(
data
.
prodh
)
$
(
"#mvgr1"
).
val
(
data
.
mvgr1
)
$
(
"#mvgr2"
).
val
(
data
.
mvgr2
)
$
(
"#mvgr2_text"
).
val
(
data
.
mvgr2TextView
)
$
(
"#mvgr3"
).
val
(
data
.
mvgr3
)
$
(
"#mvgr4"
).
val
(
data
.
mvgr4
)
$
(
"#mvgr5"
).
val
(
data
.
mvgr5
)
//2
$
(
"#mtpos"
).
val
(
data
.
mtpos
)
$
(
"#mtpos_text"
).
val
(
data
.
mtposTextView
)
$
(
"#tragr"
).
val
(
data
.
tragr
)
$
(
"#tragr_text"
).
val
(
data
.
tragrTextView
)
$
(
"#ladgr"
).
val
(
data
.
ladgr
)
$
(
"#ladgrName"
).
val
(
data
.
ladgrName
)
//采购视图
$
(
"#bstmeName"
).
val
(
data
.
bstmeName
)
$
(
"#bstme"
).
val
(
data
.
bstme
)
$
(
"#umrenPurch"
).
val
(
data
.
umrenPurch
)
$
(
"#umrezPurch"
).
val
(
data
.
umrezPurch
)
$
(
"#ekgrpName"
).
val
(
data
.
ekgrpName
)
$
(
"#ekgrp"
).
val
(
data
.
ekgrp
)
//MRP视图
$
(
"#rgekz"
).
val
(
data
.
rgekz
)
$
(
"#rgekz_text"
).
val
(
data
.
rgekzTextView
)
$
(
"#strgr"
).
val
(
data
.
strgr
)
$
(
"#strgr_text"
).
val
(
data
.
strgrTextView
)
$
(
"#sbdkz"
).
val
(
data
.
sbdkz
)
$
(
"#sbdkz_text"
).
val
(
data
.
sbdkzTextView
)
$
(
"#vrmod"
).
val
(
data
.
vrmod
)
$
(
"#vrmod_text"
).
val
(
data
.
vrmodTextView
)
$
(
"#vint1"
).
val
(
data
.
vint1
)
$
(
"#vint2"
).
val
(
data
.
vint2
)
$
(
"#perkz"
).
val
(
data
.
perkz
)
$
(
"#perkz_text"
).
val
(
data
.
perkzTextView
)
$
(
"#dismm"
).
val
(
data
.
dismm
)
$
(
"#dismm_text"
).
val
(
data
.
dismmTextView
)
$
(
"#dispo"
).
val
(
data
.
dispo
)
$
(
"#dispo_text"
).
val
(
data
.
dispoTextView
)
$
(
"#disls"
).
val
(
data
.
disls
)
$
(
"#disls_text"
).
val
(
data
.
dislsTextView
)
$
(
"#bstmi"
).
val
(
data
.
bstmi
)
$
(
"#bstrf"
).
val
(
data
.
bstrf
)
$
(
"#lgproName"
).
val
(
data
.
lgproName
)
$
(
"#lgpro"
).
val
(
data
.
lgpro
)
$
(
"#lgfsbName"
).
val
(
data
.
lgfsbName
)
$
(
"#lgfsb"
).
val
(
data
.
lgfsb
)
$
(
"#disgr"
).
val
(
data
.
disgr
)
$
(
"#disgr_text"
).
val
(
data
.
disgrTextView
)
$
(
"#minbe"
).
val
(
data
.
minbe
)
$
(
"#bstfe"
).
val
(
data
.
bstfe
)
$
(
"#bstma"
).
val
(
data
.
bstma
)
$
(
"#beskz"
).
val
(
data
.
beskz
)
$
(
"#beskz_text"
).
val
(
data
.
beskzTextView
)
$
(
"#sobsl"
).
val
(
data
.
sobsl
)
$
(
"#sobsl_text"
).
val
(
data
.
sobslTextView
)
$
(
"#webaz"
).
val
(
data
.
webaz
)
$
(
"#dzeit"
).
val
(
data
.
dzeit
)
$
(
"#fhori"
).
val
(
data
.
fhori
)
$
(
"#eisbe"
).
val
(
data
.
eisbe
)
$
(
"#eislo"
).
val
(
data
.
eislo
)
$
(
"#wzeit"
).
val
(
data
.
wzeit
)
$
(
"#plifz"
).
val
(
data
.
plifz
)
$
(
"#diskz"
).
val
(
data
.
diskz
)
$
(
"#diskz_text"
).
val
(
data
.
diskzTextView
)
$
(
"#miskz_text"
).
val
(
data
.
miskzTextView
)
$
(
"#miskz"
).
val
(
data
.
miskz
)
//生产视图
$
(
"#fevor"
).
val
(
data
.
fevor
)
$
(
"#sfcpf"
).
val
(
data
.
sfcpf
)
$
(
"#sfcpf_text"
).
val
(
data
.
sfcpfTextView
)
$
(
"#ausmeName"
).
val
(
data
.
ausmeName
)
$
(
"#ausme"
).
val
(
data
.
ausme
)
$
(
"#umrenProd"
).
val
(
data
.
umrenProd
)
$
(
"#umrezProd"
).
val
(
data
.
umrezProd
)
//存储视图
$
(
"#lgortQmName"
).
val
(
data
.
lgortQmName
)
$
(
"#lgortQm"
).
val
(
data
.
lgortQm
)
$
(
"#sernp"
).
val
(
data
.
sernp
)
$
(
"#sernp_text"
).
val
(
data
.
sernpTextView
)
$
(
"#serlv"
).
val
(
data
.
serlv
)
$
(
"#prctr"
).
val
(
data
.
prctr
)
$
(
"#prctr_text"
).
val
(
data
.
prctrTextView
)
$
(
"#insmk"
).
val
(
data
.
insmk
)
$
(
"#insmk_text"
).
val
(
data
.
insmkTextView
)
$
(
"#sledBbd"
).
val
(
data
.
sledBbd
)
$
(
"#sledBbd_text"
).
val
(
data
.
sledBbdTextView
)
//仓库视图
$
(
"#lgnumName"
).
val
(
data
.
lgnumName
)
$
(
"#lgnum"
).
val
(
data
.
lgnum
)
$
(
"#lgortProfitName"
).
val
(
data
.
lgortProfitName
)
$
(
"#lgortProfit"
).
val
(
data
.
lgortProfit
)
$
(
"#ltkzaName"
).
val
(
data
.
ltkzaName
)
$
(
"#ltkza"
).
val
(
data
.
ltkza
)
$
(
"#lety1"
).
val
(
data
.
lety1
)
$
(
"#lhmg1"
).
val
(
data
.
lhmg1
)
$
(
"#lhme1Name"
).
val
(
data
.
lhme1Name
)
$
(
"#lhme1"
).
val
(
data
.
lhme1
)
$
(
"#ltkzeName"
).
val
(
data
.
ltkzeName
)
$
(
"#ltkze"
).
val
(
data
.
ltkze
)
$
(
"#lgbkz"
).
val
(
data
.
lgbkz
)
//财务视图
$
(
"#bklas"
).
val
(
data
.
bklas
)
$
(
"#vprsv"
).
val
(
data
.
vprsv
)
$
(
"#vprsv_text"
).
val
(
data
.
vprsvTextView
)
$
(
"#mlast"
).
val
(
data
.
mlast
)
$
(
"#mlast_text"
).
val
(
data
.
mlastTextView
)
$
(
"#peinh"
).
val
(
data
.
peinh
)
$
(
"#ncost"
).
val
(
data
.
ncost
)
$
(
"#ncost_text"
).
val
(
data
.
ncostTextView
)
$
(
"#hkmat"
).
val
(
data
.
hkmat
)
$
(
"#hkmat_text"
).
val
(
data
.
hkmatTextView
)
$
(
"#verpr"
).
val
(
data
.
verpr
)
$
(
"#stprs"
).
val
(
data
.
stprs
)
$
(
"#ekalr"
).
val
(
data
.
ekalr
)
$
(
"#ekalr_text"
).
val
(
data
.
ekalrTextView
)
$
(
"#awsls"
).
val
(
data
.
awsls
)
$
(
"#eklas"
).
val
(
data
.
eklas
)
}
});
}
}
function
bindEvent_sale
()
{
function
bindEvent_sale
()
{
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @
0188c3af
...
@@ -111,20 +111,17 @@
...
@@ -111,20 +111,17 @@
<div
class=
"hg-form-cols"
id=
"basicInfoDiv"
>
<div
class=
"hg-form-cols"
id=
"basicInfoDiv"
>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"matnr"
label=
"物品编码"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"matnr"
label=
"物品编码"
readonly=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"copyMatnr"
label=
"参考物料"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<!--x:inputC name="mbrsh" label="行业" labelCol="1" fieldCol="2"/-->
<!--x:inputC name="mbrsh" label="行业" labelCol="1" fieldCol="2"/-->
<x:selectC
name=
"mtart"
label=
"物品类型"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"suppliesType"
/>
<x:selectC
name=
"mtart"
label=
"物品类型"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"suppliesType"
/>
<x:inputC
name=
"matklName"
label=
"物料组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:inputC
name=
"matklName"
label=
"物料组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:hidden
name=
"matkl"
/>
<x:hidden
name=
"matkl"
/>
<x:inputC
name=
"groes"
label=
"规格"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"groes"
label=
"规格"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
/>
<c:if
test=
"
${
applyType
==
1
}
"
>
<x:selectC
name=
"lvorm"
label=
"集团级删除"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"lvorm"
/>
</c:if>
<x:inputC
name=
"spartName"
label=
"产品组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:inputC
name=
"spartName"
label=
"产品组"
required=
"true"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:hidden
name=
"spart"
/>
<x:hidden
name=
"spart"
/>
<x:selectC
name=
"mtposMara"
label=
"项目类别组"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"mtposMara"
/>
<x:selectC
name=
"mtposMara"
label=
"项目类别组"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"mtposMara"
/>
<x:inputC
name=
"maktx"
label=
"汉语品名"
required=
"true"
labelCol=
"1"
fieldCol=
"5"
/>
<x:selectC
name=
"xchpf"
label=
"批次管理"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"xchpf"
required=
"true"
/>
<x:selectC
name=
"xchpf"
label=
"批次管理"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"xchpf"
required=
"true"
/>
<x:inputC
name=
"maktx"
label=
"汉语品名"
required=
"true"
labelCol=
"1"
fieldCol=
"5"
/>
<!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
<!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
<x:inputC
name=
"maktxEn"
label=
"英语品名"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"maktxEn"
label=
"英语品名"
labelCol=
"1"
fieldCol=
"2"
/>
...
@@ -138,7 +135,6 @@
...
@@ -138,7 +135,6 @@
<!--x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/-->
<!--x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/-->
<x:selectC
name=
"iprkz"
label=
"有效时间标识"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"iprkz"
/>
<x:selectC
name=
"iprkz"
label=
"有效时间标识"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"iprkz"
/>
<x:inputC
name=
"mhdhb"
label=
"总有效期"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"mhdhb"
label=
"总有效期"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
""
label=
"旧料号"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"mhdrz"
label=
"最小货架寿命"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"mhdrz"
label=
"最小货架寿命"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"normt"
label=
"适用行业标准"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"normt"
label=
"适用行业标准"
labelCol=
"1"
fieldCol=
"2"
/>
...
@@ -148,11 +144,11 @@
...
@@ -148,11 +144,11 @@
<x:inputC
name=
"thickness"
label=
"厚度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"thickness"
label=
"厚度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"weight"
label=
"克重g"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"weight"
label=
"克重g"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"singleThickness"
label=
"单层厚"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"singleThickness"
label=
"单层厚"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"klart"
label=
"类型"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"klart"
label=
"类型"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"classify"
label=
"分类"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"classify"
label=
"分类"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<c:if
test=
"
${
applyType
==
1
}
"
>
<x:selectC
name=
"lvorm"
label=
"集团级删除"
required=
"false"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"lvorm"
/>
</c:if>
</div>
</div>
</div>
</div>
<div
class=
"hg-form-cols"
>
<div
class=
"hg-form-cols"
>
...
...
topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java
View file @
0188c3af
...
@@ -395,12 +395,14 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
...
@@ -395,12 +395,14 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
//日志记录
//日志记录
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
//成品变更
//成品变更
String
url
=
"pro/productionSolution/openEcn?pds="
+
epChangeForm
.
getPd
();
//
String url = "pro/productionSolution/openEcn?pds="+epChangeForm.getPd();
//String url = "pro/productionSolution/openEcn?pds="+epChangeForm.getPd()+"&changedPd="+"
";
String
url
=
"pro/productionSolution/openEcn?pds="
+
epChangeForm
.
getPd
()+
"&type=
"
;
//原材料变更
//原材料变更
// if (StringUtil.isNotBlank(epChangeForm.getMaterialReasonForChange())){
if
(
StringUtil
.
isNotBlank
(
epChangeForm
.
getMaterialReasonForChange
())){
// url = url + epChangeForm.getChangedPd();
url
=
url
+
"material"
;
// }
}
else
{
url
=
url
+
"product"
;
}
try
{
try
{
String
execute
=
httpClient
.
executeForEp
(
map
,
url
);
String
execute
=
httpClient
.
executeForEp
(
map
,
url
);
EpResult
epResult
=
JSONObject
.
parseObject
(
execute
,
EpResult
.
class
);
EpResult
epResult
=
JSONObject
.
parseObject
(
execute
,
EpResult
.
class
);
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @
0188c3af
...
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
...
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
...
@@ -71,47 +72,37 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
...
@@ -71,47 +72,37 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String
meId
=
sdo
.
getString
(
"meId"
);
String
meId
=
sdo
.
getString
(
"meId"
);
String
opstatus
=
sdo
.
getString
(
"opstatus"
);
//操作状态
String
opstatus
=
sdo
.
getString
(
"opstatus"
);
//操作状态
NonProdApplyBaseInfo
baseInfo
=
nonProdApplyBaseInfoRepository
.
findOne
(
sdo
.
getString
(
"id"
));
NonProdApplyBaseInfo
baseInfo
=
nonProdApplyBaseInfoRepository
.
findOne
(
sdo
.
getString
(
"id"
));
String
maktx
=
sdo
.
getString
(
"maktx"
);
boolean
isSame
=
false
;
//判断汉语品名是否已经存在
//判断汉语品名是否已经存在
if
(
StringUtil
.
isNotBlank
(
sdo
.
getString
(
"maktx"
)))
{
if
(
StringUtil
.
isNotBlank
(
maktx
))
{
List
<
Map
<
String
,
Object
>>
baseList
=(
List
<
Map
<
String
,
Object
>>)
sdo
.
getProperty
(
"baseList"
);
List
<
SapNonProdApplyDept
>
applyDeptList
=
nonProdApplyDeptRepository
.
findByMaktx
(
maktx
);
boolean
isSame
=
false
;
if
(!
CollectionUtils
.
isEmpty
(
applyDeptList
)){
if
(
baseList
.
size
()>
0
){
//半成品 产成品 设备类从EP发起，已有物料编码，需要根据编码是否相同判断，如果存在不同的编码则汉语品名重复
Map
maps
=
baseList
.
get
(
0
);
if
(
"new"
.
equals
(
baseInfo
.
getMaintenanceType
())){
String
nbid
=
maps
.
get
(
"id"
).
toString
();
for
(
SapNonProdApplyDept
sapNonProdApplyDept
:
applyDeptList
)
{
if
((
"ZBCP"
.
equals
(
sapNonProdApplyDept
.
getMtart
())
if
(
"new"
.
equals
(
baseInfo
.
getMaintenanceType
())){
||
"ZSHB"
.
equals
(
sapNonProdApplyDept
.
getMtart
())
if
(!
nbid
.
equals
(
baseInfo
.
getId
())){
||
"ZZCP"
.
equals
(
sapNonProdApplyDept
.
getMtart
()))
&&
!
sdo
.
getString
(
"matnr"
).
equals
(
sapNonProdApplyDept
.
getMatnr
())){
isSame
=
true
;
isSame
=
true
;
}
}
else
{
}
else
{
//变更、扩展的
//如果不是上诉类型的物料，只要查到数据，就存在汉语品名重复
String
rootId
=
getRootId
(
baseInfo
.
getId
(),
baseList
);
isSame
=
true
;
if
(!
rootId
.
equals
(
nbid
)){
}
isSame
=
true
;
}
}
if
(
isSame
)
{
throw
new
RuntimeException
(
"汉语品名:"
+
sdo
.
getString
(
"maktx"
)
+
"已经存在！请检查输入"
);
}
}
/* List<SapNonProdApplyDept> prodApplyDeptList = nonProdApplyDeptRepository.findByMaktx(sdo.getString("maktx").trim());
}
if (prodApplyDeptList.size() > 0) {
}
else
{
for (SapNonProdApplyDept prodApplyDept : prodApplyDeptList) {
for
(
SapNonProdApplyDept
sapNonProdApplyDept
:
applyDeptList
)
{
NonProdApplyBaseInfo parentBaseInfo = nonProdApplyBaseInfoRepository.findOne(prodApplyDept.getBaseInfoId());
if
(!
sdo
.
getString
(
"matnr"
).
equals
(
sapNonProdApplyDept
.
getMatnr
()))
{
if (parentBaseInfo != null) {
isSame
=
true
;
if (baseInfo.getId().equals(parentBaseInfo.getId()) //表示是当前单据 忽略掉
|| parentBaseInfo.getStatusId() == 5 //排除终止的
|| (baseInfo.getSourceId()!=null&&baseInfo.getSourceId().equals(parentBaseInfo.getId()))
|| (baseInfo.getSourceId()!=null&&baseInfo.getSourceId().equals(parentBaseInfo.getSourceId())) //扩展与变更
) {
} else {
throw new RuntimeException("汉语品名:" + sdo.getString("maktx") + "已经存在！请检查输入");
}
}
}
}
}
}
} */
}
}
if
(
isSame
)
{
throw
new
RuntimeException
(
"汉语品名:"
+
sdo
.
getString
(
"maktx"
)
+
"已经存在！请检查输入"
);
}
}
baseInfo
.
setBusinessUsage
(
sdo
.
getString
(
"businessUsage"
));
baseInfo
.
setBusinessUsage
(
sdo
.
getString
(
"businessUsage"
));
if
(
StringUtil
.
isNotBlank
(
sdo
.
getString
(
"distribute"
))){
//是否已分发
if
(
StringUtil
.
isNotBlank
(
sdo
.
getString
(
"distribute"
))){
//是否已分发
baseInfo
.
setDistribute
(
2
);
baseInfo
.
setDistribute
(
2
);
...
@@ -437,8 +428,11 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
...
@@ -437,8 +428,11 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
}
sapVO
.
setBwkey
(
applyDept
.
getWerks
());
sapVO
.
setBwkey
(
applyDept
.
getWerks
());
sapVO
.
setLosgr
(
applyDept
.
getPeinh
());
//成本核算的价格单位 默认为定价基数
sapVO
.
setLosgr
(
applyDept
.
getPeinh
());
//成本核算的价格单位 默认为定价基数
sapVO
.
setUpdkz
(
"I"
);
//新增
sapVO
.
setUpdkz
(
"I"
);
if
(
"modify"
.
equals
(
baseInfo
.
getMaintenanceType
())
||
"extend"
.
equals
(
baseInfo
.
getMaintenanceType
())){
sapVO
.
setUpdkz
(
"U"
);
//修改和扩展
}
if
(
"0"
.
equals
(
sapVO
.
getInsmk
())){
if
(
"0"
.
equals
(
sapVO
.
getInsmk
())){
sapVO
.
setInsmk
(
""
);
sapVO
.
setInsmk
(
""
);
}
}
...
@@ -612,7 +606,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
...
@@ -612,7 +606,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
}
if
(
"S"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
()))
{
if
(
"S"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
()))
{
messageExecute
.
setTaskDescribe
(
title
+
sign
+
backMap
.
get
(
"MESSAGE"
).
toString
());
messageExecute
.
setTaskDescribe
(
title
+
sign
+
backMap
.
get
(
"MESSAGE"
).
toString
());
}
else
if
(
"E"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
()))
{
}
else
if
(
"E"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
())
||
"5"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
())
)
{
messageExecute
.
setTaskDescribe
(
title
+
sign
+
backMap
.
get
(
"MESSAGE"
).
toString
());
messageExecute
.
setTaskDescribe
(
title
+
sign
+
backMap
.
get
(
"MESSAGE"
).
toString
());
}
else
if
(
"C"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
()))
{
//审批完成 推送待办的基本信息处理信息
}
else
if
(
"C"
.
equals
(
backMap
.
get
(
"TYPE"
).
toString
()))
{
//审批完成 推送待办的基本信息处理信息
String
mess
=
sign
+
"物料维护("
;
String
mess
=
sign
+
"物料维护("
;
...
...
topsun/src/main/java/com/huigou/topsun/sap/processQuotedPrice/application/impl/ProcessQuotedPriceItemApplicationImpl.java
View file @
0188c3af
...
@@ -145,8 +145,12 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple
...
@@ -145,8 +145,12 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple
//返回含税单价+运输费
//返回含税单价+运输费
BigDecimal
unitPrice
=
processQuotedPriceItemNumber
.
getUnitPrice
();
BigDecimal
unitPrice
=
processQuotedPriceItemNumber
.
getUnitPrice
();
BigDecimal
freight
=
processQuotedPriceItemNumber
.
getFreight
();
BigDecimal
freight
=
processQuotedPriceItemNumber
.
getFreight
();
BigDecimal
packMoney
=
processQuotedPriceItemNumber
.
getPackMoney
();
if
(
freight
!=
null
){
if
(
freight
!=
null
){
return
unitPrice
.
add
(
freight
);
unitPrice
=
unitPrice
.
add
(
freight
);
}
if
(
packMoney
!=
null
){
unitPrice
=
unitPrice
.
add
(
packMoney
);
}
}
return
unitPrice
;
return
unitPrice
;
}
}
...
...
topsun/src/main/resources/config/content/easysearch/easy-search-material.xml
0 → 100644
View file @
0188c3af
This diff is collapsed.
Click to expand it.
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
