Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
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
ximai
mes
Commits
e0ae775b
Commit
e0ae775b
authored
Oct 22, 2024
by
温志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加单价字段
parent
0891dc46
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
ProProductionSolution.java
.../pro/domain/productionSolution/ProProductionSolution.java
+5
-1
ProProductionSolutionVo.java
.../com/ximai/mes/pro/domain/vo/ProProductionSolutionVo.java
+7
-0
ProProductionSolutionMapper.xml
...er/pro/productionSolution/ProProductionSolutionMapper.xml
+5
-1
No files found.
mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolution.java
View file @
e0ae775b
...
@@ -191,5 +191,9 @@ public class ProProductionSolution extends BaseEntity {
...
@@ -191,5 +191,9 @@ public class ProProductionSolution extends BaseEntity {
*/
*/
private
String
sapUsageId
;
private
String
sapUsageId
;
/**
* 规格书
*/
@ApiModelProperty
(
"单价"
)
private
BigDecimal
unitPrice
;
}
}
mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionVo.java
View file @
e0ae775b
...
@@ -212,6 +212,11 @@ public class ProProductionSolutionVo implements Serializable {
...
@@ -212,6 +212,11 @@ public class ProProductionSolutionVo implements Serializable {
@ApiModelProperty
(
"SAP用途"
)
@ApiModelProperty
(
"SAP用途"
)
private
String
sapUsageId
;
private
String
sapUsageId
;
/**
* 规格书
*/
@ApiModelProperty
(
"单价"
)
private
BigDecimal
unitPrice
;
/**
/**
* BOM头信息
* BOM头信息
*/
*/
...
@@ -230,4 +235,6 @@ public class ProProductionSolutionVo implements Serializable {
...
@@ -230,4 +235,6 @@ public class ProProductionSolutionVo implements Serializable {
@ApiModelProperty
(
"规格书"
)
@ApiModelProperty
(
"规格书"
)
private
ProProductionSolutionSpecificationSheet
specificationSheet
;
private
ProProductionSolutionSpecificationSheet
specificationSheet
;
}
}
mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionMapper.xml
View file @
e0ae775b
...
@@ -71,7 +71,8 @@
...
@@ -71,7 +71,8 @@
pps.min_lot,
pps.min_lot,
pps.unit_of_measure,
pps.unit_of_measure,
pps.ecn_code,
pps.ecn_code,
pps.sap_usage_id
pps.sap_usage_id,
pps.unitPrice
from pro_production_solution pps
from pro_production_solution pps
left join md_item mi on pps.item_id = mi.item_id
left join md_item mi on pps.item_id = mi.item_id
left join pro_route pr on pr.route_id = pps.route_id
left join pro_route pr on pr.route_id = pps.route_id
...
@@ -156,6 +157,7 @@
...
@@ -156,6 +157,7 @@
<if
test=
"unitOfMeasure != null"
>
unit_of_measure,
</if>
<if
test=
"unitOfMeasure != null"
>
unit_of_measure,
</if>
<if
test=
"sapUsageId != null"
>
sap_usage_id,
</if>
<if
test=
"sapUsageId != null"
>
sap_usage_id,
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
sap_prototype_make_code,
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
sap_prototype_make_code,
</if>
<if
test=
"unitPrice != null"
>
unit_price,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"productionSolutionCode != null"
>
#{productionSolutionCode},
</if>
<if
test=
"productionSolutionCode != null"
>
#{productionSolutionCode},
</if>
...
@@ -184,6 +186,7 @@
...
@@ -184,6 +186,7 @@
<if
test=
"unitOfMeasure != null"
>
#{unitOfMeasure},
</if>
<if
test=
"unitOfMeasure != null"
>
#{unitOfMeasure},
</if>
<if
test=
"sapUsageId != null"
>
#{sapUsageId},
</if>
<if
test=
"sapUsageId != null"
>
#{sapUsageId},
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
#{sapPrototypeMakeCode},
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
#{sapPrototypeMakeCode},
</if>
<if
test=
"unitPrice != null"
>
#{unitPrice},
</if>
</trim>
</trim>
</insert>
</insert>
...
@@ -216,6 +219,7 @@
...
@@ -216,6 +219,7 @@
<if
test=
"unitOfMeasure != null"
>
unit_of_measure = #{unitOfMeasure},
</if>
<if
test=
"unitOfMeasure != null"
>
unit_of_measure = #{unitOfMeasure},
</if>
<if
test=
"sapUsageId != null"
>
sap_usage_id = #{sapUsageId},
</if>
<if
test=
"sapUsageId != null"
>
sap_usage_id = #{sapUsageId},
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
sap_prototype_make_code = #{sapPrototypeMakeCode},
</if>
<if
test=
"sapPrototypeMakeCode != null"
>
sap_prototype_make_code = #{sapPrototypeMakeCode},
</if>
<if
test=
"unitPrice != null"
>
unit_price = #{unitPrice},
</if>
</trim>
</trim>
where production_solution_id = #{productionSolutionId}
where production_solution_id = #{productionSolutionId}
</update>
</update>
...
...
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