diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
index 89bd5b50..0eb85f1a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
@@ -78,4 +78,7 @@ public class PurchaseMacodeInfo extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date productionTime;
+
+ @ApiModelProperty(value = "出厂编码")
+ private String outFacCode;
}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
index 8053ab3d..c6694080 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -26,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select pmi.id, pmi.task_id, pmi.type_id, pmi.ma_code, pmi.qr_code, pmi.fix_code, pmi.code_type, pmi.status,
- pmi.create_by, pmi.create_time, pmi.update_by, pmi.update_time, pmi.remark, pmi.company_id,
- mt.type_name, mt.unit_name, mtp.type_name as ma_type_name
+ pmi.create_by, pmi.create_time, pmi.update_by, pmi.update_time, pmi.remark, pmi.company_id, pmi.out_fac_code,
+ mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, pcd.production_time
from purchase_macode_info pmi
left join ma_type mt on pmi.type_id = mt.type_id
left join ma_type mtp on mt.parent_id = mtp.type_id
+ left join purchase_check_details pcd on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id