Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-custom-business/src/main/resources/mapper/business/ProductCodeListMapper.xml

@@ -261,7 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND p.del_flag = '0'
           AND sc.del_flag = '0'
             and ml.del_flag = '0'
-            and sp.status = '6'
+            and sp.status in ('4','6')
         <if test="machineTool != null"> and sp.production_line_no = #{machineTool}</if>
     </select>
 

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join   {DBNAME}.materiel as m on sp.colour_number= m.materiel_code
         inner join   {DBNAME}.production as pd on sp.product_no= pd.product_no
         left  join  {DBNAME}.production_line as pl on sp.production_line_no=pl.id
-        where sp.del_flag = '0' and cs.del_flag = '0' and m.del_flag = '0' and so.order_type=2 and  so.status=3 or so.status=4 or so.status=5
+        where sp.del_flag = '0' and cs.del_flag = '0' and m.del_flag = '0' and so.order_type=2 and  (so.status=3 or so.status=4 or so.status=5)
         <if test="saleProductNo != null  and saleProductNo != ''"> and sale_product_no = #{saleProductNo}</if>
             <if test="saleOrderNo != null  and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
             <if test="productNo != null  and productNo != ''"> and product_no = #{productNo}</if>