diff --git a/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java b/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java index 34dd7cb..954b818 100644 --- a/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java +++ b/src/main/java/com/heai/modules/production/entity/SOOpsTransferData.java @@ -17,7 +17,7 @@ public class SOOpsTransferData { * */ private String site; - + private String umid; /** * */ @@ -412,5 +412,13 @@ public class SOOpsTransferData { public void setEndDate(Date endDate) { this.endDate = endDate; } + + public String getUmid() { + return umid; + } + + public void setUmid(String umid) { + this.umid = umid; + } } diff --git a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java index 923c2cc..3c8e8d5 100644 --- a/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java +++ b/src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java @@ -30,6 +30,7 @@ public class SOScheduledRoutingOutData { private String orderRef1; private String workCenterDesc; private String partSpec; + private String umid; /** * */ @@ -679,5 +680,13 @@ public class SOScheduledRoutingOutData { public void setUserId(String userId) { this.userId = userId; } + + public String getUmid() { + return umid; + } + + public void setUmid(String umid) { + this.umid = umid; + } } diff --git a/src/main/java/com/heai/modules/production/entity/StockPrintData.java b/src/main/java/com/heai/modules/production/entity/StockPrintData.java index 40b2039..0e5b134 100644 --- a/src/main/java/com/heai/modules/production/entity/StockPrintData.java +++ b/src/main/java/com/heai/modules/production/entity/StockPrintData.java @@ -48,12 +48,12 @@ public class StockPrintData { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date transDate; - + private String umid; /** * */ private BigDecimal qty; - + private String wareHouseDesc; /** * */ @@ -164,5 +164,21 @@ public class StockPrintData { public void setPrintQty(Integer printQty) { this.printQty = printQty; } + + public String getWareHouseDesc() { + return wareHouseDesc; + } + + public void setWareHouseDesc(String wareHouseDesc) { + this.wareHouseDesc = wareHouseDesc; + } + + public String getUmid() { + return umid; + } + + public void setUmid(String umid) { + this.umid = umid; + } } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 5c638ab..3d8b18d 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -148,11 +148,13 @@ select top 1 a.TransNo,a.Site,b.FromWorkCenterNo WorkCenterNo ,b.OrderNo,b.TransQty,a.TransDate,b.PartNo,b.seqNo,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc + ,dbo.Get_Part_UMID(a.Site,b.PartNo) umid FROM SOOpsTransferHeader a left join SOOpsTransferDetail b on a.site=b.site and a.TransNo=b.TransNo where a.TransNo=#{transNo} and a.Site=#{site}