diff --git a/src/main/java/com/gaotao/modules/schedule/data/BaseData.java b/src/main/java/com/gaotao/modules/schedule/data/BaseData.java index d5275f4..50f2c4b 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/BaseData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/BaseData.java @@ -25,6 +25,15 @@ public class BaseData extends QueryPage { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updatedDate;//更细时间 + private String buNo; + + public String getBuNo() { + return buNo; + } + + public void setBuNo(String buNo) { + this.buNo = buNo; + } public BaseData() { } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index ec97b18..94d6349 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -288,7 +288,8 @@ T.ClosedDate closedDate, T.mat_issueflag matIssueFlag, T.plate_issueflag plateIssueFlag, - T.tool_issueflag toolIssueFlag + T.tool_issueflag toolIssueFlag, + so.bu_no buNo from SOScheduledRouting as T Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo, SORouting as D,Part as P,ShopOrder as SO @@ -578,6 +579,7 @@ D.PartNo partNo, P.PartDescription partDesc, P.Spec spec, + SO.bu_no buNo, T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 29aea53..9bab4e8 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -446,12 +446,22 @@