Merge remote-tracking branch 'origin/master'

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.java

@@ -61,4 +61,6 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlanEntity> {
 	 */
 	List<WorkPlanExcel> export(@Param("ew") Wrapper<WorkPlanEntity> queryWrapper);
 
+	boolean removeByIds(@Param("ids") List<Long> ids);
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.xml

@@ -56,4 +56,11 @@
         SELECT * FROM MES_WORK_PLAN ${ew.customSqlSegment}
     </select>
 
+    <delete id="removeByIds">
+        delete from MES_WORK_PLAN where id in
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkPlanService.java

@@ -68,4 +68,6 @@ public interface IWorkPlanService extends BaseService<WorkPlanEntity> {
 	 * @param factEndTime
 	 */
 	void updateWorkPlan(Long id, Date factStartTime, Date factEndTime);
+
+	boolean removeByIds(List<Long> ids);
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -490,8 +490,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     //把加工班组为空的删掉
                     List<WorkPlanEntity> emptyWorkPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,oldWorkOrder.getId()).isNull(WorkPlanEntity::getMakeTeam).isNull(WorkPlanEntity::getFactStartTime));
                     List<Long> ids = emptyWorkPlanList.stream().map(BaseEntity::getId).collect(Collectors.toList());
+                    log.info("外协返回订单获取到的空工序id是：" + JSONObject.toJSONString(ids));
                     if(CollectionUtils.isNotEmpty(ids)){
-                        workPlanService.deleteLogic(ids);
+                        workPlanService.removeByIds(ids);
                     }
                     //查询已经加工完的
                     List<WorkPlanEntity> oldWorkPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,oldWorkOrder.getId()).orderByAsc(WorkPlanEntity::getOrders));
@@ -509,10 +510,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             .filter(chineseName -> chineseName != null && !chineseName.isEmpty())
                             .collect(Collectors.joining(","));
                     errorInfo.append("工序信息不完整，工序：" + errorInfo2 + "未匹配作业中心;");
-//                    order.setErrorInfo("工序信息不完整，工序：" + errorInfo + "未匹配作业中心");
-//                    order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
-//                    yieldOrderService.updateById(order);
-//                    continue;
                 }
 
                 //上一道工序结束时间
@@ -1337,7 +1334,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 }
                             }*/
 
-                            workPlanService.deleteLogic(Arrays.asList(workPlan.getId()));
+                            workPlanService.removeByIds(Arrays.asList(workPlan.getId()));
                         }
 
                     }
@@ -1531,7 +1528,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 }
             }
             if (workPlan.getId() != null) {
-                workPlanService.deleteLogic(Arrays.asList(workPlan.getId()));
+                workPlanService.removeByIds(Arrays.asList(workPlan.getId()));
             }
 
         }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java

@@ -25,24 +25,22 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper;
 import org.springblade.scheduling.scheduling.mapper.WorkPlanMapper;
-import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
 import org.springblade.scheduling.scheduling.service.IWorkPlanService;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -110,4 +108,9 @@ public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPla
 		}
 		workOrderMapper.updateById(workOrder);
 	}
+
+	@Override
+	public boolean removeByIds(List<Long> ids) {
+		return baseMapper.removeByIds(ids);
+	}
 }