排产相关-sjx

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

@@ -113,6 +113,7 @@
         LEFT JOIN MES_WORK_PLAN e on a.wp_id = e.id
         LEFT JOIN BS_PROCESS_SET f on e.pps_id = f.id
         <where>
+            c.ts_name is not null and b.EQUIP_CODE is not null and a.is_deleted = 0
             <if test="startTime !=null and startTime != ''">
                 and (to_char(b.start_time,'YYYY-MM-DD') = #{startTime} or (b.start_time <![CDATA[ < ]]> to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and   b.end_time <![CDATA[ > ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
             </if>

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

@@ -118,7 +118,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (CollectionUtils.isNotEmpty(list)) {
             //校验已排产订单
             checkSchedulingOrder(list);
-            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().eq(BaseEntity::getStatus, YieldOrderConst.STATUS_APS));
+            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().eq(BaseEntity::getStatus, YieldOrderConst.STATUS_APS).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
             //初始化人员能力
             List<PersonAbilityEntity> personAbilityEntityList = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId));
             Map<String, PersonAbilityEntity> personAbilityMap = new HashMap<>();
@@ -584,6 +584,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                             equipWrapper.eq(EquipResourceEntity::getEquipCode,equipResource.getEquipCode());
                                             equipWrapper.eq(EquipResourceEntity::getDateTime,equipResource.getDateTime());
                                             equipWrapper.eq(EquipResourceEntity::getPeriod,equipResource.getPeriod());
+                                            equipWrapper.eq(EquipResourceEntity::getStartTime,equipResource.getStartTime());
+                                            equipWrapper.eq(EquipResourceEntity::getEndTime,equipResource.getEndTime());
                                             equipResourceService.update(equipResource,equipWrapper);
                                             //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
                                             LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper();