Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailRouting.java

@@ -54,9 +54,9 @@ public class QuoteDetailRouting {
 
     private BigDecimal laborSetupTime;
 
-    private Integer crewSize;
+    private BigDecimal crewSize;
 
-    private Integer setupCrewSize;
+    private BigDecimal setupCrewSize;
 
     private String outsideOpItem;
 

src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml

@@ -39,6 +39,7 @@
         where bd.site = #{site}
         and bd.part_no = #{partNo}
         and bd.bu_no = #{buNo}
+        and bd.status != 'Tentative'
         <if test="engChgLevel == null">
             and bh.eff_phase_out_date is null
         </if>
@@ -116,14 +117,15 @@
                bom.alternative_no,
                p.part_desc
         from plm_bom_detail bom
-        left join part p on bom.part_no = p.part_no and bom.site = p.site
+                 left join part p on bom.part_no = p.part_no and bom.site = p.site
         where bom.site = #{site}
           and bom.part_no = #{partNo}
           and bom.bu_no = #{buNo}
+          and bom.status != 'Tentative'
         <if test="bomType != null and bomType != ''">
             and bom.bom_type = #{bomType}
         </if>
-          and bom.eng_chg_level = #{engChgLevel}
+        and bom.eng_chg_level = #{engChgLevel}
         order by bom.alternative_no
     </select>