烧结生产订单查询待排产以及之前

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java

@@ -27,7 +27,9 @@ public interface YieldOrderMapper extends BaseMapper<YieldOrder> {
 	 * @param yieldTypeList
 	 * @return
 	 */
-	List<YieldOrder> selectPage(IPage page, @Param("entity") YieldOrderDto entity, List<YieldOrderEnum> yieldTypeList);
+	List<YieldOrder> selectPage(IPage page, @Param("entity") YieldOrderDto entity,
+								@Param("yieldTypeList") List<YieldOrderEnum> yieldTypeList,
+								@Param("yieldStatusList")List<YieldOrderEnum> yieldStatusList);
 
 	/**
 	 * 自定义分页 - 用于需求申报

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -29,6 +29,12 @@
             <foreach collection = "yieldTypeList" item = "yieldType" open = "(" separator = "," close = ")">
                 #{yieldType.code}
             </foreach>
+        </if>
+        <if test = "yieldStatusList != null and yieldStatusList.size() > 0">
+            AND yo.STATUS IN
+            <foreach collection = "yieldStatusList" item = "yieldStatus" open = "(" separator = "," close = ")">
+                #{yieldStatus.code}
+            </foreach>
         </if>
 		<if test = "entity.workCenterId != null and entity.workCenterId != ''">
             AND WORK_CENTER_ID = #{entity.workCenterId}
@@ -57,9 +63,6 @@
         <if test = "entity.validationResult != null and entity.validationResult != ''">
             AND VALIDATION_RESULT = #{entity.validationResult}
         </if>
-        <if test = "entity.status != null and entity.status != ''">
-            AND yo.status = #{entity.status}
-        </if>
         <if test = "entity.receiveStatus != null and entity.receiveStatus != ''">
             AND receive_status = #{entity.receiveStatus}
         </if>
@@ -78,7 +81,7 @@
                 <if test="!entity.isAsc">DESC</if>
             </when>
             <otherwise>
-                ORDER BY CREATE_TIME DESC
+                ORDER BY yo.CREATE_TIME DESC
             </otherwise>
         </choose>
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -174,7 +174,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
         //烧结 热表订单
         List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
         yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType()));
-        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
+        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList,null);
         if (CollectionUtils.isNotEmpty(dataList)) {
             // 1. 收集所有需要查询的 taskingId
             List<Long> taskingIdList = dataList.stream()
@@ -240,7 +240,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
     public IPage<YieldOrder> selectPageElectroplate(IPage<YieldOrder> page, YieldOrderDto entity) {
         List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
         yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_1);
-        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
+        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList,null);
         return page.setRecords(dataList);
     }
 
@@ -257,11 +257,19 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
             yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType()));
         }
 
+        List<YieldOrderEnum> yieldStatusList = new ArrayList<>();
+        if (ObjectUtil.isEmpty(entity.getStatus())) {
+            yieldStatusList.add(YieldOrderEnum.STATUS_NORMAL);
+            yieldStatusList.add(YieldOrderEnum.STATUS_EXCEPTION);
+            yieldStatusList.add(YieldOrderEnum.STATUS_NO_ISSUED);
+            yieldStatusList.add(YieldOrderEnum.STATUS_APS);
+        } else {
+            yieldStatusList.add(YieldOrderEnum.getEnum(entity.getStatus()));
+        }
+
         entity.setIsSinTerIng(true);
-        //展示待排产
-        entity.setStatus(YieldOrderEnum.STATUS_APS.getCode());
-        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
 
+        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList,yieldStatusList);
 
         // 获取所有父订单ID
         List<Long> idList = dataList.stream()