diff --git a/src/main/java/com/heai/modules/production/entity/OutBoxPrintData.java b/src/main/java/com/heai/modules/production/entity/OutBoxPrintData.java index d64cd08..fe2f29d 100644 --- a/src/main/java/com/heai/modules/production/entity/OutBoxPrintData.java +++ b/src/main/java/com/heai/modules/production/entity/OutBoxPrintData.java @@ -39,6 +39,7 @@ public class OutBoxPrintData { private String code; private Integer keyInfoInt1; private String siteDetail; + private String contractNo; /** * */ @@ -290,4 +291,12 @@ public class OutBoxPrintData { public void setSiteDetail(String siteDetail) { this.siteDetail = siteDetail; } + + public String getContractNo() { + return contractNo; + } + + public void setContractNo(String contractNo) { + this.contractNo = contractNo; + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 3f453a3..ddac860 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -16,6 +16,9 @@ AND a.site = #{site} + + + AND P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription} AND a.OrderNo LIKE #{orderNo} @@ -278,6 +281,9 @@ and S.ItemNo = #{itemNo} + + + and P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription} and a.E_Levels = #{eLevels} @@ -320,6 +326,9 @@ AND #{endDate1} >= a.orderDate + + + and P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription} AND a.OrderRef1 LIKE #{orderRef1} @@ -460,7 +469,9 @@ AND OrderNo LIKE #{orderNo} - + + AND dbo.Get_Part_SpecDesc(a.Site,partNo) LIKE #{partDesc} + AND seqNo = #{seqNo} @@ -906,6 +917,9 @@ and a.ItemNo = #{itemNo} + + + and dbo.Get_Part_SpecDesc(a.site,b.partNo) like #{partDesc} and c.OperatorName like #{operatorName}