Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
c69506db
Commit
c69506db
authored
Oct 06, 2022
by
季圣华
Browse files
修改逻辑:销售出库单(如果是批次商品,则要根据批号去找之前的采购价)
parent
588a4045
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View file @
c69506db
...
...
@@ -525,10 +525,13 @@ public class DepotItemService {
}
}
}
//如果是销售出库单则给采购单价字段赋值
//如果是销售出库单则给采购单价字段赋值
(如果是批次商品,则要根据批号去找之前的采购价)
if
(
BusinessConstants
.
DEPOTHEAD_TYPE_OUT
.
equals
(
depotHead
.
getType
())
&&
BusinessConstants
.
SUB_TYPE_SALES
.
equals
(
depotHead
.
getSubType
()))
{
depotItem
.
setPurchaseUnitPrice
(
materialExtend
.
getPurchaseDecimal
());
if
(
StringUtil
.
isNotEmpty
(
depotItem
.
getBatchNumber
()))
{
depotItem
.
setPurchaseUnitPrice
(
getDepotItemByBatchNumber
(
depotItem
.
getBatchNumber
()).
getUnitPrice
());
}
}
if
(
StringUtil
.
isExist
(
rowObj
.
get
(
"taxUnitPrice"
)))
{
depotItem
.
setTaxUnitPrice
(
rowObj
.
getBigDecimal
(
"taxUnitPrice"
));
...
...
@@ -698,6 +701,22 @@ public class DepotItemService {
}
}
/**
* 根据批号查询单据明细信息
* @param batchNumber
* @return
*/
public
DepotItem
getDepotItemByBatchNumber
(
String
batchNumber
)
{
DepotItem
depotItem
=
new
DepotItem
();
DepotItemExample
example
=
new
DepotItemExample
();
example
.
createCriteria
().
andBatchNumberEqualTo
(
batchNumber
).
andDeleteFlagNotEqualTo
(
BusinessConstants
.
DELETE_FLAG_DELETED
);
List
<
DepotItem
>
depotItemList
=
depotItemMapper
.
selectByExample
(
example
);
if
(
null
!=
depotItemList
&&
depotItemList
.
size
()
>
0
){
depotItem
=
depotItemList
.
get
(
0
);
}
return
depotItem
;
}
@Transactional
(
value
=
"transactionManager"
,
rollbackFor
=
Exception
.
class
)
public
void
deleteDepotItemHeadId
(
Long
headerId
)
throws
Exception
{
try
{
...
...
Write
Preview
Supports
Markdown
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