diff --git a/src/main/java/com/xujie/sys/modules/fanuc/entity/FanucEntity.java b/src/main/java/com/xujie/sys/modules/fanuc/entity/FanucEntity.java
index 0813b29b..cff9cf0e 100644
--- a/src/main/java/com/xujie/sys/modules/fanuc/entity/FanucEntity.java
+++ b/src/main/java/com/xujie/sys/modules/fanuc/entity/FanucEntity.java
@@ -7,6 +7,7 @@ import com.xujie.sys.common.utils.QueryPage;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -59,6 +60,22 @@ public class FanucEntity extends QueryPage implements Serializable {
private String version;
private String site;
private String buNo;
+ /**
+ * 人均日产量
+ */
+ private BigDecimal refDailyProduction;
+ /**
+ * 速度
+ */
+ private BigDecimal refSpeed;
+ /**
+ * 时间
+ */
+ private BigDecimal refTime;
+ /**
+ * 效率
+ */
+ private BigDecimal refEfficiency;
@TableField(exist = false)
private Integer resourceCount;
diff --git a/src/main/resources/mapper/fanuc/FanucMapper.xml b/src/main/resources/mapper/fanuc/FanucMapper.xml
index 9a5eda64..7792288d 100644
--- a/src/main/resources/mapper/fanuc/FanucMapper.xml
+++ b/src/main/resources/mapper/fanuc/FanucMapper.xml
@@ -29,7 +29,11 @@
wc.site,
wc.bu_no,
bu.id as bu_id,
- bu.bu_desc
+ bu.bu_desc,
+ wc.ref_daily_production,
+ wc.ref_speed,
+ wc.ref_time,
+ wc.ref_efficiency
FROM
work_center wc
left join BU bu on wc.bu_no = bu.bu_no and wc.site = bu.site
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index ac6e55c4..a9d4bd35 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -869,11 +869,11 @@
AND b.item_result = #{itemResult}
-
- AND b.item_no like '%' + #{query.itemNo} + '%'
+
+ AND b.item_no like '%' + #{itemNo} + '%'
-
- AND b.item_desc like '%' + #{query.itemDesc} + '%'
+
+ AND b.item_desc like '%' + #{itemDesc} + '%'
ORDER BY
@@ -1232,11 +1232,11 @@
AND b.item_result = #{itemResult}
-
- AND b.item_no like '%' + #{query.itemNo} + '%'
+
+ AND b.item_no like '%' + #{itemNo} + '%'
-
- AND b.item_desc like '%' + #{query.itemDesc} + '%'
+
+ AND b.item_desc like '%' + #{itemDesc} + '%'
ORDER BY
@@ -1587,11 +1587,11 @@
AND b.item_result = #{itemResult}
-
- AND b.item_no like '%' + #{query.itemNo} + '%'
+
+ AND b.item_no like '%' + #{itemNo} + '%'
-
- AND b.item_desc like '%' + #{query.itemDesc} + '%'
+
+ AND b.item_desc like '%' + #{itemDesc} + '%'
ORDER BY
@@ -1942,11 +1942,11 @@
AND b.item_result = #{itemResult}
-
- AND b.item_no like '%' + #{query.itemNo} + '%'
+
+ AND b.item_no like '%' + #{itemNo} + '%'
-
- AND b.item_desc like '%' + #{query.itemDesc} + '%'
+
+ AND b.item_desc like '%' + #{itemDesc} + '%'
ORDER BY