排产功能修改-sjx

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

@@ -38,6 +38,7 @@
                 and equip_code = #{param2.equipCode}
             </if>
         </where>
+        order by update_time desc
     </select>
 
 

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

@@ -22,8 +22,8 @@
         select * from MES_MAIN_PRODUCER
         <where>
             is_deleted = 0
-            <if test="param2.processId !=null">
+            <if test="param2.processName !=null">
-                and process_id = #{param2.processId}
+                and process_name like CONCAT('%', CONCAT(#{param2.processName}, '%'))
             </if>
             <if test="param2.mainProducer !=null and param2.mainProducer !=''">
                 and main_producer = #{param2.mainProducer}

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

@@ -36,6 +36,7 @@
                 and craft_id = #{param2.craftId}
             </if>
         </where>
+        order by update_time desc
     </select>
 
 

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

@@ -38,6 +38,9 @@
             LEFT JOIN BS_TEAM_TIME c ON b.TS_ID = c.ts_id
         WHERE
             c.special = 0
+          and a.IS_DELETED = 0
+          and b.IS_DELETED = 0
+          and c.IS_DELETED = 0
           and a.work_center_id = #{workCenterId}
     </select>
 </mapper>

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

@@ -215,7 +215,7 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 					}
 				}else{
 					LocalDateTime startTime = startOfDay.plusMinutes(i * interval);
-					LocalDateTime endTime = startTime.plusMinutes(interval);
+					LocalDateTime endTime = startTime.plusMinutes("0".equals(equipAbility.getEquipType()) ? interval : equipAbility.getStandardTime().longValue());
 					EquipResourceEntity equipResource = new EquipResourceEntity();
 					equipResource.setDateTime(day);
 					equipResource.setEquipCode(equipAbility.getEquipCode());

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

@@ -429,7 +429,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 Boolean isSchecuding = true;
                 List<WorkPlanEntity> workPlanList = new ArrayList<>();
                 //查询所有工序
-                List<YieldOrderCraftEntity> craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId, 27).orderByAsc(YieldOrderCraftEntity::getProcessNo));
+                List<YieldOrderCraftEntity> craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getPpsId, 105).orderByAsc(YieldOrderCraftEntity::getProcessNo));
                 //如果是外协回来的订单
                 if(order.getStatus() == YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()){
                     WorkOrderEntity oldWorkOrder = this.getOne(Wrappers.<WorkOrderEntity>lambdaQuery().eq(WorkOrderEntity::getYoId,order.getId()));
@@ -1251,12 +1251,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             for (YieldOrderEntity order : commonCraftOrderList) {
                 List<WorkPlanEntity> workPlanList = new ArrayList<>();
                 //获取相关工序
-                YieldOrderCraftEntity craft = yieldOrderCraftService.getOne(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).eq(YieldOrderCraftEntity::getCaId, equipAbility.getCraftId()));
+                YieldOrderCraftEntity craft = yieldOrderCraftService.getOne(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).eq(YieldOrderCraftEntity::getPpsId, equipAbility.getProcessId()));
                 if (craft == null) {
                     continue;
                 }
                 //计算订单总产能
-                BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getYpQty()));
+                BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
                 //计算需要占用几个时间段
                 int period = sumCapacity.divide(standardProcessAbility, 0, RoundingMode.CEILING).intValue();