收回调用自动分派修改

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

@@ -15,39 +15,41 @@ import java.util.List;
  */
 public interface IYieldOrderCraftService extends BaseService<YieldOrderCraft> {
 
-	/**
+    /**
-	 * 自定义分页
+     * 自定义分页
-	 *
+     *
-	 * @param page
+     * @param page
-	 * @param entity
+     * @param entity
-	 * @return
+     * @return
-	 */
+     */
-	IPage<YieldOrderCraft> selectPage(IPage<YieldOrderCraft> page, YieldOrderCraft entity);
+    IPage<YieldOrderCraft> selectPage(IPage<YieldOrderCraft> page, YieldOrderCraft entity);
-
+
-	/**
+    /**
-	 * 根据生产订单ID查询工艺列表
+     * 根据生产订单ID查询工艺列表
-	 *
+     *
-	 * @param yoId
+     * @param yoId
-	 * @return
+     * @return
-	 */
+     */
-	List<YieldOrderCraft> listByYoId(Long yoId);
+    List<YieldOrderCraft> listByYoId(Long yoId);
-
+
-	/**
+    /**
-	 * 根据生产订单ID删除工艺列表
+     * 根据生产订单ID删除工艺列表
-	 *
+     *
-	 * @param yoId
+     * @param yoId
-	 * @return
+     * @return
-	 */
+     */
-	int deleteByYoId(Long yoId);
+    int deleteByYoId(Long yoId);
-
+
-	/**
+    /**
-	 * 查找订单各工序的加工单位
+     * 查找订单各工序的加工单位
-	 *
+     *
-	 * @param yieldOrderCraftList 订单工艺列表
+     * @param yieldOrderCraftList 订单工艺列表
-	 * @param yieldOrder          生产订单
+     * @param yieldOrder          生产订单
-	 * @param factor              null 整体 ，true : 转厂内 ，false：转厂外
+     * @param factor              null 整体 ，true : 转厂内 ，false：转厂外
-	 * @param rxlSpace            需要特殊分派，true:需要， false：不需要，null：不需要
+     * @param rxlSpace            需要特殊分派，true:需要， false：不需要，null：不需要
-	 * @throws BusinessException
+     * @throws BusinessException
-	 */
+     */
-	void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws Exception;
+    void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws Exception;
+
+    List<YieldOrderCraft> listByYoIdAndNo(Long id, String orders);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.desk.basic.mapper.TeamSetMapper;
 import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.dashboard.mapper.BsProcessSetMapper;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.oem.pojo.request.*;
@@ -171,8 +172,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     workOrderRun.getCreateTime(), new Date(), oemTakeBack.getDeliverKey(),
                     scrapQty, testQty);
 
-            // 调用转厂内自动分派逻辑
+            // 调用转厂内自动分派逻辑，只查询外协工序之后的工序
-            List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yieldOrder.getId());
+            List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoIdAndNo(yieldOrder.getId(), deliverablePlan.getOrders());
+//            List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yieldOrder.getId(), deliverablePlan.getOrders());
             try {
                 yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yieldOrder, Boolean.TRUE, null);
             } catch (Exception e) {