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
63a98039
Commit
63a98039
authored
May 26, 2022
by
季圣华
Browse files
给单据明细增加采购价格字段
parent
e6acd2a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @
63a98039
...
@@ -215,6 +215,7 @@ public class DepotItemController {
...
@@ -215,6 +215,7 @@ public class DepotItemController {
item
.
put
(
"basicNumber"
,
diEx
.
getBasicNumber
());
item
.
put
(
"basicNumber"
,
diEx
.
getBasicNumber
());
item
.
put
(
"preNumber"
,
diEx
.
getOperNumber
());
//原数量
item
.
put
(
"preNumber"
,
diEx
.
getOperNumber
());
//原数量
item
.
put
(
"finishNumber"
,
depotItemService
.
getFinishNumber
(
diEx
.
getMaterialExtendId
(),
diEx
.
getHeaderId
(),
unitInfo
,
materialUnit
,
linkType
));
//已入库|已出库
item
.
put
(
"finishNumber"
,
depotItemService
.
getFinishNumber
(
diEx
.
getMaterialExtendId
(),
diEx
.
getHeaderId
(),
unitInfo
,
materialUnit
,
linkType
));
//已入库|已出库
item
.
put
(
"purchaseDecimal"
,
diEx
.
getPurchaseDecimal
());
//采购价
item
.
put
(
"unitPrice"
,
diEx
.
getUnitPrice
());
item
.
put
(
"unitPrice"
,
diEx
.
getUnitPrice
());
item
.
put
(
"taxUnitPrice"
,
diEx
.
getTaxUnitPrice
());
item
.
put
(
"taxUnitPrice"
,
diEx
.
getTaxUnitPrice
());
item
.
put
(
"allPrice"
,
diEx
.
getAllPrice
());
item
.
put
(
"allPrice"
,
diEx
.
getAllPrice
());
...
...
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View file @
63a98039
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
<result
column=
"DepotName"
jdbcType=
"VARCHAR"
property=
"DepotName"
/>
<result
column=
"DepotName"
jdbcType=
"VARCHAR"
property=
"DepotName"
/>
<result
column=
"AnotherDepotName"
jdbcType=
"VARCHAR"
property=
"AnotherDepotName"
/>
<result
column=
"AnotherDepotName"
jdbcType=
"VARCHAR"
property=
"AnotherDepotName"
/>
<result
column=
"barCode"
jdbcType=
"VARCHAR"
property=
"barCode"
/>
<result
column=
"barCode"
jdbcType=
"VARCHAR"
property=
"barCode"
/>
<result
column=
"purchase_decimal"
jdbcType=
"DECIMAL"
property=
"purchaseDecimal"
/>
</resultMap>
</resultMap>
<resultMap
extends=
"com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap"
id=
"ResultByMaterial"
type=
"com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx"
>
<resultMap
extends=
"com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap"
id=
"ResultByMaterial"
type=
"com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx"
>
...
@@ -181,7 +182,7 @@
...
@@ -181,7 +182,7 @@
<select
id=
"getDetailList"
parameterType=
"com.jsh.erp.datasource.entities.DepotItemExample"
resultMap=
"ResultWithInfoExMap"
>
<select
id=
"getDetailList"
parameterType=
"com.jsh.erp.datasource.entities.DepotItemExample"
resultMap=
"ResultWithInfoExMap"
>
select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,
select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number,
dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode
dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode
, me.purchase_decimal
from jsh_depot_item di
from jsh_depot_item di
left join jsh_material m on di.material_id=m.id and ifnull(m.delete_flag,'0') !='1'
left join jsh_material m on di.material_id=m.id and ifnull(m.delete_flag,'0') !='1'
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
...
...
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