0412更新

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;
+    }
 }

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -16,6 +16,9 @@
         <where>
             <if test="site != null and site != ''">
                 AND a.site = #{site}
+            </if>
+                <if test="partDescription != null and partDescription != ''">
+                AND P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription}
             </if>
             <if test="orderNo != null and orderNo != ''">
                 AND a.OrderNo LIKE  #{orderNo}
@@ -278,6 +281,9 @@
             </if>
             <if test="itemNo != null and itemNo != ''">
                 and S.ItemNo = #{itemNo}
+            </if>
+              <if test="partDescription != null and partDescription != ''">
+                and P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription}
             </if>
             <if test="eLevels != null ">
                 and a.E_Levels = #{eLevels}
@@ -320,6 +326,9 @@
             </if>
             <if test="endDate1 != null ">
                 AND  #{endDate1} >=   a.orderDate
+            </if>
+                  <if test="partDescription != null and partDescription != ''">
+                and P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription}
             </if>
              <if test="orderRef1 != null and orderRef1 != ''">
                 AND a.OrderRef1 LIKE  #{orderRef1}
@@ -460,7 +469,9 @@
         <if test="orderNo != null and orderNo != ''">
             AND OrderNo LIKE  #{orderNo}
         </if>
-
+        <if test="partDesc != null and partDesc != ''">
+            AND  dbo.Get_Part_SpecDesc(a.Site,partNo) LIKE  #{partDesc}
+        </if>
         <if test="seqNo != null ">
             AND seqNo =  #{seqNo}
         </if>
@@ -906,6 +917,9 @@
             </if>
              <if test="itemNo != null and itemNo != ''">
                 and a.ItemNo = #{itemNo}
+            </if>
+              <if test="partDesc != null and partDesc != ''">
+                and dbo.Get_Part_SpecDesc(a.site,b.partNo) like #{partDesc}
             </if>
              <if test="operatorName != null and operatorName != ''">
                 and c.OperatorName like #{operatorName}