diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
index 7ddba90..8afddc9 100644
--- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
+++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
@@ -27,6 +27,14 @@ public interface BaseOrderInfoMapper {
      */
     public List<BaseOrderInfo> selectBaseOrderInfoList(BaseOrderInfo baseOrderInfo);
 
+    /**
+     * 查询ALL工单信息列表
+     *
+     * @param baseOrderInfo 工单信息
+     * @return 工单信息集合
+     */
+    public List<BaseOrderInfo> selectAllOrderInfoList(BaseOrderInfo baseOrderInfo);
+
     /**
      * 新增工单信息
      *
diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java
index f328658..3e7ba5c 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseOrderInfoService.java
@@ -20,13 +20,21 @@ public interface IBaseOrderInfoService {
     public BaseOrderInfo selectBaseOrderInfoByObjId(Long objId);
 
     /**
-     * 查询工单信息列表
+     * 查询成品工单信息列表
      *
      * @param baseOrderInfo 工单信息
      * @return 工单信息集合
      */
     public List<BaseOrderInfo> selectBaseOrderInfoList(BaseOrderInfo baseOrderInfo);
 
+    /**
+     * 查询ALL工单信息列表
+     *
+     * @param baseOrderInfo 工单信息
+     * @return 工单信息集合
+     */
+    public List<BaseOrderInfo> selectAllOrderInfoList(BaseOrderInfo baseOrderInfo);
+
     /**
      * 新增工单信息
      *
diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java
index 88099bc..c3294ee 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseOrderInfoServiceImpl.java
@@ -42,6 +42,17 @@ public class BaseOrderInfoServiceImpl implements IBaseOrderInfoService {
         return baseOrderInfoMapper.selectBaseOrderInfoList(baseOrderInfo);
     }
 
+    /**
+     * 查询ALL工单信息列表
+     *
+     * @param baseOrderInfo 工单信息
+     * @return 工单信息
+     */
+    @Override
+    public List<BaseOrderInfo> selectAllOrderInfoList(BaseOrderInfo baseOrderInfo) {
+        return baseOrderInfoMapper.selectAllOrderInfoList(baseOrderInfo);
+    }
+
     /**
      * 新增工单信息
      *
diff --git a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
index 2a9f8f1..74004cd 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
@@ -76,7 +76,8 @@
             <if test="orderAmount != null ">and oi.order_amount = #{orderAmount}</if>
             <if test="completeAmount != null ">and oi.complete_amount = #{completeAmount}</if>
             <if test="orderType != null  and orderType != ''">and oi.order_type = #{orderType}</if>
-            <if test="orderStatus != null  and orderStatus != ''">and oi.order_status = #{orderStatus}</if>
+            <if test="orderStatus != null  and orderStatus != '' and orderStatus != 'RELCRTD'">and oi.order_status LIKE #{orderStatus} || '%'</if>
+            <if test="orderStatus != null  and orderStatus != '' and orderStatus == 'RELCRTD'">and (oi.order_status LIKE 'REL%' OR oi.order_status LIKE 'CRTD%')</if>
             <if test="manualUpdateFlag != null  and manualUpdateFlag != ''">and oi.manual_update_flag = #{manualUpdateFlag}</if>
             <if test="beginDate != null ">and oi.begin_date = #{beginDate}</if>
             <if test="endDate != null ">and oi.end_date = #{endDate}</if>
@@ -102,6 +103,19 @@
         where obj_id = #{objId}
     </select>
 
+    <select id="selectAllOrderInfoList" parameterType="BaseOrderInfo" resultMap="BaseOrderInfoResult">
+        <include refid="selectBaseOrderInfoVo"/>
+        <where>
+            <if test="orderCode != null  and orderCode != ''">and oi.order_code = #{orderCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and oi.material_code = #{materialCode}</if>
+            <if test="materialName != null  and materialName != ''">and oi.material_name like concat(concat('%',
+                #{materialName}), '%')
+            </if>
+            <if test="workCenterCode != null ">and oi.work_center_code = #{workCenterCode}</if>
+        </where>
+        order by oi.material_name, order_code desc
+    </select>
+
     <insert id="insertBaseOrderInfo" parameterType="BaseOrderInfo">
         <selectKey keyProperty="objId" resultType="long" order="BEFORE">
             SELECT seq_base_orderinfo.NEXTVAL as objId FROM DUAL
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
index 1c50739..69b4947 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
@@ -69,7 +69,22 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
     @Override
     public int insertProductPlanInfo(ProductPlanInfo productPlanInfo) {
         productPlanInfo.setCreatedTime(DateUtils.getNowDate());
-        return productPlanInfoMapper.insertProductPlanInfo(productPlanInfo);
+        try {
+            ProductPlanInfo info = new ProductPlanInfo();
+            info.setOrderCode(productPlanInfo.getOrderCode());
+            info.setProductLineCode(productPlanInfo.getProductLineCode());
+            List<ProductPlanInfo> productPlanInfos = this.selectProductPlanInfoList(info);
+            if (productPlanInfos.size() > 0){
+                productPlanInfo.setUpdatedBy("user");
+                productPlanInfo.setObjId(productPlanInfos.get(0).getObjId());
+                return productPlanInfoMapper.updateProductPlanInfo(productPlanInfo);
+            }else {
+                return productPlanInfoMapper.insertProductPlanInfo(productPlanInfo);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
     }
 
     /**
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
index 5a6fe5b..ec7cda3 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
@@ -137,7 +137,7 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect
                 markLocation = i;
             }
         }
-        if (markLocation <= 1){
+        if (markLocation <= 2){
             return null;
         }
         BaseProductLine productLineInfo = productLineList.get(markLocation - 1);