功能修改-sjx

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

@@ -35,7 +35,7 @@
                 and work_center_name LIKE CONCAT('%', CONCAT(#{param2.workCenterName}, '%'))
             </if>
             <if test="param2.equipCode !=null and param2.equipCode !=''">
-                and equip_code = #{param2.equipCode}
+                and equip_code LIKE CONCAT('%', CONCAT(#{param2.equipCode}, '%'))
             </if>
             <if test="param2.equipName !=null and param2.equipName !=''">
                 and equip_name LIKE CONCAT('%', CONCAT(#{param2.equipName}, '%'))

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

@@ -33,7 +33,19 @@
 
 
     <select id="selectSameTroughPage" resultMap="sameTroughResultMap">
-        select * from MES_SAME_TROUGH where is_deleted = 0
+        select * from MES_SAME_TROUGH
+        <where>
+            is_deleted = 0
+            <if test="param2.workCenterId !=null and param2.workCenterId !=''">
+                and work_center_id = #{param2.workCenterId}
+            </if>
+            <if test="param2.processId !=null and param2.processId !=''">
+                and process_id = #{param2.processId}
+            </if>
+            <if test="param2.craftId !=null and param2.craftId !=''">
+                and craft_id = #{param2.craftId}
+            </if>
+        </where>
     </select>
 
 

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

@@ -24,7 +24,13 @@
 
 
     <select id="selectSintTempCurvePage" resultMap="sintTempCurveResultMap">
-        select * from MES_SINT_TEMP_CURVE where is_deleted = 0
+        select * from MES_SINT_TEMP_CURVE
+        <where>
+            is_deleted = 0
+            <if test="param2.processId !=null and param2.processId !=''">
+                and process_id = #{param2.processId}
+            </if>
+        </where>
     </select>
 
 

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

@@ -850,7 +850,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         }
                                         hourMap.put("totalTime",totalTime);
                                         hourMap.put("standardTime",ability.getStandardTime());
-                                        hourMap.put("preareTime",ability.getPrepareTime());
+                                        hourMap.put("prepareTime",ability.getPrepareTime());
                                         hourMap.put("hourType",ability.getType());
                                     }else{
                                         if("玻璃封接组装".equals(processMap.get(craft.getPpsId()))){//玻璃封接组装单独计算
@@ -997,8 +997,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
 
                         this.save(workOrder);
-                        //生成生产运行记录
-                        disTaskingClient.saveWorkOrderRun(workOrder.getId().toString());
+
                     }else if(order.getStatus() == YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()){
                         workOrder = this.getOne(Wrappers.<WorkOrderEntity>lambdaQuery().eq(WorkOrderEntity::getYoId,order.getId()));
                         workOrder.setPlanEndDate(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
@@ -1027,6 +1026,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     order.setErrorInfo(null);
                     yieldOrderService.updateById(order);
                     workOrderList.add(workOrder);
+                    //生成生产运行记录
+                    disTaskingClient.saveWorkOrderRun(workOrder.getId().toString());
                     if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){
                         StGlassCakeOutDTO glassDto = new StGlassCakeOutDTO();
                         glassDto.setCardNo(workOrder.getCardNo());
@@ -2122,7 +2123,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",standardTime);
-        hourMap.put("preareTime",prepareTime);
+        hourMap.put("prepareTime",prepareTime == null ? 0 : prepareTime);
         hourMap.put("hourType",hourType);
         hourMap.put("totalTime",Math.ceil(personTime));
         return hourMap;
@@ -2229,7 +2230,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",0);
+        hourMap.put("prepareTime",0);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty));
         return hourMap;
@@ -2263,7 +2264,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             result = 0.6 + 0.6 * Math.pow(1.2, y);
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",19);
+        hourMap.put("prepareTime",19);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty + 19));
         return hourMap;
@@ -2358,7 +2359,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",3);
+        hourMap.put("prepareTime",3);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty + 3));
         return hourMap;
@@ -2406,7 +2407,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",4);
+        hourMap.put("prepareTime",4);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty + 4));
         return hourMap;
@@ -2467,7 +2468,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",0);
+        hourMap.put("prepareTime",0);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result));
         return hourMap;
@@ -2497,7 +2498,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",2);
+        hourMap.put("prepareTime",2);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty + 2));
         return hourMap;
@@ -2522,7 +2523,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
         }
         hourMap.put("standardTime",result);
-        hourMap.put("preareTime",3);
+        hourMap.put("prepareTime",3);
         hourMap.put("hourType","0");
         hourMap.put("totalTime",Math.ceil(result * qty + 3));
         return hourMap;