优化自定义订单

imcs-admin-boot/imcs-authority-server/src/main/resources/application-docker.yml

@@ -5,7 +5,7 @@ zuihou:
   redis:
     ip: 127.0.0.1
     port: 6379
-    password:
+    password: 123456
     database: 0
   rabbitmq:
     enabled: false

imcs-admin-boot/imcs-authority-server/src/main/resources/application-test.yml

@@ -11,26 +11,27 @@ zuihou:
     enabled: true
     ip: 127.0.0.1
     port: 5672
-    username: admin    
-    password: adminoyq
+    username: guest
+    password: guest
   mysql:
     ip: 127.0.0.1
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
+#    database: zuihou_defaults_yj
     database: zuihou_defaults_yj
     username: root
-    password: adminoyq
+    password: 123456
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   database:
     isNotWrite: false
   smb:
-    userName: administrator
-    password: Aa1
-    fileIp: 192.168.11.240
-    filePath: smb://192.168.11.240/report/
+    userName: ftp01
+    password: 123456
+    fileIp: 127.0.0.1
+    filePath: smb://127.0.0.1/report/
   file:
     #remoteInputDataPath: smb://SOFLEX-PCS:SOFLEX-PCS@192.168.0.2/SOFLEX_PCS_iGen_CASC1_INPUT/ERP_DATA/
-    remoteInputDataPath: smb://192.168.11.240/report/
+    remoteInputDataPath: smb://127.0.0.1/report/
   machineCuttingTools:
     synUrl: https://www.baidu.com
   swagger:

imcs-admin-boot/imcs-authority-server/src/main/resources/application.yml

@@ -11,22 +11,22 @@ zuihou:
     enabled: true
     ip: 127.0.0.1
     port: 5672
-    username: admin
-    password: adminoyq
+    username: guest
+    password: guest
   mysql:
 #    ip: 106.15.38.8
 #    username: root
 #    password: adminoyq
     ip: 127.0.0.1
     username: root
-    password: adminoyq
+    password: 123456
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
     database: zuihou_defaults_yj
     #database: imcs_defaults_yj_test
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   database:
-    tenantDatabasePrefix: zuihou_base_yj2
+    tenantDatabasePrefix: zuihou_base_yj
     #tenantDatabasePrefix: imcs_base_yj_test
     multiTenantType: SCHEMA
     isNotWrite: false

imcs-admin-boot/imcs-authority-server/src/main/resources/bootstrap.yml

@@ -19,9 +19,9 @@ machine:
 ##  username: ftpUser1
 ##  password: 1
 ##  path: /cncFile
-  ip: 192.168.11.245
+  ip: 127.0.0.1
   port: 21
-  username: measuring
-  password: Imcs@123456
+  username: ftp01
+  password: 123456
   path: /
 

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

@@ -55,7 +55,7 @@ import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.common.constant.RepeatCacheKey;
 import com.github.zuihou.common.util.DateUtil;
-import com.github.zuihou.common.util.ForEachUtil;
+//import com.github.zuihou.common.util.ForEachUtil;
 import com.github.zuihou.common.util.TimeUtils;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
@@ -616,7 +616,6 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 
         //查出本次需要得工艺信息
         Map<Long, List<BomProcedure>> bomProcedureMap = bomProcedureService.getBomProcedureMap(bomIdList);
-
         if(bomProcedureMap.size() == 0){
             return R.fail("当前排产零件中存在未配置工艺路线，无法进行排产");
         }else{
@@ -628,6 +627,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                 for(BomProcedure bomProcedure : bomProcedures){
                     if(CollectionUtil.isEmpty(bomProcedure.getProductionresourceList())){
                         log.warn("{}当前排产零件中存在未配置加工设备、设备不在线或报警，无法进行排产", bomProcedure.getName());
+                        System.out.println(bomProcedure.getName()+": " + bomProcedure.getProductionresourceList());
                         return R.fail("当前排产零件中"+bomProcedure.getName()+"存在未配置加工设备、设备不在线或报警，无法进行排产");
                     }
                 }

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

@@ -203,6 +203,9 @@ public class OrderTaskServiceImpl extends SuperServiceImpl<OrderTaskMapper, Orde
             boolean isMachine = orderTask.getIsMachine().equals("0");
             if(pauseNode!=null && isMachine) {
                 pauseNode.setExeStatus("4");
+                if ("下料".equals(pauseNode.getNodeName())){
+                    pauseNode.setExeStatus("1");
+                }
                 taskNodeService.updateById(pauseNode);
             }
         }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolController.java

@@ -2,6 +2,7 @@ package com.github.zuihou.business.controller.productionReadyCenter;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.zuihou.authority.dto.auth.UserPageDTO;
 import com.github.zuihou.authority.entity.core.Org;
 import com.github.zuihou.base.controller.SuperCacheController;