diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java index abd136338..b91cc67db 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java @@ -54,6 +54,9 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = "产品名称") private String productName; + @Excel(name = "带线组长") + private String lineLeader; + // @Excel(name = "产线编码") // private String sapCode; @@ -78,6 +81,8 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = "岗位") private String post; + @Excel(name = "工时") + private String attr2; /** * 子工序名称 */ @@ -110,8 +115,6 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = " 计件薪酬(元)") private BigDecimal result; - @Excel(name = "工时") - private String attr2; @Excel(name = "扣款") private BigDecimal kk; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml index 58b2e4ad9..e463ab550 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml @@ -27,7 +27,7 @@ - + @@ -95,7 +95,8 @@ CAST (mup.attr1 AS DECIMAL(18, 6)) AS attr1, ROUND(mup.attr1 * mur.attr1, 2) AS result, - mur.create_time + mur.create_time, + mur.create_by FROM mes_unitprice_report mur LEFT JOIN mes_unit_price mup ON RIGHT ( mur.product_code, 11 ) = mup.product_code @@ -168,8 +169,8 @@ mur.sj, mur.tsfy, mur.ybbt, - mur.xcbt - + mur.xcbt, + mur.create_by