diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java index 72deee8..193798c 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcMaterialData.java @@ -40,6 +40,15 @@ public class SfdcMaterialData extends BaseRollData { private String setupFlagDesc; private String partDesc; private String spec; + private String batchNo; + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } public String getPartDesc() { return partDesc; diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 5db52f3..fb44224 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -833,9 +833,11 @@ smh.Setupflag setupflag, case when smh.Setupflag = 'Y' then '是' else '否' end as setupFlagDesc, B.PartDescription AS partDesc, --新增字段:物料名称,放到物料编码下面 - B.Spec AS Spec --新增字段,放到物料名称下面 + B.Spec AS Spec ,--新增字段,放到物料名称下面 + I.batch_no as batchNo FROM SFDC_MaterialHist smh WITH(NOLOCK) LEFT JOIN Part B WITH(NOLOCK) ON smh.Site = B.Site AND smh.PartNo = B.PartNo + LEFT JOIN inventory_stock I ON SMH.Site = I.Site AND SMH.RMRollNo = I.roll_no AND smh.Site = #{site}