Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderDetailProcessController.java

@@ -76,6 +76,8 @@ public class BizOutsourcedOrderDetailProcessController extends BaseController
                 item.setReturnStatus(1);
             }
             BizOutsourcedOrderDetail detail = details.stream().filter(v -> v.getId().equals(item.getDetailId())).findFirst().orElse(null);
+            item.setPackagingMethod(detail.getPackagingMethod());
+            item.setFormDate(detail.getFormDate());
             if(detail != null) {
                 if(supplier.getIsInnerOutsource().equals(1)) {
                     // 将字符串拆分转为对象

src/main/resources/mybatis/business/BizCarrierMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
         FROM biz_carrier t1 left join biz_carrier_category t2 on t2.id = t1.category_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0 and t1.is_inspection = 0
+            t1.deleted = 0 and t1.is_inspection = 0 and t2.is_none = 0
             <if test="categoryId != null  and categoryId != 0"> AND t1.category_id = #{categoryId}</if>
             <if test="code != null  and code != ''"> AND  t1.code=#{code}</if>
             <!--  未关联任何生产单  -->