去除排产批次号，登录修改非验证码登录问题

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskService.java

@@ -26,7 +26,7 @@ public interface TaskService extends SuperService<TTask> {
 
      List<TTask> createTaskByPlan(List<PlanProduct>planProductList, Map<Long,List<BomProcedure>> bomProcedureMap,String taskBatchNo);
 
-    List<TTask> createNewTaskByPlan(List<OrderProduct> orderProductList, List<PlanProduct>planProductList, Map<Long,List<BomProcedure>> bomProcedureMap, String taskBatchNo);
+    List<TTask> createNewTaskByPlan(List<OrderProduct> orderProductList, List<PlanProduct>planProductList, Map<Long,List<BomProcedure>> bomProcedureMap);
 
      Map<String,Object>scheduleTaskpageList(Map<String,Object>map);
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -534,7 +534,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             //查出所有的计划产品
             List<PlanProduct> planProductList = planProductService.list(Wraps.<PlanProduct>lbQ().in(PlanProduct::getPlanId, planIdList));
             //生成任务
-            List<TTask> taskList = taskService.createNewTaskByPlan(orderProductList, planProductList, bomProcedureMap, taskBatchNo);
+            List<TTask> taskList = taskService.createNewTaskByPlan(orderProductList, planProductList, bomProcedureMap);
 
             map.put("taskBatchNo", taskBatchNo);
             map.put("planIds", planIds);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/PlanServiceImpl.java

@@ -180,7 +180,7 @@ public class PlanServiceImpl extends SuperServiceImpl<PlanMapper, Plan> implemen
         String taskBatchNo = UUID.randomUUID().toString();
 
         //生成任务
-        taskService.createNewTaskByPlan(orderProductList,planProductList,bomProcedureMap,taskBatchNo);
+        taskService.createNewTaskByPlan(orderProductList,planProductList,bomProcedureMap);
         map.put("taskBatchNo",taskBatchNo);
         return map;
     }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -210,7 +210,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 
 
     @Override
-    public List<TTask> createNewTaskByPlan(List<OrderProduct> orderProductList, List<PlanProduct> planProductList, Map<Long,List<BomProcedure>> bomProcedureMap, String taskBatchNo) {
+    public List<TTask> createNewTaskByPlan(List<OrderProduct> orderProductList, List<PlanProduct> planProductList, Map<Long,List<BomProcedure>> bomProcedureMap) {
         // 可选设备集合（工序名称+可选设备列表）
         Map<String, List<CandidateProcess>> candidateProMap = new HashMap<>(); // 可选处理集合（可选设备以及对应的加工时间）
         // 工序集合（工序名+工序）

imcs-admin-boot/imcs-oauth-biz/src/main/java/com/github/zuihou/oauth/granter/AbstractTokenGranter.java

@@ -151,7 +151,8 @@ public abstract class AbstractTokenGranter implements TokenGranter {
         // 密码错误
         String passwordMd5 = "";
         if(StringUtils.isBlank(code)){
-            passwordMd5 = password;
+//            passwordMd5 = password;
+            passwordMd5 = cn.hutool.crypto.SecureUtil.md5(password);
         }else{
             passwordMd5 = cn.hutool.crypto.SecureUtil.md5(password);
         }